Merge pull request #694 from oceanprotocol/feature/ve_testnet_deploy

v1.1.1

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = v1.1.0
+current_version = v1.1.1
 commit = True
 tag = True
 

addresses/address.json

@@ -1,7 +1,7 @@
 {
   "rinkeby": {
     "chainId": 4,
-    "Ocean": "0x8967BCF84170c91B0d24D4302C2376283b0B3a07",
+    "Ocean": "0x8967bcf84170c91b0d24d4302c2376283b0b3a07",
     "OPFCommunityFeeCollector": "0x39b50501c22578D084191d7E91cfDd1068A4e163",
     "startBlock": 10693767,
     "poolTemplate": "0x41016a5a0a21B24C5c8C3ae119902a5bF5999bE2",
@@ -16,7 +16,14 @@
       "1": "0x2A1D7746BecA3910e2FaCfd26060B9960B4CD9ED"
     },
     "Dispenser": "0xCdbdDFeac752EC993e14bF07424D324B6B6959F2",
-    "ERC721Factory": "0x465069D3d6Ec45CDB006ec3E22cC9E8d6f9793eF"
+    "ERC721Factory": "0x465069D3d6Ec45CDB006ec3E22cC9E8d6f9793eF",
+    "veAllocate": "0x3334A995Aa6839dA2ECC9B51e3062055c6765D38",
+    "veOCEAN": "0x89a6599c603CbfFe001D4C4F7394BC97555E72B2",
+    "veDelegation": "0xB47E89BE4194aE3f5b069E0DAF045fC52D2188db",
+    "veFeeDistributor": "0xDC3b2EBDDA869ed4bffCF38DCef3B0E9Ad5697F2",
+    "veDelegationProxy": "0xc5FeF478924B8Bb8856E3bAaA4FF4de07CAc20f0",
+    "DFRewards": "0x751a9F7a548f2198eb00C3a9Ecc1951cCb09835E",
+    "DFStrategyV1": "0x859a6519a876ba4D6C17fe5F85E1Bd895d6D2f52"
   },
   "mumbai": {
     "chainId": 80001,
@@ -35,7 +42,14 @@
       "1": "0xda01B7dD00ef97Eb477B69D943779b7df5ed0Aec"
     },
     "Dispenser": "0x21bc18b92F7551e715B490E2C2875E8532317F8d",
-    "ERC721Factory": "0x7d46d74023507D30ccc2d3868129fbE4e400e40B"
+    "ERC721Factory": "0x7d46d74023507D30ccc2d3868129fbE4e400e40B",
+    "veAllocate": "0xa5B8e190B59D9C1dca3Ff8c2598fe99b2d51c4f5",
+    "veOCEAN": "0xA305a0480d9a3a68f28A0660d35f5cBCd9578385",
+    "veDelegation": "0xc225dCcb1BB9D626102b24605fcE90c196e9C4E5",
+    "veFeeDistributor": "0x06e27488D1F9c7E039bfF771f6046c0A31c3c113",
+    "veDelegationProxy": "0x1358BafbEDa762fA4d5190fee663224823E5e5Bb",
+    "DFRewards": "0xD09523218B155149414c14559C55209FFBbaAa18",
+    "DFStrategyV1": "0x6117D97280af5066baB7De21562ee106011f694D"
   },
   "ropsten": {
     "chainId": 3,
@@ -54,7 +68,14 @@
       "1": "0x101fd973F488c40DC57305CFED84bB2a2C8A7D6E"
     },
     "Dispenser": "0x660B3832e940E4bb4FfbDAA0aAB9E9B8D524C7Ef",
-    "ERC721Factory": "0xB0F8c68eF94ACB8E976b1dED6351Cc62e383d253"
+    "ERC721Factory": "0xB0F8c68eF94ACB8E976b1dED6351Cc62e383d253",
+    "veAllocate": "0x1358BafbEDa762fA4d5190fee663224823E5e5Bb",
+    "veOCEAN": "0xD09523218B155149414c14559C55209FFBbaAa18",
+    "veDelegation": "0x6117D97280af5066baB7De21562ee106011f694D",
+    "veFeeDistributor": "0x473A92D366AFD1D5935DE89cF7C3b346fe2CF856",
+    "veDelegationProxy": "0xaE626cc19d5F999B1CA8aD91377BcCc8d386dC26",
+    "DFRewards": "0x75Bd2cFC0EFeCbdBf9E565C3180d2CF9A9E413cB",
+    "DFStrategyV1": "0x0c86faF54E6B90c643ef330F118A856b34e0e7F7"
   },
   "moonbase": {
     "chainId": 1287,
@@ -196,6 +217,13 @@
       "1": "0x4dD281EB67DED07E76E413Df16176D66ae69e240"
     },
     "Dispenser": "0xFe7967A5176fDAFa8DE109b3507016B885a82D6e",
