feat: add hash type in the script structure

Author: Keith-CY

packages/neuron-wallet/src/database/chain/entities/input.ts

@@ -1,5 +1,5 @@
 import { Entity, BaseEntity, Column, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
-import { OutPoint, Input as InputInterface, CellOutPoint } from '../../../types/cell-types'
+import { OutPoint, Input as InputInterface, CellOutPoint, ScriptHashType } from '../../../types/cell-types'
 import Transaction from './transaction'
 
 /* eslint @typescript-eslint/no-unused-vars: "warn" */
@@ -42,13 +42,22 @@ export default class Input extends BaseEntity {
   })
   capacity: string | null = null
 
+  @Column({
+    type: 'enum',
+    enum: ScriptHashType,
+    default: ScriptHashType.Data,
+    nullable: false,
+  })
+  hashType: ScriptHashType = ScriptHashType.Data
+
   public cellOutPoint(): CellOutPoint | null {
     if (!this.outPointTxHash || !this.outPointIndex) {
       return null
     }
     return {
       txHash: this.outPointTxHash,
       index: this.outPointIndex,
+      hashType: this.hashType,
     }
   }
 

packages/neuron-wallet/src/database/chain/entities/output.ts

@@ -1,5 +1,5 @@
 import { Entity, BaseEntity, Column, PrimaryColumn, ManyToOne } from 'typeorm'
-import { Script, OutPoint, Cell, CellOutPoint } from '../../../types/cell-types'
+import { Script, OutPoint, Cell, CellOutPoint, ScriptHashType } from '../../../types/cell-types'
 import TransactionEntity from './transaction'
 
 /* eslint @typescript-eslint/no-unused-vars: "warn" */
@@ -35,10 +35,19 @@ export default class Output extends BaseEntity {
   })
   status!: string
 
+  @Column({
+    type: 'enum',
+    enum: ScriptHashType,
+    default: ScriptHashType.Data,
+    nullable: false,
+  })
+  hashType!: ScriptHashType
+
   public cellOutPoint(): CellOutPoint {
     return {
       txHash: this.outPointTxHash,
       index: this.outPointIndex,
+      hashType: this.hashType,
     }
   }
 

packages/neuron-wallet/src/database/chain/migrations/1561695143591-InitMigration.ts

@@ -3,9 +3,9 @@ import {MigrationInterface, QueryRunner} from "typeorm";
 export class InitMigration1561695143591 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`CREATE TABLE "output" ("outPointTxHash" varchar NOT NULL, "outPointIndex" varchar NOT NULL, "capacity" varchar NOT NULL, "lock" text NOT NULL, "lockHash" varchar NOT NULL, "status" varchar NOT NULL, "transactionHash" varchar, PRIMARY KEY ("outPointTxHash", "outPointIndex"))`);
+        await queryRunner.query(`CREATE TABLE "output" ("outPointTxHash" varchar NOT NULL, "outPointIndex" varchar NOT NULL, "capacity" varchar NOT NULL, "lock" text NOT NULL, "lockHash" varchar NOT NULL, "status" varchar NOT NULL, "hashType" enum NOT NULL, transactionHash" varchar, PRIMARY KEY ("outPointTxHash", "outPointIndex"))`);
         await queryRunner.query(`CREATE TABLE "transaction" ("hash" varchar PRIMARY KEY NOT NULL, "version" varchar NOT NULL, "deps" text NOT NULL, "witnesses" text NOT NULL, "timestamp" varchar, "blockNumber" varchar, "blockHash" varchar, "description" varchar, "createdAt" varchar NOT NULL, "updatedAt" varchar NOT NULL)`);
