@argonprotocol/testing 1.4.7-dev.6c827619 → 1.4.7-dev.ceb2baac

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;
@@ -425,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;
@@ -425,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",
@@ -1978,7 +1957,8 @@ var TestMintingAuthorityActor = class {
       annualPercentRate: 0.05,
       baseFee: 0n,
       bitcoinXpub: args.bitcoinXpub,
-      treasuryProfitSharing: 0
+      treasuryProfitSharing: 0,
+      bonusSharingPercent: 0
     });
     await vault.getVault();
     await this.harness.sudoSubmit(
@@ -2216,7 +2196,6 @@ async function activateNotary(sudo2, client, notary) {
 export {
   EthereumProofE2eHarness,
   SKIP_E2E,
-  TestBitcoinCli,
   TestEthereum,
   TestMainchain,
   TestMintingAuthorityActor,