deploy 14 (#556)

* rinkeby deploy 14 * mainnet depoy 14 * do not delete the zombie mock contract
OriginProtocol · Feb 10, 2021 · a941306 · a941306
1 parent 162686f
commit a941306
Show file tree

Hide file tree

Showing 21 changed files with 5,369 additions and 149 deletions.
diff --git a/contracts/deploy/014_3pool_strategy.js b/contracts/deploy/014_3pool_strategy.js
@@ -4,6 +4,7 @@ const {
   isFork,
   isRinkeby,
   isMainnetOrRinkebyOrFork,
+  isSmokeTest,
 } = require("../test/helpers.js");
 const {
   log,
@@ -174,6 +175,6 @@ const main = async (hre) => {
 
 main.id = deployName;
 main.dependencies = ["013_trustee"];
-main.skip = () => !isMainnetOrRinkebyOrFork;
+main.skip = () => !(isMainnet || isRinkeby || isFork) || isSmokeTest;
 
 module.exports = main;
diff --git a/contracts/deployments/mainnet/.migrations.json b/contracts/deployments/mainnet/.migrations.json
@@ -10,5 +10,6 @@
   "011_ousd_fix": 1610148010,
   "005_compensation_claims": 1610487584,
   "012_upgrades": 1612303613,
-  "013_trustee": 1612380836
+  "013_trustee": 1612380836,
+  "014_3pool_strategy": 1612999718
 }
diff --git a/contracts/deployments/mainnet/AaveStrategy.json b/contracts/deployments/mainnet/AaveStrategy.json
diff --git a/contracts/deployments/mainnet/CompoundStrategy.json b/contracts/deployments/mainnet/CompoundStrategy.json