-        await queryRunner.query(`CREATE TABLE "input" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "outPointTxHash" varchar, "outPointIndex" varchar, "since" varchar NOT NULL, "lockHash" varchar, "capacity" varchar, "transactionHash" varchar)`);
+        await queryRunner.query(`CREATE TABLE "input" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "outPointTxHash" varchar, "outPointIndex" varchar, "since" varchar NOT NULL, "lockHash" varchar, "capacity" varchar, "hashType" enum NOT NULL, "transactionHash" varchar)`);
         await queryRunner.query(`CREATE TABLE "sync_info" ("name" varchar PRIMARY KEY NOT NULL, "value" varchar NOT NULL)`);
         await queryRunner.query(`CREATE TABLE "temporary_output" ("outPointTxHash" varchar NOT NULL, "outPointIndex" varchar NOT NULL, "capacity" varchar NOT NULL, "lock" text NOT NULL, "lockHash" varchar NOT NULL, "status" varchar NOT NULL, "transactionHash" varchar, CONSTRAINT "FK_29236a0eb11fac458990882f985" FOREIGN KEY ("transactionHash") REFERENCES "transaction" ("hash") ON DELETE CASCADE ON UPDATE NO ACTION, PRIMARY KEY ("outPointTxHash", "outPointIndex"))`);
         await queryRunner.query(`INSERT INTO "temporary_output"("outPointTxHash", "outPointIndex", "capacity", "lock", "lockHash", "status", "transactionHash") SELECT "outPointTxHash", "outPointIndex", "capacity", "lock", "lockHash", "status", "transactionHash" FROM "output"`);
