feat: handle hash_type:data2 (#3280)

Keith-CY · devchenyan · web-flow · commit f5942d7db0fd · 2024-12-13T06:41:32.000Z
* feat: update ckb client versions

* feat: handle hash_type:data2

* fix

---------

Co-authored-by: Keith-CY &lt;7271329+Keith-CY@users.noreply.github.com&gt;
Co-authored-by: devchenyan &lt;sgt39007@163.com&gt;
diff --git a/packages/neuron-ui/src/components/SpecialAssetList/hooks.ts b/packages/neuron-ui/src/components/SpecialAssetList/hooks.ts
@@ -30,7 +30,7 @@ export interface SpecialAssetCell {
   lock: {
     args: string
     codeHash: string
-    hashType: 'type' | 'data'
+    hashType: 'type' | 'data' | 'data1' | 'data2'
   }
   lockHash: string
   multiSignBlake160: string
diff --git a/packages/neuron-ui/src/types/Controller/index.d.ts b/packages/neuron-ui/src/types/Controller/index.d.ts
@@ -215,7 +215,7 @@ declare namespace Controller {
     interface Response {
       cellDep: any
       codeHash: string
-      hashType: 'data' | 'type'
+      hashType: 'data' | 'type' | 'data1' | 'data2'
     }
   }
   interface SUDTAccount {
diff --git a/packages/neuron-wallet/src/models/asset-account-info.ts b/packages/neuron-wallet/src/models/asset-account-info.ts
@@ -401,6 +401,7 @@ function toScriptInfo(sporeConfig: SporeScript): ScriptCellInfo {
     if (sporeScriptHashType === 'type') return ScriptHashType.Type
     if (sporeScriptHashType === 'data') return ScriptHashType.Data
     if (sporeScriptHashType === 'data1') return ScriptHashType.Data1
+    if (sporeScriptHashType === 'data2') return ScriptHashType.Data2
 
     throw new Error(`Invalid hash type: ${sporeScriptHashType}`)
   })()
diff --git a/packages/neuron-wallet/src/models/chain/live-cell.ts b/packages/neuron-wallet/src/models/chain/live-cell.ts
@@ -6,6 +6,7 @@ const LUMOS_HASH_TYPE_MAP: Record<string, ScriptHashType> = {
   type: ScriptHashType.Type,
   data1: ScriptHashType.Data1,
   data: ScriptHashType.Data,
+  data2: ScriptHashType.Data2,
 }
 
 export type CellWithOutPoint = Cell & { outPoint: IOutPoint }
diff --git a/packages/neuron-wallet/src/models/chain/script.ts b/packages/neuron-wallet/src/models/chain/script.ts
@@ -6,6 +6,7 @@ export enum ScriptHashType {
   Data = 'data',
   Type = 'type',
   Data1 = 'data1',
+  Data2 = 'data2',
 }
 
 export default class Script {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export interface SpecialAssetCell {`
`30`	`30`	`lock: {`
`31`	`31`	`args: string`
`32`	`32`	`codeHash: string`
`33`		`- hashType: 'type' \| 'data'`
	`33`	`+ hashType: 'type' \| 'data' \| 'data1' \| 'data2'`
`34`	`34`	`}`
`35`	`35`	`lockHash: string`
`36`	`36`	`multiSignBlake160: string`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ declare namespace Controller {`
`215`	`215`	`interface Response {`
`216`	`216`	`cellDep: any`
`217`	`217`	`codeHash: string`
`218`		`- hashType: 'data' \| 'type'`
	`218`	`+ hashType: 'data' \| 'type' \| 'data1' \| 'data2'`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`	`interface SUDTAccount {`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ const LUMOS_HASH_TYPE_MAP: Record<string, ScriptHashType> = {`
`6`	`6`	`type: ScriptHashType.Type,`
`7`	`7`	`data1: ScriptHashType.Data1,`
`8`	`8`	`data: ScriptHashType.Data,`
	`9`	`+ data2: ScriptHashType.Data2,`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`export type CellWithOutPoint = Cell & { outPoint: IOutPoint }`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ export enum ScriptHashType {`
`6`	`6`	`Data = 'data',`
`7`	`7`	`Type = 'type',`
`8`	`8`	`Data1 = 'data1',`
	`9`	`+ Data2 = 'data2',`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`export default class Script {`