@argonprotocol/testing 1.4.9 → 1.4.10-dev.459cb75f

package/lib/dev.docker-compose.yml

@@ -1,6 +1,6 @@
 ## Shared configs
 x-oracle-config: &oracle
-  image: ghcr.io/argonprotocol/argon-oracle:${VERSION:-latest}
+  image: ghcr.io/argonprotocol/argon-oracle:${VERSION:-dev}
   user: root
   build:
     context: .
@@ -8,7 +8,7 @@ x-oracle-config: &oracle
     target: oracle
   restart: on-failure
 x-notary-config: &notary
-  image: ghcr.io/argonprotocol/argon-notary:${VERSION:-latest}
+  image: ghcr.io/argonprotocol/argon-notary:${VERSION:-dev}
   user: root
   build:
     context: .
@@ -16,7 +16,7 @@ x-notary-config: &notary
     target: argon-notary
   restart: on-failure
 x-node-config: &node
-  image: ghcr.io/argonprotocol/argon-miner:${VERSION:-latest}
+  image: ghcr.io/argonprotocol/argon-miner:${VERSION:-dev}
   build:
     context: .
     dockerfile: dev.Dockerfile
@@ -212,7 +212,7 @@ services:
       --validator
       --pruning=archive
     ports:
-      - "${RPC_PORT:-9944}:9944"
+      - "${ARCHIVE_NODE_RPC_PORT:-0}:9944"
       - "0:30334"
     volumes:
       - archive-data:/data
@@ -230,6 +230,50 @@ services:
       start_period: 30s
       retries: 12
 
+  archive-rpc:
+    image: ghcr.io/argonprotocol/argon-rpc:dev
+    build:
+      context: .
+      dockerfile: docker/argon-rpc/Containerfile
+    restart: on-failure
+    depends_on:
+      archive-node:
+        condition: service_healthy
+    # Forward optional host overrides; config.yml defaults still apply when values are unset or blank.
+    environment:
+      - RUST_LOG=${ARGON_RPC_RUST_LOG:-info,subway=debug}
+      - LOG_FORMAT=${ARGON_RPC_LOG_FORMAT:-compact}
+      - ARGON_RPC_ENDPOINTS
+      - ARGON_RPC_UPSTREAM_REQUEST_TIMEOUT_SECONDS
+      - ARGON_RPC_UPSTREAM_CONNECTION_TIMEOUT_SECONDS
+      - ARGON_RPC_UPSTREAM_RETRIES
+      - ARGON_RPC_STALE_TIMEOUT_SECONDS
+      - ARGON_RPC_CACHE_TTL_SECONDS
+      - ARGON_RPC_CACHE_SIZE
+      - ARGON_RPC_KEEP_ALIVE_SECONDS
+      - ARGON_RPC_MAX_CONNECTIONS
+      - ARGON_RPC_MAX_BATCH_SIZE
+      - ARGON_RPC_CONNECTION_BURST
+      - ARGON_RPC_CONNECTION_PERIOD_SECS
+      - ARGON_RPC_IP_BURST
+      - ARGON_RPC_IP_PERIOD_SECS
+      - ARGON_RPC_USE_XFF
+      - ARGON_RPC_PROMETHEUS_LABEL
+    ports:
+      - "${RPC_PORT:-9944}:9944"
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - >
+          bash -lc 'exec 3<>/dev/tcp/127.0.0.1/9944 &&
+          printf "GET /liveness HTTP/1.1\r\nHost: 127.0.0.1\r\nConnection: close\r\n\r\n" >&3 &&
+          IFS= read -r status <&3 &&
+          [[ $$status == *"200 OK"* ]]'
+      interval: 5s
+      timeout: 5s
+      start_period: 10s
+      retries: 12
+
   miner-1:
     <<: *node
     depends_on:
@@ -357,7 +401,7 @@ services:
         condition: service_completed_successfully
       notary-migrate:
         condition: service_completed_successfully
-      archive-node:
+      archive-rpc:
         condition: service_healthy
       minio:
         condition: service_healthy
@@ -380,7 +424,7 @@ services:
         aliases:
           - notary.localhost
     environment:
-      - TRUSTED_RPC_URL=ws://archive-node:9944
+      - TRUSTED_RPC_URL=ws://archive-rpc:9944
 
   oracle-btc-insert-key:
     <<: *oracle
@@ -397,7 +441,7 @@ services:
     depends_on:
       oracle-btc-insert-key:
         condition: service_completed_successfully
-      archive-node:
+      archive-rpc:
         condition: service_healthy
     command:
       - bitcoin
@@ -408,7 +452,7 @@ services:
     volumes:
       - oracle-btc-keystore:/keystore
     environment:
-      - TRUSTED_RPC_URL=ws://archive-node:9944
+      - TRUSTED_RPC_URL=ws://archive-rpc:9944
 
   oracle-price-insert-key:
     <<: *oracle
@@ -428,7 +472,7 @@ services:
     depends_on:
       oracle-price-insert-key:
         condition: service_completed_successfully
-      archive-node:
+      archive-rpc:
         condition: service_healthy
     command: >
       price-index
@@ -441,7 +485,7 @@ services:
       - /tmp/oracle/data/:/tmp/oracle/data/
       - ${PRICE_INDEX_FILE_PATH:-./oracle/test-price-index.json}:/price_index.json:ro
     environment:
-      - TRUSTED_RPC_URL=ws://archive-node:9944
+      - TRUSTED_RPC_URL=ws://archive-rpc:9944
     profiles:
       - price-oracle
       - all
