fix(types): set the type of arg in script to string

ckb-js · Apr 24, 2019 · 7ea3ad2 · 7ea3ad2
1 parent 8c46065
commit 7ea3ad2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/packages/ckb-sdk-utils/src/index.ts b/packages/ckb-sdk-utils/src/index.ts
@@ -64,15 +64,13 @@ export const hexToUtf8 = (hex: string) => {
   return utf8.decode(str)
 }
 
-export const lockScriptToHash = ({ binaryHash, args }: { binaryHash?: string; args?: Uint8Array[] }) => {
+export const lockScriptToHash = ({ binaryHash, args }: { binaryHash?: string; args?: (Uint8Array | string)[] }) => {
   const s = blake2b(32, null, null, PERSONAL)
   if (binaryHash) {
     s.update(Buffer.from(binaryHash.replace(/^0x/, ''), 'hex'))
   }
   if (args && args.length) {
-    args.forEach(arg => {
-      s.update(arg)
-    })
+    args.forEach(arg => (typeof arg === 'string' ? s.update(hexToBytes(arg)) : s.update(arg)))
   }
 
   const digest = s.digest('hex')

diff --git a/packages/ckb-sdk-wallet/src/account.ts b/packages/ckb-sdk-wallet/src/account.ts
@@ -7,7 +7,7 @@ class Account extends ECPair {
 
   public rpc: RPC
 
-  public unlockArgs: Uint8Array[] = []
+  public unlockArgs: string[] = []
 
   public lockScript: CKBComponents.Script = {
     version: 0,

diff --git a/packages/ckb-types/index.d.ts b/packages/ckb-types/index.d.ts
@@ -50,7 +50,7 @@ declare namespace CKBComponents {
    */
   export interface CellInput {
     prevOutput: OutPoint
-    args: Uint8Array[]
+    args: Hash[]
   }
 
   /**