@argonprotocol/testing 1.4.10 → 1.4.11-dev.3dea4c32

package/lib/dev.docker-compose.yml

@@ -512,7 +512,7 @@ services:
       - ARGON_TOKEN_ADDRESS=${ARGON_TOKEN_ADDRESS:-3e622317f8C93f7328350cF0B56d9eD4C620C5d6}
       - ARGONOT_TOKEN_ADDRESS=${ARGONOT_TOKEN_ADDRESS:-3e622317f8C93f7328350cF0B56d9eD4C620C5d6}
       - BLS_API_KEY=${BLS_API_KEY}
-      - INFURA_PROJECT_ID=${INFURA_PROJECT_ID}
+      - ETHEREUM_RPC_URLS=${ETHEREUM_RPC_URLS}
       - ORACLE_CPI_CACHE_PATH=/tmp/oracle/data/US_CPI_State.json
     profiles:
       - price-oracle-live

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)),
@@ -1977,8 +2018,7 @@ var TestMintingAuthorityActor = class {
       annualPercentRate: 0.05,
       baseFee: 0n,
       bitcoinXpub: args.bitcoinXpub,
-      treasuryProfitSharing: 0,
-      treasuryBonusProfitSharing: 0
+      treasuryProfitSharing: 0
     });
     await vault.getVault();
     await this.harness.sudoSubmit(
@@ -1986,14 +2026,17 @@ var TestMintingAuthorityActor = class {
     );
     const currentTick = await this.harness.mainchainClient.query.ticks.currentTick();
     await this.harness.submit(
-      this.harness.mainchainClient.tx.priceIndex.submit({
-        btcUsdPrice: (0, import_mainchain7.toFixedNumber)(6e4, 18),
-        argonotUsdPrice: (0, import_mainchain7.toFixedNumber)(1, 18),
-        argonUsdPrice: (0, import_mainchain7.toFixedNumber)(1, 18),
-        argonUsdTargetPrice: (0, import_mainchain7.toFixedNumber)(1, 18),
-        argonTimeWeightedAverageLiquidity: (0, import_mainchain7.toFixedNumber)(1e6, 18),
-        tick: currentTick.toBigInt()
-      }),
+      this.harness.mainchainClient.tx.priceIndex.submit(
+        {
+          btcUsdPrice: (0, import_mainchain7.toFixedNumber)(6e4, 18),
+          argonotUsdPrice: (0, import_mainchain7.toFixedNumber)(1, 18),
+          argonUsdPrice: (0, import_mainchain7.toFixedNumber)(1, 18),
+          argonUsdTargetPrice: (0, import_mainchain7.toFixedNumber)(1, 18),
+          argonTimeWeightedAverageLiquidity: (0, import_mainchain7.toFixedNumber)(1e6, 18),
+          tick: currentTick.toBigInt()
+        },
+        null
+      ),
       this.operator
     );
     await this.harness.submit(