@argonprotocol/testing 1.4.6 → 1.4.7-dev.6244465b

package/lib/index.d.cts

@@ -120,13 +120,6 @@ type BitcoinRawTransactionResult = {
     txid: string;
 };
 
-declare class TestBitcoinCli {
-    /**
-     * Returns the localhost address of the notary (NOTE: not accessible from containers)
-     */
-    static run(command: string): string;
-}
-
 declare class TestOracle implements ITeardownable {
     #private;
     static BitcoinOperator: string;
@@ -234,7 +227,6 @@ type EthereumGatewayUpdateBatch = {
     argonApprovalsNonce: bigint;
     argonApprovalsHash: Hex;
     paused: boolean;
-    pendingClearOutQueueNonces: bigint[];
     firstQueueNonce?: bigint;
     lastQueueNonce?: bigint;
     updates: MintingGatewayGatewayUpdate[];
@@ -426,4 +418,4 @@ declare function stringifyExt(obj: any): any;
 declare function sudo(): KeyringPair;
 declare function activateNotary(sudo: KeyringPair, client: ArgonClient, notary: TestNotary): Promise<void>;
 
-export { type EthereumGatewayUpdateBatch, EthereumProofE2eHarness, type ITeardownable, SKIP_E2E, TestBitcoinCli, TestEthereum, TestMainchain, TestMintingAuthorityActor, TestMintingGateway, TestNotary, TestOracle, activateNotary, addTeardown, cleanHostForDocker, closeOnTeardown, disconnectOnTeardown, getDockerPortMapping, getProxy, getReadyEthereumGatewayUpdates, mineLaterExecutionAnchorReceipt, projectRoot, runOnTeardown, runTestScript, signGatewayPermit, startNetwork, stringifyExt, sudo, syncEthereumVerifierUntilAnchorCovers, teardown, toArgonKeccakSignature, toEvmRecoverableSignature, waitForExecutionReceipt, waitForFinalizedBeaconExecutionAtOrAbove };
+export { type EthereumGatewayUpdateBatch, EthereumProofE2eHarness, type ITeardownable, SKIP_E2E, TestEthereum, TestMainchain, TestMintingAuthorityActor, TestMintingGateway, TestNotary, TestOracle, activateNotary, addTeardown, cleanHostForDocker, closeOnTeardown, disconnectOnTeardown, getDockerPortMapping, getProxy, getReadyEthereumGatewayUpdates, mineLaterExecutionAnchorReceipt, projectRoot, runOnTeardown, runTestScript, signGatewayPermit, startNetwork, stringifyExt, sudo, syncEthereumVerifierUntilAnchorCovers, teardown, toArgonKeccakSignature, toEvmRecoverableSignature, waitForExecutionReceipt, waitForFinalizedBeaconExecutionAtOrAbove };

package/lib/index.d.ts

@@ -120,13 +120,6 @@ type BitcoinRawTransactionResult = {
     txid: string;
 };
 
-declare class TestBitcoinCli {
-    /**
-     * Returns the localhost address of the notary (NOTE: not accessible from containers)
-     */
-    static run(command: string): string;
-}
-
 declare class TestOracle implements ITeardownable {
     #private;
     static BitcoinOperator: string;
@@ -234,7 +227,6 @@ type EthereumGatewayUpdateBatch = {
     argonApprovalsNonce: bigint;
     argonApprovalsHash: Hex;
     paused: boolean;
-    pendingClearOutQueueNonces: bigint[];
     firstQueueNonce?: bigint;
     lastQueueNonce?: bigint;
     updates: MintingGatewayGatewayUpdate[];
@@ -426,4 +418,4 @@ declare function stringifyExt(obj: any): any;
 declare function sudo(): KeyringPair;
 declare function activateNotary(sudo: KeyringPair, client: ArgonClient, notary: TestNotary): Promise<void>;
 
-export { type EthereumGatewayUpdateBatch, EthereumProofE2eHarness, type ITeardownable, SKIP_E2E, TestBitcoinCli, TestEthereum, TestMainchain, TestMintingAuthorityActor, TestMintingGateway, TestNotary, TestOracle, activateNotary, addTeardown, cleanHostForDocker, closeOnTeardown, disconnectOnTeardown, getDockerPortMapping, getProxy, getReadyEthereumGatewayUpdates, mineLaterExecutionAnchorReceipt, projectRoot, runOnTeardown, runTestScript, signGatewayPermit, startNetwork, stringifyExt, sudo, syncEthereumVerifierUntilAnchorCovers, teardown, toArgonKeccakSignature, toEvmRecoverableSignature, waitForExecutionReceipt, waitForFinalizedBeaconExecutionAtOrAbove };
+export { type EthereumGatewayUpdateBatch, EthereumProofE2eHarness, type ITeardownable, SKIP_E2E, TestEthereum, TestMainchain, TestMintingAuthorityActor, TestMintingGateway, TestNotary, TestOracle, activateNotary, addTeardown, cleanHostForDocker, closeOnTeardown, disconnectOnTeardown, getDockerPortMapping, getProxy, getReadyEthereumGatewayUpdates, mineLaterExecutionAnchorReceipt, projectRoot, runOnTeardown, runTestScript, signGatewayPermit, startNetwork, stringifyExt, sudo, syncEthereumVerifierUntilAnchorCovers, teardown, toArgonKeccakSignature, toEvmRecoverableSignature, waitForExecutionReceipt, waitForFinalizedBeaconExecutionAtOrAbove };

package/lib/index.js

@@ -567,34 +567,13 @@ var BitcoinRpcClient = class {
   }
 };
 
-// src/TestBitcoinCli.ts
-import * as child_process3 from "child_process";
-import * as Path4 from "path";
-var TestBitcoinCli = class {
-  /**
-   * Returns the localhost address of the notary (NOTE: not accessible from containers)
-   */
-  static run(command) {
-    const binPath = Path4.join(`${projectRoot()}`, "target/debug/argon-bitcoin-cli");
-    try {
-      return child_process3.execSync(`${binPath} ${command}`, {
-        encoding: "utf8"
-      }).trim();
-    } catch (e) {
-      console.error(`Error running command: ${command}`);
-      console.error(e.stdout);
-      throw e;
-    }
-  }
-};
-
 // src/TestOracle.ts
-import * as child_process4 from "child_process";
+import * as child_process3 from "child_process";
 import { Keyring as Keyring2 } from "@argonprotocol/mainchain";
 import * as fs3 from "fs";
 import * as readline3 from "readline";
 import * as process4 from "process";
-import * as Path5 from "path";
+import * as Path4 from "path";
 var TestOracle = class _TestOracle {
   static BitcoinOperator = "//Dave";
   static PriceIndexOperator = "//Eve";
@@ -609,7 +588,7 @@ var TestOracle = class _TestOracle {
     const { pathToBin, mainchainUrl, bitcoinRpcUrl } = options;
     const operatorSuri = service == "bitcoin" ? _TestOracle.BitcoinOperator : _TestOracle.PriceIndexOperator;
     this.operator = new Keyring2({ type: "sr25519" }).createFromUri(operatorSuri);
-    const binPath = pathToBin ?? Path5.join(projectRoot(), "target/debug/argon-oracle");
+    const binPath = pathToBin ?? Path4.join(projectRoot(), "target/debug/argon-oracle");
     if (!fs3.existsSync(binPath)) {
       throw new Error(`Oracle binary not found at ${binPath}`);
     }
@@ -621,7 +600,7 @@ var TestOracle = class _TestOracle {
       }
       execArgs.push("--bitcoin-rpc-url", bitcoinRpcUrl);
     }
-    this.#childProcess = child_process4.spawn(binPath, execArgs, {
+    this.#childProcess = child_process3.spawn(binPath, execArgs, {
       stdio: ["ignore", "pipe", "pipe"],
       env: { ...process4.env, RUST_LOG: "info", ...options.env }
     });
@@ -646,7 +625,7 @@ var TestOracle = class _TestOracle {
 // src/TestEthereum.ts
 import * as fs4 from "fs/promises";
 import * as os from "os";
-import * as Path6 from "path";
+import * as Path5 from "path";
 import { spawn as spawn4, spawnSync } from "child_process";
 import { detectPort as detectPort2 } from "detect-port";
 import { EvmContracts } from "@argonprotocol/mainchain";
@@ -708,8 +687,8 @@ var TestEthereum = class {
     } = options ?? {};
     const elPublicPortStart = await findFreePortRange(DEFAULT_EL_PORT_START, PORT_RANGE_SIZE);
     const clPublicPortStart = await findFreePortRange(DEFAULT_CL_PORT_START, PORT_RANGE_SIZE);
-    this.#argsDir = await fs4.mkdtemp(Path6.join(os.tmpdir(), "argon-ethereum-devnet-"));
-    const argsFile = Path6.join(this.#argsDir, "network-params.yaml");
+    this.#argsDir = await fs4.mkdtemp(Path5.join(os.tmpdir(), "argon-ethereum-devnet-"));
+    const argsFile = Path5.join(this.#argsDir, "network-params.yaml");
     await fs4.writeFile(
       argsFile,
       renderEthereumArgs(
@@ -1109,9 +1088,9 @@ async function delay(ms) {
 
 // src/TestNetwork.ts
 import * as docker from "docker-compose";
-import * as Path7 from "path";
+import * as Path6 from "path";
 async function startNetwork(testName, options) {
-  const config = Path7.join(__dirname, `dev.docker-compose.yml`);
+  const config = Path6.join(__dirname, `dev.docker-compose.yml`);
   const env4 = {
     VERSION: "dev",
     ARGON_CHAIN: "dev-docker",
@@ -1342,7 +1321,6 @@ var {
   encodeMintingGatewayMintingAuthorityDeactivateTarget,
   hashMintingGatewayActivateMintingAuthority,
   hashMintingGatewayGatewayUpdateApproval,
-  hashMintingGatewayMintingAuthorityDeactivation,
   mintingGatewayAbi,
   MINTING_GATEWAY_UPDATE_KINDS
 } = EvmContracts2;
@@ -1394,7 +1372,6 @@ async function getReadyEthereumGatewayUpdates(client, gatewayClient, options = {
   const argonApprovalsNonce = rawArgonApprovalsNonce;
   const argonApprovalsHash = rawArgonApprovalsHash;
   const paused = rawPaused;
-  const pendingClearOutQueueNonces = [];
   const candidateUpdates = [];
   let expectedPreviousApprovalHash = argonApprovalsHash;
   let readyQueueEntriesScanned = 0;
@@ -1409,14 +1386,8 @@ async function getReadyEthereumGatewayUpdates(client, gatewayClient, options = {
       }
       const entry = entryOption.unwrap();
       const approvingCouncilHash = toHexValue(entry.approvingCouncilHash);
-      if (!await queueEntryIsReady(
-        client,
-        entry,
-        approvingCouncilHash,
-        councilCache,
-        hashContext,
-        queueNonce
-      )) {
+      const approvingCouncil = await loadCouncilByHash(client, approvingCouncilHash, councilCache);
+      if (!queueEntryHasQuorum(entry, approvingCouncil)) {
         break;
       }
       readyQueueEntriesScanned += 1;
@@ -1433,10 +1404,15 @@ async function getReadyEthereumGatewayUpdates(client, gatewayClient, options = {
       expectedPreviousApprovalHash = toHexValue(entry.approvalHash);
     }
   }
-  while (candidateUpdates.length > 0 && candidateUpdates[candidateUpdates.length - 1]?.kind === MINTING_GATEWAY_UPDATE_KINDS.mintingAuthorityDeactivate) {
-    pendingClearOutQueueNonces.unshift(candidateUpdates.pop().queueNonce);
-  }
   const updates = candidateUpdates;
+  for (let index = 0; index < updates.length; index += 1) {
+    const isBorder = updates[index].kind === MINTING_GATEWAY_UPDATE_KINDS.globalIssuanceCouncilRotate || index === updates.length - 1;
+    if (isBorder || updates[index].signatures.length === 0) continue;
+    updates[index] = {
+      ...updates[index],
+      signatures: []
+    };
+  }
   const firstQueueNonce = updates[0]?.queueNonce;
   const lastQueueNonce = updates[updates.length - 1]?.queueNonce;
   return {
@@ -1448,7 +1424,6 @@ async function getReadyEthereumGatewayUpdates(client, gatewayClient, options = {
     argonApprovalsNonce,
     argonApprovalsHash,
     paused,
-    pendingClearOutQueueNonces,
     ...firstQueueNonce !== void 0 ? { firstQueueNonce, lastQueueNonce } : {},
     updates
   };
@@ -1476,7 +1451,7 @@ async function buildGatewayUpdate(client, destinationChain, hashContext, queueNo
       signingKey
     };
     const payload = encodeMintingGatewayMintingAuthorityActivationTarget(target);
-    const targetPayloadHash = payloadHashFromActivationPayload(hashContext, target);
+    const targetPayloadHash = hashMintingGatewayActivateMintingAuthority(hashContext, target);
     const approvalHash = hashMintingGatewayGatewayUpdateApproval(hashContext, {
       queueNonce,
       approvingCouncilHash,
@@ -1501,17 +1476,30 @@ async function buildGatewayUpdate(client, destinationChain, hashContext, queueNo
     };
   }
   if (entry.target.isMintingAuthorityDeactivation) {
-    const { payload, signatures } = validateDeactivationEntry(
-      hashContext,
+    const signingKey = getAddress2(toHexValue(entry.target.asMintingAuthorityDeactivation));
+    const payload = encodeMintingGatewayMintingAuthorityDeactivateTarget({ signingKey });
+    const targetPayloadHash = keccak256(payload);
+    const approvalHash = hashMintingGatewayGatewayUpdateApproval(hashContext, {
       queueNonce,
-      entry,
-      approvingCouncilHash
-    );
+      approvingCouncilHash,
+      kind: MINTING_GATEWAY_UPDATE_KINDS.mintingAuthorityDeactivate,
+      targetId: signingKeyTargetId(signingKey),
+      targetPayloadHash,
+      previousUpdateHash: toHexValue(entry.previousApprovalHash)
+    });
+    if (toHexValue(entry.targetPayloadHash) !== targetPayloadHash) {
+      throw new Error(`Queue nonce ${queueNonce} target payload hash does not match deactivation`);
+    }
+    if (toHexValue(entry.approvalHash) !== approvalHash) {
+      throw new Error(
+        `Queue nonce ${queueNonce} approval hash does not match deactivation: actual=${toHexValue(entry.approvalHash)} expected=${approvalHash} previous=${toHexValue(entry.previousApprovalHash)} council=${approvingCouncilHash}`
+      );
+    }
     return {
       queueNonce,
       kind: MINTING_GATEWAY_UPDATE_KINDS.mintingAuthorityDeactivate,
       payload,
-      signatures
+      signatures: getSortedSignatures(entry.signatures)
     };
   }
   throw new Error(`Unsupported approval queue target ${entry.target.type}`);
@@ -1537,23 +1525,20 @@ async function loadCouncilByHash(client, councilHash, cache) {
   return loaded;
 }
 function queueEntryHasQuorum(entry, council) {
-  const signedWeight = [...entry.signatures.entries()].reduce((total, [signer]) => {
+  let signedWeight = 0n;
+  for (const [signer] of entry.signatures.entries()) {
     const signerAddress = getAddress2(toHexValue(signer));
     const member = council.members.find((x) => x.signer === signerAddress);
     if (!member) {
       throw new Error(`Signature submitted by ${signerAddress}, which is not in the council`);
     }
-    return total + member.weight;
-  }, 0n);
-  return signedWeight * 2n > council.totalWeight;
-}
-async function queueEntryIsReady(client, entry, approvingCouncilHash, councilCache, hashContext, queueNonce) {
-  if (entry.target.isMintingAuthorityDeactivation) {
-    validateDeactivationEntry(hashContext, queueNonce, entry, approvingCouncilHash);
+    signedWeight += member.weight;
+  }
+  if (signedWeight * 100n >= council.totalWeight * 90n) {
     return true;
   }
-  const approvingCouncil = await loadCouncilByHash(client, approvingCouncilHash, councilCache);
-  return queueEntryHasQuorum(entry, approvingCouncil);
+  const unsignedMemberCount = council.members.length - entry.signatures.size;
+  return unsignedMemberCount <= 2 && signedWeight * 100n >= council.totalWeight * 80n;
 }
 function councilToSnapshot(council) {
   return {
@@ -1561,46 +1546,8 @@ function councilToSnapshot(council) {
     weights: council.members.map((member) => member.weight)
   };
 }
-function payloadHashFromActivationPayload(hashContext, target) {
-  return hashMintingGatewayActivateMintingAuthority(hashContext, target);
-}
-function payloadHashFromDeactivationPayload(target) {
-  return keccak256(encodeMintingGatewayMintingAuthorityDeactivateTarget(target));
-}
-function validateDeactivationEntry(hashContext, queueNonce, entry, approvingCouncilHash) {
-  const signingKey = getAddress2(toHexValue(entry.target.asMintingAuthorityDeactivation));
-  const target = { signingKey };
-  const payload = encodeMintingGatewayMintingAuthorityDeactivateTarget(target);
-  const targetPayloadHash = payloadHashFromDeactivationPayload(target);
-  const approvalHash = hashMintingGatewayMintingAuthorityDeactivation(hashContext, {
-    queueNonce,
-    target,
-    previousUpdateHash: toHexValue(entry.previousApprovalHash)
-  });
-  if (toHexValue(entry.targetPayloadHash) !== targetPayloadHash) {
-    throw new Error(`Queue nonce ${queueNonce} target payload hash does not match deactivation`);
-  }
-  if (toHexValue(entry.approvalHash) !== approvalHash) {
-    throw new Error(
-      `Queue nonce ${queueNonce} approval hash does not match deactivation: actual=${toHexValue(entry.approvalHash)} expected=${approvalHash} previous=${toHexValue(entry.previousApprovalHash)} council=${approvingCouncilHash}`
-    );
-  }
-  const deactivationSignatures = [...entry.signatures.entries()];
-  if (deactivationSignatures.length !== 1) {
-    throw new Error(
-      `Queue nonce ${queueNonce} expected exactly one deactivation signature, received ${deactivationSignatures.length}`
-    );
-  }
-  const [signer] = deactivationSignatures[0];
-  if (getAddress2(toHexValue(signer)) !== signingKey) {
-    throw new Error(
-      `Queue nonce ${queueNonce} deactivation signature was submitted by ${getAddress2(toHexValue(signer))}, expected ${signingKey}`
-    );
-  }
-  return {
-    payload,
-    signatures: getSortedSignatures(entry.signatures)
-  };
+function signingKeyTargetId(signingKey) {
+  return `0x${signingKey.slice(2).padStart(64, "0").toLowerCase()}`;
 }
 function getSortedSignatures(signatures) {
   return [...signatures.entries()].sort(
@@ -2248,7 +2195,6 @@ async function activateNotary(sudo2, client, notary) {
 export {
   EthereumProofE2eHarness,
   SKIP_E2E,
-  TestBitcoinCli,
   TestEthereum,
   TestMainchain,
   TestMintingAuthorityActor,