-    "ERC721Factory": "0xe8c6Dc39602031A152440311e364818ba25C2Bc1"
+    "ERC721Factory": "0xe8c6Dc39602031A152440311e364818ba25C2Bc1",
+    "veAllocate": "0x8c98ea273bA22327F896Aa1a1a46E1BFf56e9b1D",
+    "veOCEAN": "0x49E35cd2bAE043Abd9074B6e5a649a5AdEB05C33",
+    "veDelegation": "0x8daC419D5D81Af8c8E795D0D73f64d5220e28cd8",
+    "veFeeDistributor": "0x8149276f275EEFAc110D74AFE8AFECEaeC7d1593",
+    "veDelegationProxy": "0xfa48673a7C36A2A768f89AC1ee8C355D5c367B02",
+    "DFRewards": "0x7842Fa3B2d87Ff1cd52C4152382f7C4B3406E5A6",
+    "DFStrategyV1": "0x973e69303259B0c2543a38665122b773D28405fB"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oceanprotocol/contracts",
-  "version": "v1.1.0",
+  "version": "v1.1.1",
   "description": "Ocean Protocol Smartcontracts",
   "bugs": {
     "url": "https://github.com/oceanprotocol/contracts/issues"

scripts/deploy-contracts.js

@@ -17,7 +17,7 @@ let shouldDeployVE = true;
 let shouldDeployOceanToken = false;
 let shouldDeployMocks = false;
 let shouldDeployOPFCommunityFeeCollector = false;
-const shouldDeployOPFCommunity = true;
+let shouldDeployOPFCommunity = true;
 const logging = true;
 const show_verify = true;
 
@@ -99,7 +99,7 @@ async function main() {
       shouldDeployDF = false;
       shouldDeployVE = false;
       sleepAmount = 2
-      gasPrice = ethers.utils.parseUnits('1.5', 'gwei')
+      gasPrice = ethers.utils.parseUnits('5', 'gwei')
       break;
     case 0x89:
       networkName = "polygon";
@@ -246,7 +246,7 @@ async function main() {
   }
 
 
-  if (shouldDeployOPFCommunityFeeCollector || !OPFCommunityFeeCollectorAddress) {
+  if (shouldDeployOPFCommunityFeeCollector || !addresses.OPFCommunityFeeCollector) {
     if (logging) console.info("Deploying OPF Community Fee");
     const OPFCommunityFeeCollector = await ethers.getContractFactory(
       "OPFCommunityFeeCollector",
@@ -265,10 +265,7 @@ async function main() {
     }
     if (sleepAmount > 0) await sleep(sleepAmount)
   }
-  else {
-    addresses.OPFCommunityFeeCollector = OPFCommunityFeeCollectorAddress;
-  }
-
+
   // v4 contracts
   if (shouldDeployV4) {
     if (logging) console.info("Deploying V4 contracts");
@@ -529,7 +526,7 @@ async function main() {
     addresses.veFeeDistributor = deployedFeeDistributor.address;
     if (show_verify) {
       console.log("\tRun the following to verify on etherscan");
-      console.log("\tnpx hardhat verify --network " + networkName + " " + addresses.FeeDistributor + " " + addresses.veOCEAN + " " + timestamp + " " + addresses.Ocean + " " + routerOwner + " " + owner.address)
+      console.log("\tnpx hardhat verify --network " + networkName + " " + addresses.veFeeDistributor + " " + addresses.veOCEAN + " " + timestamp + " " + addresses.Ocean + " " + routerOwner + " " + owner.address)
     }
     if (sleepAmount > 0) await sleep(sleepAmount)
 
@@ -546,7 +543,7 @@ async function main() {
     addresses.veDelegationProxy = deployedDelegationProxy.address;
     if (show_verify) {
       console.log("\tRun the following to verify on etherscan");
-      console.log("\tnpx hardhat verify --network " + networkName + " " + addresses.DelegationProxy + " " + addresses.veDelegation + " " + routerOwner + " " + owner.address)
+      console.log("\tnpx hardhat verify --network " + networkName + " " + addresses.veDelegationProxy + " " + addresses.veDelegation + " " + routerOwner + " " + owner.address)
     }
     if (sleepAmount > 0) await sleep(sleepAmount)
   }

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ocean-contracts
-version = v1.1.0
+version = v1.1.1
 author = leucothia
 author_email = devops@oceanprotocol.com
 description =  🐳 Ocean Protocol L1 - v4