Fix SubQL ECS image manifests

Author: xlc

.dockerignore

@@ -4,10 +4,10 @@ node_modules
 
 # Build artifacts
 dist
+**/dist
 build
+**/build
 *.tsbuildinfo
-!packages/*/dist
-!packages/*/dist/**
 
 # Git
 .git

.github/workflows/docker.yml

@@ -70,6 +70,15 @@ jobs:
           bun install
           bun run build
 
+      - name: Verify dex bundle
+        working-directory: packages/dex-subql
+        run: |
+          bun run test
+          if grep -R "rpc\\.oracle\\.getValue" dist; then
+            echo "Built dex output still contains stale direct rpc.oracle.getValue"
+            exit 1
+          fi
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
         with:
@@ -117,6 +126,14 @@ jobs:
           bun install
           bun run build
 
+      - name: Verify dex fixed bundle
+        working-directory: packages/dex-subql-fixed
+        run: |
+          if grep -R "rpc\\.oracle\\.getValue" dist; then
+            echo "Built dex-fixed output still contains stale direct rpc.oracle.getValue"
+            exit 1
+          fi
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
         with:

packages/chain-stats-subql/acala-project.yaml

@@ -1,5 +1,5 @@
 specVersion: 1.0.0
-name: acala-tokens
+name: acala-stats
 version: 1.0.0
 description: 'statistics tokens data'
 repository: 'https://github.com/AcalaNetwork/acala-subql-services'
@@ -96,4 +96,4 @@ dataSources:
             kind: substrate/EventHandler
             filter:
               module: tokens
-              method: Slashed
+              method: Slashed

packages/chain-stats-subql/karura-project.yaml

@@ -1,5 +1,5 @@
 specVersion: 1.0.0
-name: karura-tokens
+name: karura-stats
 version: 1.0.0
 description: 'statistics tokens data of karura network'
 repository: 'https://github.com/AcalaNetwork/acala-subql-services'
@@ -96,4 +96,4 @@ dataSources:
             kind: substrate/EventHandler
             filter:
               module: tokens
-              method: Slashed
+              method: Slashed

packages/chain-stats-subql/project.yaml

@@ -1,5 +1,5 @@
 specVersion: 1.0.0
-name: acala-tokens
+name: acala-stats
 version: 1.0.0
 description: 'statistics tokens data'
 repository: 'https://github.com/AcalaNetwork/acala-tokens-subql'

packages/dex-subql-fixed/Dockerfile

@@ -16,12 +16,9 @@ COPY packages/dex-subql-fixed/package.json packages/dex-subql-fixed/bun.lock ./
 RUN bun install
 COPY packages/dex-subql-fixed/ ./
 RUN set -e \
-    && if [ -d /app/dist ]; then \
-        echo "Using prebuilt dist from build context"; \
-      else \
-        ./node_modules/.bin/subql codegen; \
-        ./node_modules/.bin/subql build --output dist; \
-      fi \
+    && rm -rf /app/dist \
+    && ./node_modules/.bin/subql codegen \
+    && ./node_modules/.bin/subql build --output dist \
     && for i in 1 2 3 4 5; do [ -d /app/dist ] && break; sleep 1; done \
     && if [ ! -d /app/dist ]; then \
         echo "SubQL build did not create /app/dist"; \
@@ -35,6 +32,10 @@ RUN set -e \
     && if [ -f /app/src/chaintypes.ts ] && [ ! -f /app/dist/chaintypes.js ]; then \
         ./node_modules/.bin/tsc /app/src/chaintypes.ts --module commonjs --target es2019 --esModuleInterop --skipLibCheck --outDir /app/dist; \
       fi \
+    && if grep -R "rpc\\.oracle\\.getValue" /app/dist; then \
+        echo "Built dex-fixed output still contains stale direct rpc.oracle.getValue"; \
+        exit 1; \
+      fi \
     && ls -la /app/dist \
     && echo "Build completed successfully"
 

packages/dex-subql-fixed/bun.lock

@@ -24,7 +24,6 @@
   "dependencies": {
     "@acala-network/sdk-core": "^4.1.6-30",
     "@acala-network/sdk-wallet": "^4.1.6-30",
-    "@acala-network/subql-utils": "^0.1.23",
     "@acala-network/type-definitions": "latest",
     "@open-web3/util": "^1.1.4",
     "dayjs": "^1.10.7"

packages/dex-subql-fixed/package.json

@@ -17,7 +17,7 @@ dotenv.config({ path: dotenvPath });
 const project: SubstrateProject = {
   specVersion: "1.0.0",
   version: "0.0.1",
-  name: "acala-starter",
+  name: "acala-dex",
   description:
     "This project can be used as a starting point for developing your SubQuery project. It indexes all transfers on Acala network",
   runner: {

packages/dex-subql-fixed/project.ts

@@ -1,9 +1,45 @@
 import { AnyApi, FixedPointNumber as FN, MaybeCurrency, Token, forceToCurrencyId } from "@acala-network/sdk-core";
 import { SubstrateBlock } from '@subql/types/dist/interfaces';
-import { getPool, getToken } from ".";
+import { getBlock, getPool, getToken } from "./record";
 import { getTokenName } from './getTokenName';
 import { PriceBundle } from "../types";
-import { queryPriceFromOracle } from "@acala-network/subql-utils";
+
+const getOracleValue = async (api: AnyApi, token: MaybeCurrency) => {
+	const currencyId = forceToCurrencyId(api as any, token);
+	const query = (api as any)?.query?.acalaOracle?.values || (api as any)?.query?.oracle?.values;
+
+	if (query) {
+		return query(currencyId);
+	}
+
+	const getValue = (api as any)?.rpc?.oracle?.getValue;
+
+	if (typeof getValue === 'function') {
+		return getValue('Aggregated', currencyId);
+	}
+
+	throw new Error(`Oracle price source is unavailable for ${getTokenName(token)}`);
+}
+
+const queryPriceFromOracle = async (api: AnyApi, _block: SubstrateBlock, token: MaybeCurrency) => {
+	const result = await getOracleValue(api, token);
+	const value = result?.unwrapOrDefault?.() || result;
+
+	return FN.fromInner(value?.value?.value?.toString() || value?.value?.toString() || 0, 18);
+}
+
+export const ensurePriceBundleBlock = async (block: SubstrateBlock) => {
+	const blockId = block.block.header.number.toString();
+	const blockRecord = await getBlock(blockId);
+
+	blockRecord.hash = block.block.hash.toString();
+	blockRecord.number = BigInt(blockId);
+	blockRecord.timestamp = block.timestamp;
+
+	await blockRecord.save();
+
+	return blockRecord;
+}
 
 const getOtherPrice = async (api: AnyApi, block: SubstrateBlock, token: string, stakingCurrency: string, StableCurrency: string) => {
 	const { rate: rateA, amount: _amountA } = await getPriceFromDexPool(token, stakingCurrency);
@@ -154,11 +190,12 @@ export const getStablePriceBundle = async (api: AnyApi, block: SubstrateBlock, t
 
 	if (!record) {
 		const price = token === 'KUSD' ? await getKusdMarketPrice(api, block) : await getAusdMarketPrice(api, block);
+		const blockRecord = await ensurePriceBundleBlock(block);
 
 		record = new PriceBundle(id);
 
 		record.tokenId = token
-		record.blockId = block.block.header.number.toString();
+		record.blockId = blockRecord.id;
 		record.price = BigInt((price || FN.ZERO).toChainData())
 
 		await record.save();