fix: remove default hash_type=data

nervosnetwork · Aug 28, 2019 · 33cc4cf · 33cc4cf
1 parent 9c25b4a
commit 33cc4cf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/packages/neuron-wallet/src/models/lock-utils.ts b/packages/neuron-wallet/src/models/lock-utils.ts
@@ -79,7 +79,7 @@ export default class LockUtils {
     return LockUtils.computeScriptHash(lock)
   }
 
-  static async addressToLockScript(address: string, hashType: ScriptHashType = ScriptHashType.Data): Promise<Script> {
+  static async addressToLockScript(address: string, hashType: ScriptHashType = ScriptHashType.Type): Promise<Script> {
     const systemScript = await this.systemScript()
 
     const lock: Script = {
@@ -90,15 +90,15 @@ export default class LockUtils {
     return lock
   }
 
-  static async addressToLockHash(address: string, hashType: ScriptHashType = ScriptHashType.Data): Promise<string> {
+  static async addressToLockHash(address: string, hashType: ScriptHashType = ScriptHashType.Type): Promise<string> {
     const lock: Script = await this.addressToLockScript(address, hashType)
     const lockHash: string = await this.lockScriptToHash(lock)
 
     return lockHash
   }
 
   static async addressToAllLockHashes(address: string): Promise<string[]> {
-    const dataLockHash = await LockUtils.addressToLockHash(address, ScriptHashType.Data)
+    const dataLockHash = await LockUtils.addressToLockHash(address)
     return [dataLockHash]
   }
 

diff --git a/packages/neuron-wallet/src/services/tx/transaction-generator.ts b/packages/neuron-wallet/src/services/tx/transaction-generator.ts
@@ -1,4 +1,4 @@
-import { TransactionWithoutHash, Cell, ScriptHashType, DepType } from 'types/cell-types'
+import { TransactionWithoutHash, Cell, DepType } from 'types/cell-types'
 import CellsService, { MIN_CELL_CAPACITY } from 'services/cells'
 import LockUtils from 'models/lock-utils'
 import { CapacityTooSmall } from 'exceptions'
@@ -12,7 +12,7 @@ export class TransactionGenerator {
     changeAddress: string,
     fee: string = '0'
   ): Promise<TransactionWithoutHash> => {
-    const { codeHash, outPoint } = await LockUtils.systemScript()
+    const { codeHash, outPoint, hashType } = await LockUtils.systemScript()
 
     const needCapacities: bigint = targetOutputs
       .map(o => BigInt(o.capacity))
@@ -35,7 +35,7 @@ export class TransactionGenerator {
         lock: {
           codeHash,
           args: [blake160],
-          hashType: ScriptHashType.Data,
+          hashType,
         },
       }
 
@@ -54,7 +54,7 @@ export class TransactionGenerator {
         lock: {
           codeHash,
           args: [changeBlake160],
-          hashType: ScriptHashType.Data,
+          hashType,
         },
       }
 

diff --git a/packages/neuron-wallet/src/types/convert-to.ts b/packages/neuron-wallet/src/types/convert-to.ts
@@ -1,13 +1,4 @@
-import {
-  Transaction,
-  Input,
-  Cell,
-  Script,
-  TransactionWithoutHash,
-  ScriptHashType,
-  CellDep,
-  OutPoint,
-} from './cell-types'
+import { Transaction, Input, Cell, Script, TransactionWithoutHash, CellDep, OutPoint } from './cell-types'
 
 export default class ConvertTo {
   public static toSdkTransaction = (tx: Transaction): CKBComponents.Transaction => {
@@ -62,10 +53,9 @@ export default class ConvertTo {
 
   public static toSdkScript = (script: Script): CKBComponents.Script => {
     return {
-      ...script,
       args: script.args!,
       codeHash: script.codeHash!,
-      hashType: ScriptHashType.Data,
+      hashType: script.hashType,
     }
   }
 }