diff --git a/subgraphs/external-promos/config/index.ts b/subgraphs/external-promos/config/index.ts index 34b7ff6c..d1bf9a23 100644 --- a/subgraphs/external-promos/config/index.ts +++ b/subgraphs/external-promos/config/index.ts @@ -22,8 +22,10 @@ const main = () => { network: 'hardhat', vWeEthAddress: sepoliaILDeployments.addresses.VToken_vweETH_LiquidStakedETH, vWeEthStartBlock: '0', - vWeEthsAddress: sepoliaILDeployments.addresses.VToken_vweETHs_LiquidStakedETH, - vWeEthsStartBlock: '0', + vWeEthsLSEthAddress: sepoliaILDeployments.addresses.VToken_vweETHs_LiquidStakedETH, + vWeEthsLSEthStartBlock: '0', + vWeEthsCoreAddress: sepoliaILDeployments.addresses.VToken_vweETHs_Core, + vWeEthsCoreStartBlock: '0', veBTCAddress: sepoliaILDeployments.addresses.VToken_veBTC, veBTCStartBlock: '0', template: 'template-eth.yaml', @@ -32,8 +34,10 @@ const main = () => { network: 'sepolia', vWeEthAddress: sepoliaILDeployments.addresses.VToken_vweETH_LiquidStakedETH, vWeEthStartBlock: '5659827', - vWeEthsAddress: sepoliaILDeployments.addresses.VToken_vweETHs_LiquidStakedETH, - vWeEthsStartBlock: '6536644', + vWeEthsLSEthAddress: sepoliaILDeployments.addresses.VToken_vweETHs_LiquidStakedETH, + vWeEthsLSEthStartBlock: '6536644', + vWeEthsCoreAddress: sepoliaILDeployments.addresses.VToken_vweETHs_Core, + vWeEthsCoreStartBlock: '7650833', veBTCAddress: sepoliaILDeployments.addresses.VToken_veBTC, veBTCStartBlock: '0', template: 'template-eth.yaml', @@ -42,8 +46,10 @@ const main = () => { network: 'mainnet', vWeEthAddress: ethereumILDeployments.addresses.VToken_vweETH_LiquidStakedETH, vWeEthStartBlock: '19638180', - vWeEthsAddress: ethereumILDeployments.addresses.VToken_vweETHs_LiquidStakedETH, - vWeEthsStartBlock: '20583508', + vWeEthsLSEthAddress: ethereumILDeployments.addresses.VToken_vweETHs_LiquidStakedETH, + vWeEthsLSEthStartBlock: '20583508', + vWeEthsCoreAddress: ethereumILDeployments.addresses.VToken_vweETHs_Core, + vWeEthsCoreStartBlock: '21786620', veBTCAddress: ethereumILDeployments.addresses.VToken_veBTC_Core, veBTCStartBlock: '21079720', template: 'template-eth.yaml', diff --git a/subgraphs/external-promos/package.json b/subgraphs/external-promos/package.json index 2ea2832a..31241c3c 100644 --- a/subgraphs/external-promos/package.json +++ b/subgraphs/external-promos/package.json @@ -1,6 +1,6 @@ { "name": "@venusprotocol/external-promos-subgraph", - "version": "1.0.0", + "version": "1.1.0", "license": "MIT", "repository": { "url": "https://github.com/VenusProtocol/subgraphs", diff --git a/subgraphs/external-promos/template-eth.yaml b/subgraphs/external-promos/template-eth.yaml index d004f38e..75f99d9f 100644 --- a/subgraphs/external-promos/template-eth.yaml +++ b/subgraphs/external-promos/template-eth.yaml @@ -34,12 +34,41 @@ dataSources: - event: AccrueInterest(uint256,uint256,uint256,uint256) handler: handleAccrueInterest - kind: ethereum/contract - name: vWeETHs + name: vWeETHsLSEth network: {{ network }} source: - address: "{{ vWeEthsAddress }}" + address: "{{ vWeEthsLSEthAddress }}" abi: VToken - startBlock: {{ vWeEthsStartBlock }} + startBlock: {{ vWeEthsLSEthStartBlock }} + mapping: + kind: ethereum/events + apiVersion: 0.0.9 + language: wasm/assemblyscript + file: ./src/mappings/vToken.ts + entities: + - SupplierAccount + - BorrowerAccount + abis: + - name: VToken + file: ../../node_modules/@venusprotocol/isolated-pools/artifacts/contracts/VToken.sol/VToken.json + - name: ERC20 + file: ../../node_modules/@venusprotocol/isolated-pools/artifacts/contracts/test/ERC20.sol/ERC20.json + eventHandlers: + - event: Mint(indexed address,uint256,uint256,uint256) + handler: handleMint + - event: Borrow(indexed address,uint256,uint256,uint256) + handler: handleBorrow + - event: Transfer(indexed address,indexed address,uint256) + handler: handleTransfer + - event: AccrueInterest(uint256,uint256,uint256,uint256) + handler: handleAccrueInterest + - kind: ethereum/contract + name: vWeETHsCore + network: {{ network }} + source: + address: "{{ vWeEthsCoreAddress }}" + abi: VToken + startBlock: {{ vWeEthsCoreStartBlock }} mapping: kind: ethereum/events apiVersion: 0.0.9 diff --git a/subgraphs/isolated-pools/deploy.sh b/subgraphs/isolated-pools/deploy.sh index 3e976175..3f038c74 100755 --- a/subgraphs/isolated-pools/deploy.sh +++ b/subgraphs/isolated-pools/deploy.sh @@ -1,21 +1,42 @@ #!/bin/bash version=($(jq -r '.version' package.json)) +alchemy_node=https://subgraphs.alchemy.com/api/subgraphs/deploy +alchemy_ipfs=https://ipfs.satsuma.xyz if [[ $version == *"testnet"* ]]; then + # Alchemy backups + yarn deploy:chapel --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $TESTNET_GRAPH_CLI_ALCHEMY_KEY + yarn deploy:sepolia --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $TESTNET_GRAPH_CLI_ALCHEMY_KEY + yarn deploy:arbitrumSepolia --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $TESTNET_GRAPH_CLI_ALCHEMY_KEY + yarn deploy:zksyncSepolia --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $TESTNET_GRAPH_CLI_ALCHEMY_KEY + yarn deploy:optimismSepolia --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $TESTNET_GRAPH_CLI_ALCHEMY_KEY + yarn deploy:baseSepolia --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $TESTNET_GRAPH_CLI_ALCHEMY_KEY + yarn deploy:unichainSepolia --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $TESTNET_GRAPH_CLI_ALCHEMY_KEY + # The Graph yarn graph auth --studio $TESTNET_GRAPH_CLI_API_KEY - yarn deploy:chapel --version-label $version - yarn deploy:sepolia --version-label $version - yarn deploy:arbitrumSepolia --version-label $version - yarn deploy:zksyncSepolia --version-label $version - yarn deploy:optimismSepolia --version-label $version - yarn deploy:baseSepolia --version-label $version + yarn deploy:chapel --studio --version-label $version + yarn deploy:sepolia --studio --version-label $version + yarn deploy:arbitrumSepolia --studio --version-label $version + # ZKsync is deprecated in The Graph + yarn deploy:optimismSepolia --studio --version-label $version + yarn deploy:baseSepolia --studio --version-label $version + yarn deploy:unichainSepolia --studio --version-label $version else + # Alchemy backups + yarn deploy:bsc --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $MAINNET_GRAPH_CLI_ALCHEMY_KEY + yarn deploy:ethereum --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $MAINNET_GRAPH_CLI_ALCHEMY_KEY + yarn deploy:arbitrum --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $MAINNET_GRAPH_CLI_ALCHEMY_KEY + yarn deploy:zksync --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $MAINNET_GRAPH_CLI_ALCHEMY_KEY + yarn deploy:optimism --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $MAINNET_GRAPH_CLI_ALCHEMY_KEY + yarn deploy:base --node $alchemy_node --ipfs $alchemy_ipfs --version-label $version --deploy-key $MAINNET_GRAPH_CLI_ALCHEMY_KEY + # The Graph yarn graph auth --studio $MAINNET_GRAPH_CLI_API_KEY - yarn deploy:bsc --version-label $version - yarn deploy:ethereum --version-label $version - yarn deploy:arbitrum --version-label $version - yarn deploy:zksync --version-label $version - yarn deploy:optimism --version-label $version - yarn deploy:base --version-label $version + yarn deploy:bsc --studio --version-label $version + yarn deploy:ethereum --studio --version-label $version + yarn deploy:arbitrum --studio --version-label $version + # ZKsync is deprecated in The Graph + yarn deploy:optimism --studio --version-label $version + yarn deploy:base --studio --version-label $version + yarn deploy:unichain --studio --version-label $version fi diff --git a/subgraphs/isolated-pools/package.json b/subgraphs/isolated-pools/package.json index caee43d7..6d161ca6 100644 --- a/subgraphs/isolated-pools/package.json +++ b/subgraphs/isolated-pools/package.json @@ -1,6 +1,6 @@ { "name": "@venusprotocol/isolated-pools-subgraph", - "version": "1.4.0", + "version": "1.5.0", "license": "MIT", "repository": { "url": "https://github.com/VenusProtocol/subgraphs", @@ -16,20 +16,20 @@ "build:bsc": "graph build --ipfs https://api.thegraph.com/ipfs/ ", "deploy:integration": "graph deploy venusprotocol/venus-isolated-pools --ipfs http://localhost:5001 --node http://127.0.0.1:8020/", "deploy:docker": "yarn prepare:docker && yarn codegen && yarn graph deploy venusprotocol/venus-isolated-pools --ipfs http://ipfs:5001 --node http://graph-node:8020/ --version-label ci", - "deploy:chapel": "yarn prepare:chapel && yarn codegen && graph deploy --studio venus-isolated-pools-chapel", - "deploy:bsc": "yarn prepare:bsc && yarn codegen && graph deploy --studio venus-isolated-pools", - "deploy:ethereum": "yarn prepare:ethereum && yarn codegen && yarn graph deploy --studio venus-isolated-pools-ethereum", - "deploy:sepolia": "yarn prepare:sepolia && yarn codegen && yarn graph deploy --studio venus-isolated-pools-sepolia", - "deploy:arbitrumSepolia": "yarn prepare:arbitrumSepolia && yarn codegen && yarn graph deploy --studio venus-il-arbitrumsepolia", - "deploy:arbitrum": "yarn prepare:arbitrum && yarn codegen && yarn graph deploy --studio venus-isolated-pools-arbitrum", - "deploy:zksyncSepolia": "yarn prepare:zksyncSepolia && yarn codegen && yarn graph deploy --studio venus-il-zksync-sepolia", - "deploy:zksync": "yarn prepare:zksync && yarn codegen && yarn graph deploy --studio venus-isolated-pools-zksync", - "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", - "deploy:unichainSepolia": "yarn prepare:unichainSepolia && yarn codegen && yarn graph deploy --studio venus-isolated-pools-unichain-sepolia", - "deploy:unichain": "yarn prepare:unichain && yarn codegen && yarn graph deploy --studio venus-isolated-pools-unichain", + "deploy:chapel": "yarn prepare:chapel && yarn codegen && graph deploy venus-isolated-pools-chapel", + "deploy:bsc": "yarn prepare:bsc && yarn codegen && graph deploy venus-isolated-pools-bsc", + "deploy:ethereum": "yarn prepare:ethereum && yarn codegen && yarn graph deploy venus-isolated-pools-ethereum", + "deploy:sepolia": "yarn prepare:sepolia && yarn codegen && yarn graph deploy venus-isolated-pools-sepolia", + "deploy:arbitrumSepolia": "yarn prepare:arbitrumSepolia && yarn codegen && yarn graph deploy venus-il-arbitrumsepolia", + "deploy:arbitrum": "yarn prepare:arbitrum && yarn codegen && yarn graph deploy venus-isolated-pools-arbitrum", + "deploy:zksyncSepolia": "yarn prepare:zksyncSepolia && yarn codegen && yarn graph deploy venus-il-zksync-sepolia", + "deploy:zksync": "yarn prepare:zksync && yarn codegen && yarn graph deploy venus-isolated-pools-zksync", + "deploy:optimismSepolia": "yarn prepare:optimismSepolia && yarn codegen && yarn graph deploy venus-il-optimism-sepolia", + "deploy:optimism": "yarn prepare:optimism && yarn codegen && yarn graph deploy venus-isolated-pools-optimism", + "deploy:baseSepolia": "yarn prepare:baseSepolia && yarn codegen && yarn graph deploy venus-isolated-pools-base-sepolia", + "deploy:base": "yarn prepare:base && yarn codegen && yarn graph deploy venus-isolated-pools-base", + "deploy:unichainSepolia": "yarn prepare:unichainSepolia && yarn codegen && yarn graph deploy venus-isolated-pools-unichain-sepolia", + "deploy:unichain": "yarn prepare:unichain && yarn codegen && yarn graph deploy venus-isolated-pools-unichain", "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",