Clean up SubQL runtime smoke fixes

Author: xlc

packages/chain-stats-subql/src/mappings/handleBlock.ts

@@ -21,8 +21,6 @@ export async function handleBlock(block: SubstrateBlock) {
 
     logger.info(`start insert ${startIndex}, batch ${accountData.length}`);
 
-    if (accountData.length === 0) return;
-
     for (const data of accountData) {
       const token = await getToken(data.token);
 
@@ -38,7 +36,5 @@ export async function handleBlock(block: SubstrateBlock) {
     }
   }
 
-
-
   await record.save();
 }

packages/chain-stats-subql/src/runtimePolyfills.ts

@@ -1,14 +1,19 @@
-import { TextDecoder, TextEncoder } from "util";
+import { TextDecoder as NodeTextDecoder, TextEncoder as NodeTextEncoder } from "util";
+
+type RuntimeWithTextEncoding = typeof globalThis & {
+  TextDecoder?: typeof NodeTextDecoder;
+  TextEncoder?: typeof NodeTextEncoder;
+};
 
 export const installRuntimePolyfills = () => {
-  const runtime = globalThis as any;
+  const runtime = globalThis as RuntimeWithTextEncoding;
 
   if (typeof runtime.TextEncoder === "undefined") {
-    runtime.TextEncoder = TextEncoder;
+    runtime.TextEncoder = NodeTextEncoder;
   }
 
   if (typeof runtime.TextDecoder === "undefined") {
-    runtime.TextDecoder = TextDecoder;
+    runtime.TextDecoder = NodeTextDecoder;
   }
 };
 

packages/chain-stats-subql/src/utils/records.ts

@@ -1,4 +1,4 @@
-import { isSystemAccount, getNativeCurrency, getTokenDecimals, isTokenEqual, getSystemAccountName } from '@acala-network/subql-utils'
+import { isSystemAccount, getNativeCurrency, getTokenDecimals, isTokenEqual } from '@acala-network/subql-utils'
 import { stringToHex, u8aToHex } from '@polkadot/util'
 import { decodeAddress } from '@polkadot/util-crypto'
 import { Block, Token, Account, AccountBalance, DailyAccountBalance, HourAccountBalance, HourToken, DailyToken } from '../types/models'
@@ -131,8 +131,8 @@ export async function getAccountBalance(
         record.accountId = address
         record.tokenId = tokenName
 
-        let free = BigInt(0);
-        let reserved = BigInt(0);
+        const free = BigInt(0);
+        const reserved = BigInt(0);
 
         record.total = free + reserved
         record.free = free

packages/histories-subql/src/handlers/handleRequestedRedeem.ts

@@ -4,15 +4,19 @@ import { getAccount, getRequestedRedeem } from "../records";
 import { getBlockHash, getBlockNumber, getBlockTimestamp } from "../utils/block";
 import { getExtrinsicHashFromEvent } from "../utils/extrinsic";
 
+type BooleanCodec = {
+  toString(): string;
+};
+
 export const handleRequestedRedeem = async (event: SubstrateEvent) => {
-  const [address, liquid_amount, allow_fast_match] = event.event.data as unknown as [AccountId, Balance, any];
+  const [address, liquidAmount, allowFastMatch] = event.event.data as unknown as [AccountId, Balance, BooleanCodec];
   const account = await getAccount(address.toString());
 
   const historyId = `${getBlockNumber(event.block)}-${event.idx.toString()}`;
   const history = await getRequestedRedeem(historyId);
   history.addressId = account.id;
-  history.amount = BigInt(liquid_amount.toString());
-  history.allowFastMatch = allow_fast_match.toString() === "true";
+  history.amount = BigInt(liquidAmount.toString());
+  history.allowFastMatch = allowFastMatch.toString() === "true";
   history.blockNumber = getBlockNumber(event.block);
   history.blockHash = getBlockHash(event.block);
   history.timestamp = getBlockTimestamp(event.block);

packages/histories-subql/src/runtimePolyfills.ts

@@ -1,14 +1,19 @@
-import { TextDecoder, TextEncoder } from "util";
+import { TextDecoder as NodeTextDecoder, TextEncoder as NodeTextEncoder } from "util";
+
+type RuntimeWithTextEncoding = typeof globalThis & {
+  TextDecoder?: typeof NodeTextDecoder;
+  TextEncoder?: typeof NodeTextEncoder;
+};
 
 export const installRuntimePolyfills = () => {
-  const runtime = globalThis as any;
+  const runtime = globalThis as RuntimeWithTextEncoding;
 
   if (typeof runtime.TextEncoder === "undefined") {
-    runtime.TextEncoder = TextEncoder;
+    runtime.TextEncoder = NodeTextEncoder;
   }
 
   if (typeof runtime.TextDecoder === "undefined") {
-    runtime.TextDecoder = TextDecoder;
+    runtime.TextDecoder = NodeTextDecoder;
   }
 };
 

scripts/smoke-subql-images.sh

@@ -32,12 +32,19 @@ docker run -d \
 
 for _ in {1..30}; do
   if docker exec "${POSTGRES}" pg_isready -U postgres >/dev/null 2>&1; then
+    postgres_ready=true
     break
   fi
 
   sleep 1
 done
 
+if [[ "${postgres_ready:-false}" != "true" ]]; then
+  docker logs "${POSTGRES}" 2>&1 || true
+  echo "postgres failed to become ready"
+  exit 1
+fi
+
 run_smoke() {
   local name="$1"
   local image="$2"