@@ -19,12 +19,12 @@ export class InitMigration1561695143591 implements MigrationInterface {
 
     public async down(queryRunner: QueryRunner): Promise<any> {
         await queryRunner.query(`ALTER TABLE "input" RENAME TO "temporary_input"`);
-        await queryRunner.query(`CREATE TABLE "input" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "outPointTxHash" varchar, "outPointIndex" varchar, "since" varchar NOT NULL, "lockHash" varchar, "capacity" varchar, "transactionHash" varchar)`);
-        await queryRunner.query(`INSERT INTO "input"("id", "outPointTxHash", "outPointIndex", "since", "lockHash", "capacity", "transactionHash") SELECT "id", "outPointTxHash", "outPointIndex", "since", "lockHash", "capacity", "transactionHash" FROM "temporary_input"`);
+        await queryRunner.query(`CREATE TABLE "input" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "outPointTxHash" varchar, "outPointIndex" varchar, "since" varchar NOT NULL, "lockHash" varchar, "capacity" varchar, "hashType: enum NOT NULL, "transactionHash" varchar)`);
+        await queryRunner.query(`INSERT INTO "input"("id", "outPointTxHash", "outPointIndex", "since", "lockHash", "capacity", "hashType", "transactionHash") SELECT "id", "outPointTxHash", "outPointIndex", "since", "lockHash", "capacity", "hashType", "transactionHash" FROM "temporary_input"`);
         await queryRunner.query(`DROP TABLE "temporary_input"`);
         await queryRunner.query(`ALTER TABLE "output" RENAME TO "temporary_output"`);
-        await queryRunner.query(`CREATE TABLE "output" ("outPointTxHash" varchar NOT NULL, "outPointIndex" varchar NOT NULL, "capacity" varchar NOT NULL, "lock" text NOT NULL, "lockHash" varchar NOT NULL, "status" varchar NOT NULL, "transactionHash" varchar, PRIMARY KEY ("outPointTxHash", "outPointIndex"))`);
-        await queryRunner.query(`INSERT INTO "output"("outPointTxHash", "outPointIndex", "capacity", "lock", "lockHash", "status", "transactionHash") SELECT "outPointTxHash", "outPointIndex", "capacity", "lock", "lockHash", "status", "transactionHash" FROM "temporary_output"`);
+        await queryRunner.query(`CREATE TABLE "output" ("outPointTxHash" varchar NOT NULL, "outPointIndex" varchar NOT NULL, "capacity" varchar NOT NULL, "lock" text NOT NULL, "lockHash" varchar NOT NULL, "status" varchar NOT NULL, "hashType" enum NOT NULL, "transactionHash" varchar, PRIMARY KEY ("outPointTxHash", "outPointIndex"))`);
+        await queryRunner.query(`INSERT INTO "output"("outPointTxHash", "outPointIndex", "capacity", "lock", "lockHash", "status", "hashType", "transactionHash") SELECT "outPointTxHash", "outPointIndex", "capacity", "lock", "lockHash", "status", hashType", "transactionHash" FROM "temporary_output"`);
         await queryRunner.query(`DROP TABLE "temporary_output"`);
         await queryRunner.query(`DROP TABLE "sync_info"`);
         await queryRunner.query(`DROP TABLE "input"`);

packages/neuron-wallet/src/models/lock-utils.ts

@@ -1,5 +1,5 @@
 import NodeService from '../services/node'
-import { OutPoint, Script } from '../types/cell-types'
+import { OutPoint, Script, ScriptHashType } from '../types/cell-types'
 import env from '../env'
 import systemScriptSubject from './subjects/system-script'
 
@@ -56,6 +56,7 @@ export default class LockUtils {
         cell: {
           txHash,
           index,
+          hashType: ScriptHashType.Data,
         },
       },
     }
@@ -77,6 +78,7 @@ export default class LockUtils {
     const lockHash: string = core.utils.lockScriptToHash({
       codeHash,
       args,
+      hashType: ScriptHashType.Data,
     })
 
     if (lockHash.startsWith('0x')) {
@@ -92,6 +94,7 @@ export default class LockUtils {
     const lock: Script = {
       codeHash: systemScript.codeHash,
       args: [LockUtils.addressToBlake160(address)],
+      hashType: ScriptHashType.Data,
     }
     return lock
   }
@@ -120,7 +123,7 @@ export default class LockUtils {
   static addressToBlake160(address: string): string {
     const prefix = env.testnet ? core.utils.AddressPrefix.Testnet : core.utils.AddressPrefix.Mainnet
     const result: string = core.utils.parseAddress(address, prefix, 'hex') as string
-    const hrp: string = `01${Buffer.from('P2PH').toString('hex')}`
+    const hrp: string = `0100`
     let blake160: string = result.slice(hrp.length, result.length)
     if (!blake160.startsWith('0x')) {
       blake160 = `0x${blake160}`

packages/neuron-wallet/src/services/transactions.ts

@@ -1,6 +1,14 @@
 import { getConnection, In, ObjectLiteral } from 'typeorm'
 import { ReplaySubject } from 'rxjs'
-import { OutPoint, Transaction, TransactionWithoutHash, Input, Cell, TransactionStatus } from '../types/cell-types'
+import {
+  OutPoint,
+  Transaction,
+  TransactionWithoutHash,
+  Input,
+  Cell,
+  TransactionStatus,
+  ScriptHashType,
+} from '../types/cell-types'
 import CellsService, { MIN_CELL_CAPACITY } from './cells'
 import InputEntity from '../database/chain/entities/input'
 import OutputEntity from '../database/chain/entities/output'
@@ -522,6 +530,7 @@ export default class TransactionsService {
         lock: {
           codeHash,
           args: [blake160],
+          hashType: ScriptHashType.Data,
         },
       }
 
@@ -540,6 +549,7 @@ export default class TransactionsService {
         lock: {
           codeHash,
           args: [changeBlake160],
+          hashType: ScriptHashType.Data,
         },
       }
 

packages/neuron-wallet/src/types/cell-types.ts

@@ -1,5 +1,10 @@
 // define types in app
 
+export enum ScriptHashType {
+  Data = 'Data',
+  Type = 'Type',
+}
+
 export interface Block {
   header: BlockHeader
   transactions: Transaction[]
@@ -70,10 +75,11 @@ export interface OutPoint {
 export interface CellOutPoint {
   txHash: string
   index: string
+  hashType: ScriptHashType
 }
 
 export interface Script {
   args?: string[]
   codeHash?: string | null
-  hashType: string
+  hashType: ScriptHashType
 }

packages/neuron-wallet/src/types/type-convert.ts

@@ -48,6 +48,7 @@ export default class TypeConvert {
     const cell: CellOutPoint = {
       txHash: outPoint.cell!.txHash,
       index: outPoint.cell!.index,
+      hashType: outPoint.cell!.hashType,
     }
     return {
       blockHash: null,
@@ -66,6 +67,7 @@ export default class TypeConvert {
     return {
       args: script.args,
       codeHash: script.codeHash,
+      hashType: script.hashType,
     }
   }
 }