Skip to content

add bundles & relocks #1031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexcos20 merged 4 commits into from
Jul 3, 2026
Merged

add bundles & relocks #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe2657e
add bundles & relocks
alexcos20 Jul 1, 2026
b3e0129
fix slither
alexcos20 Jul 1, 2026
66cd246
deployed new contracts
alexcos20 Jul 3, 2026
86f18c7
v2.9.0
alexcos20 Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = v2.8.0
current_version = v2.9.0
commit = True
tag = True

Expand Down
20 changes: 10 additions & 10 deletions addresses/address.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@
"VestingWalletC": "0x29F74B853C4B8D36273666FB63a3b71c754424Ed",
"OceanNodesBooster": "0x73558Ef3bb6543A8107ac032C5a98Da03ceb0eEf",
"OPFCommunityFeeCollectorCompute": "0x1705CaF86B86e85804e20FE342f39B17322Ff592",
"Escrow": "0xC98C71A9efeF2a940c73B7986f1D8469f1815F94",
"Escrow": "0x10E71722c34B16440D6889287F3Ed77A74f809BE",
"AccessListFactory": "0x7ed6ac4243472adA55408fEE45c5Dff379f7aBE0",
"EnterpriseFeeCollector": "0x254302d1Ae1e1200319c885D93D40a8927ACFcD7",
"EnterpriseEscrow": "0x2213FeBd4E681633bE255AfceFbd233EbcFc33c9",
"EnterpriseEscrow": "0x3dE5029154256aC90E483f7a4068388F90f3e940",
"FixedPriceEnterprise": "0x6C97D128f7E7D21ac3C722458Dc5d71f7e1bBa6e"
},
"goerli": {
Expand Down Expand Up @@ -305,11 +305,11 @@
"Dispenser": "0x2720d405ef7cDC8a2E2e5AeBC8883C99611d893C",
"ERC721Factory": "0xEF62FB495266C72a5212A11Dce8baa79Ec0ABeB1",
"OPFCommunityFeeCollectorCompute": "0x0Ee8b03Dafc868a0899ebE1c12d734D53A957250",
"Escrow": "0xd09789Ce05aa0f6feFc18315de4964Db07Cc0618",
"Escrow": "0x98307499910691aaA93A2D753A02ca5d908D3Cf7",
"EnterpriseFeeCollector": "0x8c98ea273bA22327F896Aa1a1a46E1BFf56e9b1D",
"FixedPriceEnterprise": "0xfa48673a7C36A2A768f89AC1ee8C355D5c367B02",
"AccessListFactory": "0x43eC0a34E1b70C7f8E579ab866F37642777727E7",
"EnterpriseEscrow": "0x6fd867E5AEE6D62a24f97939db90C4e67A73A651",
"EnterpriseEscrow": "0x4aA261bC595abC6fDEf0255C83e2a9305261753f",
"COMPY": "0x92b368055425f34c18e6f7A80DEaB7Ff106C9d05",
"COMPYFaucet": "0xC56663D0c3f535211E5bb238Eb8E80e184A4bA11",
"COMPYSwap": "0x7DBDcF3579831ed30666817D53DA7f6D5bC9861F"
Expand Down Expand Up @@ -339,7 +339,7 @@
"AccessListFactory": "0x12bB8D85a091A69A07E22E52d4567dBB91568f52",
"BatchPayments": "0x9497d1d64F2aFeBcd4f9916Eef3d9094E5Df962f",
"OPFCommunityFeeCollectorCompute": "0xE5aa2C9B551aFcA4C0A98BB3B37D7A43084d0a66",
"Escrow": "0x0Ee8b03Dafc868a0899ebE1c12d734D53A957250"
"Escrow": "0x86F2BB9F8f18B5a836b342199a3eC89F282E4018"
},
"optimism_sepolia": {
"chainId": 11155420,
Expand All @@ -358,11 +358,11 @@
"Dispenser": "0x30E4CC2C7A9c6aA2b2Ce93586E3Df24a3A00bcDD",
"ERC721Factory": "0xDEfD0018969cd2d4E648209F876ADe184815f038",
"OPFCommunityFeeCollectorCompute": "0xe47991939632757DEe324E8ec9A3268c62C0DB76",
"Escrow": "0x23A8b2D7176485a6349e4830605F323f31019333",
"Escrow": "0x7842Fa3B2d87Ff1cd52C4152382f7C4B3406E5A6",
"AccessListFactory": "0xEcD0C3519a081e3924D6F3197f86980eA7dfCf71",
"EnterpriseFeeCollector": "0x43eC0a34E1b70C7f8E579ab866F37642777727E7",
"FixedPriceEnterprise": "0x6976320eC365202118B4B0B0906E13DDf21633A5",
"EnterpriseEscrow": "0x5494711392a67DA50D3bC7b1fcC2d1877cFaA4d2"
"EnterpriseEscrow": "0xfa48673a7C36A2A768f89AC1ee8C355D5c367B02"
},
"optimism": {
"chainId": 10,
Expand All @@ -381,10 +381,10 @@
"Dispenser": "0x2112Eb973af1DBf83a4f11eda82f7a7527D7Fde5",
"ERC721Factory": "0x80E63f73cAc60c1662f27D2DFd2EA834acddBaa8",
"OPFCommunityFeeCollectorCompute": "0xc37F8341Ac6e4a94538302bCd4d49Cf0852D30C0",
"Escrow": "0x4dD281EB67DED07E76E413Df16176D66ae69e240",
"Escrow": "0xA4E108a4fa07C931cFe4bF2c1c6f9C1579d5a819",
"AccessListFactory": "0x4E6058dC00e90C0DCA47A5d0D3346F409939A5ab",
"EnterpriseFeeCollector": "0xE9397625Df9B63f0C152f975234b7988b54710B8",
"EnterpriseEscrow": "0xFe7967A5176fDAFa8DE109b3507016B885a82D6e",
"EnterpriseEscrow": "0xe8c6Dc39602031A152440311e364818ba25C2Bc1",
"FixedPriceEnterprise": "0x1d535147a97bd87c8443125376E6671B60556E07"
},
"pontus-x-devnet": {
Expand Down Expand Up @@ -421,7 +421,7 @@
"ERC721Factory": "0x159924ca0F47D6F704B97E29099b89e518A17B5E",
"BatchPayments": "0xFe7967A5176fDAFa8DE109b3507016B885a82D6e",
"OPFCommunityFeeCollectorCompute": "0x7b0576CF01E868bce46cca91b2a8E674141b0355",
"Escrow": "0x43eC0a34E1b70C7f8E579ab866F37642777727E7",
"Escrow": "0xfa48673a7C36A2A768f89AC1ee8C355D5c367B02",
"AccessListFactory": "0xE5aa2C9B551aFcA4C0A98BB3B37D7A43084d0a66",
"COMPY": "0x5494711392a67DA50D3bC7b1fcC2d1877cFaA4d2",
"COMPYFaucet": "0x8c98ea273bA22327F896Aa1a1a46E1BFf56e9b1D",
Expand Down
245 changes: 221 additions & 24 deletions contracts/escrow/EnterpriseEscrow.sol
View file
Open in desktop

Large diffs are not rendered by default.

235 changes: 210 additions & 25 deletions contracts/escrow/Escrow.sol
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oceanprotocol/contracts",
"version": "2.8.0",
"version": "2.9.0",
"description": "Ocean Protocol Smartcontracts",
"bugs": {
"url": "https://github.com/oceanprotocol/contracts/issues"
Expand Down
8 changes: 4 additions & 4 deletions scripts/deploy_enterpriseescrow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ async function main() {
case 1:
networkName = "mainnet";
gasLimit = 6500000;
gasPrice = ethers.utils.parseUnits("0.08", "gwei");
gasPrice = ethers.utils.parseUnits("0.12", "gwei");
break;
case 10:
networkName = "optimism";
Expand All @@ -58,13 +58,13 @@ async function main() {
break;
case 11155111:
networkName = "sepolia";
gasPrice = ethers.utils.parseUnits("5", "gwei");
gasPrice = ethers.utils.parseUnits("23", "gwei");
gasLimit = 6500000;
break;
case 11155420:
networkName = "optimism_sepolia";
gasPrice = ethers.utils.parseUnits("0.001000011", "gwei");
gasLimit = 5000000;
gasPrice = ethers.utils.parseUnits("0.0016", "gwei");
gasLimit = 6500000;
break;
}

Expand Down
24 changes: 12 additions & 12 deletions scripts/deploy_escrow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,57 +50,57 @@ async function main() {
networkName = "mainnet";
OPFOwner = "0x0d27cd67c4A3fd3Eb9C7C757582f59089F058167";
RouterAddress = "0x8149276f275EEFAc110D74AFE8AFECEaeC7d1593";
gasLimit = 5000000
gasPrice = ethers.utils.parseUnits('1.2', 'gwei')
gasLimit = 6500000
gasPrice = ethers.utils.parseUnits('0.12', 'gwei')
break;
case 10:
networkName = "optimism";
OPFOwner = '0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687'
RouterAddress = "0xf26c6C93f9f1d725e149d95f8E7B2334a406aD10";
gasPrice = ethers.utils.parseUnits('0.0010', 'gwei')
gasLimit = 28000000
gasLimit = 6500000
break;
case 0x89:
networkName = "polygon";
OPFOwner = "0x6272E00741C16b9A337E29DB672d51Af09eA87dD";
RouterAddress = "0x78e1317186786591912A10a7aF2490B8B4697A93";
gasLimit = 19000000;
gasLimit = 6500000;
gasPrice = ethers.utils.parseUnits('30', 'gwei');
break;
case 8453:
networkName = "base";
OPFOwner = '0x4169e846f1524Cf0ac02Bd4B04fa33242709Cf64';
RouterAddress = "0xEF62FB495266C72a5212A11Dce8baa79Ec0ABeB1";
gasPrice = ethers.utils.parseUnits('0.022999855', 'gwei')
gasLimit = 5000000
gasPrice = ethers.utils.parseUnits('0.05', 'gwei')
gasLimit = 6500000
break;
case 23294:
networkName = "oasis_sapphire";
OPFOwner = '0x086E7F0588755af5AF5f8194542Fd8328238F3C1'
RouterAddress = "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8";
gasPrice = ethers.utils.parseUnits('100', 'gwei')
gasLimit = 15000000
gasLimit = 6500000
break;
case 23295:
networkName = "oasis_saphire_testnet";
OPFOwner = '0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687'
RouterAddress = "0x5FBC2A29f7C8e4533dECD14Dc1c561A8eF0d4e31";
gasPrice = ethers.utils.parseUnits('100', 'gwei')
gasLimit = 28000000
gasLimit = 6500000
break;
case 11155111:
networkName = "sepolia";
OPFOwner = '0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687';
RouterAddress = "0x2112Eb973af1DBf83a4f11eda82f7a7527D7Fde5";
gasPrice = ethers.utils.parseUnits('5', 'gwei')
gasLimit = 5000000
gasPrice = ethers.utils.parseUnits('23', 'gwei')
gasLimit = 6500000
break;
case 11155420:
networkName = "optimism_sepolia";
OPFOwner = '0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687';
RouterAddress = "0x1B083D8584dd3e6Ff37d04a6e7e82b5F622f3985";
gasPrice = ethers.utils.parseUnits('1', 'gwei')
gasLimit = 28000000
gasPrice = ethers.utils.parseUnits('0.0016', 'gwei')
gasLimit = 6500000
break;
default:
OPFOwner = "0x0d27cd67c4A3fd3Eb9C7C757582f59089F058167";
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = ocean-contracts
version = v2.8.0
version = v2.9.0
author = leucothia
author_email = devops@oceanprotocol.com
description = 🐳 Ocean Protocol L1 - v4
Expand Down
Loading
Loading