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

package/lib/index.cjs

@@ -32,7 +32,6 @@ var index_exports = {};
 __export(index_exports, {
   EthereumProofE2eHarness: () => EthereumProofE2eHarness,
   SKIP_E2E: () => SKIP_E2E,
-  TestBitcoinCli: () => TestBitcoinCli,
   TestEthereum: () => TestEthereum,
   TestMainchain: () => TestMainchain,
   TestMintingAuthorityActor: () => TestMintingAuthorityActor,
@@ -624,34 +623,13 @@ var BitcoinRpcClient = class {
   }
 };
 
-// src/TestBitcoinCli.ts
-var child_process3 = __toESM(require("child_process"), 1);
-var Path4 = __toESM(require("path"), 1);
-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
-var child_process4 = __toESM(require("child_process"), 1);
+var child_process3 = __toESM(require("child_process"), 1);
 var import_mainchain3 = require("@argonprotocol/mainchain");
 var fs3 = __toESM(require("fs"), 1);
 var readline3 = __toESM(require("readline"), 1);
 var process4 = __toESM(require("process"), 1);
-var Path5 = __toESM(require("path"), 1);
+var Path4 = __toESM(require("path"), 1);
 var TestOracle = class _TestOracle {
   static BitcoinOperator = "//Dave";
   static PriceIndexOperator = "//Eve";
@@ -666,7 +644,7 @@ var TestOracle = class _TestOracle {
     const { pathToBin, mainchainUrl, bitcoinRpcUrl } = options;
     const operatorSuri = service == "bitcoin" ? _TestOracle.BitcoinOperator : _TestOracle.PriceIndexOperator;
     this.operator = new import_mainchain3.Keyring({ 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}`);
     }
@@ -678,7 +656,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 }
     });
@@ -703,7 +681,7 @@ var TestOracle = class _TestOracle {
 // src/TestEthereum.ts
 var fs4 = __toESM(require("fs/promises"), 1);
 var os = __toESM(require("os"), 1);
-var Path6 = __toESM(require("path"), 1);
+var Path5 = __toESM(require("path"), 1);
 var import_node_child_process2 = require("child_process");
 var import_detect_port2 = require("detect-port");
 var import_mainchain4 = require("@argonprotocol/mainchain");
@@ -757,8 +735,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(
@@ -1158,9 +1136,9 @@ async function delay(ms) {
 
 // src/TestNetwork.ts
 var docker = __toESM(require("docker-compose"), 1);
-var Path7 = __toESM(require("path"), 1);
+var Path6 = __toESM(require("path"), 1);
 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",
@@ -1382,7 +1360,6 @@ var {
   encodeMintingGatewayMintingAuthorityDeactivateTarget,
   hashMintingGatewayActivateMintingAuthority,
   hashMintingGatewayGatewayUpdateApproval,
-  hashMintingGatewayMintingAuthorityDeactivation,
   mintingGatewayAbi,
   MINTING_GATEWAY_UPDATE_KINDS
 } = import_mainchain6.EvmContracts;
@@ -1434,7 +1411,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;
@@ -1449,14 +1425,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;
@@ -1473,10 +1443,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 {
@@ -1488,7 +1463,6 @@ async function getReadyEthereumGatewayUpdates(client, gatewayClient, options = {
     argonApprovalsNonce,
     argonApprovalsHash,
     paused,
-    pendingClearOutQueueNonces,
     ...firstQueueNonce !== void 0 ? { firstQueueNonce, lastQueueNonce } : {},
     updates
   };
@@ -1516,7 +1490,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,
@@ -1541,17 +1515,30 @@ async function buildGatewayUpdate(client, destinationChain, hashContext, queueNo
     };
   }
   if (entry.target.isMintingAuthorityDeactivation) {
-    const { payload, signatures } = validateDeactivationEntry(
-      hashContext,
+    const signingKey = (0, import_viem3.getAddress)(toHexValue(entry.target.asMintingAuthorityDeactivation));
+    const payload = encodeMintingGatewayMintingAuthorityDeactivateTarget({ signingKey });
+    const targetPayloadHash = (0, import_viem3.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}`);
@@ -1577,23 +1564,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 = (0, import_viem3.getAddress)(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 {
@@ -1601,46 +1585,8 @@ function councilToSnapshot(council) {
     weights: council.members.map((member) => member.weight)
   };
 }
-function payloadHashFromActivationPayload(hashContext, target) {
-  return hashMintingGatewayActivateMintingAuthority(hashContext, target);
-}
-function payloadHashFromDeactivationPayload(target) {
-  return (0, import_viem3.keccak256)(encodeMintingGatewayMintingAuthorityDeactivateTarget(target));
-}
-function validateDeactivationEntry(hashContext, queueNonce, entry, approvingCouncilHash) {
-  const signingKey = (0, import_viem3.getAddress)(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 ((0, import_viem3.getAddress)(toHexValue(signer)) !== signingKey) {
-    throw new Error(
-      `Queue nonce ${queueNonce} deactivation signature was submitted by ${(0, import_viem3.getAddress)(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(
@@ -2270,7 +2216,6 @@ async function activateNotary(sudo2, client, notary) {
 0 && (module.exports = {
   EthereumProofE2eHarness,
   SKIP_E2E,
-  TestBitcoinCli,
   TestEthereum,
   TestMainchain,
   TestMintingAuthorityActor,