From a51fb2d11e5fd544cce227143429c18e19786e3e Mon Sep 17 00:00:00 2001 From: Kirill Fedoseev Date: Mon, 15 May 2023 12:52:12 +0100 Subject: [PATCH 1/2] Add secrets to env --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8dbd146..a70f76a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,6 +6,9 @@ on: env: FOUNDRY_PROFILE: ci + FORK_RPC_URL_MAINNET: ${{ secrets.FORK_RPC_URL_MAINNET }} + FORK_RPC_URL_OPTIMISM: ${{ secrets.FORK_RPC_URL_OPTIMISM }} + FORK_RPC_URL_POLYGON: ${{ secrets.FORK_RPC_URL_POLYGON }} jobs: lint: From 07228cf724d265d8642d25c9d2535e6fc4bf7f81 Mon Sep 17 00:00:00 2001 From: Kirill Fedoseev Date: Mon, 15 May 2023 13:01:54 +0100 Subject: [PATCH 2/2] Fix expectEmit --- test/zkbob/ZkBobPool.t.sol | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/zkbob/ZkBobPool.t.sol b/test/zkbob/ZkBobPool.t.sol index abbc23f..30ae805 100644 --- a/test/zkbob/ZkBobPool.t.sol +++ b/test/zkbob/ZkBobPool.t.sol @@ -205,13 +205,14 @@ abstract contract AbstractZkBobPoolTest is AbstractMainnetForkTest { vm.expectRevert("ZkBobAccounting: single direct deposit cap exceeded"); _transferAndCall(15 ether, user2, zkAddress); + ZkAddress.ZkAddress memory parsedZkAddress = ZkAddress.parseZkAddress(zkAddress, 0); vm.expectEmit(true, true, false, true); - emit SubmitDirectDeposit(user1, 0, user2, ZkAddress.parseZkAddress(zkAddress, 0), 9.9 gwei); + emit SubmitDirectDeposit(user1, 0, user2, parsedZkAddress, 9.9 gwei); _transferAndCall(10 ether, user2, zkAddress); IERC20(token).approve(address(queue), 10 ether); vm.expectEmit(true, true, false, true); - emit SubmitDirectDeposit(user1, 1, user2, ZkAddress.parseZkAddress(zkAddress, 0), 9.9 gwei); + emit SubmitDirectDeposit(user1, 1, user2, parsedZkAddress, 9.9 gwei); queue.directDeposit(user2, 10 ether, zkAddress); vm.expectRevert("ZkBobAccounting: daily user direct deposit cap exceeded");