@@ -453,7 +497,7 @@ services:
     depends_on:
       oracle-price-insert-key:
         condition: service_completed_successfully
-      archive-node:
+      archive-rpc:
         condition: service_healthy
     command: >
       price-index
@@ -464,7 +508,7 @@ services:
       - oracle-price-keystore:/keystore
       - /tmp/oracle/data/:/tmp/oracle/data/
     environment:
-      - TRUSTED_RPC_URL=ws://archive-node:9944
+      - TRUSTED_RPC_URL=ws://archive-rpc:9944
       - ARGON_TOKEN_ADDRESS=${ARGON_TOKEN_ADDRESS:-3e622317f8C93f7328350cF0B56d9eD4C620C5d6}
       - ARGONOT_TOKEN_ADDRESS=${ARGONOT_TOKEN_ADDRESS:-3e622317f8C93f7328350cF0B56d9eD4C620C5d6}
       - BLS_API_KEY=${BLS_API_KEY}

package/lib/index.cjs

@@ -1356,10 +1356,14 @@ async function delay2(ms) {
 var import_mainchain6 = require("@argonprotocol/mainchain");
 var import_viem3 = require("viem");
 var {
+  encodeMintingGatewayGlobalIssuanceCouncilRotateTarget,
   encodeMintingGatewayMintingAuthorityActivationTarget,
   encodeMintingGatewayMintingAuthorityDeactivateTarget,
   hashMintingGatewayActivateMintingAuthority,
   hashMintingGatewayGatewayUpdateApproval,
+  hashMintingGatewayGlobalIssuanceCouncil: hashMintingGatewayGlobalIssuanceCouncil2,
+  hashMintingGatewayRotateGlobalIssuanceCouncil,
+  hashMintingGatewayRotateGlobalIssuanceCouncilApproval,
   mintingGatewayAbi,
   MINTING_GATEWAY_UPDATE_KINDS
 } = import_mainchain6.EvmContracts;
@@ -1437,7 +1441,8 @@ async function getReadyEthereumGatewayUpdates(client, gatewayClient, options = {
       }
       const update = await buildGatewayUpdate(client, destinationChain, hashContext, queueNonce, {
         entry,
-        approvingCouncilHash
+        approvingCouncilHash,
+        councilCache
       });
       candidateUpdates.push(update);
       expectedPreviousApprovalHash = toHexValue(entry.approvalHash);
@@ -1468,7 +1473,42 @@ async function getReadyEthereumGatewayUpdates(client, gatewayClient, options = {
   };
 }
 async function buildGatewayUpdate(client, destinationChain, hashContext, queueNonce, queueItem) {
-  const { entry, approvingCouncilHash } = queueItem;
+  const { entry, approvingCouncilHash, councilCache } = queueItem;
+  if (entry.target.isGlobalIssuanceCouncilRotation) {
+    const signatures = getSortedSignatures(entry.signatures);
+    const nextCouncilHash = toHexValue(entry.target.asGlobalIssuanceCouncilRotation);
+    const nextCouncil = await loadCouncilByHash(client, nextCouncilHash, councilCache);
+    const target = {
+      council: councilToSnapshot(nextCouncil),
+      epochMicrogonsPerArgonot: nextCouncil.epochMicrogonsPerArgonot
+    };
+    const calculatedCouncilHash = hashMintingGatewayGlobalIssuanceCouncil2({
+      ...target.council,
+      epochMicrogonsPerArgonot: target.epochMicrogonsPerArgonot
+    });
+    const targetPayloadHash = hashMintingGatewayRotateGlobalIssuanceCouncil(hashContext, target);
+    const approvalHash = hashMintingGatewayRotateGlobalIssuanceCouncilApproval(hashContext, {
+      queueNonce,
+      approvingCouncilHash,
+      previousUpdateHash: toHexValue(entry.previousApprovalHash),
+      target
+    });
+    if (calculatedCouncilHash !== nextCouncilHash) {
+      throw new Error(`Queue nonce ${queueNonce} target council hash does not match council`);
+    }
+    if (toHexValue(entry.targetPayloadHash) !== targetPayloadHash) {
+      throw new Error(`Queue nonce ${queueNonce} target payload hash does not match council`);
+    }
+    if (toHexValue(entry.approvalHash) !== approvalHash) {
+      throw new Error(`Queue nonce ${queueNonce} approval hash does not match council rotation`);
+    }
+    return {
+      queueNonce,
+      kind: MINTING_GATEWAY_UPDATE_KINDS.globalIssuanceCouncilRotate,
+      payload: encodeMintingGatewayGlobalIssuanceCouncilRotateTarget(target),
+      signatures
+    };
+  }
   if (entry.target.isMintingAuthorityActivation) {
     const signatures = getSortedSignatures(entry.signatures);
     const signingKey = (0, import_viem3.getAddress)(toHexValue(entry.target.asMintingAuthorityActivation));
@@ -1554,6 +1594,7 @@ async function loadCouncilByHash(client, councilHash, cache) {
   }
   const council = councilOption.unwrap();
   const loaded = {
+    epochMicrogonsPerArgonot: council.epochMicrogonsPerArgonot.toBigInt(),
     totalWeight: council.totalWeight.toBigInt(),
     members: [...council.members.entries()].map(([signer, member]) => ({
       signer: (0, import_viem3.getAddress)(toHexValue(signer)),