Add support for safe/finalized blocks and support latest subquery ima…

…ge (#4)

* Support last version of subquery

* linting issues

* Support latest subquery image for alt layers

* delete unnecessary file

docs/setup-and-deployment.md

@@ -66,7 +66,7 @@ This guide provides instructions for setting up and deploying the ICP-EVM Proxy
    cd ../subq-indexer
    ```
 
-   Edit `project.yaml` and update the URL of the deployed EVM Adapter Proxy.
+   After the build, edit `project.yaml` and update the URL of the deployed EVM Adapter Proxy. Note: For easier testing, ensure the URL has SSL enabled.
 
    ```shell
    npm install

evm-adapter-proxy/internal/routers/evm/eth_handlers.go

@@ -13,8 +13,11 @@ import (
 	"github.com/aviate-labs/agent-go/candid/idl"
 )
 
+// Block tag constants for EVM block references
 const (
-	latestParam = "latest"
+	BlockTagLatest    = "latest"
+	BlockTagSafe      = "safe"
+	BlockTagFinalized = "finalized"
 )
 
 // EthChainID implements the eth_chainId RPC method
@@ -96,7 +99,8 @@ func (r *evmRouter) EthGetBlockByNumber(request JSONRPCRequest) (interface{}, er
 
 	var blockNumber string
 	var err error
-	if strings.EqualFold(blockNumberHex, latestParam) {
+	switch blockNumberHex {
+	case BlockTagLatest, BlockTagSafe, BlockTagFinalized:
 		latestBlockHex, err := r.EthBlockNumber(JSONRPCRequest{})
 		if err != nil {
 			return nil, fmt.Errorf("failed to get latest block number: %w", err)
@@ -270,15 +274,15 @@ func extractBlockRange(filter map[string]interface{}) (uint64, uint64, error) {
 	return fromBlock, toBlock, nil
 }
 
-// parseBlockParam parses a block parameter which can be a number or "latest"
+// parseBlockParam parses a block parameter which can be a number or block tag
 func parseBlockParam(blockParam interface{}, defaultValue uint64) (uint64, error) {
 	if blockParam == nil {
 		return defaultValue, nil
 	}
 
 	switch v := blockParam.(type) {
 	case string:
-		if v == "latest" {
+		if v == BlockTagLatest || v == BlockTagSafe || v == BlockTagFinalized {
 			return defaultValue, nil
 		}
 		return strconv.ParseUint(v, 0, 64)

subq-indexer/.gitignore

@@ -8,6 +8,7 @@ node_modules/
 dist/
 
 # lock files
+yarn.lock
 package-lock.json
 
 # Compiled Java class files

subq-indexer/abis/erc20.abi.json

@@ -219,4 +219,4 @@
     "name": "Transfer",
     "type": "event"
   }
-]
+]

subq-indexer/docker-compose.yml

@@ -16,27 +16,31 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
+
   subquery-node:
-    image: zondax/subql-node-ethereum:v3.5.3
+    image: onfinality/subql-node-ethereum:latest
     depends_on:
       "postgres":
         condition: service_healthy
-    restart: always
+    restart: unless-stopped
     environment:
       DB_USER: postgres
       DB_PASS: postgres
       DB_DATABASE: postgres
       DB_HOST: postgres
       DB_PORT: 5432
-      ENDPOINT_URL: https://<proxy_url>/rpc/v1
-      CHAIN_ID: 314160
-      START_BLOCK: 1
     volumes:
       - ./:/app
-    entrypoint: "/bin/sh"
     command:
-      - -c
-      - "cd /app && sh ./scripts/replace_endpoint.sh && /usr/local/lib/node_modules/@subql/node-ethereum/bin/run -f=/app --db-schema=app --workers=1 --batch-size=2 --unfinalized-blocks=false --log-level=trace --block-confirmations=0 --all-events"
+      - ${SUB_COMMAND:-} # set SUB_COMMAND env variable to "test" to run tests
+      - -f=/app
+      - --db-schema=app
+      - --workers=1
+      - --batch-size=2
+      - --unfinalized-blocks=true
+      - --log-level=trace
+      - --block-confirmations=0
+      - --all-events
 
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://subquery-node:3000/ready" ]
@@ -45,7 +49,7 @@ services:
       retries: 10
 
   graphql-engine:
-    image: subquerynetwork/subql-query:latest
+    image: onfinality/subql-query:latest
     ports:
       - 3000:3000
     depends_on:
@@ -63,3 +67,4 @@ services:
     command:
       - --name=app
       - --playground
+      - --indexer=http://subquery-node:3000

subq-indexer/project.ts

@@ -4,6 +4,15 @@ import {
   EthereumHandlerKind,
 } from "@subql/types-ethereum";
 
+import * as dotenv from 'dotenv';
+import path from 'path';
+
+const mode = process.env.NODE_ENV || 'production';
+
+// Load the appropriate .env file
+const dotenvPath = path.resolve(__dirname, `.env${mode !== 'production' ? `.${mode}` : ''}`);
+dotenv.config({ path: dotenvPath });
+
 // Can expand the Datasource processor types via the generic param
 const project: EthereumProject = {
   specVersion: "1.0.0",
@@ -29,7 +38,7 @@ const project: EthereumProject = {
      * chainId is the EVM Chain ID, for Altlayer OP Demo Testnet this is 20240219
      * https://chainlist.org/chain/20240219
      */
-    chainId: "CHAIN_ID_ENV_VAR_REF",
+    chainId: process.env.CHAIN_ID!,
     /**
      * These endpoint(s) should be public non-pruned archive node
      * We recommend providing more than one endpoint for improved reliability, performance, and uptime
@@ -38,13 +47,13 @@ const project: EthereumProject = {
      * If you use a rate limited endpoint, adjust the --batch-size and --workers parameters
      * These settings can be found in your docker-compose.yaml, they will slow indexing but prevent your project being rate limited
      */
-    endpoint: ["ENDPOINT_URL_ENV_VAR_REF"],
+    endpoint: process.env.ENDPOINT!?.split(',') as string[] | string,
   },
   dataSources: [
     {
       kind: EthereumDatasourceKind.Runtime,
       // Block height at which the smart contract was deployed
-      startBlock: -1,
+      startBlock: 1,
       options: {
         abi: "erc20",
       },