Skip to content

Commit

Permalink
v1.0.0-alpha.35
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcos20 committed May 26, 2022
1 parent 3324d74 commit 8b596c8
Show file tree
Hide file tree
Showing 6 changed files with 219 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = v1.0.0-alpha.34
current_version = v1.0.0-alpha.35
commit = True
tag = True

Expand Down
8 changes: 4 additions & 4 deletions addresses/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Ocean": "0x8967bcf84170c91b0d24d4302c2376283b0b3a07",
"OPFCommunityFeeCollector": "0x39b50501c22578D084191d7E91cfDd1068A4e163",
"startBlock": 10693767,
"poolTemplate": "0x12B483C14581876E6EF7A94708Df502518Ca17C1",
"poolTemplate": "0x41016a5a0a21B24C5c8C3ae119902a5bF5999bE2",
"Router": "0x4d3232171465C9F19b937b5ffBd25876345C8EfE",
"FixedPrice": "0x65Ee19cd86dE140fE08Bfd5d51e62Fe53e96358f",
"Staking": "0x651e859510A219f6CAd57E23926CdE6B9eaee822",
Expand All @@ -23,7 +23,7 @@
"Ocean": "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8",
"OPFCommunityFeeCollector": "0xd8839c98ca8CE07dDa4e460a71B634A4A82f8BD6",
"startBlock": 26354458,
"poolTemplate": "0x22C1eE63037a3F17F73Ad8EF26905189C5EB43b2",
"poolTemplate": "0x101fd973F488c40DC57305CFED84bB2a2C8A7D6E",
"Router": "0x564955E9d25B49afE5Abd66966Ab4Bc9Ad55Fedb",
"FixedPrice": "0x25e1926E3d57eC0651e89C654AB0FA182C6D5CF7",
"Staking": "0xdFa50781f1E58419f56A00A8Bb5Fce1a9dE67269",
Expand Down Expand Up @@ -61,7 +61,7 @@
"Ocean": "0xF6410bf5d773C7a41ebFf972f38e7463FA242477",
"OPFCommunityFeeCollector": "0xeD8CA02627867f459593DD35bC2B0C465B9E9518",
"startBlock": 2169229,
"poolTemplate": "0x01DAcAF074C8700091dB1Cad6305503A89Abf1Aa",
"poolTemplate": "0x3385Ff92e9A9fbE3A36672a3857c90351d2E56a9",
"Router": "0x08bEEfA4AD10C5Fcf5132326bebF1AA7181aC301",
"FixedPrice": "0x7c7d24E786887257a7EcAdBa03063E10B4Ff3655",
"Staking": "0x5FFE6649C7562F3bee1ca114c7c3316BF4B45b50",
Expand All @@ -80,7 +80,7 @@
"Ocean": "0x282d8efCe846A88B159800bd4130ad77443Fa1A1",
"OPFCommunityFeeCollector": "0x042BFbd88c3998282153088604207b2AeF045b43",
"startBlock": 28443969,
"poolTemplate": "0xbFBc7A21133B4e0e54a182BE8d4337A5e036A615",
"poolTemplate": "0xBB3051dF2D3E408DAE6E6dAa2296BC6215F0dCFd",
"Router": "0x78e1317186786591912A10a7aF2490B8B4697A93",
"FixedPrice": "0xb28Ab1AaDe4c75F8cF013136fc0c290AeaeA9BA6",
"Staking": "0x3EFDD8f728c8e774aB81D14d0B2F07a8238960f4",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oceanprotocol/contracts",
"version": "v1.0.0-alpha.34",
"version": "v1.0.0-alpha.35",
"description": "Ocean Protocol Smartcontracts",
"bugs": {
"url": "https://github.com/oceanprotocol/contracts/issues"
Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy-contracts.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ async function main() {
OPFOwner = "0x6272E00741C16b9A337E29DB672d51Af09eA87dD";
routerOwner = OPFOwner;
gasLimit = 19000000;
gasPrice = ethers.utils.parseUnits('40', 'gwei')
gasPrice = ethers.utils.parseUnits('120', 'gwei')
break;
case 0x507:
networkName = "moonbase";
Expand Down
211 changes: 211 additions & 0 deletions scripts/deploy_pool_template.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
// We require the Hardhat Runtime Environment explicitly here. This is optional
// but useful for running the script in a standalone fashion through `node <script>`.
//
// When running the script with `hardhat run <script>` you'll find the Hardhat
// Runtime Environment's members available in the global scope.
const hre = require("hardhat");
const fs = require("fs");
const { address } = require("../test/helpers/constants");
const { Wallet } = require("ethers");
const { UV_FS_O_FILEMAP } = require("constants");
const ethers = hre.ethers;
require("dotenv").config();
const logging = true;
const show_verify = true;
async function main() {
const url = process.env.NETWORK_RPC_URL;
console.log("Using RPC: "+url);
if (!url) {
console.error("Missing NETWORK_RPC_URL. Aborting..");
return null;
}
if( !process.env.ADDRESS_FILE){
console.error("Missing ADDRESS_FILE. Aborting..");
return null;
}
const provider = new ethers.providers.JsonRpcProvider(url);
const network = provider.getNetwork();
// utils
const networkDetails = await network;


let wallet;
if (process.env.MNEMONIC)
wallet = new Wallet.fromMnemonic(process.env.MNEMONIC);
if (process.env.PRIVATE_KEY) wallet = new Wallet(process.env.PRIVATE_KEY);
if (!wallet) {
console.error("Missing MNEMONIC or PRIVATE_KEY. Aborting..");
return null;
}
owner = wallet.connect(provider);
//let OPFOwner = '0x7DF5273aD9A6fCce64D45c64c1E43cfb6F861725';
let gasLimit = 8000000;
let gasPrice = null;
let sleepAmount = 10;
console.log("Using chain "+networkDetails.chainId);
switch (networkDetails.chainId) {
case 1:
networkName = "mainnet";
productionNetwork = true;
OPFOwner = "0x7DF5273aD9A6fCce64D45c64c1E43cfb6F861725";
routerOwner = OPFOwner;
OceanTokenAddress = "0x967da4048cD07aB37855c090aAF366e4ce1b9F48";
break;
case 0x3:
networkName = "ropsten";
OceanTokenAddress = "0x5e8DCB2AfA23844bcc311B00Ad1A0C30025aADE9";
OPFOwner = '0x58F76AE5BC7Fe80D2fb2781d92189e6eE6Eb8F76';
routerOwner = OPFOwner;
gasPrice = ethers.utils.parseUnits('25', 'gwei')
sleepAmount = 1
break;
case 0x4:
networkName = "rinkeby";
OceanTokenAddress = "0x8967bcf84170c91b0d24d4302c2376283b0b3a07";
OPFOwner = "0x0e901bC5D49636eC75B3B4fB88238698E5322dE6";
routerOwner = OPFOwner;
sleepAmount = 2
break;
case 0x89:
networkName = "polygon";
productionNetwork = true;
OceanTokenAddress = "0x282d8efCe846A88B159800bd4130ad77443Fa1A1";
OPFOwner = "0x6272E00741C16b9A337E29DB672d51Af09eA87dD";
routerOwner = OPFOwner;
gasPrice = ethers.utils.parseUnits('220', 'gwei')
break;
case 0x507:
networkName = "moonbase";
OPFOwner = '0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8';
OceanTokenAddress = "0xF6410bf5d773C7a41ebFf972f38e7463FA242477";
routerOwner = OPFOwner;
sleepAmount = 1
break;
case 2021000:
networkName = "gaiaxtestnet";
OPFOwner = '0x2112Eb973af1DBf83a4f11eda82f7a7527D7Fde5'
routerOwner = OPFOwner;
OceanTokenAddress = "0x80E63f73cAc60c1662f27D2DFd2EA834acddBaa8";
break;
case 80001:
networkName = "mumbai";
OPFOwner = '0x06100AB868206861a4D7936166A91668c2Ce1312'
routerOwner = OPFOwner;
OceanTokenAddress = "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8";
gasPrice = ethers.utils.parseUnits('45', 'gwei')
sleepAmount = 2
break;
case 0x38:
networkName = "bsc";
productionNetwork = true;
OPFOwner = '0x30E4CC2C7A9c6aA2b2Ce93586E3Df24a3A00bcDD';
routerOwner = OPFOwner;
OceanTokenAddress = "0xdce07662ca8ebc241316a15b611c89711414dd1a";
break;
case 2021001:
networkName = "catenaxtestnet";
OPFOwner = '0x06100AB868206861a4D7936166A91668c2Ce1312'
OceanTokenAddress = "0xf26c6C93f9f1d725e149d95f8E7B2334a406aD10";
routerOwner = OPFOwner;
break;
case 0xf6:
networkName = "energyweb";
productionNetwork = true;
OceanTokenAddress = "0x593122aae80a6fc3183b2ac0c4ab3336debee528";
OPFOwner = "0x06100AB868206861a4D7936166A91668c2Ce1312";
routerOwner = OPFOwner;
break;
case 1285:
networkName = "moonriver";
productionNetwork = true;
OceanTokenAddress = "0x99C409E5f62E4bd2AC142f17caFb6810B8F0BAAE";
OPFOwner = "0x06100AB868206861a4D7936166A91668c2Ce1312"
routerOwner = OPFOwner;
break;
default:
OPFOwner = "0x7DF5273aD9A6fCce64D45c64c1E43cfb6F861725";
networkName = "development";
routerOwner = owner.address;
shouldDeployOceanMock = true;
sleepAmount = 0
break;
}

if (!routerOwner || !OPFOwner) {
console.error("We need OPFOwner and routerOwner in order to deploy!");
return null;
}
let options
if(gasPrice){
options = {gasLimit: gasLimit, gasPrice: gasPrice}
}
else{
options = { gasLimit }
}
const addressFile = process.env.ADDRESS_FILE;
let oldAddresses;
if (addressFile) {
try {
oldAddresses = JSON.parse(fs.readFileSync(addressFile));
} catch (e) {
console.log(e);
oldAddresses = {};
}
if (!oldAddresses[networkName]) oldAddresses[networkName] = {};
addresses = oldAddresses[networkName];
}
if (logging)
console.info(
"Use existing addresses:" + JSON.stringify(addresses, null, 2)
);

if (!addresses || !addresses.chainId) {
console.error("Missing addresses. Aborting..");
return null;
}



if (logging) console.info("Deploying BPool");
const BPool = await ethers.getContractFactory("BPool", owner);
const poolTemplate = await BPool.connect(owner).deploy(options);
const receipt = await poolTemplate.deployTransaction.wait();
addresses.poolTemplate = poolTemplate.address;
if(show_verify){
console.log("\tRun the following to verify on etherscan");
console.log("\tnpx hardhat verify --network "+networkName+" "+addresses.poolTemplate)
}

if (addressFile) {
// write address.json if needed
oldAddresses[networkName] = addresses;
if (logging)
console.info(
"writing to " +
addressFile +
"\r\n" +
JSON.stringify(oldAddresses, null, 2)
);
try {
fs.writeFileSync(addressFile, JSON.stringify(oldAddresses, null, 2));
} catch (e) {
console.error(e);
}
}
}



async function sleep(s) {
return new Promise((resolve) => {
setTimeout(resolve, s*1000)
})
}
// We recommend this pattern to be able to use async/await everywhere
// and properly handle errors.
main()
.then(() => process.exit(0))
.catch((error) => {
console.error(error);
process.exit(1);
});
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = ocean-contracts
version = v1.0.0-alpha.34
version = v1.0.0-alpha.35
author = leucothia
author_email = devops@oceanprotocol.com
description = 🐳 Ocean Protocol L1 - v4
Expand Down

0 comments on commit 8b596c8

Please sign in to comment.