removed deployment script for filters

argentlabs · Sep 1, 2021 · 96c5e66 · 96c5e66
1 parent 631ac22
commit 96c5e66
Show file tree

Hide file tree

Showing 10 changed files with 120 additions and 551 deletions.
diff --git a/deployment/0_limited_test.js b/deployment/0_limited_test.js
diff --git a/deployment/1_setup_test_environment.js b/deployment/1_setup_test_environment.js
@@ -6,6 +6,7 @@ const ENSRegistry = artifacts.require("ENSRegistry");
 const ENSRegistryWithFallback = artifacts.require("ENSRegistryWithFallback");
 const UniswapFactory = artifacts.require("../lib/uniswap/UniswapFactory");
 const UniswapExchange = artifacts.require("../lib/uniswap/UniswapExchange");
+const DappRegistry = artifacts.require("DappRegistry");
 
 // Uniswap V2
 const UniswapV2Router01 = artifacts.require("UniswapV2Router01Mock");
@@ -82,6 +83,12 @@ async function main() {
     configurator.updateENSRegistry(address);
   }
 
+  if (config.trustlist.deployOwn) {
+    const DappRegistryWrapper = await DappRegistry.new(0);
+    console.log("Deployed local DappRegistry at ", DappRegistryWrapper.address);
+    configurator.updateDappRegistry(DappRegistryWrapper.address);
+  }
+
   if (config.defi.paraswap.deployOwn) {
     const { contract, uniswapProxy, uniAdapter } = await deployParaswap(deploymentAccount);
     configurator.updateParaswap(contract, uniswapProxy, { uniswap: uniAdapter }, []);

diff --git a/deployment/2_deploy_wallet_infrastructure.js b/deployment/2_deploy_wallet_infrastructure.js
@@ -15,6 +15,7 @@ const ENSManager = artifacts.require("ArgentENSManager");
 const ENSResolver = artifacts.require("ArgentENSResolver");
 const WalletFactory = artifacts.require("WalletFactory");
 const ArgentWalletDetector = artifacts.require("ArgentWalletDetector");
+const MultiCallHelper = artifacts.require("MultiCallHelper");
 
 const utils = require("../utils/utilities.js");
 const deployManager = require("../utils/deploy-manager.js");
@@ -62,6 +63,9 @@ async function main() {
   // Deploy ArgentWalletDetector contract
   const ArgentWalletDetectorWrapper = await ArgentWalletDetector.new([], []);
   console.log("Deployed ArgentWalletDetector at ", ArgentWalletDetectorWrapper.address);
+  // Deploy MultiCall Helper
+  const MultiCallHelperWrapper = await MultiCallHelper.new(TransferStorageWrapper.address, config.trustlist.dappRegistry);
+  console.log("Deployed MultiCallHelper at ", MultiCallHelperWrapper.address);
 
   // /////////////////////////////////////////////////
   // Making ENSManager owner of the root wallet ENS
@@ -148,6 +152,7 @@ async function main() {
     ENSManager: ENSManagerWrapper.address,
     ModuleRegistry: ModuleRegistryWrapper.address,
     BaseWallet: BaseWalletWrapper.address,
+    MultiCallHelper: MultiCallHelperWrapper.address,
   });
   await configurator.save();
 
@@ -161,6 +166,7 @@ async function main() {
     abiUploader.upload(ENSManagerWrapper, "contracts"),
     abiUploader.upload(ModuleRegistryWrapper, "contracts"),
     abiUploader.upload(BaseWalletWrapper, "contracts"),
+    abiUploader.upload(MultiCallHelperWrapper, "contracts"),
   ]);
 
   console.log("## completed deployment script 2 ##");