From a3c918bef323f45719faa94e9299e24ac24e43bc Mon Sep 17 00:00:00 2001 From: Nitin Mittal Date: Tue, 13 Feb 2024 23:51:43 +0400 Subject: [PATCH 1/2] fix: etrog global index --- src/pos/exit_util.ts | 2 +- src/zkevm/erc20.ts | 8 ++++---- src/zkevm/zkevm_bridge.ts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pos/exit_util.ts b/src/pos/exit_util.ts index 7c1316b53..bef5973a2 100644 --- 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 index d9a040b80..55f4aac85 100644 --- 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 index d05d9c185..828b17b82 100644 --- a/src/zkevm/zkevm_bridge.ts +++ b/src/zkevm/zkevm_bridge.ts @@ -127,7 +127,7 @@ export class ZkEvmBridge extends BaseToken { claimAssetNew( smtProof: string[], smtProofRollup: string[], - index: number, + index: string, mainnetExitRoot: string, rollupExitRoot: string, originNetwork: number, @@ -263,7 +263,7 @@ export class ZkEvmBridge extends BaseToken { claimMessageNew( smtProof: string[], smtProofRollup: string[], - index: number, + index: string, mainnetExitRoot: string, rollupExitRoot: string, originNetwork: number, From 21d43aa9a9d6740ed2c37f2a7809b520df1c739f Mon Sep 17 00:00:00 2001 From: Nitin Mittal Date: Tue, 13 Feb 2024 23:52:14 +0400 Subject: [PATCH 2/2] upd: package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 89ee53abc..36e6eebac 100644 --- 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",