Remove config.modules.TokenTransfer and use current TransferManager a…

…ddress prior to upgrades, otherwise use 0x0
argentlabs · Apr 8, 2020 · 9f2d735 · 9f2d735
1 parent 57f4fc1
commit 9f2d735
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/deployment/5_deploy_modules.js b/deployment/5_deploy_modules.js
@@ -92,7 +92,7 @@ const deploy = async (network) => {
     config.settings.securityPeriod || 0,
     config.settings.securityWindow || 0,
     config.settings.defaultLimit || "1000000000000000000",
-    ["test", "staging", "prod"].includes(network) ? config.modules.TokenTransfer : "0x0000000000000000000000000000000000000000",
+    "0x0000000000000000000000000000000000000000",
   );
     // Deploy the TokenExchanger module
   const TokenExchangerWrapper = await deployer.deploy(

diff --git a/deployment/7_upgrade_1_6.js b/deployment/7_upgrade_1_6.js
@@ -112,7 +112,7 @@ const deploy = async (network) => {
     config.settings.securityPeriod || 0,
     config.settings.securityWindow || 0,
     config.settings.defaultLimit || "1000000000000000000",
-    ["test", "staging", "prod"].includes(network) ? config.modules.TokenTransfer : "0x0000000000000000000000000000000000000000",
+    ["test", "staging", "prod"].includes(network) ? config.modules.TransferManager : "0x0000000000000000000000000000000000000000",
   );
   newModuleWrappers.push(TransferManagerWrapper);
 

diff --git a/utils/config/ganache.json b/utils/config/ganache.json
@@ -1 +1 @@
-{"ENS":{"deployOwnRegistry":true,"ensRegistry":"0x9d6CfEc16741f08991654Bc36d1045A1D241F29e","domain":"argent.xyz"},"backend":{"accounts":["0xD9995BAE12FEe327256FFec1e3184d492bD94C31"]},"multisig":{"owners":["0xD9995BAE12FEe327256FFec1e3184d492bD94C31"],"threshold":1,"autosign":true},"settings":{"deployer":{"type":"ganache"},"lockPeriod":480,"recoveryPeriod":480,"securityPeriod":240,"securityWindow":240,"feeRatio":15,"defaultLimit":"1000000000000000000"},"Kyber":{"deployOwn":true,"contract":"0x81A1198d28a7491F1257B22DaB444a73ABCf9298"},"CryptoKitties":{"contract":"0x0000000000000000000000000000000000000000"},"defi":{"maker":{"deployOwn":true,"tub":"0x0000000000000000000000000000000000000000","pot":"0x0000000000000000000000000000000000000000","jug":"0x0000000000000000000000000000000000000000","migration":"0x09ce60Bd50333a737e03db957bd7f845b08DB095"},"uniswap":{"deployOwn":true,"factory":"0xb5d7Ef06dd742b62d71eb2CaBa47d320b4D2A578"},"compound":{"comptroller":"0x0000000000000000000000000000000000000000","markets":{"0x0000000000000000000000000000000000000000":"0x0000000000000000000000000000000000000000"}}},"contracts":{"MultiSigWallet":"0xE6192099D3489211a92be2645aDe339ad4998a8c","WalletFactory":"0x0d326c46DCb8a85242C80d3c2A1a426CD2328401","ENSResolver":"0xD629AF06612B631c5b370055dA1cB3FB46A1c392","ENSManager":"0xb7358663Ed8f0E0aF7b05482AF9E8016DE3b554F","TokenPriceProvider":"0x1C2878ABd6a189D5449e797D735545A9C08d9234","ModuleRegistry":"0x0c1bCf5DF51D47ebD980cBb870dF35dCE283e771","BaseWallet":"0xa9442f66E6bEF32c3d196B71e943406e4722326b","CompoundRegistry":"0x93e33b71aF68a10ACd863A5DF1D5D81719Ac15B2","MakerRegistry":"0x4576CA92833f8A1E99A33E1595cce9E5349dD19d"},"modules":{"GuardianStorage":"0xE9c77f070a5671fA32381ac826036eE3FDF5Ad56","TransferStorage":"0x73C62c291621e20799CA5D6Bf7b114F678ebE9Cb","GuardianManager":"0xd85C69EA74b1DBaBb40Eea240E5Cd2Ce4426856F","LockManager":"0x0eA33b7525189c49e8Da46AD99278480811fcA64","RecoveryManager":"0xC07f212AaEeF5Dc948BBC5302cB46D9D799417Ec","ApprovedTransfer":"0x84c01919c85CE8c0a43F7A6b95FC5B3cf6230D0a","TokenTransfer":"0x101b60626A8073271fE2eFE59FB8fD74c108c2eC","TokenExchanger":"0x88A8e4a07fed276B6EeDB33449bfE9b0b5448B1F","NftTransfer":"0xD41288d45765e93ef63F58ac11CAa271BdA2bC21","MakerManager":"0x8A90941A8fB0B386eEEbFb2E1E96b54Af59ec29B","TransferManager":"0x39dCCe15d1a2c17c61B757C34cbe6aacF813Edc1","CompoundManager":"0xDCD324973848077F310E884CA7207b1Ecc67B493","MakerV2Manager":"0xFc31F3f732e9F1293ca3eb587871691bC8b28b82"},"gitCommit":"be87cf3131b90214644372a9331d20e64622ce03"}
+{"ENS":{"deployOwnRegistry":true,"ensRegistry":"0x9d6CfEc16741f08991654Bc36d1045A1D241F29e","domain":"argent.xyz"},"backend":{"accounts":["0xD9995BAE12FEe327256FFec1e3184d492bD94C31"]},"multisig":{"owners":["0xD9995BAE12FEe327256FFec1e3184d492bD94C31"],"threshold":1,"autosign":true},"settings":{"deployer":{"type":"ganache"},"lockPeriod":480,"recoveryPeriod":480,"securityPeriod":240,"securityWindow":240,"feeRatio":15,"defaultLimit":"1000000000000000000"},"Kyber":{"deployOwn":true,"contract":"0x81A1198d28a7491F1257B22DaB444a73ABCf9298"},"CryptoKitties":{"contract":"0x0000000000000000000000000000000000000000"},"defi":{"maker":{"deployOwn":true,"tub":"0x0000000000000000000000000000000000000000","pot":"0x0000000000000000000000000000000000000000","jug":"0x0000000000000000000000000000000000000000","migration":"0x09ce60Bd50333a737e03db957bd7f845b08DB095"},"uniswap":{"deployOwn":true,"factory":"0xb5d7Ef06dd742b62d71eb2CaBa47d320b4D2A578"},"compound":{"comptroller":"0x0000000000000000000000000000000000000000","markets":{"0x0000000000000000000000000000000000000000":"0x0000000000000000000000000000000000000000"}}},"contracts":{"MultiSigWallet":"0xE6192099D3489211a92be2645aDe339ad4998a8c","WalletFactory":"0x0d326c46DCb8a85242C80d3c2A1a426CD2328401","ENSResolver":"0xD629AF06612B631c5b370055dA1cB3FB46A1c392","ENSManager":"0xb7358663Ed8f0E0aF7b05482AF9E8016DE3b554F","TokenPriceProvider":"0x1C2878ABd6a189D5449e797D735545A9C08d9234","ModuleRegistry":"0x0c1bCf5DF51D47ebD980cBb870dF35dCE283e771","BaseWallet":"0xa9442f66E6bEF32c3d196B71e943406e4722326b","CompoundRegistry":"0x93e33b71aF68a10ACd863A5DF1D5D81719Ac15B2","MakerRegistry":"0x4576CA92833f8A1E99A33E1595cce9E5349dD19d"},"modules":{"GuardianStorage":"0xE9c77f070a5671fA32381ac826036eE3FDF5Ad56","TransferStorage":"0x73C62c291621e20799CA5D6Bf7b114F678ebE9Cb","GuardianManager":"0xd85C69EA74b1DBaBb40Eea240E5Cd2Ce4426856F","LockManager":"0x0eA33b7525189c49e8Da46AD99278480811fcA64","RecoveryManager":"0xC07f212AaEeF5Dc948BBC5302cB46D9D799417Ec","ApprovedTransfer":"0x84c01919c85CE8c0a43F7A6b95FC5B3cf6230D0a","TokenExchanger":"0x88A8e4a07fed276B6EeDB33449bfE9b0b5448B1F","NftTransfer":"0xD41288d45765e93ef63F58ac11CAa271BdA2bC21","MakerManager":"0x8A90941A8fB0B386eEEbFb2E1E96b54Af59ec29B","TransferManager":"0x39dCCe15d1a2c17c61B757C34cbe6aacF813Edc1","CompoundManager":"0xDCD324973848077F310E884CA7207b1Ecc67B493","MakerV2Manager":"0xFc31F3f732e9F1293ca3eb587871691bC8b28b82"},"gitCommit":"be87cf3131b90214644372a9331d20e64622ce03"}