Skip to content
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

Markeb release v2.98.3 #2181

Merged
merged 21 commits into from
Feb 2, 2024
Merged

Markeb release v2.98.3 #2181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
13366da
Prelim changes to add sepolia-ovm in config
davidvuong Dec 6, 2023
5b1e1c3
Missed typo in network: 'sepolia
davidvuong Dec 6, 2023
471c980
Merge branch 'develop' into sepolia-ovm
0xjocke Dec 7, 2023
1eae43f
Copied over deployments configs from goerli-ovm
0xjocke Dec 7, 2023
6186e03
First pass at core contracts deployed/configured sepolia-ovm
davidvuong Dec 11, 2023
fb1484d
Comment ZERO_ADDRESS for lint fix on skipped deploy
davidvuong Dec 11, 2023
800de48
Skip non OVM for sepolia deployment tests
davidvuong Dec 11, 2023
60e2627
Wipe away unused Futures* contracts
davidvuong Dec 11, 2023
2105d28
OP Sepolia core contracts verified
davidvuong Dec 11, 2023
339093c
Fix cannon test (and some misc)
leomassazza Jan 26, 2024
d8374a7
lint fix
leomassazza Jan 26, 2024
592dc9c
Merge branch 'develop' into markeb-release-v2.97.4
leomassazza Jan 26, 2024
597ee70
add feeds and goerli params
leomassazza Jan 26, 2024
682c6b1
add perps markets
leomassazza Jan 26, 2024
5643a7f
restore skipped step
leomassazza Jan 26, 2024
9c607f4
reducing priority gas to not overpay
leomassazza Jan 26, 2024
0ca4294
artifacts
leomassazza Jan 28, 2024
0d12e75
lint fix
leomassazza Jan 28, 2024
c311da8
update pyth feed ids
leomassazza Jan 31, 2024
469f745
Merge branch 'develop' into markeb-release-v2.97.4
leomassazza Feb 1, 2024
155a944
add version info for sepolia
leomassazza Feb 1, 2024
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
5 changes: 5 additions & 0 deletions hardhat.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ module.exports = {
chainId: 420,
accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : [],
},
'sepolia-ovm': {
url: process.env.OVM_SEPOLIA_PROVIDER_URL || 'https://sepolia.optimism.io/',
chainId: 11155420,
accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : [],
},
rinkeby: {
url: process.env.PROVIDER_URL?.replace('network', 'rinkeby') || '',
chainId: 4,
Expand Down
2 changes: 1 addition & 1 deletion hardhat/tasks/task-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ task('node', 'Run a node')
: process.env.PROVIDER_URL.replace('network', networkHostReplace);
}

console.log(yellow(`Forking ${network}...`));
console.log(yellow(`Forking ${network}... ${taskArguments.fork}`));
}

subtask(TASK_NODE_SERVER_READY).setAction(async ({ provider }, hre, runSuper) => {
Expand Down
17 changes: 16 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const data = {
mainnet: require('./publish/deployed/mainnet'),
goerli: require('./publish/deployed/goerli'),
'goerli-ovm': require('./publish/deployed/goerli-ovm'),
'sepolia-ovm': require('./publish/deployed/sepolia-ovm'),
'local-ovm': require('./publish/deployed/local-ovm'),
'mainnet-ovm': require('./publish/deployed/mainnet-ovm'),
};
Expand All @@ -16,7 +17,7 @@ const assets = require('./publish/assets.json');
const nonUpgradeable = require('./publish/non-upgradeable.json');
const releases = require('./publish/releases.json');

const networks = ['local', 'mainnet', 'goerli'];
const networks = ['local', 'mainnet', 'goerli', 'sepolia'];

const chainIdMapping = Object.entries({
1: {
Expand All @@ -39,6 +40,11 @@ const chainIdMapping = Object.entries({
network: 'goerli',
useOvm: true,
},
11155420: {
network: 'sepolia',
useOvm: true,
},

'-1': {
// no chain ID for this currently
network: 'unknown',
Expand Down Expand Up @@ -158,13 +164,18 @@ const defaults = {
RENBTC_ERC20_ADDRESSES: {
mainnet: '0xEB4C2781e4ebA804CE9a9803C67d0893436bB27D',
goerli: '0x9B2fE385cEDea62D839E4dE89B0A23EF4eacC717',
// Adding zero addresses here - we don't actually support renBTC anymore.
sepolia: '0x0000000000000000000000000000000000000000',
'sepolia-ovm': '0x0000000000000000000000000000000000000000',
// TODO: get actual goerli address
},
WETH_ERC20_ADDRESSES: {
mainnet: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
goerli: '0xB4FBF271143F4FBf7B91A5ded31805e42b2208d6',
sepolia: '0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9',
'mainnet-ovm': '0x4200000000000000000000000000000000000006',
'goerli-ovm': '0x4200000000000000000000000000000000000006',
'sepolia-ovm': '0x4200000000000000000000000000000000000006',
// TODO: get actual goerli-ovm address
},
INITIAL_ISSUANCE: w3utils.toWei(`${100e6}`),
Expand Down Expand Up @@ -731,6 +742,10 @@ const getUsers = ({ network = 'mainnet', user, useOvm = false } = {}) => {
owner: '0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9',
deployer: '0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9',
}),
'sepolia-ovm': Object.assign({}, base, {
owner: '0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9',
deployer: '0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9',
}),
local: Object.assign({}, base, {
// Deterministic account #0 when using `npx hardhat node`
owner: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266',
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"publish/deployed/mainnet-ovm/*",
"publish/deployed/goerli/*",
"publish/deployed/goerli-ovm/*",
"publish/deployed/sepolia-ovm/*",
"publish/deployed/local-ovm/*"
],
"bin": {
Expand Down
Loading
Loading