feat: update merkle logic to apply latest chain update (#39)

* update merkle logic to apply latest chain update * remove console.log --------- Co-authored-by: Harvey <[email protected]>
initia-labs · Jun 14, 2024 · 831b925 · 831b925
1 parent a3e711e
commit 831b925
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/lib/storage.spec.ts b/src/lib/storage.spec.ts
@@ -25,6 +25,30 @@ const v1 = [
     receiver: 'init174knscjg688ddtxj8smyjz073r3w5mmsp3m0m2',
     l1_denom: 'uinit',
     amount: BigInt(1000000)
+  },
+  {
+    bridge_id: BigInt(1),
+    sequence: BigInt(4),
+    sender: 'init1wzenw7r2t2ra39k4l9yqq95pw55ap4sm4vsa9g',
+    receiver: 'init174knscjg688ddtxj8smyjz073r3w5mmsp3m0m2',
+    l1_denom: 'uinit',
+    amount: BigInt(1000231200)
+  },
+  {
+    bridge_id: BigInt(1),
+    sequence: BigInt(5),
+    sender: 'init1wzenw7r2t2ra39k4l9yqq95pw55ap4sm4vsa9g',
+    receiver: 'init174knscjg688ddtxj8smyjz073r3w5mmsp3m0m2',
+    l1_denom: 'uinit',
+    amount: BigInt(32340000)
+  },
+  {
+    bridge_id: BigInt(1),
+    sequence: BigInt(6),
+    sender: 'init1wzenw7r2t2ra39k4l9yqq95pw55ap4sm4vsa9g',
+    receiver: 'init174knscjg688ddtxj8smyjz073r3w5mmsp3m0m2',
+    l1_denom: 'uinit',
+    amount: BigInt(101230000)
   }
 ]
 
@@ -80,5 +104,12 @@ describe('WithdrawStorage', () => {
       ])
     ).toString('base64')
     expect(airdrop.verify(merkleProof, target)).toBeTruthy()
+    expect(merkleRoot).toEqual('VcN+0UZbTtGyyLfQtAHW+bCv5ixadyyT0ZZ26aUT1JY=')
+    expect(merkleProof).toEqual([
+      'gnUeNU3EnW4iBOk8wounvu98aTER0BP5dOD0lkuwBBE=',
+      'yE4zjliK5P9sfdzR2iNh6nYHmD+mjDK6dONuZ3QlVcA=',
+      'GQXXUQ5P/egGvbAHkYfWHIAfgyCEmnjz/fUMKrWCEn8='
+    ])
+    expect(outputRoot).toEqual('0cg24XcpDwTIFXHY4jNyxg2EQS5RUqcMvlMJeuI5rf4=')
   })
 })
diff --git a/src/lib/storage.ts b/src/lib/storage.ts
@@ -3,7 +3,7 @@ import { sha3_256 } from './util'
 import { WithdrawalTx } from './types'
 import { AccAddress } from 'initia-l1'
 
-const SPLITTER = Buffer.from('|')
+const SPLITTER = Buffer.from('|', 'utf8')
 
 function convertHexToBase64(hex: string): string {
   return Buffer.from(hex, 'hex').toString('base64')
@@ -23,7 +23,7 @@ export class WithdrawStorage {
       const amount_buf = Buffer.alloc(8)
       amount_buf.writeBigInt64BE(tx.amount)
 
-      return sha3_256(
+      return sha3_256(sha3_256(
         Buffer.concat([
           bridge_id_buf,
           sequence_buf,
@@ -35,7 +35,7 @@ export class WithdrawStorage {
           SPLITTER,
           amount_buf
         ])
-      )
+      ))
     })
 
     this.tree = new MerkleTree(leaves, sha3_256, { sort: true })
@@ -57,7 +57,7 @@ export class WithdrawStorage {
 
     return this.tree
       .getHexProof(
-        sha3_256(
+        sha3_256(sha3_256(
           Buffer.concat([
             bridge_id_buf,
             sequence_buf,
@@ -69,7 +69,7 @@ export class WithdrawStorage {
             SPLITTER,
             amount_buf
           ])
-        )
+        ))
       )
       .map((v) => convertHexToBase64(v.replace('0x', '')))
   }
@@ -94,7 +94,7 @@ export class WithdrawStorage {
     const amount_buf = Buffer.alloc(8)
     amount_buf.writeBigInt64BE(tx.amount)
 
-    let hashBuf = sha3_256(
+    let hashBuf = sha3_256(sha3_256(
       Buffer.concat([
         bridge_id_buf,
         sequence_buf,
@@ -106,7 +106,7 @@ export class WithdrawStorage {
         SPLITTER,
         amount_buf
       ])
-    )
+    ))
 
     proof.forEach((proofElem) => {
       const proofBuf = Buffer.from(proofElem, 'base64')