Merge pull request #429 from maticnetwork/etrog-global-index

Etrog global index
maticnetwork · Feb 15, 2024 · 6d929d6 · 6d929d6
2 parents fc28a41 + 21d43aa
commit 6d929d6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@maticnetwork/maticjs",
-  "version": "3.7.8",
+  "version": "3.7.9",
   "description": "Javascript developer library for interacting with Matic Network",
   "main": "dist/npm.export.js",
   "types": "dist/ts/index.d.ts",

diff --git a/src/pos/exit_util.ts b/src/pos/exit_util.ts
@@ -297,7 +297,7 @@ export class ExitUtil {
               );
 
               if(index >= logIndices.length) {
-                throw new Error('Index is grater than the number of tokens in this transaction');
+                throw new Error('Index is greater than the number of tokens in this transaction');
               }
 
               return this.encodePayload_(

diff --git a/src/zkevm/erc20.ts b/src/zkevm/erc20.ts
@@ -330,7 +330,7 @@ export class ERC20 extends ZkEvmToken {
                 return this.childBridge.claimMessageNew(
                     payload.smtProof,
                     payload.smtProofRollup,
-                    payload.index,
+                    (BigInt(payload.index) + BigInt(2 ** 64)).toString(),
                     payload.mainnetExitRoot,
                     payload.rollupExitRoot,
                     payload.originNetwork,
@@ -379,7 +379,7 @@ export class ERC20 extends ZkEvmToken {
                 return this.childBridge.claimAssetNew(
                     payload.smtProof,
                     payload.smtProofRollup,
-                    payload.index,
+                    (BigInt(payload.index) + BigInt(2 ** 64)).toString(),
                     payload.mainnetExitRoot,
                     payload.rollupExitRoot,
                     payload.originNetwork,
@@ -479,7 +479,7 @@ export class ERC20 extends ZkEvmToken {
                 return this.parentBridge.claimMessageNew(
                     payload.smtProof,
                     payload.smtProofRollup,
-                    payload.index,
+                    payload.index.toString(),
                     payload.mainnetExitRoot,
                     payload.rollupExitRoot,
                     payload.originNetwork,
@@ -562,7 +562,7 @@ export class ERC20 extends ZkEvmToken {
                 return this.parentBridge.claimAssetNew(
                     payload.smtProof,
                     payload.smtProofRollup,
-                    payload.index,
+                    payload.index.toString(),
                     payload.mainnetExitRoot,
                     payload.rollupExitRoot,
                     payload.originNetwork,

diff --git a/src/zkevm/zkevm_bridge.ts b/src/zkevm/zkevm_bridge.ts
@@ -127,7 +127,7 @@ export class ZkEvmBridge extends BaseToken<IZkEvmClientConfig> {
     claimAssetNew(
         smtProof: string[],
         smtProofRollup: string[],
-        index: number,
+        index: string,
         mainnetExitRoot: string,
         rollupExitRoot: string,
         originNetwork: number,
@@ -263,7 +263,7 @@ export class ZkEvmBridge extends BaseToken<IZkEvmClientConfig> {
     claimMessageNew(
         smtProof: string[],
         smtProofRollup: string[],
-        index: number,
+        index: string,
         mainnetExitRoot: string,
         rollupExitRoot: string,
         originNetwork: number,