Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Etrog global index #429

Merged
merged 2 commits into from
Feb 15, 2024
Merged

Etrog global index #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3c918b
fix: etrog global index
nitinmittal23 Feb 13, 2024
21d43aa
upd: package
nitinmittal23 Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/pos/exit_util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_(
Expand Down
8 changes: 4 additions & 4 deletions src/zkevm/erc20.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/zkevm/zkevm_bridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading