diff --git a/artifacts/address.json b/artifacts/address.json index 0f4804d84..068ce272e 100644 --- a/artifacts/address.json +++ b/artifacts/address.json @@ -4,14 +4,16 @@ "BFactory": "0x53eDF9289B0898e1652Ce009AACf8D25fA9A42F8", "FixedRateExchange": "0xeD1DfC5F3a589CfC4E8B91C1fbfC18FC6699Fbde", "Metadata": "0xFD8a7b6297153397B7eb4356C47dbd381d58bFF4", - "Ocean": "0x8967BCF84170c91B0d24D4302C2376283b0B3a07" + "Ocean": "0x8967BCF84170c91B0d24D4302C2376283b0B3a07", + "Dispenser": "0x623744Cd25Ed553d3b4722667697F926cf99658B" }, "ropsten": { "DTFactory": "0x6ebcCa6df2CAba986FCF44E64Ee82251c1455Dcc", "BFactory": "0x75be6e18c80A487C8b49663bf14f80A6495045B2", "FixedRateExchange": "0xA7a711A09396DF82D9be46A26B48BafdB9BB4fA6", "Metadata": "0x3cd7Ef1F207E1a46AAd7D5d7F5f0A5cF081Fc726", - "Ocean": "0x5e8DCB2AfA23844bcc311B00Ad1A0C30025aADE9" + "Ocean": "0x5e8DCB2AfA23844bcc311B00Ad1A0C30025aADE9", + "Dispenser": "0xc37F8341Ac6e4a94538302bCd4d49Cf0852D30C0" }, "development": { "DTFactory": "0x626aD26c7Ea494b11DbFd5dD487fA98BA32CaA42", @@ -25,20 +27,23 @@ "BFactory": "0xbe0083053744ECb871510C88dC0f6b77Da162706", "FixedRateExchange": "0x608d05214E42722B94a54cF6114d4840FCfF84e1", "Metadata": "0x1a4b70d8c9DcA47cD6D0Fb3c52BB8634CA1C0Fdf", - "Ocean": "0x967da4048cD07aB37855c090aAF366e4ce1b9F48" + "Ocean": "0x967da4048cD07aB37855c090aAF366e4ce1b9F48", + "Dispenser": "0xDEfD0018969cd2d4E648209F876ADe184815f038" }, "polygon": { "DTFactory": "0xF6410bf5d773C7a41ebFf972f38e7463FA242477", "BFactory": "0x69B6E54Ad2b3c2801d11d8Ad56ea1d892555b776", "FixedRateExchange": "0x2112Eb973af1DBf83a4f11eda82f7a7527D7Fde5", "Metadata": "0x80E63f73cAc60c1662f27D2DFd2EA834acddBaa8", - "Ocean": "0x282d8efCe846A88B159800bd4130ad77443Fa1A1" + "Ocean": "0x282d8efCe846A88B159800bd4130ad77443Fa1A1", + "Dispenser": "0x30E4CC2C7A9c6aA2b2Ce93586E3Df24a3A00bcDD" }, "moonbeamalpha": { "DTFactory": "0x80E63f73cAc60c1662f27D2DFd2EA834acddBaa8", "BFactory": "0x30E4CC2C7A9c6aA2b2Ce93586E3Df24a3A00bcDD", "FixedRateExchange": "0xDEfD0018969cd2d4E648209F876ADe184815f038", "Metadata": "0x9C9eE07b8Ce907D2f9244F8317C1Ed29A3193bAe", - "Ocean": "0x3c21a90599b5B7f37014cA5Bf30d3f1b73d7e391" + "Ocean": "0x3c21a90599b5B7f37014cA5Bf30d3f1b73d7e391", + "Dispenser": "0x042D709b72B437d7d387F2679bD4ac060e561c9f" } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 21261cda4..137377d29 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "deploy:pacific": "npm run clean && npm run compile && export NETWORK='pacific' && truffle migrate --network pacific && npm run export:artifacts", "deploy:mainnet": "npm run clean && npm run compile && export NETWORK='mainnet' && truffle migrate --network mainnet && npm run export:artifacts", "deploy:rinkeby": "npm run clean && npm run compile && export NETWORK='rinkeby' && truffle migrate --network rinkeby && npm run export:artifacts", + "deploy:ropsten": "npm run clean && npm run compile && export NETWORK='ropsten' && truffle migrate --network ropsten && npm run export:artifacts", "deploy:polygon": "npm run clean && npm run compile && export NETWORK='polygon' && truffle migrate --network polygon && npm run export:artifacts", "deploy:moonbeamalpha": "npm run clean && npm run compile && export NETWORK='moonbeamalpha' && truffle migrate --network moonbeamalpha && npm run export:artifacts", "security:slither": "slither . 2>&1 | tee slitherReport.txt" diff --git a/truffle.js b/truffle.js index 3a8716966..7f95190ca 100644 --- a/truffle.js +++ b/truffle.js @@ -93,15 +93,22 @@ module.exports = { mainnet: { provider: () => setupWallet(`https://mainnet.infura.io/v3/${process.env.INFURA_TOKEN}`), network_id: 0x1, // 1 - from: '0x614E188acBB597C2b2BF0CB39819975b05217C33', - gas: 7 * 1000000, - gasPrice: utils.toWei('60', 'gwei') + from: '0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687', + gas: 2 * 1000000, + gasPrice: utils.toWei('105', 'gwei') }, // mainnet the ethereum mainnet rinkeby: { provider: () => setupWallet(`https://rinkeby.infura.io/v3/${process.env.INFURA_TOKEN}`), network_id: 0x4, - from: '0xD6e0F938323A9D9d52b26700716E2e8E027f3795', + from: '0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687', + gas: 7 * 1000000, + gasPrice: utils.toWei('8', 'gwei') + }, + ropsten: { + provider: () => setupWallet(`https://ropsten.infura.io/v3/${process.env.INFURA_TOKEN}`), + network_id: 0x3, + from: '0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687', gas: 7 * 1000000, gasPrice: utils.toWei('8', 'gwei') }, @@ -114,7 +121,7 @@ module.exports = { gasPrice: utils.toWei('10', 'mwei') }, polygon: { - provider: () => setupWallet('https://rpc-mainnet.maticvigil.com'), + provider: () => setupWallet('https://rpc.polygon.oceanprotocol.com/'), network_id: 0x89, // 137 from: '0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687', gas: 7 * 1000000,