diff --git a/.bumpversion.cfg b/.bumpversion.cfg index fcf3afc8..d21112cb 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = v2.0.0-alpha.13 +current_version = v2.0.0-alpha.14 commit = True tag = True diff --git a/addresses/address.json b/addresses/address.json index caf8790c..8ed512f4 100644 --- a/addresses/address.json +++ b/addresses/address.json @@ -287,5 +287,26 @@ }, "Dispenser": "0x2720d405ef7cDC8a2E2e5AeBC8883C99611d893C", "ERC721Factory": "0xEF62FB495266C72a5212A11Dce8baa79Ec0ABeB1" + }, + "oasis_saphire": { + "chainId": 23294, + "Ocean": "0x39d22B78A7651A76Ffbde2aaAB5FD92666Aca520", + "OPFCommunityFeeCollector": "0x06100AB868206861a4D7936166A91668c2Ce1312", + "startBlock": 905232, + "Router": "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8", + "FixedPrice": "0xf26c6C93f9f1d725e149d95f8E7B2334a406aD10", + "ERC20Template": { + "1": "0xDBDa486d8fE29F75e9Ca858F438b380Fc14b1232", + "2": "0xF6410bf5d773C7a41ebFf972f38e7463FA242477", + "3": "0x1B083D8584dd3e6Ff37d04a6e7e82b5F622f3985" + }, + "ERC721Template": { + "1": "0x69B6E54Ad2b3c2801d11d8Ad56ea1d892555b776" + }, + "Dispenser": "0x2112Eb973af1DBf83a4f11eda82f7a7527D7Fde5", + "ERC721Factory": "0x80E63f73cAc60c1662f27D2DFd2EA834acddBaa8", + "DFRewards": "0xc37F8341Ac6e4a94538302bCd4d49Cf0852D30C0", + "DFStrategyV1": "0x3c21a90599b5B7f37014cA5Bf30d3f1b73d7e391", + "PredictoorHelper": "0xE9397625Df9B63f0C152f975234b7988b54710B8" } } \ No newline at end of file diff --git a/hardhat.config.js b/hardhat.config.js index 767ca689..6a377d1e 100644 --- a/hardhat.config.js +++ b/hardhat.config.js @@ -138,6 +138,12 @@ module.exports = { accounts: process.env.PRIVATE_KEY !== undefined ? [process.env.PRIVATE_KEY] : [], }, + oasis_saphire: { + url: + process.env.NETWORK_RPC_URL !== undefined ? process.env.NETWORK_RPC_URL : "", + accounts: + process.env.PRIVATE_KEY !== undefined ? [process.env.PRIVATE_KEY] : [], + }, oasis_saphire_testnet: { url: process.env.NETWORK_RPC_URL !== undefined ? process.env.NETWORK_RPC_URL : "", @@ -148,7 +154,8 @@ module.exports = { }, etherscan: { apiKey: { - oasis_saphire_testnet: process.env.ETHERSCAN_API_KEY + oasis_saphire_testnet: process.env.ETHERSCAN_API_KEY, + oasis_saphire: process.env.ETHERSCAN_API_KEY }, customChains: [ { @@ -167,6 +174,14 @@ module.exports = { browserURL: "https://celoscan.io/", }, }, + { + network: "oasis_saphire", + chainId: 23294, + urls: { + apiURL: "https://explorer.sapphire.oasis.io/api", + browserURL: "https://explorer.sapphire.oasis.io/", + }, + }, { network: "oasis_saphire_testnet", chainId: 23295, diff --git a/package-lock.json b/package-lock.json index 5508efa8..9c66d01b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@oceanprotocol/contracts", - "version": "2.0.0-next.11", + "version": "2.0.0-next.14", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index 0b60a5f6..b3fd21aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@oceanprotocol/contracts", - "version": "2.0.0-next.13", + "version": "2.0.0-next.14", "description": "Ocean Protocol Smartcontracts", "bugs": { "url": "https://github.com/oceanprotocol/contracts/issues" diff --git a/scripts/deploy-contracts.js b/scripts/deploy-contracts.js index 447e045a..f4e85a9e 100644 --- a/scripts/deploy-contracts.js +++ b/scripts/deploy-contracts.js @@ -207,6 +207,21 @@ async function main() { gasPrice = null gasLimit = null break; + case 23294: + networkName = "oasis_saphire"; + OceanTokenAddress = "0x39d22B78A7651A76Ffbde2aaAB5FD92666Aca520"; + OPFOwner = '0x086E7F0588755af5AF5f8194542Fd8328238F3C1' + routerOwner = OPFOwner; + sleepAmount = 30 + shouldDeployOceanToken = false; + shouldDeployV4 = true; + shouldDeployDF = true; + shouldDeployVE = false; + gasPrice = ethers.utils.parseUnits('100', 'gwei') + gasLimit = 15000000 + shouldDeployPredictoorHelper = true; + pdrTrueValSubmiter = "0x886A892670A7afc719Dcf36eF92c798203F74B67" + break; case 23295: networkName = "oasis_saphire_testnet"; OPFOwner = '0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687' diff --git a/setup.cfg b/setup.cfg index 1ea272e7..78d03bc4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = ocean-contracts -version = v2.0.0-alpha.13 +version = v2.0.0-alpha.14 author = leucothia author_email = devops@oceanprotocol.com description = 🐳 Ocean Protocol L1 - v4