feat(core): use the secp256k1 type script hash as the code hash of th…

…e secp256k1 dep
ckb-js · Aug 23, 2019 · 617487e · 617487e
1 parent 40cdbaa
commit 617487e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/packages/ckb-sdk-core/examples/sendTransaction.js b/packages/ckb-sdk-core/examples/sendTransaction.js
@@ -32,7 +32,7 @@ const bootstrap = async () => {
    */
 
   const script = {
-    type: 'Data',
+    type: secp256k1Dep.type,
     codeHash: `0x${secp256k1Dep.codeHash}`,
     args: [`0x${myAddressObj.identifier}`],
   }
@@ -117,6 +117,7 @@ const bootstrap = async () => {
     const targetOutput = {
       capacity: targetCapacity,
       lock: {
+        type: secp256k1Dep.type,
         codeHash: secp256k1Dep.codeHash,
         args: [targetIdentifier],
       },
@@ -128,7 +129,8 @@ const bootstrap = async () => {
     const changeOutput = {
       capacity: 0n,
       lock: {
-        codeHash: secp256k1Dep.codeHash,
+        type: secp256k1Dep.type,
+        codeHash: `0x${secp256k1Dep.codeHash}`,
         args: [`0x${myAddressObj.identifier}`],
       },
     }

diff --git a/packages/ckb-sdk-core/src/index.ts b/packages/ckb-sdk-core/src/index.ts
@@ -3,6 +3,7 @@ import Address from '@nervosnetwork/ckb-sdk-address'
 import * as utils from '@nervosnetwork/ckb-sdk-utils'
 
 interface DepCellInfo {
+  type: CKBComponents.ScriptHashType
   codeHash: CKBComponents.Hash256
   outPoint: CKBComponents.OutPoint
 }
@@ -90,10 +91,13 @@ class Core {
     const secp256k1CodeTx = block.transactions[0]
     if (!secp256k1CodeTx) throw new Error('Cannot load the transaction which has the secp256k1 code cell')
     if (!secp256k1CodeTx.outputs[1]) {
-      throw new Error('Cannot load the secp256k1 code because the specific output is not found')
+      throw new Error('Cannot load the secp256k1 cell because the specific output is not found')
+    }
+    if (!secp256k1CodeTx.outputs[1].type) {
+      throw new Error('Secp256k1 type script not found in the cell')
     }
 
-    const secp256k1CodeHash = this.utils.blake160(secp256k1CodeTx.outputsData[1], 'hex')
+    const secp256k1TypeHash = this.utils.scriptToHash(secp256k1CodeTx.outputs[1].type)
 
     const secp256k1DepTx = block.transactions[1]
     if (!secp256k1DepTx) throw new Error('Cannot load the transaction which has the secp256k1 dep cell')
@@ -102,7 +106,8 @@ class Core {
     }
 
     this.config.secp256k1Dep = {
-      codeHash: secp256k1CodeHash,
+      type: 'Type' as CKBComponents.ScriptHashType.Type,
+      codeHash: secp256k1TypeHash,
       outPoint: {
         txHash: secp256k1DepTx.hash.replace(/^0x/, ''),
         index: '0',