Skip to content

Commit

Permalink
feat: add base isolated pool deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
coreyar committed Dec 18, 2024
1 parent a9ba84e commit 2a3f553
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 70 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@
"@types/node": "^20.5.9",
"@typescript-eslint/eslint-plugin": "^5.40.1",
"@typescript-eslint/parser": "^5.40.1",
"@venusprotocol/governance-contracts": "2.5.0-dev.6",
"@venusprotocol/isolated-pools": "3.7.0-dev.6",
"@venusprotocol/oracle": "2.6.0",
"@venusprotocol/governance-contracts": "2.7.0",
"@venusprotocol/isolated-pools": "3.7.0",
"@venusprotocol/oracle": "2.7.0",
"@venusprotocol/protocol-reserve": "2.3.0",
"@venusprotocol/solidity-utilities": "^2.0.3",
"@venusprotocol/venus-protocol": "9.3.0",
"@venusprotocol/venus-protocol": "9.4.0",
"assemblyscript": "0.19.23",
"chai": "^4.3.6",
"dotenv": "^16.4.5",
Expand All @@ -88,8 +88,8 @@
"typescript": "^4.8.4"
},
"resolutions": {
"@venusprotocol/governance-contracts": "2.5.0-dev.6",
"@venusprotocol/venus-protocol": "9.3.0",
"@venusprotocol/governance-contracts": "2.7.0",
"@venusprotocol/venus-protocol": "9.4.0",
"prettier": "^3.0.3"
},
"husky": {
Expand Down
7 changes: 4 additions & 3 deletions subgraphs/cross-chain-governance/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import sepoliaDeployments from '@venusprotocol/governance-contracts/deployments/
import zkSyncDeployments from '@venusprotocol/governance-contracts/deployments/zksyncmainnet_addresses.json';
import zkSyncSepoliaDeployments from '@venusprotocol/governance-contracts/deployments/zksyncsepolia_addresses.json';
import baseSepoliaDeployments from '@venusprotocol/governance-contracts/deployments/basesepolia_addresses.json';
import baseMainnetDeployments from '@venusprotocol/governance-contracts/deployments/basemainnet_addresses.json';
import fs from 'fs';
import Mustache from 'mustache';

Expand Down Expand Up @@ -156,11 +157,11 @@ const main = () => {
base: {
network: 'base',
layerZeroChainId: 184,
omnichainGovernanceOwnerAddress: '0x8BA591f72a90fb379b9a82087b190d51b226F0a9',
omnichainGovernanceOwnerAddress: baseMainnetDeployments.addresses.OmnichainExecutorOwner,
startBlockOmnichainGovernanceOwner: '23531514',
omnichainGovernanceExecutorAddress: '0xE7C56EaA4b6eafCe787B3E1AB8BCa0BC6CBDDb9e',
omnichainGovernanceExecutorAddress: baseMainnetDeployments.addresses.OmnichainGovernanceExecutor,
startBlockOmnichainGovernanceExecutor: '23531230',
accessControlManagerAddress: '0x9E6CeEfDC6183e4D0DF8092A9B90cDF659687daB',
accessControlManagerAddress: baseMainnetDeployments.addresses.AccessControlManager,
accessControlManagerStartBlock: '23212000',
},
};
Expand Down
2 changes: 1 addition & 1 deletion subgraphs/cross-chain-governance/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@graphprotocol/client-cli": "3.0.0",
"@graphprotocol/graph-cli": "^0.80.0",
"@layerzerolabs/solidity-examples": "^1.0.0",
"@venusprotocol/governance-contracts": "2.5.0-dev.6",
"@venusprotocol/governance-contracts": "2.7.0",
"@venusprotocol/subgraph-utils": "0.0.0",
"apollo-fetch": "^0.7.0",
"hardhat": "^2.10.2",
Expand Down
2 changes: 1 addition & 1 deletion subgraphs/etherfi-promo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"test:integration": "true"
},
"dependencies": {
"@venusprotocol/isolated-pools": "3.7.0-dev.5"
"@venusprotocol/isolated-pools": "3.7.0"
},
"devDependencies": {
"@graphprotocol/graph-cli": "^0.80.0",
Expand Down
19 changes: 16 additions & 3 deletions subgraphs/isolated-pools/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import sepoliaDeployments from '@venusprotocol/isolated-pools/deployments/sepoli
import zksyncDeployments from '@venusprotocol/isolated-pools/deployments/zksyncmainnet_addresses.json';
import zksyncSepoliaDeployments from '@venusprotocol/isolated-pools/deployments/zksyncsepolia_addresses.json';
import baseSepoliaDeployments from '@venusprotocol/isolated-pools/deployments/basesepolia_addresses.json';
import baseMainnetDeployments from '@venusprotocol/isolated-pools/deployments/basemainnet_addresses.json';
import fs from 'fs';
import Mustache from 'mustache';

Expand All @@ -28,6 +29,7 @@ export const getNetwork = () => {
'optimismSepolia',
'optimism',
'baseSepolia',
'base',
] as const;
const network = process.env.NETWORK;
// @ts-expect-error network env var is unknown here
Expand All @@ -42,8 +44,14 @@ const main = () => {
const config = {
docker: {
network: 'hardhat',
poolRegistryAddress: '0x3155755b79aA083bd953911C92705B7aA82a18F9',
startBlock: 0,
poolRegistryAddress: chapelDeployments.addresses.PoolRegistry,
vBifiAddress: '0xEF949287834Be010C1A5EDd757c385FB9b644E4A',
vLisUsdAddress: chapelDeployments.addresses.VToken_vHAY_StableCoins,
vagEURAddress: chapelDeployments.addresses.VToken_vagEUR_Stablecoins,
vankrBNBLiquidStakedBNBAddress: chapelDeployments.addresses.VToken_vankrBNB_LiquidStakedBNB,
vankrBNBDeFiAddress: chapelDeployments.addresses.VToken_vankrBNB_DeFi,
vSnBNBAddress: chapelDeployments.addresses.VToken_vSnBNB_LiquidStakedBNB,
startBlock: '31235580',
},
ethereum: {
network: 'mainnet',
Expand Down Expand Up @@ -115,7 +123,12 @@ const main = () => {
baseSepolia: {
network: 'base-sepolia',
poolRegistryAddress: baseSepoliaDeployments.addresses.PoolRegistry,
startBlock: '18242654',
startBlock: '23344365',
},
base: {
network: 'base',
poolRegistryAddress: baseMainnetDeployments.addresses.PoolRegistry,
startBlock: '23344365',
},
};

Expand Down
4 changes: 3 additions & 1 deletion subgraphs/isolated-pools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"deploy:optimismSepolia": "yarn prepare:optimismSepolia && yarn codegen && yarn graph deploy --studio venus-il-optimism-sepolia",
"deploy:optimism": "yarn prepare:optimism && yarn codegen && yarn graph deploy --studio venus-isolated-pools-optimism",
"deploy:baseSepolia": "yarn prepare:baseSepolia && yarn codegen && yarn graph deploy --studio venus-isolated-pools-base-sepolia",
"deploy:base": "yarn prepare:base && yarn codegen && yarn graph deploy --studio venus-isolated-pools-base",
"prepare:docker": "NETWORK=docker yarn ts-node config/index.ts",
"prepare:chapel": "NETWORK=chapel yarn ts-node config/index.ts",
"prepare:bsc": "NETWORK=bsc yarn ts-node config/index.ts",
Expand All @@ -40,13 +41,14 @@
"prepare:optimismSepolia": "NETWORK=optimismSepolia yarn ts-node config/index.ts",
"prepare:optimism": "NETWORK=optimism yarn ts-node config/index.ts",
"prepare:baseSepolia": "NETWORK=baseSepolia yarn ts-node config/index.ts",
"prepare:base": "NETWORK=base yarn ts-node config/index.ts",
"generate-subgraph-types": "rm -rf /subgraph-client/.graphclient && yarn graphclient build --dir ./subgraph-client",
"pretty": "prettier —-write '**/*.ts'",
"test": "yarn prepare:docker && graph test",
"test:integration": "yarn hardhat test tests/integration/index.ts --network localhost"
},
"dependencies": {
"@venusprotocol/isolated-pools": "3.7.0-dev.6"
"@venusprotocol/isolated-pools": "3.7.0"
},
"devDependencies": {
"@graphprotocol/client-cli": "3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion subgraphs/venus-governance/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"devDependencies": {
"@graphprotocol/client-cli": "3.0.0",
"@graphprotocol/graph-cli": "^0.80.0",
"@venusprotocol/governance-contracts": "2.5.0-dev.3",
"@venusprotocol/governance-contracts": "2.7.0",
"@venusprotocol/subgraph-utils": "0.0.0",
"apollo-fetch": "^0.7.0",
"hardhat": "^2.10.2",
Expand Down
2 changes: 1 addition & 1 deletion subgraphs/venus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dependencies": {
"@graphprotocol/client-cli": "3.0.0",
"@graphprotocol/graph-cli": "^0.80.0",
"@venusprotocol/venus-protocol": "9.3.0",
"@venusprotocol/venus-protocol": "9.4.0",
"@venusprotocol/venus-protocol-orig-events": "npm:@venusprotocol/[email protected]",
"hardhat": "^2.10.2",
"ts-node": "^10.9.2"
Expand Down
89 changes: 36 additions & 53 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5640,7 +5640,7 @@ __metadata:
dependencies:
"@graphprotocol/client-cli": 3.0.0
"@graphprotocol/graph-cli": ^0.80.0
"@venusprotocol/venus-protocol": 9.3.0
"@venusprotocol/venus-protocol": 9.4.0
"@venusprotocol/venus-protocol-orig-events": "npm:@venusprotocol/[email protected]"
hardhat: ^2.10.2
semantic-release: ^23.1.1
Expand All @@ -5656,7 +5656,7 @@ __metadata:
"@graphprotocol/client-cli": 3.0.0
"@graphprotocol/graph-cli": ^0.80.0
"@layerzerolabs/solidity-examples": ^1.0.0
"@venusprotocol/governance-contracts": 2.5.0-dev.6
"@venusprotocol/governance-contracts": 2.7.0
"@venusprotocol/subgraph-utils": 0.0.0
apollo-fetch: ^0.7.0
hardhat: ^2.10.2
Expand All @@ -5672,22 +5672,22 @@ __metadata:
resolution: "@venusprotocol/etherfi-promo-subgraph@workspace:subgraphs/etherfi-promo"
dependencies:
"@graphprotocol/graph-cli": ^0.80.0
"@venusprotocol/isolated-pools": 3.7.0-dev.5
"@venusprotocol/isolated-pools": 3.7.0
semantic-release: ^23.1.1
semantic-release-monorepo: ^8.0.2
ts-node: ^10.9.2
viem: ^2.9.26
languageName: unknown
linkType: soft

"@venusprotocol/governance-contracts@npm:2.5.0-dev.6":
version: 2.5.0-dev.6
resolution: "@venusprotocol/governance-contracts@npm:2.5.0-dev.6"
"@venusprotocol/governance-contracts@npm:2.7.0":
version: 2.7.0
resolution: "@venusprotocol/governance-contracts@npm:2.7.0"
dependencies:
"@venusprotocol/solidity-utilities": 2.0.0
hardhat-deploy-ethers: ^0.3.0-beta.13
module-alias: ^2.2.2
checksum: b0c975ea3c0620cbde8cda7c25c0525ba0b876ebedf31ff74f4f51637e2fc0d73f4c17c8fb5c57392645c11ef1eac91c702861247895d8a03ad15063638c6616
checksum: 1e4e0cb3d0fbad4a155d623d25f9d5144940d8b90d1a62933c31cb6d8ea16e5fa30503aa3bad0f835e23529f0c1876be9b66f78a3a7de31986f17d4a6bff786e
languageName: node
linkType: hard

Expand All @@ -5697,7 +5697,7 @@ __metadata:
dependencies:
"@graphprotocol/client-cli": 3.0.0
"@graphprotocol/graph-cli": ^0.80.0
"@venusprotocol/governance-contracts": 2.5.0-dev.3
"@venusprotocol/governance-contracts": 2.7.0
"@venusprotocol/subgraph-utils": 0.0.0
apollo-fetch: ^0.7.0
hardhat: ^2.10.2
Expand All @@ -5714,7 +5714,7 @@ __metadata:
dependencies:
"@graphprotocol/client-cli": 3.0.0
"@graphprotocol/graph-cli": ^0.80.0
"@venusprotocol/isolated-pools": 3.7.0-dev.6
"@venusprotocol/isolated-pools": 3.7.0
"@venusprotocol/subgraph-utils": 0.0.0
apollo-fetch: ^0.7.0
hardhat: ^2.10.2
Expand All @@ -5725,9 +5725,9 @@ __metadata:
languageName: unknown
linkType: soft

"@venusprotocol/isolated-pools@npm:3.7.0-dev.5":
version: 3.7.0-dev.5
resolution: "@venusprotocol/isolated-pools@npm:3.7.0-dev.5"
"@venusprotocol/isolated-pools@npm:3.7.0":
version: 3.7.0
resolution: "@venusprotocol/isolated-pools@npm:3.7.0"
dependencies:
"@nomiclabs/hardhat-ethers": ^2.2.3
"@openzeppelin/contracts": ^4.8.3
Expand All @@ -5738,30 +5738,13 @@ __metadata:
ethers: ^5.7.0
hardhat-deploy: ^0.11.14
module-alias: ^2.2.2
checksum: 0d4cea585025102481d6634ab5ec902b6d8abffcdfee4769b27023d5f4ad6d0fc86ad63ea4e30a73d43bf5f729e05bc5eb786b27233630a4982b366e124a34c6
checksum: 666fe6961bfc5f42795aa9bfca4bd33affb459347946c9e0ea61b13a7946fa8e202c2a0a0d92ca384075d28fae48f503018d580230b19d3828c249e3bfe80ab0
languageName: node
linkType: hard

"@venusprotocol/isolated-pools@npm:3.7.0-dev.6":
version: 3.7.0-dev.6
resolution: "@venusprotocol/isolated-pools@npm:3.7.0-dev.6"
dependencies:
"@nomiclabs/hardhat-ethers": ^2.2.3
"@openzeppelin/contracts": ^4.8.3
"@openzeppelin/contracts-upgradeable": ^4.8.3
"@openzeppelin/hardhat-upgrades": ^1.21.0
"@solidity-parser/parser": ^0.13.2
"@venusprotocol/solidity-utilities": ^2.0.0
ethers: ^5.7.0
hardhat-deploy: ^0.11.14
module-alias: ^2.2.2
checksum: 94cc295b4bc5cc4720b9f2a5b4b2a6914d460ba18440c1ad66840ea43930f91c703668e15ad73ce41130889249dcc9a07f267ff03c7be11d6ff086951dd0cb2f
languageName: node
linkType: hard

"@venusprotocol/oracle@npm:2.6.0":
version: 2.6.0
resolution: "@venusprotocol/oracle@npm:2.6.0"
"@venusprotocol/oracle@npm:2.7.0":
version: 2.7.0
resolution: "@venusprotocol/oracle@npm:2.7.0"
dependencies:
"@chainlink/contracts": ^0.5.1
"@defi-wonderland/smock": 2.3.5
Expand All @@ -5776,7 +5759,7 @@ __metadata:
hardhat-deploy: ^0.12.4
module-alias: ^2.2.2
solidity-docgen: ^0.6.0-beta.29
checksum: 47c36e0cbba6f4963113e8e2db268063a52f4ffe913a8aab398f25d5c83ac5f448e45cb57992cb8f406e1be9a581557b7c75c4d8754d42f5d3164bff49f2b5c9
checksum: 1fd036da69399b2d7024958bf12e07b053be553d0ba136334035b055b691a2b3b748dd6f52f6756c9770a216df8a8915a0e1a49d7169efcd1c658a21107e2ba4
languageName: node
linkType: hard

Expand Down Expand Up @@ -5813,9 +5796,9 @@ __metadata:
languageName: node
linkType: hard

"@venusprotocol/protocol-reserve@npm:^2.4.0":
version: 2.4.0
resolution: "@venusprotocol/protocol-reserve@npm:2.4.0"
"@venusprotocol/protocol-reserve@npm:^3.0.0":
version: 3.0.0
resolution: "@venusprotocol/protocol-reserve@npm:3.0.0"
dependencies:
"@nomiclabs/hardhat-ethers": ^2.2.3
"@openzeppelin/contracts": ^4.8.3
Expand All @@ -5827,7 +5810,7 @@ __metadata:
ethers: ^5.7.0
hardhat-deploy: ^0.11.14
module-alias: ^2.2.2
checksum: 6e5ffa1c458cff073f9b920ab6385d9db0c86ac11d0950fe421a853e709ee12ec0013c6d3e9cb4e50e94f749dcd33e7a515d57828c5aa6f925dee8324e896ee5
checksum: d492ea9f2d2e1a587eeeddcdaa56ee87db0eee47674d62dfa34278c679f78b79a7045f5e2a2322e0cab42c45abd8248841318e8ad0a02ab35299520c3fccc901
languageName: node
linkType: hard

Expand Down Expand Up @@ -5880,12 +5863,12 @@ __metadata:
"@types/node": ^20.5.9
"@typescript-eslint/eslint-plugin": ^5.40.1
"@typescript-eslint/parser": ^5.40.1
"@venusprotocol/governance-contracts": 2.5.0-dev.6
"@venusprotocol/isolated-pools": 3.7.0-dev.6
"@venusprotocol/oracle": 2.6.0
"@venusprotocol/governance-contracts": 2.7.0
"@venusprotocol/isolated-pools": 3.7.0
"@venusprotocol/oracle": 2.7.0
"@venusprotocol/protocol-reserve": 2.3.0
"@venusprotocol/solidity-utilities": ^2.0.3
"@venusprotocol/venus-protocol": 9.3.0
"@venusprotocol/venus-protocol": 9.4.0
assemblyscript: 0.19.23
chai: ^4.3.6
dotenv: ^16.4.5
Expand Down Expand Up @@ -5913,9 +5896,9 @@ __metadata:
languageName: unknown
linkType: soft

"@venusprotocol/token-bridge@npm:^2.3.0":
version: 2.3.0
resolution: "@venusprotocol/token-bridge@npm:2.3.0"
"@venusprotocol/token-bridge@npm:^2.4.0":
version: 2.4.0
resolution: "@venusprotocol/token-bridge@npm:2.4.0"
dependencies:
"@layerzerolabs/solidity-examples": ^1.0.0
"@openzeppelin/contracts": ^4.8.3
Expand All @@ -5924,7 +5907,7 @@ __metadata:
"@solidity-parser/parser": ^0.13.2
ethers: ^5.7.0
module-alias: ^2.2.2
checksum: c9f3dcf9eb014592404de14998f817c230e51ec640074ad0811c4ab21e141478b91daefe949b51fc80d6437f3b1f1bb9f606f2c50c2720b01a2e673008208917
checksum: f9d087df9c7e643b058c5c468f07145d76e44c01049ce1c824e326ec4b5549769b18575234267d1bef808c1eda2703b7a9ba6a3bb6ced99b46ccd5341657bf21
languageName: node
linkType: hard

Expand All @@ -5942,21 +5925,21 @@ __metadata:
languageName: node
linkType: hard

"@venusprotocol/venus-protocol@npm:9.3.0":
version: 9.3.0
resolution: "@venusprotocol/venus-protocol@npm:9.3.0"
"@venusprotocol/venus-protocol@npm:9.4.0":
version: 9.4.0
resolution: "@venusprotocol/venus-protocol@npm:9.4.0"
dependencies:
"@nomicfoundation/hardhat-ethers": ^3.0.0
"@openzeppelin/contracts": 4.9.3
"@openzeppelin/contracts-upgradeable": ^4.8.0
"@venusprotocol/governance-contracts": ^2.4.0
"@venusprotocol/protocol-reserve": ^2.4.0
"@venusprotocol/governance-contracts": ^2.6.0
"@venusprotocol/protocol-reserve": ^3.0.0
"@venusprotocol/solidity-utilities": ^2.0.3
"@venusprotocol/token-bridge": ^2.3.0
"@venusprotocol/token-bridge": ^2.4.0
bignumber.js: ^9.1.2
dotenv: ^16.0.1
module-alias: ^2.2.2
checksum: e9869d63a5c6a4f00ad091357cf76ee6b27a2c61459e69e6818fb36fedb677ae4717c047c5241c6993b86ce29d8657e69abbd88ce4f3344d636a0069ca1559d2
checksum: 8c5c6fa31f6aaef9816143f353986cc9e8faf9fabae1fdc999c477d61b952303f8b7004e5c5f4e8f3432157af14e5c831d6117b479787fc8d851ad6318fcca04
languageName: node
linkType: hard

Expand Down

0 comments on commit 2a3f553

Please sign in to comment.