From 8f9b9a4e1b2bf1ff9556b13321179276421c072c Mon Sep 17 00:00:00 2001 From: xiaohuo Date: Thu, 18 Jul 2024 21:15:26 +0800 Subject: [PATCH 1/3] Update messageDataParser.ts --- src/lib/message/messageDataParser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/message/messageDataParser.ts b/src/lib/message/messageDataParser.ts index 20a175bfec..b36683d774 100644 --- a/src/lib/message/messageDataParser.ts +++ b/src/lib/message/messageDataParser.ts @@ -15,7 +15,7 @@ export class SubmitRetryableMessageDataParser { const parsed = defaultAbiCoder.decode( [ 'uint256', // dest - 'uint256', // l2 call balue + 'uint256', // l2 call value 'uint256', // msg val 'uint256', // max submission 'uint256', // excess fee refund addr From a20eb16dd329eaea1184e85430a44fcb05bfe50e Mon Sep 17 00:00:00 2001 From: xiaohuo Date: Fri, 19 Jul 2024 17:22:26 +0800 Subject: [PATCH 2/3] chore: renaming some for better understanding --- src/lib/message/messageDataParser.ts | 33 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/lib/message/messageDataParser.ts b/src/lib/message/messageDataParser.ts index b36683d774..0b2c7b9869 100644 --- a/src/lib/message/messageDataParser.ts +++ b/src/lib/message/messageDataParser.ts @@ -12,16 +12,17 @@ export class SubmitRetryableMessageDataParser { */ public parse(eventData: string) { // decode the data field - is been packed so we cant decode the bytes field this way + // refer to ArbitrumSubmitRetryableTx here: https://github.com/OffchainLabs/go-ethereum/blob/18256c2dfcce8fd567aa05e03fbc11a4c17aa550/core/types/arb_types.go#L283 const parsed = defaultAbiCoder.decode( [ - 'uint256', // dest - 'uint256', // l2 call value - 'uint256', // msg val - 'uint256', // max submission - 'uint256', // excess fee refund addr - 'uint256', // call value refund addr - 'uint256', // max gas - 'uint256', // gas price bid + 'uint256', // RetryTo + 'uint256', // RetryValue + 'uint256', // DepositValue + 'uint256', // MaxSubmissionFee + 'uint256', // FeeRefundAddr + 'uint256', // Beneficiary + 'uint256', // Gas + 'uint256', // GasFeeCap 'uint256', // data length ], eventData @@ -30,12 +31,12 @@ export class SubmitRetryableMessageDataParser { const addressFromBigNumber = (bn: BigNumber) => getAddress(hexZeroPad(bn.toHexString(), 20)) - const destAddress = addressFromBigNumber(parsed[0]) - const l2CallValue = parsed[1] + const retryTo = addressFromBigNumber(parsed[0]) + const retryValue = parsed[1] const l1Value = parsed[2] const maxSubmissionFee = parsed[3] - const excessFeeRefundAddress = addressFromBigNumber(parsed[4]) - const callValueRefundAddress = addressFromBigNumber(parsed[5]) + const feeRefundAddr = addressFromBigNumber(parsed[4]) + const beneficiary = addressFromBigNumber(parsed[5]) const gasLimit = parsed[6] const maxFeePerGas = parsed[7] const callDataLength = parsed[8] @@ -44,12 +45,12 @@ export class SubmitRetryableMessageDataParser { eventData.substring(eventData.length - callDataLength.mul(2).toNumber()) return { - destAddress, - l2CallValue, + retryTo, + retryValue, l1Value, maxSubmissionFee: maxSubmissionFee, - excessFeeRefundAddress, - callValueRefundAddress, + feeRefundAddr, + beneficiary, gasLimit, maxFeePerGas, data, From 864b5040a2d2c309239c00c4c115fcbf05380376 Mon Sep 17 00:00:00 2001 From: xiaohuo Date: Fri, 19 Jul 2024 17:23:39 +0800 Subject: [PATCH 3/3] chore: typo --- src/lib/message/messageDataParser.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/message/messageDataParser.ts b/src/lib/message/messageDataParser.ts index 0b2c7b9869..1a01454455 100644 --- a/src/lib/message/messageDataParser.ts +++ b/src/lib/message/messageDataParser.ts @@ -23,7 +23,7 @@ export class SubmitRetryableMessageDataParser { 'uint256', // Beneficiary 'uint256', // Gas 'uint256', // GasFeeCap - 'uint256', // data length + 'uint256', // DataLength ], eventData ) as BigNumber[] @@ -33,7 +33,7 @@ export class SubmitRetryableMessageDataParser { const retryTo = addressFromBigNumber(parsed[0]) const retryValue = parsed[1] - const l1Value = parsed[2] + const depositValue = parsed[2] const maxSubmissionFee = parsed[3] const feeRefundAddr = addressFromBigNumber(parsed[4]) const beneficiary = addressFromBigNumber(parsed[5]) @@ -47,7 +47,7 @@ export class SubmitRetryableMessageDataParser { return { retryTo, retryValue, - l1Value, + depositValue, maxSubmissionFee: maxSubmissionFee, feeRefundAddr, beneficiary,