Ivan/fix l1 l2 address conversion (matter-labs#262)

neotheprogramist · Mar 27, 2024 · 27dd364 · 27dd364
1 parent bb0ec3d
commit 27dd364
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/l1-contracts/scripts/utils.ts b/l1-contracts/scripts/utils.ts
@@ -86,7 +86,10 @@ export function getNumberFromEnv(envName: string): string {
 const ADDRESS_MODULO = ethers.BigNumber.from(2).pow(160);
 
 export function applyL1ToL2Alias(address: string): string {
-  return ethers.utils.hexlify(ethers.BigNumber.from(address).add(L1_TO_L2_ALIAS_OFFSET).mod(ADDRESS_MODULO));
+  return ethers.utils.hexZeroPad(
+    ethers.utils.hexlify(ethers.BigNumber.from(address).add(L1_TO_L2_ALIAS_OFFSET).mod(ADDRESS_MODULO)),
+    20
+  );
 }
 
 export function readBatchBootloaderBytecode() {

diff --git a/l2-contracts/src/utils.ts b/l2-contracts/src/utils.ts
@@ -32,13 +32,19 @@ export const testConfigPath = path.join(process.env.ZKSYNC_HOME as string, "etc/
 export const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: "utf-8" }));
 
 export function applyL1ToL2Alias(address: string): string {
-  return ethers.utils.hexlify(ethers.BigNumber.from(address).add(L1_TO_L2_ALIAS_OFFSET).mod(ADDRESS_MODULO));
+  return ethers.utils.hexZeroPad(
+    ethers.utils.hexlify(ethers.BigNumber.from(address).add(L1_TO_L2_ALIAS_OFFSET).mod(ADDRESS_MODULO)),
+    20
+  );
 }
 
 export function unapplyL1ToL2Alias(address: string): string {
   // We still add ADDRESS_MODULO to avoid negative numbers
-  return ethers.utils.hexlify(
-    ethers.BigNumber.from(address).sub(L1_TO_L2_ALIAS_OFFSET).add(ADDRESS_MODULO).mod(ADDRESS_MODULO)
+  return ethers.utils.hexZeroPad(
+    ethers.utils.hexlify(
+      ethers.BigNumber.from(address).sub(L1_TO_L2_ALIAS_OFFSET).add(ADDRESS_MODULO).mod(ADDRESS_MODULO)
+    ),
+    20
   );
 }