feat: shared bridge support

composables/zksync/deposit/useTransaction.ts

@@ -44,6 +44,7 @@ export default (getL1Signer: () => Promise<L1Signer | undefined>) => {
         token: transaction.tokenAddress,
         amount: transaction.amount,
         l2GasLimit: fee.l2GasLimit,
+        approveERC20: true,
         overrides,
       });
 

composables/zksync/useTransaction.ts

@@ -40,7 +40,7 @@ export default (getSigner: () => Promise<Signer | undefined>, getProvider: () =>
       const getRequiredBridgeAddress = async () => {
         if (transaction.tokenAddress === ETH_TOKEN.address) return undefined;
         const bridgeAddresses = await retrieveBridgeAddresses();
-        return bridgeAddresses.erc20L2;
+        return bridgeAddresses.sharedL2;
       };
       const bridgeAddress = transaction.type === "withdrawal" ? await getRequiredBridgeAddress() : undefined;
 

composables/zksync/useWithdrawalFinalization.ts

@@ -1,8 +1,7 @@
 import { useMemoize } from "@vueuse/core";
 import { BigNumber, type BigNumberish } from "ethers";
 import { Wallet } from "zksync-ethers";
-import ZkSyncL1BridgeAbi from "zksync-ethers/abi/IL1Bridge.json";
-import ZkSyncContractAbi from "zksync-ethers/abi/IZkSync.json";
+import IL1SharedBridge from "zksync-ethers/abi/IL1SharedBridge.json";
 
 import type { Hash } from "@/types";
 
@@ -16,13 +15,14 @@ export default (transactionInfo: ComputedRef<TransactionInfo>) => {
   const { isCorrectNetworkSet } = storeToRefs(onboardStore);
   const { tokens } = storeToRefs(tokensStore);
 
-  const retrieveBridgeAddress = useMemoize(() =>
+  const retrieveBridgeAddresses = useMemoize(() => providerStore.requestProvider().getDefaultBridgeAddresses());
+
+  const retrieveChainId = useMemoize(() =>
     providerStore
       .requestProvider()
-      .getDefaultBridgeAddresses()
-      .then((e) => e.erc20L1)
+      .getNetwork()
+      .then((network) => network.chainId)
   );
-  const retrieveMainContractAddress = useMemoize(() => providerStore.requestProvider().getMainContractAddress());
 
   const gasLimit = ref<BigNumberish | undefined>();
   const gasPrice = ref<BigNumberish | undefined>();
@@ -58,6 +58,7 @@ export default (transactionInfo: ComputedRef<TransactionInfo>) => {
       transactionInfo.value.transactionHash
     );
     return {
+      chainId: await retrieveChainId(),
       l1BatchNumber,
       l2MessageIndex,
       l2TxNumberInBlock,
@@ -70,16 +71,16 @@ export default (transactionInfo: ComputedRef<TransactionInfo>) => {
     finalizeWithdrawalParams.value = await getFinalizationParams();
     if (usingMainContract.value) {
       return {
-        address: (await retrieveMainContractAddress()) as Hash,
-        abi: ZkSyncContractAbi,
+        address: (await retrieveBridgeAddresses()).sharedL1 as Hash,
+        abi: IL1SharedBridge,
         account: onboardStore.account.address!,
-        functionName: "finalizeEthWithdrawal",
+        functionName: "finalizeWithdrawal",
         args: Object.values(finalizeWithdrawalParams.value!),
       };
     } else {
       return {
-        address: (await retrieveBridgeAddress()) as Hash,
-        abi: ZkSyncL1BridgeAbi,
+        address: (await retrieveBridgeAddresses()).sharedL1 as Hash,
+        abi: IL1SharedBridge,
         account: onboardStore.account.address!,
         functionName: "finalizeWithdrawal",
         args: Object.values(finalizeWithdrawalParams.value!),

data/wagmi.ts

@@ -41,6 +41,7 @@ const formatZkSyncChain = (network: ZkSyncNetwork) => {
       : undefined,
   };
 };
+
 const getAllChains = () => {
   const chains: Chain[] = [];
   const addUniqueChain = (chain: Chain) => {

package.json

@@ -87,7 +87,7 @@
     "vite": "^3.0.0",
     "vue-tippy": "^6.0.0",
     "web3-avatar-vue": "^1.0.0",
-    "zksync-ethers": "^5.5.0"
+    "zksync-ethers": "^5.8.0-beta.5"
   },
   "overrides": {
     "vue": "latest"

store/zksync/transactionStatus.ts

@@ -1,6 +1,6 @@
 import { useStorage } from "@vueuse/core";
 import { decodeEventLog } from "viem";
-import ZkSyncContractInterface from "zksync-ethers/abi/IZkSync.json";
+import ZkSyncContractInterface from "zksync-ethers/abi/IZkSyncStateTransition.json";
 
 import type { FeeEstimationParams } from "@/composables/zksync/useFee";
 import type { TokenAmount, Hash } from "@/types";
@@ -30,14 +30,6 @@ export const useZkSyncTransactionStatusStore = defineStore("zkSyncTransactionSta
   const { account } = storeToRefs(onboardStore);
   const { eraNetwork } = storeToRefs(providerStore);
 
-  const failedTransaction = useStorage<TransactionInfo[]>("zksync-bridge-failed-transaction", []);
-  const addFailedTransaction = (transaction: TransactionInfo) => {
-    if (failedTransaction.value.some((tx) => tx.transactionHash === transaction.transactionHash)) {
-      return;
-    }
-    failedTransaction.value = [...failedTransaction.value, transaction];
-  };
-
   const storageSavedTransactions = useStorage<{ [networkKey: string]: TransactionInfo[] }>(
     "zksync-bridge-transactions",
     {}
@@ -96,7 +88,6 @@ export const useZkSyncTransactionStatusStore = defineStore("zkSyncTransactionSta
         transaction.info.withdrawalFinalizationAvailable = false;
         transaction.info.failed = true;
         transaction.info.completed = true;
-        addFailedTransaction(transaction);
         return transaction;
       }
       if (transactionDetails.status !== "verified") {
@@ -115,11 +106,10 @@ export const useZkSyncTransactionStatusStore = defineStore("zkSyncTransactionSta
     const transactionReceipt = await providerStore.requestProvider().getTransactionReceipt(transaction.transactionHash);
     if (!transactionReceipt) return transaction;
     const transactionDetails = await providerStore.requestProvider().getTransactionDetails(transaction.transactionHash);
-    transaction.info.completed = true;
     if (transactionDetails.status === "failed") {
       transaction.info.failed = true;
-      addFailedTransaction(transaction);
     }
+    transaction.info.completed = true;
     return transaction;
   };
   const waitForCompletion = async (transaction: TransactionInfo) => {