diff --git a/deployment/7_upgrade_1_6.js b/deployment/7_upgrade_1_6.js index d265c0581..dbced49cf 100644 --- a/deployment/7_upgrade_1_6.js +++ b/deployment/7_upgrade_1_6.js @@ -140,9 +140,11 @@ const deploy = async (network) => { // Disable KyberNetwork on the TokenPriceProvider // //////////////////////////////////////////////////// - const TokenPriceProviderAddManagerTx = await TokenPriceProviderWrapper.contract.addManager(deploymentWallet.address, { gasPrice }); - await TokenPriceProviderWrapper.verboseWaitForTransaction(TokenPriceProviderAddManagerTx, - `Set ${deploymentWallet.address} as the manager of the TokenPriceProvider`); + if (!await TokenPriceProviderWrapper.contract.managers(deploymentWallet.address)) { + const TokenPriceProviderAddManagerTx = await TokenPriceProviderWrapper.contract.addManager(deploymentWallet.address, { gasPrice }); + await TokenPriceProviderWrapper.verboseWaitForTransaction(TokenPriceProviderAddManagerTx, + `Set ${deploymentWallet.address} as the manager of the TokenPriceProvider`); + } const TokenPriceProviderSetKyberNetworkTx = await TokenPriceProviderWrapper.contract.setKyberNetwork("0x0000000000000000000000000000000000000000", { gasPrice }); diff --git a/utils/config/ganache.json b/utils/config/ganache.json index 47cd333da..4a43a86a5 100644 --- a/utils/config/ganache.json +++ b/utils/config/ganache.json @@ -1,73 +1 @@ -{ - "ENS": { - "deployOwnRegistry": true, - "ensRegistry": "0x9eD274314f0fB37837346C425D3cF28d89ca9599", - "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": "0xa6DD34f3CeA10D1F78c0b1F8C13eFbAbE5DF9708" - }, - "CryptoKitties": { "contract": "0x0000000000000000000000000000000000000000" }, - "defi": { - "maker": { - "deployOwn": true, - "tub": "0x0000000000000000000000000000000000000000", - "pot": "0x0000000000000000000000000000000000000000", - "jug": "0x0000000000000000000000000000000000000000", - "migration": "0x933cF2Aecc1c17CA1b3bd51557B253bB4bd02A12" - }, - "uniswap": { - "deployOwn": true, - "factory": "0xa00f6A3a3D00979D7B7E23D7C7dF6CC7E255Ad88" - }, - "compound": { - "comptroller": "0x0000000000000000000000000000000000000000", - "markets": { - "0x0000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000" - } - } - }, - "contracts": { - "MultiSigWallet": "0x7d6FAe26B090953A46098d7513b559B0a339Ee4d", - "WalletFactory": "0x898779af1927e51187808AC69A0D03D54D0c8501", - "ENSResolver": "0x72E18a9812244f32aA1Bd9fB84979051DeDc8ce5", - "ENSManager": "0x291ffCA34a413205EaE535888c9D45D856D822FF", - "TokenPriceProvider": "0x67044E3c8D2E1658419e4E177B4D3F64d442D6B1", - "ModuleRegistry": "0x1a32B366cfB226Acf3C9fe0489a88bB176a9e267", - "BaseWallet": "0x6E11978D2560027526f8E0545823E537c196370d", - "CompoundRegistry": "0x1456d1d7BC82A64e389541f754351D85AE02a271", - "MakerRegistry": "0x5049DF4315ECb9CC30AbE5DAfe4929EA4D988f81" - }, - "modules": { - "GuardianStorage": "0x963D5B228d5Fa7DE3d69F636704Cf5070d41A760", - "TransferStorage": "0x38376A367fc2Ec806155dbDFf6c0A53E3a410102", - "GuardianManager": "0x994cB812bE47CEA32542954A4E134Ba2C3a1DC54", - "LockManager": "0xA8Ea2087b79a3Df13506E705E5344676A9a005c7", - "RecoveryManager": "0x037031b1E76Af7E8D7E3866F9a43d4B677E86D0F", - "ApprovedTransfer": "0x16624996BBafE4930fEbb8087DD7cB5cf5d6f1a4", - "TokenTransfer": "0x101b60626A8073271fE2eFE59FB8fD74c108c2eC", - "TokenExchanger": "0xE9d45870c6C3446A87Ac4091c110E5bbed2b3468", - "NftTransfer": "0xEb4152Aa9a9730B89Bd61CAE8f960FF99FD0f86f", - "MakerManager": "0xE50a98Af12B493df3fD762d30889cbAbb01aB6B1", - "TransferManager": "0x2A45A5064ad6F9b358D043A464494042dBaA2C87", - "CompoundManager": "0x8a250e6c1C94d494611EeB49b75fa72A1f6E619D", - "MakerV2Manager": "0x6D3E69cA1b61BFEAee8AABd60538D1c20363CF7A" - }, - "gitCommit": "1fb847e73fdf8fc44158b02436671740d513b3f6" -} +{"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"} \ No newline at end of file diff --git a/utils/multisigexecutor.js b/utils/multisigexecutor.js index 20223c7b4..ef2f682b2 100644 --- a/utils/multisigexecutor.js +++ b/utils/multisigexecutor.js @@ -8,7 +8,7 @@ class MultisigExecutor { this._multisigWrapper = multisigWrapper; this._ownerWallet = ownerWallet; this._autoSign = autoSign; - this._overrides = Object.assign(overrides, { gasLimit: 300000 }); + this._overrides = Object.assign(overrides, { gasLimit: 1000000 }); } async executeCall(contractWrapper, method, params) { diff --git a/utils/versions/ganache/latest.json b/utils/versions/ganache/latest.json index ec2e13197..ffbcac42d 100644 --- a/utils/versions/ganache/latest.json +++ b/utils/versions/ganache/latest.json @@ -1 +1 @@ -{"version":"1.6.0","createdAt":1586172364,"modules":[{"address":"0x994cB812bE47CEA32542954A4E134Ba2C3a1DC54","name":"GuardianManager"},{"address":"0xA8Ea2087b79a3Df13506E705E5344676A9a005c7","name":"LockManager"},{"address":"0x2A45A5064ad6F9b358D043A464494042dBaA2C87","name":"TransferManager"},{"address":"0xE9d45870c6C3446A87Ac4091c110E5bbed2b3468","name":"TokenExchanger"},{"address":"0xEb4152Aa9a9730B89Bd61CAE8f960FF99FD0f86f","name":"NftTransfer"},{"address":"0xE50a98Af12B493df3fD762d30889cbAbb01aB6B1","name":"MakerManager"},{"address":"0x8a250e6c1C94d494611EeB49b75fa72A1f6E619D","name":"CompoundManager"},{"address":"0x16624996BBafE4930fEbb8087DD7cB5cf5d6f1a4","name":"ApprovedTransfer"},{"address":"0x037031b1E76Af7E8D7E3866F9a43d4B677E86D0F","name":"RecoveryManager"},{"address":"0x6D3E69cA1b61BFEAee8AABd60538D1c20363CF7A","name":"MakerV2Manager"}],"fingerprint":"0x5e550283"} \ No newline at end of file +{"version":"1.6.0","createdAt":1586262380,"modules":[{"address":"0xd85C69EA74b1DBaBb40Eea240E5Cd2Ce4426856F","name":"GuardianManager"},{"address":"0x0eA33b7525189c49e8Da46AD99278480811fcA64","name":"LockManager"},{"address":"0x39dCCe15d1a2c17c61B757C34cbe6aacF813Edc1","name":"TransferManager"},{"address":"0x88A8e4a07fed276B6EeDB33449bfE9b0b5448B1F","name":"TokenExchanger"},{"address":"0xD41288d45765e93ef63F58ac11CAa271BdA2bC21","name":"NftTransfer"},{"address":"0x8A90941A8fB0B386eEEbFb2E1E96b54Af59ec29B","name":"MakerManager"},{"address":"0xDCD324973848077F310E884CA7207b1Ecc67B493","name":"CompoundManager"},{"address":"0x84c01919c85CE8c0a43F7A6b95FC5B3cf6230D0a","name":"ApprovedTransfer"},{"address":"0xC07f212AaEeF5Dc948BBC5302cB46D9D799417Ec","name":"RecoveryManager"},{"address":"0xFc31F3f732e9F1293ca3eb587871691bC8b28b82","name":"MakerV2Manager"}],"fingerprint":"0x8aee6424"} \ No newline at end of file