From fef18f17319af4b010737889cc7f53795284d33a Mon Sep 17 00:00:00 2001 From: qwer951123 Date: Mon, 9 Oct 2023 15:33:12 +0800 Subject: [PATCH] update --- packages/earn-subql/docker-compose.yml | 4 +- packages/earn-subql/karura-project.yaml | 45 +++++++++---------- packages/earn-subql/project.yaml | 13 +++--- .../histories-subql/src/utils/getPoolId.ts | 2 + packages/lsd-staking/docker-compose.yml | 2 + 5 files changed, 35 insertions(+), 31 deletions(-) diff --git a/packages/earn-subql/docker-compose.yml b/packages/earn-subql/docker-compose.yml index c8cc671..887858b 100644 --- a/packages/earn-subql/docker-compose.yml +++ b/packages/earn-subql/docker-compose.yml @@ -37,6 +37,8 @@ services: - --workers=4 - --batch-size=30 - --unfinalized-blocks=true + - --network-dictionary='' + - ----dictionary-resolver='' healthcheck: test: ["CMD", "curl", "-f", "http://subquery-node:3000/ready"] interval: 3s @@ -46,7 +48,7 @@ services: graphql-engine: image: onfinality/subql-query:latest ports: - - 3000:3000 + - 3001:3000 depends_on: "postgres": condition: service_healthy diff --git a/packages/earn-subql/karura-project.yaml b/packages/earn-subql/karura-project.yaml index daad792..63d1812 100644 --- a/packages/earn-subql/karura-project.yaml +++ b/packages/earn-subql/karura-project.yaml @@ -1,50 +1,49 @@ specVersion: 1.0.0 -name: karura-liquid-staking +name: karura-staking +repository: 'https://github.com/AcalaNetwork/acala-subql-services' version: 1.0.0 -description: 'liquid protocal statistics' runner: node: name: "@subql/node" - version: "1.21.1" + version: "2.12.6" query: name: "@subql/query" - version: "1.1.1" -schema: + version: "2.3.0" +schema: file: ./schema.graphql network: chainId: '0xbaf5aabe40646d11f0ee8abbdc64f4a4b7674925cba08e4a05ff9ebed6e2126b' - dictionary: https://api.subquery.network/sq/subquery/karura-dictionary - endpoint: wss://karura.api.onfinality.io/public-ws + endpoint: wss://crosschain-dev.polkawallet.io:9905 chaintypes: file: './dist/chain-types.js' dataSources: - kind: substrate/Runtime - startBlock: 3800000 + startBlock: 5370000 mapping: file: "./dist/index.js" handlers: - - handler: sync + - handler: handleClaimRewards kind: substrate/EventHandler filter: - module: homa - method: Minted - - handler: sync + module: incentives + method: ClaimRewards + - handler: handleUnbonded kind: substrate/EventHandler filter: - module: homa - method: RedeemedByFastMatch - - handler: sync + module: earning + method: Unbonded + - handler: handleBonded kind: substrate/EventHandler filter: - module: homa - method: RedeemedByUnbond - - handler: sync + module: earning + method: Bonded + - handler: handleWithdrawn kind: substrate/EventHandler filter: - module: homa - method: CurrentEraBumped - - handler: sync + module: earning + method: Withdrawn + - handler: handleRebonded kind: substrate/EventHandler filter: - module: homa - method: LedgerBondedReset \ No newline at end of file + module: earning + method: Rebonded \ No newline at end of file diff --git a/packages/earn-subql/project.yaml b/packages/earn-subql/project.yaml index ee57b74..63d1812 100644 --- a/packages/earn-subql/project.yaml +++ b/packages/earn-subql/project.yaml @@ -1,8 +1,7 @@ specVersion: 1.0.0 -name: acala-earn-subql -version: 1.0.0 -description: 'Acala Earn Subquery' +name: karura-staking repository: 'https://github.com/AcalaNetwork/acala-subql-services' +version: 1.0.0 runner: node: name: "@subql/node" @@ -10,16 +9,16 @@ runner: query: name: "@subql/query" version: "2.3.0" -schema: +schema: file: ./schema.graphql network: - chainId: "0x3035b88c212be330a1a724c675d56d53a5016ec32af1790738832db0227ac54c" - endpoint: wss://mandala-tc9-rpc.aca-staging.network + chainId: '0xbaf5aabe40646d11f0ee8abbdc64f4a4b7674925cba08e4a05ff9ebed6e2126b' + endpoint: wss://crosschain-dev.polkawallet.io:9905 chaintypes: file: './dist/chain-types.js' dataSources: - kind: substrate/Runtime - startBlock: 529663 + startBlock: 5370000 mapping: file: "./dist/index.js" handlers: diff --git a/packages/histories-subql/src/utils/getPoolId.ts b/packages/histories-subql/src/utils/getPoolId.ts index 9bf26bb..9c29a20 100644 --- a/packages/histories-subql/src/utils/getPoolId.ts +++ b/packages/histories-subql/src/utils/getPoolId.ts @@ -11,6 +11,8 @@ export const getPoolId = (data: any) => { return `loans-${forceToCurrencyName(data.asLoans)}`; } else if(data?.isLoansIncentive) { return `loans-${forceToCurrencyName(data.asLoansIncentive)}`; + } else if (data?.isEarning){ + return 'acala-staking'; } else { return data.toString(); } diff --git a/packages/lsd-staking/docker-compose.yml b/packages/lsd-staking/docker-compose.yml index 1bab1b9..9ab749d 100644 --- a/packages/lsd-staking/docker-compose.yml +++ b/packages/lsd-staking/docker-compose.yml @@ -51,6 +51,8 @@ services: depends_on: "postgres": condition: service_healthy + "subquery-node": + condition: service_healthy restart: always environment: DB_USER: postgres