Modifications to test atomic swaps during exodus mode

diviser · Feb 4, 2021 · 07e7a90 · 07e7a90
1 parent de695e6
commit 07e7a90
Show file tree

Hide file tree

Showing 5 changed files with 377 additions and 3 deletions.
diff --git a/contracts/contracts/ZkSync.sol b/contracts/contracts/ZkSync.sol
@@ -553,7 +553,7 @@ contract ZkSync is UpgradeableMaster, Storage, Config, Events, ReentrancyGuard {
         bool trigger =
             block.number >= priorityRequests[firstPriorityRequestId].expirationBlock &&
                 priorityRequests[firstPriorityRequestId].expirationBlock != 0;
-        if (trigger) {
+        if ($$(EASY_EXODUS) || trigger) {
             if (!exodusMode) {
                 exodusMode = true;
                 emit ExodusMode();

diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
@@ -27,6 +27,8 @@ const testConfig = {
 
 const localConfig = Object.assign({}, prodConfig);
 localConfig.DUMMY_VERIFIER = process.env.CONTRACTS_TEST_DUMMY_VERIFIER === 'true';
+// @ts-ignore
+localConfig.EASY_EXODUS = process.env.EASY_EXODUS === 'true';
 
 const contractDefs = {
     rinkeby: testnetConfig,

diff --git a/sdk/zksync.js/package.json b/sdk/zksync.js/package.json
@@ -22,7 +22,7 @@
         "@types/mocha": "^8.0.3",
         "@types/node": "^14.14.5",
         "chai": "^4.2.0",
-        "ethers": "^5.0.19",
+        "ethers": "^5.0.26",
         "mocha": "^8.2.0",
         "rollup": "^2.32.1",
         "rollup-plugin-copy": "^3.3.0",

diff --git a/sdk/zksync.js/src/withdraw-helpers.ts b/sdk/zksync.js/src/withdraw-helpers.ts
@@ -1,5 +1,5 @@
 import { BigNumberish, ethers, Contract, BigNumber, ContractTransaction } from 'ethers';
-import { Wallet } from '.';
+import { Wallet } from './wallet';
 import { Address, TokenLike, Network } from './types';
 import { MULTICALL_INTERFACE } from './utils';