From ce6c1a8ff64aa9c35cd02c40831d6492d9a6cd26 Mon Sep 17 00:00:00 2001 From: Dmitri Tsumak Date: Sun, 11 Sep 2022 17:53:22 +0300 Subject: [PATCH] Add FeesEscrow addresses (#69) --- package-lock.json | 2 +- package.json | 2 +- packages/constants/package.json | 2 +- subgraphs/ethereum/package.json | 6 +++--- .../stakewise/config/harbour_mainnet.json | 4 ++-- subgraphs/stakewise/config/mainnet.json | 4 ++-- subgraphs/stakewise/package.json | 8 ++++---- subgraphs/stakewise/packages/abis/Pool.json | 18 ------------------ .../packages/abis/RewardEthTokenV2.json | 4 ++-- subgraphs/stakewise/src/mappings/pool.ts | 4 +--- subgraphs/uniswap-v3/package.json | 4 ++-- 11 files changed, 19 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index 461fb3b..9810a05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "stakewise-subgraphs", - "version": "1.3.1", + "version": "1.4.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3e01ba8..8cab5b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stakewise-subgraphs", - "version": "1.4.3", + "version": "1.4.5", "description": "Subgraphs for the StakeWise Protocol", "repository": "https://github.com/stakewise/subgraphs", "license": "AGPL-3.0-only", diff --git a/packages/constants/package.json b/packages/constants/package.json index 7946740..4cb5bbb 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -1,6 +1,6 @@ { "name": "const", - "version": "1.4.3", + "version": "1.4.5", "license": "AGPL-3.0-only", "main": "index.ts", "type": "module", diff --git a/subgraphs/ethereum/package.json b/subgraphs/ethereum/package.json index be6d868..61c74c8 100644 --- a/subgraphs/ethereum/package.json +++ b/subgraphs/ethereum/package.json @@ -1,6 +1,6 @@ { "name": "ethereum", - "version": "1.4.3", + "version": "1.4.5", "license": "AGPL-3.0-only", "scripts": { "prepare:goerli": "npm run --prefix=../../packages/constants prepare:goerli && mustache config/goerli.json subgraph.template.yaml > subgraph.yaml", @@ -11,12 +11,12 @@ "build:mainnet": "npm run prepare:mainnet && graph codegen subgraph.yaml && graph build subgraph.yaml", "deploy:mainnet": "npm run build:mainnet && graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ stakewise/ethereum-mainnet", "create:mainnet:local": "graph create --node $GRAPH_MAINNET_URL stakewise/ethereum", - "deploy:mainnet:local": "npm run build:mainnet && npm run create:mainnet:local && graph deploy --version-label 1.4.3 --node $GRAPH_MAINNET_URL --ipfs $IPFS_MAINNET_URL stakewise/ethereum", + "deploy:mainnet:local": "npm run build:mainnet && npm run create:mainnet:local && graph deploy --version-label 1.4.5 --node $GRAPH_MAINNET_URL --ipfs $IPFS_MAINNET_URL stakewise/ethereum", "prepare:gnosis": "npm run --prefix=../../packages/constants prepare:gnosis && mustache config/gnosis.json subgraph.template.yaml > subgraph.yaml", "build:gnosis": "npm run prepare:gnosis && graph codegen subgraph.yaml && graph build subgraph.yaml", "deploy:gnosis": "npm run build:gnosis && graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ stakewise/ethereum-gnosis", "create:gnosis:local": "graph create --node $GRAPH_GNOSIS_URL stakewise/ethereum", - "deploy:gnosis:local": "npm run build:gnosis && npm run create:gnosis:local && graph deploy --version-label 1.4.3 --node $GRAPH_GNOSIS_URL --ipfs $IPFS_GNOSIS_URL stakewise/ethereum" + "deploy:gnosis:local": "npm run build:gnosis && npm run create:gnosis:local && graph deploy --version-label 1.4.5 --node $GRAPH_GNOSIS_URL --ipfs $IPFS_GNOSIS_URL stakewise/ethereum" } } diff --git a/subgraphs/stakewise/config/harbour_mainnet.json b/subgraphs/stakewise/config/harbour_mainnet.json index c92a47d..359cfc4 100644 --- a/subgraphs/stakewise/config/harbour_mainnet.json +++ b/subgraphs/stakewise/config/harbour_mainnet.json @@ -37,8 +37,8 @@ "startBlock": "14798542" }, "feesEscrow": { - "address": "0x0000000000000000000000000000000000000000", - "startBlock": "14798545" + "address": "0xb5230ebe5b1a9299a5c44f459ed2e8eb7496f581", + "startBlock": "15508750" }, "distributorTokens": [] } \ No newline at end of file diff --git a/subgraphs/stakewise/config/mainnet.json b/subgraphs/stakewise/config/mainnet.json index 8ae87a5..fabb3d1 100644 --- a/subgraphs/stakewise/config/mainnet.json +++ b/subgraphs/stakewise/config/mainnet.json @@ -41,8 +41,8 @@ "startBlock": "14108270" }, "feesEscrow": { - "address": "0x0000000000000000000000000000000000000000", - "startBlock": "14108270" + "address": "0x6b333b20fbae3c5c0969dd02176e30802e2fbbdb", + "startBlock": "15501344" }, "distributorTokens": [ { diff --git a/subgraphs/stakewise/package.json b/subgraphs/stakewise/package.json index 34ddba8..65b2a99 100644 --- a/subgraphs/stakewise/package.json +++ b/subgraphs/stakewise/package.json @@ -1,6 +1,6 @@ { "name": "stakewise", - "version": "1.4.3", + "version": "1.4.5", "license": "AGPL-3.0-only", "scripts": { "prepare:goerli": "npm run --prefix=../../packages/constants prepare:goerli && mustache config/goerli.json subgraph.template.yaml > subgraph.yaml", @@ -11,7 +11,7 @@ "build:mainnet": "npm run prepare:mainnet && graph codegen subgraph.yaml && graph build subgraph.yaml", "deploy:mainnet": "npm run build:mainnet && graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ stakewise/stakewise-mainnet", "create:mainnet:local": "graph create --node $GRAPH_MAINNET_URL stakewise/stakewise", - "deploy:mainnet:local": "npm run build:mainnet && npm run create:mainnet:local && graph deploy --version-label 1.4.3 --node $GRAPH_MAINNET_URL --ipfs $IPFS_MAINNET_URL stakewise/stakewise", + "deploy:mainnet:local": "npm run build:mainnet && npm run create:mainnet:local && graph deploy --version-label 1.4.5 --node $GRAPH_MAINNET_URL --ipfs $IPFS_MAINNET_URL stakewise/stakewise", "prepare:harbour_goerli": "npm run --prefix=../../packages/constants prepare:harbour_goerli && mustache config/harbour_goerli.json subgraph.template.yaml > subgraph.yaml", "build:harbour_goerli": "npm run prepare:harbour_goerli && graph codegen subgraph.yaml && graph build subgraph.yaml", @@ -21,12 +21,12 @@ "build:harbour_mainnet": "npm run prepare:harbour_mainnet && graph codegen subgraph.yaml && graph build subgraph.yaml", "deploy:harbour_mainnet": "npm run build:harbour_mainnet && graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ stakewise/stakewise-harbour-mainnet", "create:harbour_mainnet:local": "graph create --node $GRAPH_MAINNET_URL stakewise/stakewise-harbour", - "deploy:harbour_mainnet:local": "npm run build:harbour_mainnet && npm run create:harbour_mainnet:local && graph deploy --version-label 1.4.3 --node $GRAPH_MAINNET_URL --ipfs $IPFS_MAINNET_URL stakewise/stakewise-harbour", + "deploy:harbour_mainnet:local": "npm run build:harbour_mainnet && npm run create:harbour_mainnet:local && graph deploy --version-label 1.4.5 --node $GRAPH_MAINNET_URL --ipfs $IPFS_MAINNET_URL stakewise/stakewise-harbour", "prepare:gnosis": "npm run --prefix=../../packages/constants prepare:gnosis && mustache config/gnosis.json subgraph.template.yaml > subgraph.yaml", "build:gnosis": "npm run prepare:gnosis && graph codegen subgraph.yaml && graph build subgraph.yaml", "deploy:gnosis": "npm run build:gnosis && graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ stakewise/stakewise-gnosis", "create:gnosis:local": "graph create --node $GRAPH_GNOSIS_URL stakewise/stakewise", - "deploy:gnosis:local": "npm run build:gnosis && npm run create:gnosis:local && graph deploy --version-label 1.4.3 --node $GRAPH_GNOSIS_URL --ipfs $IPFS_GNOSIS_URL stakewise/stakewise" + "deploy:gnosis:local": "npm run build:gnosis && npm run create:gnosis:local && graph deploy --version-label 1.4.5 --node $GRAPH_GNOSIS_URL --ipfs $IPFS_GNOSIS_URL stakewise/stakewise" } } diff --git a/subgraphs/stakewise/packages/abis/Pool.json b/subgraphs/stakewise/packages/abis/Pool.json index 9f11165..5ceb138 100644 --- a/subgraphs/stakewise/packages/abis/Pool.json +++ b/subgraphs/stakewise/packages/abis/Pool.json @@ -884,24 +884,6 @@ "stateMutability": "nonpayable", "type": "function" }, - { - "inputs": [ - { - "internalType": "address", - "name": "_poolValidators", - "type": "address" - }, - { - "internalType": "address", - "name": "_oracles", - "type": "address" - } - ], - "name": "upgrade", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, { "inputs": [], "name": "validatorRegistration", diff --git a/subgraphs/stakewise/packages/abis/RewardEthTokenV2.json b/subgraphs/stakewise/packages/abis/RewardEthTokenV2.json index f1ff2b2..031fdbd 100644 --- a/subgraphs/stakewise/packages/abis/RewardEthTokenV2.json +++ b/subgraphs/stakewise/packages/abis/RewardEthTokenV2.json @@ -1057,8 +1057,8 @@ { "inputs": [ { - "internalType": "address", - "name": "_oracles", + "internalType": "contract IFeesEscrow", + "name": "_feesEscrow", "type": "address" } ], diff --git a/subgraphs/stakewise/src/mappings/pool.ts b/subgraphs/stakewise/src/mappings/pool.ts index 1b6dd32..ad0e71a 100644 --- a/subgraphs/stakewise/src/mappings/pool.ts +++ b/subgraphs/stakewise/src/mappings/pool.ts @@ -113,9 +113,7 @@ export function handleStakeWithReferrer(event: StakedWithReferrer): void { log.info("[Pool] StakedWithReferrer sender={} referrer={} amount={}", [ event.transaction.from.toHexString(), - event.params.referrer.toHexString() - - , + event.params.referrer.toHexString(), event.params.amount.toString(), ]); } diff --git a/subgraphs/uniswap-v3/package.json b/subgraphs/uniswap-v3/package.json index 6ada4ef..2e9a042 100644 --- a/subgraphs/uniswap-v3/package.json +++ b/subgraphs/uniswap-v3/package.json @@ -1,6 +1,6 @@ { "name": "uniswap-v3", - "version": "1.4.3", + "version": "1.4.5", "license": "AGPL-3.0-only", "scripts": { "prepare:goerli": "npm run --prefix=../../packages/constants prepare:goerli && mustache config/goerli.json subgraph.template.yaml > subgraph.yaml", @@ -11,6 +11,6 @@ "build:mainnet": "npm run prepare:mainnet && graph codegen subgraph.yaml && graph build subgraph.yaml", "deploy:mainnet": "npm run build:mainnet && graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ stakewise/uniswap-v3-mainnet", "create:mainnet:local": "graph create --node $GRAPH_MAINNET_URL stakewise/uniswap-v3", - "deploy:mainnet:local": "npm run build:mainnet && npm run create:mainnet:local && graph deploy --version-label 1.4.3 --node $GRAPH_MAINNET_URL --ipfs $IPFS_MAINNET_URL stakewise/uniswap-v3" + "deploy:mainnet:local": "npm run build:mainnet && npm run create:mainnet:local && graph deploy --version-label 1.4.5 --node $GRAPH_MAINNET_URL --ipfs $IPFS_MAINNET_URL stakewise/uniswap-v3" } }