test

Author: nicholaspai

test/evm/hardhat/chain-specific-spokepools/ZkSync_SpokePool.ts

@@ -10,18 +10,34 @@ import {
   randomAddress,
   seedContract,
   avmL1ToL2Alias,
+  keccak256,
+  defaultAbiCoder,
 } from "../../../../utils/utils";
 import { hre } from "../../../../utils/utils.hre";
 
 import { hubPoolFixture } from "../fixtures/HubPool.Fixture";
 import { constructSingleRelayerRefundTree } from "../MerkleLib.utils";
 import { smock } from "@defi-wonderland/smock";
 
+const L2_ASSET_ROUTER = "0x0000000000000000000000000000000000010003";
 // TODO: Grab the following from relayer/CONTRACT_ADDRESSES dictionary?
-const ERC20_BRIDGE = "0x11f943b2c77b743ab90f4a0ae7d5a4e7fca3e102";
 const USDC_BRIDGE = "0x350ACF3d84A6E668E53d4AA682989DCA15Ea27E2";
 
 const abiData = {
+  l2AssetRouter: {
+    abi: [
+      {
+        inputs: [
+          { internalType: "bytes32", name: "_assetId", type: "bytes32" },
+          { internalType: "bytes", name: "_assetData", type: "bytes" },
+        ],
+        name: "withdraw",
+        outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+        stateMutability: "nonpayable",
+        type: "function",
+      },
+    ],
+  },
   erc20DefaultBridge: {
     abi: [
       {
@@ -60,7 +76,7 @@ describe("ZkSync Spoke Pool", function () {
   let hubPool: Contract, zkSyncSpokePool: Contract, dai: Contract, usdc: Contract, weth: Contract;
   let l2Dai: string, crossDomainAliasAddress, crossDomainAlias: SignerWithAddress;
   let owner: SignerWithAddress, relayer: SignerWithAddress, rando: SignerWithAddress;
-  let zkErc20Bridge: FakeContract, zkUSDCBridge: FakeContract, l2Eth: FakeContract;
+  let l2AssetRouter: FakeContract, zkUSDCBridge: FakeContract, l2Eth: FakeContract;
   let constructorArgs: unknown[];
 
   beforeEach(async function () {
@@ -73,14 +89,14 @@ describe("ZkSync Spoke Pool", function () {
     crossDomainAlias = await ethers.getSigner(crossDomainAliasAddress);
     await owner.sendTransaction({ to: crossDomainAliasAddress, value: toWei("1") });
 
-    zkErc20Bridge = await smock.fake(abiData.erc20DefaultBridge.abi, { address: ERC20_BRIDGE });
+    l2AssetRouter = await smock.fake(abiData.l2AssetRouter.abi, { address: L2_ASSET_ROUTER });
     zkUSDCBridge = await smock.fake(abiData.erc20DefaultBridge.abi, { address: USDC_BRIDGE });
     l2Eth = await smock.fake(abiData.eth.abi, { address: abiData.eth.address });
-    constructorArgs = [weth.address, usdc.address, zkUSDCBridge.address, cctpTokenMessenger, 60 * 60, 9 * 60 * 60];
+    constructorArgs = [weth.address, usdc.address, zkUSDCBridge.address, 1, cctpTokenMessenger, 60 * 60, 9 * 60 * 60];
 
     zkSyncSpokePool = await hre.upgrades.deployProxy(
       await getContractFactory("ZkSync_SpokePool", owner),
-      [0, zkErc20Bridge.address, owner.address, hubPool.address],
+      [0, owner.address, hubPool.address],
       { kind: "uups", unsafeAllow: ["delegatecall"], constructorArgs }
     );
 
@@ -98,11 +114,6 @@ describe("ZkSync Spoke Pool", function () {
     await expect(zkSyncSpokePool.upgradeTo(implementation)).to.be.revertedWith("ONLY_COUNTERPART_GATEWAY");
     await zkSyncSpokePool.connect(crossDomainAlias).upgradeTo(implementation);
   });
-  it("Only cross domain owner can set ZKBridge", async function () {
-    await expect(zkSyncSpokePool.setZkBridge(rando.address)).to.be.reverted;
-    await zkSyncSpokePool.connect(crossDomainAlias).setZkBridge(rando.address);
-    expect(await zkSyncSpokePool.zkErc20Bridge()).to.equal(rando.address);
-  });
   it("Invalid USDC bridge configuration is rejected", async function () {
     let _constructorArgs = [...constructorArgs];
     expect(_constructorArgs[1]).to.equal(usdc.address);
@@ -166,14 +177,21 @@ describe("ZkSync Spoke Pool", function () {
       "ONLY_COUNTERPART_GATEWAY"
     );
   });
-  it("Bridge tokens to hub pool correctly calls the Standard L2 Bridge for standard ERC20s", async function () {
+  it("Bridge tokens to hub pool correctly calls the L2 Asset Router for standard ERC20s", async function () {
     const { leaves, tree } = await constructSingleRelayerRefundTree(l2Dai, await zkSyncSpokePool.callStatic.chainId());
     await zkSyncSpokePool.connect(crossDomainAlias).relayRootBundle(tree.getHexRoot(), mockTreeRoot);
     await zkSyncSpokePool.connect(relayer).executeRelayerRefundLeaf(0, leaves[0], tree.getHexProof(leaves[0]));
 
-    // This should have sent tokens back to L1. Check the correct methods on the gateway are correctly called.
-    expect(zkErc20Bridge.withdraw).to.have.been.calledOnce;
-    expect(zkErc20Bridge.withdraw).to.have.been.calledWith(hubPool.address, l2Dai, amountToReturn);
+    // This should have sent tokens back to L1.
+    expect(l2AssetRouter.withdraw).to.have.been.calledOnce;
+    const expectedAssetId = keccak256(
+      defaultAbiCoder.encode(["uint256", "address", "address"], [1, L2_ASSET_ROUTER, l2Dai])
+    );
+    const expectedData = defaultAbiCoder.encode(
+      ["uint256", "address", "address"],
+      [amountToReturn, hubPool.address, l2Dai]
+    );
+    expect(l2AssetRouter.withdraw).to.have.been.calledWith(expectedAssetId, expectedData);
   });
   it("Bridge tokens to hub pool correctly calls the Standard L2 Bridge for zkSync Bridged USDC.e", async function () {
     // Redeploy the SpokePool with usdc address -> 0x0
@@ -193,8 +211,7 @@ describe("ZkSync Spoke Pool", function () {
     await zkSyncSpokePool.connect(relayer).executeRelayerRefundLeaf(0, leaves[0], tree.getHexProof(leaves[0]));
 
     // This should have sent tokens back to L1. Check the correct methods on the gateway are correctly called.
-    expect(zkErc20Bridge.withdraw).to.have.been.calledOnce;
-    expect(zkErc20Bridge.withdraw).to.have.been.calledWith(hubPool.address, usdc.address, amountToReturn);
+    expect(l2AssetRouter.withdraw).to.have.been.calledOnce;
   });
   it("Bridge tokens to hub pool correctly calls the custom USDC L2 Bridge for Circle Bridged USDC", async function () {
     const { leaves, tree } = await constructSingleRelayerRefundTree(