Merge branch 'main' into itemsr_pcheremu

matter-labs · Aug 22, 2024 · 7ac2957 · 7ac2957
2 parents ca0f0a4 + f58cb8f
commit 7ac2957
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/packages/app/src/composables/useEnvironmentConfig.ts b/packages/app/src/composables/useEnvironmentConfig.ts
@@ -2,6 +2,7 @@ import { computed, ref } from "vue";
 
 import type { EnvironmentConfig, NetworkConfig, RuntimeConfig } from "@/configs";
 
+import { BASE_TOKEN_L2_ADDRESS } from "@/utils/constants";
 import { checksumAddress } from "@/utils/formatters";
 
 const config = ref<EnvironmentConfig | null>(null);
@@ -28,7 +29,7 @@ export async function loadEnvironmentConfig(runtimeConfig: RuntimeConfig): Promi
   }
 
   envConfig.networks?.forEach((networkConfig) => {
-    networkConfig.baseTokenAddress = checksumAddress(networkConfig.baseTokenAddress);
+    networkConfig.baseTokenAddress = checksumAddress(networkConfig.baseTokenAddress || BASE_TOKEN_L2_ADDRESS);
   });
 
   config.value = envConfig;

diff --git a/packages/app/src/utils/constants.ts b/packages/app/src/utils/constants.ts
@@ -1,3 +1,4 @@
+export const BASE_TOKEN_L2_ADDRESS = "0x000000000000000000000000000000000000800A";
 export const PROXY_CONTRACT_IMPLEMENTATION_ABI = [
   {
     inputs: [],

diff --git a/scripts/setup-hyperchain-config.ts b/scripts/setup-hyperchain-config.ts
@@ -18,6 +18,7 @@ const buildAppConfig = (zkSyncEnvs: { [key: string]: string }) => ({
     name: zkSyncEnvs.CHAIN_ETH_ZKSYNC_NETWORK || "",
     published: true,
     rpcUrl: zkSyncEnvs.API_WEB3_JSON_RPC_HTTP_URL || "",
+    baseTokenAddress: zkSyncEnvs.ETH_TOKEN_L2_ADDRESS || "0x000000000000000000000000000000000000800A",
   }]
 });