From 41d0ef3a5c4636329c156bbab18f6fe928ddb6fb Mon Sep 17 00:00:00 2001 From: danijelTxFusion Date: Tue, 23 Jan 2024 03:13:42 +0100 Subject: [PATCH] fix(utils): pad zeroes to left instead to right in `getHashedL2ToL1Msg()` --- src/utils.ts | 4 ++-- tests/unit/utils.test.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils.ts b/src/utils.ts index 96512bb1..366d09ad 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -79,9 +79,9 @@ export function getHashedL2ToL1Msg(sender: Address, msg: BytesLike, txNumberInBl const encodedMsg = new Uint8Array([ 0, // l2ShardId 1, // isService - ...ethers.getBytes(ethers.zeroPadBytes(ethers.toBeHex(txNumberInBlock), 2)), + ...ethers.getBytes(ethers.zeroPadValue(ethers.toBeHex(txNumberInBlock), 2)), ...ethers.getBytes(L1_MESSENGER_ADDRESS), - ...ethers.getBytes(ethers.zeroPadBytes(sender, 32)), + ...ethers.getBytes(ethers.zeroPadValue(sender, 32)), ...ethers.getBytes(ethers.keccak256(msg)), ]); diff --git a/tests/unit/utils.test.ts b/tests/unit/utils.test.ts index 5e151e20..fc2f85f1 100644 --- a/tests/unit/utils.test.ts +++ b/tests/unit/utils.test.ts @@ -8,7 +8,7 @@ describe("utils", () => { const withdrawETHMessage = "0x6c0960f936615cf349d7f6344891b1e7ca7c72883f5dc04900000000000000000000000000000000000000000000000000000001a13b8600"; const withdrawETHMessageHash = - "0xd8c80ecb64619e343f57c3b133c6c6d8dd0572dd3488f1ca3276c5b7fd3a938d"; + "0x521bd25904766c83fe868d6a29cbffa011afd8a1754f6c9a52b053b693e42f18"; const result = utils.getHashedL2ToL1Msg( "0x36615Cf349d7F6344891B1e7CA7C72883F5dc049", withdrawETHMessage,