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 19, 2024
1 parent a9ba84e commit eab2875
Show file tree
Hide file tree
Showing 10 changed files with 108 additions and 80 deletions.
14 changes: 7 additions & 7 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/protocol-reserve": "2.3.0",
"@venusprotocol/governance-contracts": "2.7.0",
"@venusprotocol/isolated-pools": "3.7.0",
"@venusprotocol/oracle": "2.7.0",
"@venusprotocol/protocol-reserve": "v3.0.1-dev.1",
"@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
9 changes: 8 additions & 1 deletion 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,7 +44,7 @@ const main = () => {
const config = {
docker: {
network: 'hardhat',
poolRegistryAddress: '0x3155755b79aA083bd953911C92705B7aA82a18F9',
poolRegistryAddress: '0x3347B4d90ebe72BeFb30444C9966B2B990aE9FcB',
startBlock: 0,
},
ethereum: {
Expand Down Expand Up @@ -117,6 +119,11 @@ const main = () => {
poolRegistryAddress: baseSepoliaDeployments.addresses.PoolRegistry,
startBlock: '18242654',
},
base: {
network: 'base',
poolRegistryAddress: baseMainnetDeployments.addresses.PoolRegistry,
startBlock: '23344365',
},
};

Mustache.escape = function (text) {
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
10 changes: 5 additions & 5 deletions subgraphs/venus-governance/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ const main = () => {
network: 'hardhat',
accessControlManagerAddress: '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9',
accessControlManagerStartBlock: '0',
governorAlphaAddress: '0xb185E9f6531BA9877741022C92CE858cDCc5760E',
governorAlphaAddress: '0x71a0b8A2245A9770A4D887cE1E4eCc6C1d4FF28c',
governorAlphaStartBlock: '0',
governorAlpha2Address: '0x01E21d7B8c39dc4C764c19b308Bd8b14B1ba139E',
governorAlpha2Address: '0x9Fcca440F19c62CDF7f973eB6DDF218B15d4C71D',
governorAlpha2StartBlock: '0',
governorBravoDelegatorAddress: '0x7C8BaafA542c57fF9B2B90612bf8aB9E86e22C09',
governorBravoDelegatorAddress: '0x547382C0D1b23f707918D3c83A77317B71Aa8470',
governorBravoDelegatorStartBlock: '0',
xvsTokenAddress: '0x0E801D84Fa97b50751Dbf25036d067dCf18858bF',
xvsTokenStartBlock: '0',
xvsVaultAddress: '0x9d4454B023096f34B160D6B654540c56A1F81688',
xvsVaultAddress: '0x8f86403A4DE0BB5791fa46B8e795C547942fE4Cf',
xvsVaultStartBlock: '0',
xvsVaultPid: '0',
omnichainProposalSenderAddress: '0x0a17FabeA4633ce714F1Fa4a2dcA62C3bAc4758d',
omnichainProposalSenderAddress: '0x7C8BaafA542c57fF9B2B90612bf8aB9E86e22C09',
omnichainProposalSenderStartBlock: '0',
},
chapel: {
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
Loading

0 comments on commit eab2875

Please sign in to comment.