fix: resolve ens addresses before initializing contract

Author: Emmo00

src/index.ts

@@ -1,7 +1,7 @@
 import "dotenv/config";
 import { handleUplinks } from "./services/mqtt";
 import { Request, Response } from "express";
-import { app } from "./services/context";
+import { app, contractsReady } from "./services/context";
 import {
   loadExtensionsFromConfig,
   loadUIExtensionsFromConfig,
@@ -24,6 +24,9 @@ async function initializeApp() {
     await loadUIExtensionsFromConfig();
     console.log("[info] UI extensions loaded successfully");
 
+    await contractsReady;
+    console.log("[info] resolved contract addresses");
+
     runHook("onBeforeInit");
 
     // Initialize database tables and jobs

src/lib/sync.ts

@@ -9,6 +9,7 @@ import {
 import {
   provider,
   rollup as rollupContract,
+  contractsReady,
   ccipRevenueReader as ccipRevenueReaderContract,
   priceContext as priceContextContract,
 } from "../services/context";
@@ -101,6 +102,8 @@ export function getCachedVerifiersCount(): number {
 }
 
 export async function pruneAndSyncOnchain(meterIdentifier: number | string): Promise<number> {
+  await contractsReady;
+
   const meter =
     typeof meterIdentifier === "number" ? getMeterByTokenId(meterIdentifier) : getMeterByPublicKey(meterIdentifier);
 
@@ -124,6 +127,8 @@ export async function pruneAndSyncOnchain(meterIdentifier: number | string): Pro
 }
 
 export async function getLatestTransactionNonce(meterIdentifier: number): Promise<number> {
+  await contractsReady;
+
   // get latest nonce from chain
   let latestNonce = Number(await rollupContract.nonce(meterIdentifier));
 

src/services/context.ts

@@ -126,19 +126,47 @@ server.listen(port, () => {
 console.log("[info] Starting application initialization...");
 
 // ETHERS JS CONTRACT CONFIG
-export const provider = new JsonRpcProvider(process.env.MAINNET_RPC, undefined, { staticNetwork: true });
-
-export const m3ter = new Contract(
-  process.env.M3TER_CONTRACT_ADDRESS || "heads.m3ter.eth",
-  ["function publicKey(uint256) view returns (bytes32)", "function tokenID(bytes32) view returns (uint256)"],
-  provider,
-);
-
-export const rollup = new Contract(
-  process.env.ROLLUP_CONTRACT_ADDRESS || "rollup.m3ter.eth",
-  ["function nonce(uint256) external view returns (bytes6)"],
-  provider,
-);
+const rpcUrl = process.env.MAINNET_RPC;
+console.log("[info] using RPC", rpcUrl)
+export const provider = new JsonRpcProvider(rpcUrl);
+
+const m3terRef = process.env.M3TER_CONTRACT_ADDRESS || "heads.m3ter.eth";
+const rollupRef = process.env.ROLLUP_CONTRACT_ADDRESS || "rollup.m3ter.eth";
+
+const m3terAbi = ["function publicKey(uint256) view returns (bytes32)", "function tokenID(bytes32) view returns (uint256)"];
+const rollupAbi = ["function nonce(uint256) external view returns (bytes6)"];
+
+function isHexAddress(value: string): boolean {
+  return /^0x[a-fA-F0-9]{40}$/.test(value);
+}
+
+async function resolveContractAddress(contractName: string, ref: string): Promise<string> {
+  if (isHexAddress(ref)) {
+    console.log(`[ethers] ${contractName}: using address ${ref}`);
+    return ref;
+  }
+
+  const resolved = await provider.resolveName(ref);
+  if (!resolved) {
+    throw new Error(`[ethers] ${contractName}: failed to resolve ENS ${ref}`);
+  }
+
+  console.log(`[ethers] ${contractName}: resolved ENS ${ref} -> ${resolved}`);
+  return resolved;
+}
+
+export let m3ter!: Contract;
+export let rollup!: Contract;
+
+export const contractsReady = (async () => {
+  const [m3terAddress, rollupAddress] = await Promise.all([
+    resolveContractAddress("m3ter", m3terRef),
+    resolveContractAddress("rollup", rollupRef),
+  ]);
+
+  m3ter = new Contract(m3terAddress, m3terAbi, provider);
+  rollup = new Contract(rollupAddress, rollupAbi, provider);
+})();
 
 export const ccipRevenueReader = new Contract(
   process.env.CCIP_REVENUE_READER_ADDRESS || "0xD648cdF47e9534B2FCfb18C1E94CA9AAff07BA0E",

src/services/mqtt.ts

@@ -1,7 +1,7 @@
 import { connect } from "mqtt";
 import { enqueue } from "./grpc";
 import { encode } from "../lib/encode";
-import { app, m3ter as m3terContract } from "./context";
+import { app, m3ter as m3terContract, contractsReady } from "./context";
 import {
   deleteMeterByPublicKey,
   getAllTransactionRecords,
@@ -27,7 +27,9 @@ import { createMeterLogger } from "../utils/logger";
 const CHIRPSTACK_HOST = process.env.CHIRPSTACK_HOST;
 const deviceLocks = new Map<string, boolean>(); // Lock per devEUI to prevent concurrent message processing
 
-export function handleUplinks(): Promise<boolean> {
+export async function handleUplinks(): Promise<boolean> {
+  await contractsReady;
+
   return new Promise(function (resolve, reject) {
     const client = connect({
       host: CHIRPSTACK_HOST,