feat: 5076 v11 lh propose signs payloads

.github/workflows/build-test-deploy.yml

@@ -76,7 +76,7 @@ jobs:
         run: yarn workspace @connext/smart-contracts forge:install
 
       - name: Yarn build
-        run: yarn build
+        run: yarn build:all
 
       - name: Install DBMate
         run: sudo curl -fsSL -o /usr/local/bin/dbmate https://github.com/amacneil/dbmate/releases/latest/download/dbmate-linux-amd64 && sudo chmod +x /usr/local/bin/dbmate

packages/adapters/database/src/client.ts

@@ -1108,6 +1108,17 @@ export const getCurrentFinalizedSnapshot = async (
   return snapshot ? convertFromDbSnapshot(snapshot) : undefined;
 };
 
+export const getLatestSnapshot = async (
+  _pool?: Pool | db.TxnClientForRepeatableRead,
+): Promise<Snapshot | undefined> => {
+  const poolToUse = _pool ?? pool;
+
+  const snapshot = await db
+    .selectOne("snapshots", {}, { limit: 1, order: { by: "id", direction: "DESC" } })
+    .run(poolToUse);
+  return snapshot ? convertFromDbSnapshot(snapshot) : undefined;
+};
+
 export const getCurrentProposedOptimisticRoot = async (
   domain: string,
   _pool?: Pool | db.TxnClientForRepeatableRead,
@@ -1138,6 +1149,21 @@ export const getLatestFinalizedOptimisticRoot = async (
   return opRoot ? convertFromDbSpokeOptimisticRoot(opRoot) : undefined;
 };
 
+export const getLatestSpokeOptimisticRoot = async (
+  domain: string,
+  _pool?: Pool | db.TxnClientForRepeatableRead,
+): Promise<SpokeOptimisticRoot | undefined> => {
+  const poolToUse = _pool ?? pool;
+  const opRoot = await db
+    .selectOne(
+      "spoke_optimistic_roots",
+      { domain },
+      { limit: 1, order: { by: "propose_timestamp", direction: "DESC" } },
+    )
+    .run(poolToUse);
+  return opRoot ? convertFromDbSpokeOptimisticRoot(opRoot) : undefined;
+};
+
 export const getSpokeOptimisticRoot = async (
   root: string,
   domain: string,

packages/adapters/database/src/index.ts

@@ -68,6 +68,7 @@ import {
   getAggregateRoot,
   getCurrentProposedSnapshot,
   getCurrentFinalizedSnapshot,
+  getLatestSnapshot,
   getLatestPendingSnapshotRootByDomain,
   getMessageRootAggregatedFromIndex,
   getMessageRootsFromIndex,
@@ -104,6 +105,7 @@ import {
   saveFinalizedSpokeRoots,
   getCurrentProposedOptimisticRoot,
   getLatestFinalizedOptimisticRoot,
+  getLatestSpokeOptimisticRoot,
   getSpokeOptimisticRoot,
 } from "./client";
 
@@ -221,6 +223,7 @@ export type Database = {
   getBaseAggregateRoot: (_pool?: Pool | TxnClientForRepeatableRead) => Promise<string | undefined>;
   getCurrentProposedSnapshot: (_pool?: Pool | TxnClientForRepeatableRead) => Promise<Snapshot | undefined>;
   getCurrentFinalizedSnapshot: (_pool?: Pool | TxnClientForRepeatableRead) => Promise<Snapshot | undefined>;
+  getLatestSnapshot: (_pool?: Pool | TxnClientForRepeatableRead) => Promise<Snapshot | undefined>;
   getMessageRootIndex: (
     domain: string,
     messageRoot: string,
@@ -363,6 +366,10 @@ export type Database = {
     domain: string,
     _pool?: Pool | TxnClientForRepeatableRead,
   ) => Promise<SpokeOptimisticRoot | undefined>;
+  getLatestSpokeOptimisticRoot: (
+    domain: string,
+    _pool?: Pool | TxnClientForRepeatableRead,
+  ) => Promise<SpokeOptimisticRoot | undefined>;
   getSpokeOptimisticRoot: (
     root: string,
     domain: string,
@@ -426,6 +433,7 @@ export const getDatabase = async (databaseUrl: string, logger: Logger): Promise<
     getAggregateRoot,
     getCurrentProposedSnapshot,
     getCurrentFinalizedSnapshot,
+    getLatestSnapshot,
     getLatestPendingSnapshotRootByDomain,
     getMessageRootAggregatedFromIndex,
     getMessageRootsFromIndex,
@@ -458,6 +466,7 @@ export const getDatabase = async (databaseUrl: string, logger: Logger): Promise<
     saveFinalizedSpokeRoots,
     getCurrentProposedOptimisticRoot,
     getLatestFinalizedOptimisticRoot,
+    getLatestSpokeOptimisticRoot,
     getSpokeOptimisticRoot,
   };
 };
@@ -522,6 +531,7 @@ export const getDatabaseAndPool = async (
       getAggregateRoot,
       getCurrentProposedSnapshot,
       getCurrentFinalizedSnapshot,
+      getLatestSnapshot,
       getLatestPendingSnapshotRootByDomain,
       getMessageRootAggregatedFromIndex,
       getMessageRootsFromIndex,
@@ -554,6 +564,7 @@ export const getDatabaseAndPool = async (
       saveFinalizedSpokeRoots,
       getCurrentProposedOptimisticRoot,
       getLatestFinalizedOptimisticRoot,
+      getLatestSpokeOptimisticRoot,
       getSpokeOptimisticRoot,
     },
   };

packages/adapters/database/test/client.spec.ts

@@ -93,6 +93,7 @@ import {
   getAggregateRoots,
   getCurrentProposedOptimisticRoot,
   getLatestFinalizedOptimisticRoot,
+  getLatestSpokeOptimisticRoot,
   getSpokeOptimisticRoot,
   saveSnapshotRoots,
   getLatestPendingSnapshotRootByDomain,
@@ -101,6 +102,7 @@ import {
   savePropagatedOptimisticRoots,
   getCurrentProposedSnapshot,
   getCurrentFinalizedSnapshot,
+  getLatestSnapshot,
   saveFinalizedRoots,
   saveStableSwapExchange,
   saveRouterDailyTVL,
@@ -1140,6 +1142,7 @@ describe("Database client", () => {
     await expect(getFinalizedSnapshot(undefined as any, undefined as any)).to.eventually.not.be.rejected;
     await expect(getCurrentProposedOptimisticRoot(undefined as any, undefined as any)).to.eventually.not.be.rejected;
     await expect(getLatestFinalizedOptimisticRoot(undefined as any, undefined as any)).to.eventually.not.be.rejected;
+    await expect(getLatestSpokeOptimisticRoot(undefined as any, undefined as any)).to.eventually.not.be.rejected;
     await expect(getSpokeOptimisticRoot(undefined as any, undefined as any)).to.eventually.not.be.rejected;
     await expect(getAggregateRootCount(undefined as any, undefined as any)).to.eventually.not.be.rejected;
     await expect(getBaseAggregateRootCount(undefined as any, undefined as any)).to.eventually.not.be.rejected;
@@ -1631,6 +1634,9 @@ describe("Database client", () => {
 
     const propagagtedSnapshot = await getCurrentFinalizedSnapshot(pool);
     expect(propagagtedSnapshot!.id).to.eq(snapshots[batchSize - 1].id);
+
+    const latestSnapshot = await getLatestSnapshot(pool);
+    expect(latestSnapshot!.id).to.eq(snapshots[batchSize - 1].id);
   });
 
   it("should save and get Propagated snapshots", async () => {
@@ -1690,15 +1696,22 @@ describe("Database client", () => {
       const m = mock.entity.spokeOptimisticRoot();
       m.id = `${_i}`;
       m.rootTimestamp = _i;
+      m.proposeTimestamp = _i;
       spokeOptimisticRoots.push(m);
     }
     await saveProposedSpokeRoots(spokeOptimisticRoots, pool);
 
-    const latestSpokeRoot = await getCurrentProposedOptimisticRoot(spokeOptimisticRoots[batchSize - 1].domain, pool);
-    expect(latestSpokeRoot!.id).to.eq(spokeOptimisticRoots[batchSize - 1].id);
+    const latestProposedSpokeRoot = await getCurrentProposedOptimisticRoot(
+      spokeOptimisticRoots[batchSize - 1].domain,
+      pool,
+    );
+    expect(latestProposedSpokeRoot!.id).to.eq(spokeOptimisticRoots[batchSize - 1].id);
 
     const missingDbSpokeRoot = await getLatestPendingSpokeOptimisticRootByDomain("", pool);
     expect(missingDbSpokeRoot).to.eq(undefined);
+
+    const latestSpokeRoot = await getLatestSpokeOptimisticRoot(spokeOptimisticRoots[batchSize - 1].domain, pool);
+    expect(latestSpokeRoot!.id).to.eq(spokeOptimisticRoots[batchSize - 1].id);
   });
 
   it("should save and get finalized spoke optimistic roots", async () => {

packages/adapters/database/test/mock.ts

@@ -82,6 +82,7 @@ export const mockDatabase = (): Database => {
     saveSnapshotRoots: stub().resolves(),
     getCurrentProposedSnapshot: stub().resolves(),
     getCurrentFinalizedSnapshot: stub().resolves(),
+    getLatestSnapshot: stub().resolves(),
     getBaseAggregateRoot: stub().resolves(),
     getAggregateRoots: stub().resolves(),
     getAggregateRoot: stub().resolves(),
@@ -90,6 +91,7 @@ export const mockDatabase = (): Database => {
     getLatestPendingSnapshotRootByDomain: stub().resolves([mock.entity.snapshotRoot()]),
     getCurrentProposedOptimisticRoot: stub().resolves([mock.entity.spokeOptimisticRoot()]),
     getLatestFinalizedOptimisticRoot: stub().resolves([mock.entity.spokeOptimisticRoot()]),
+    getLatestSpokeOptimisticRoot: stub().resolves([mock.entity.spokeOptimisticRoot()]),
     getSpokeOptimisticRoot: stub().resolves([mock.entity.spokeOptimisticRoot()]),
     getLatestPendingSpokeOptimisticRootByDomain: stub().resolves(),
     saveProposedSpokeRoots: stub().resolves(),

packages/agents/lighthouse/.nycrc.json

@@ -39,6 +39,9 @@
     "src/tasks/sendOutboundRoot/sendOutboundRoot.ts",
     "src/tasks/sendOutboundRoot/operations/index.ts",
     "src/tasks/sendOutboundRoot/helpers/index.ts",
+    "src/tasks/propose/errors.ts",
+    "src/tasks/propose/context.ts",
+    "src/tasks/propose/index.ts",
     "test/**/*.ts",
     "./globalTestHook.ts"
   ]

packages/agents/lighthouse/config.json.example

@@ -22,6 +22,7 @@
   "databaseWriter": {
     "url": "postgres://postgres:postgres@localhost:5432/connext?sslmode=disable"
   },
+  "mnemonic": "test test test test test test test test test test test test",
   "relayers": [
     {
       "type": "Gelato",

packages/agents/lighthouse/src/config.ts

@@ -87,6 +87,8 @@ export const NxtpLighthouseConfigSchema = Type.Object({
   environment: Type.Union([Type.Literal("staging"), Type.Literal("production")]),
   database: TDatabaseConfig,
   databaseWriter: TDatabaseConfig,
+  mnemonic: Type.Optional(Type.String()),
+  web3SignerUrl: Type.Optional(Type.String()),
   redis: TRedisConfig,
   subgraphPrefix: Type.Optional(Type.String()),
   healthUrls: Type.Partial(
@@ -203,6 +205,8 @@ export const getEnvConfig = (
         ? +process.env.REDIS_PORT
         : undefined || configJson.redis?.port || configFile.redis?.port || 6379,
     },
+    mnemonic: process.env.NXTP_MNEMONIC || configJson.mnemonic || configFile.mnemonic,
+    web3SignerUrl: process.env.NXTP_WEB3_SIGNER_URL || configJson.web3SignerUrl || configFile.web3SignerUrl,
     environment: process.env.NXTP_ENVIRONMENT || configJson.environment || configFile.environment || "production",
     cartographerUrl: process.env.NXTP_CARTOGRAPHER_URL || configJson.cartographerUrl || configFile.cartographerUrl,
     subgraphPrefix: process.env.NXTP_SUBGRAPH_PREFIX || configJson.subgraphPrefix || configFile.subgraphPrefix,
@@ -252,6 +256,10 @@ export const getEnvConfig = (
       ? ""
       : (`${nxtpConfig.environment[0].toUpperCase()}${nxtpConfig.environment.slice(1)}` as ContractPostfix);
 
+  if (!nxtpConfig.mnemonic && !nxtpConfig.web3SignerUrl) {
+    throw new Error(`Wallet missing, please add either mnemonic or web3SignerUrl: ${JSON.stringify(nxtpConfig)}`);
+  }
+
   // add contract deployments if they exist
   const hubChain = domainToChainId(+nxtpConfig.hubDomain);
   Object.entries(nxtpConfig.chains).forEach(([domainId, chainConfig]) => {

packages/agents/lighthouse/src/tasks/propagate/context.ts

@@ -8,6 +8,8 @@ import { ChainData, Logger, RelayerType } from "@connext/nxtp-utils";
 import { Relayer } from "@connext/nxtp-adapters-relayer";
 import { SubgraphReader } from "@connext/nxtp-adapters-subgraph";
 import { Database } from "@connext/nxtp-adapters-database";
+import { Web3Signer } from "@connext/nxtp-adapters-web3signer";
+import { Wallet } from "ethers";
 
 import { NxtpLighthouseConfig } from "../../config";
 
@@ -22,6 +24,7 @@ export type PropagateContext = {
     relayers: { instance: Relayer; apiKey: string; type: RelayerType }[];
     subgraph: SubgraphReader; // Aggregates subgraphs in a FallbackSubgraph for each chain.
     database: Database;
+    wallet: Wallet | Web3Signer; // Used for signing metatxs for propagate.
   };
   config: NxtpLighthouseConfig;
   chainData: Map<string, ChainData>;

packages/agents/lighthouse/src/tasks/propagate/operations/propagate.ts

@@ -132,7 +132,6 @@ export const finalize = async () => {
     throw new NoChainIdForDomain(config.hubDomain, requestContext, methodContext);
   }
 
-  //TODO: V1.1 needs be relayer proxy hub
   const rootManagerAddress = config.chains[config.hubDomain].deployments.rootManager;
 
   const currentSnapshot = await database.getCurrentProposedSnapshot();

packages/agents/lighthouse/src/tasks/propagate/operations/propagateSpoke.ts

@@ -1,7 +1,7 @@
 import { createLoggingContext, NxtpError } from "@connext/nxtp-utils";
 
 import { sendWithRelayerWithBackup } from "../../../mockable";
-import { NoChainIdForDomain, NoSpokeConnector } from "../errors";
+import { NoChainIdForDomain } from "../errors";
 import { getContext } from "../propagate";
 
 export const finalizeSpoke = async (spokeDomain: string) => {
@@ -27,10 +27,6 @@ export const finalizeSpoke = async (spokeDomain: string) => {
   }
   const spokeConnectorAddress = config.chains[spokeDomain].deployments.spokeConnector;
 
-  if (!spokeConnectorAddress) {
-    throw new NoSpokeConnector(+spokeDomain, requestContext, methodContext);
-  }
-
   const currentProposedRoot = await database.getCurrentProposedOptimisticRoot(spokeDomain);
 
   if (!currentProposedRoot) {
@@ -75,8 +71,6 @@ export const finalizeSpoke = async (spokeDomain: string) => {
     return;
   }
 
-  // TODO: V1.1 Sign the proposal -- need signature from whitelisted proposer agent
-  // TODO: V1.1 Use relayerproxyhub to send tx ?
   const encodedDataForRelayer = contracts.spokeConnector.encodeFunctionData("finalize", [
     _proposedAggregateRoot,
     _rootTimestamp,

packages/agents/lighthouse/src/tasks/propagate/propagate.ts

@@ -14,6 +14,8 @@ import {
 } from "@connext/nxtp-utils";
 import { setupConnextRelayer, setupGelatoRelayer } from "@connext/nxtp-adapters-relayer";
 import { SubgraphReader } from "@connext/nxtp-adapters-subgraph";
+import { Web3Signer } from "@connext/nxtp-adapters-web3signer";
+import { Wallet } from "ethers";
 
 import { NxtpLighthouseConfig } from "../../config";
 
@@ -52,6 +54,10 @@ export const makePropagate = async (config: NxtpLighthouseConfig, chainData: Map
     );
     context.adapters.database = await getDatabase(context.config.database.url, context.logger);
 
+    context.adapters.wallet = context.config.mnemonic
+      ? Wallet.fromMnemonic(context.config.mnemonic)
+      : new Web3Signer(context.config.web3SignerUrl!);
+
     context.adapters.relayers = [];
     for (const relayerConfig of context.config.relayers) {
       const setupFunc =

packages/agents/lighthouse/src/tasks/propose/context.ts

@@ -8,6 +8,8 @@ import { ChainData, Logger, RelayerType } from "@connext/nxtp-utils";
 import { Relayer } from "@connext/nxtp-adapters-relayer";
 import { SubgraphReader } from "@connext/nxtp-adapters-subgraph";
 import { Database } from "@connext/nxtp-adapters-database";
+import { Web3Signer } from "@connext/nxtp-adapters-web3signer";
+import { Wallet } from "ethers";
 
 import { NxtpLighthouseConfig } from "../../config";
 
@@ -22,6 +24,7 @@ export type ProposeContext = {
     relayers: { instance: Relayer; apiKey: string; type: RelayerType }[];
     subgraph: SubgraphReader; // Aggregates subgraphs in a FallbackSubgraph for each chain.
     database: Database;
+    wallet: Wallet | Web3Signer; // Used for signing metatxs for propose.
   };
   config: NxtpLighthouseConfig;
   chainData: Map<string, ChainData>;

packages/agents/lighthouse/src/tasks/propose/operations/index.ts

@@ -1,2 +1,2 @@
-export { proposeHub, proposeSnapshot, getCurrentOutboundRoot } from "./propose";
+export { proposeHub, proposeSnapshot, getCurrentOutboundRoot } from "./proposeHub";
 export { proposeSpoke } from "./proposeSpoke";