@argonprotocol/mainchain 1.4.12-dev.8cae3588 → 1.4.12-dev.d1c83d27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argonprotocol/mainchain",
-  "version": "1.4.12-dev.8cae3588",
+  "version": "1.4.12-dev.d1c83d27",
   "description": "A client for accessing the Argon mainchain apis.",
   "repository": {
     "type": "git",
@@ -68,7 +68,7 @@
   },
   "devDependencies": {
     "@argonprotocol/ethereum-contracts": "workspace:*",
-    "@argonprotocol/testing": "1.4.12-dev.8cae3588",
+    "@argonprotocol/testing": "1.4.12-dev.d1c83d27",
     "@polkadot/typegen": "^16.5.6",
     "@substrate/ss58-registry": "^1.51.0",
     "@types/node": "^20",

package/src/interfaces/augment-api-consts.ts

@@ -82,6 +82,10 @@ declare module '@polkadot/api-base/types/consts' {
        * Maximum releasing utxos at a time
        **/
       maxConcurrentlyReleasingLocks: u32 & AugmentedConst<ApiType>;
+      /**
+       * Max bitcoin blocks up to which the first observed output may fund the Lock.
+       **/
+      maxPendingConfirmationBlocks: u64 & AugmentedConst<ApiType>;
       /**
        * Number of frames orphaned UTXO release entries are retained after a lock lifecycle
        * transition before being cleaned up.
@@ -94,27 +98,9 @@ declare module '@polkadot/api-base/types/consts' {
     };
     bitcoinUtxos: {
       /**
-       * Maximum number of candidate UTXOs stored per lock
-       **/
-      maxCandidateUtxosPerLock: u32 & AugmentedConst<ApiType>;
-      /**
-       * Maximum number of satoshi difference allowed from expected to consider a UTXO as
-       * "confirmed"
-       **/
-      maximumSatoshiThresholdFromExpected: u64 & AugmentedConst<ApiType>;
-      /**
-       * Maximum bitcoin blocks to accept a UTXO for confirmation. Expired locks remain watched
-       * for this many additional blocks so late funding can be detected as orphaned.
-       **/
-      maxPendingConfirmationBlocks: u64 & AugmentedConst<ApiType>;
-      /**
-       * The maximum number of UTXOs that can be watched in a block and/or expiring at same block
-       **/
-      maxPendingConfirmationUtxos: u32 & AugmentedConst<ApiType>;
-      /**
-       * The maximum number of expired pending funding entries cleaned up in a block
+       * Maximum number of outputs tracked for a single Lock address.
        **/
-      maxPendingFundingExpirationsPerBlock: u32 & AugmentedConst<ApiType>;
+      maxUtxosPerLock: u32 & AugmentedConst<ApiType>;
     };
     blockRewards: {
       /**

package/src/interfaces/augment-api-errors.ts

@@ -234,18 +234,14 @@ declare module '@polkadot/api-base/types/errors' {
        * Invalid bitcoin sync height attempted
        **/
       InvalidBitcoinSyncHeight: AugmentedError<ApiType>;
-      /**
-       * This Lock already has an attached funding UTXO
-       **/
-      LockAlreadyFunded: AugmentedError<ApiType>;
-      /**
-       * Too many candidate UTXOs are being stored for this lock
-       **/
-      MaxCandidateUtxosExceeded: AugmentedError<ApiType>;
       /**
        * Too many UTXOs are being watched
        **/
       MaxUtxosExceeded: AugmentedError<ApiType>;
+      /**
+       * Too many outputs have been observed at one Lock address.
+       **/
+      MaxUtxosPerLockExceeded: AugmentedError<ApiType>;
       /**
        * No Oracle-provided bitcoin block has been provided to the network
        **/
@@ -267,11 +263,7 @@ declare module '@polkadot/api-base/types/errors' {
        **/
       ScriptPubkeyConflict: AugmentedError<ApiType>;
       /**
-       * The UTXO reference does not map to a candidate entry
-       **/
-      UtxoNotCandidate: AugmentedError<ApiType>;
-      /**
-       * Locked Utxo Not Found
+       * Watched Lock or attached UTXO not found.
        **/
       UtxoNotLocked: AugmentedError<ApiType>;
     };

package/src/interfaces/augment-api-events.ts

@@ -24,7 +24,6 @@ import type { ITuple } from '@polkadot/types-codec/types';
 import type { AccountId32, H160, H256 } from '@polkadot/types/interfaces/runtime';
 import type {
   ArgonNotaryAuditErrorVerifyError,
-  ArgonPrimitivesBitcoinBitcoinRejectedReason,
   ArgonPrimitivesBitcoinUtxoRef,
   ArgonPrimitivesBlockSealBlockPayout,
   ArgonPrimitivesBlockSealMiningRegistration,
@@ -439,42 +438,32 @@ declare module '@polkadot/api-base/types/events' {
         [utxoId: u64, vaultId: u32, newSatoshis: u64, accountId: AccountId32],
         { utxoId: u64; vaultId: u32; newSatoshis: u64; accountId: AccountId32 }
       >;
-      UtxoFundedFromCandidate: AugmentedEvent<
-        ApiType,
-        [utxoId: u64, utxoRef: ArgonPrimitivesBitcoinUtxoRef, vaultId: u32, accountId: AccountId32],
-        {
-          utxoId: u64;
-          utxoRef: ArgonPrimitivesBitcoinUtxoRef;
-          vaultId: u32;
-          accountId: AccountId32;
-        }
-      >;
     };
     bitcoinUtxos: {
-      UtxoRejected: AugmentedEvent<
+      UtxoDetected: AugmentedEvent<
         ApiType,
         [
           utxoId: u64,
           utxoRef: ArgonPrimitivesBitcoinUtxoRef,
-          rejectedReason: ArgonPrimitivesBitcoinBitcoinRejectedReason,
           satoshisReceived: u64,
+          bitcoinHeight: u64,
         ],
         {
           utxoId: u64;
           utxoRef: ArgonPrimitivesBitcoinUtxoRef;
-          rejectedReason: ArgonPrimitivesBitcoinBitcoinRejectedReason;
           satoshisReceived: u64;
+          bitcoinHeight: u64;
         }
       >;
-      UtxoRejectedError: AugmentedEvent<
+      UtxoDetectedError: AugmentedEvent<
         ApiType,
         [utxoId: u64, error: SpRuntimeDispatchError],
         { utxoId: u64; error: SpRuntimeDispatchError }
       >;
       UtxoSpent: AugmentedEvent<
         ApiType,
-        [utxoId: u64, blockHeight: u64],
-        { utxoId: u64; blockHeight: u64 }
+        [utxoId: u64, utxoRef: ArgonPrimitivesBitcoinUtxoRef, blockHeight: u64],
+        { utxoId: u64; utxoRef: ArgonPrimitivesBitcoinUtxoRef; blockHeight: u64 }
       >;
       UtxoSpentError: AugmentedEvent<
         ApiType,
@@ -482,16 +471,6 @@ declare module '@polkadot/api-base/types/events' {
         { utxoId: u64; error: SpRuntimeDispatchError }
       >;
       UtxoUnwatched: AugmentedEvent<ApiType, [utxoId: u64], { utxoId: u64 }>;
-      UtxoVerified: AugmentedEvent<
-        ApiType,
-        [utxoId: u64, satoshisReceived: u64],
-        { utxoId: u64; satoshisReceived: u64 }
-      >;
-      UtxoVerifiedError: AugmentedEvent<
-        ApiType,
-        [utxoId: u64, error: SpRuntimeDispatchError],
-        { utxoId: u64; error: SpRuntimeDispatchError }
-      >;
     };
     blockRewards: {
       RewardCreated: AugmentedEvent<

package/src/interfaces/augment-api-query.ts

@@ -27,10 +27,11 @@ import type {
   ArgonNotaryAuditErrorVerifyError,
   ArgonPrimitivesBalanceChangeAccountOrigin,
   ArgonPrimitivesBitcoinBitcoinBlock,
+  ArgonPrimitivesBitcoinBitcoinCosignScriptPubkey,
   ArgonPrimitivesBitcoinBitcoinNetwork,
   ArgonPrimitivesBitcoinBitcoinXPub,
+  ArgonPrimitivesBitcoinUtxoAddress,
   ArgonPrimitivesBitcoinUtxoRef,
-  ArgonPrimitivesBitcoinUtxoValue,
   ArgonPrimitivesBlockSealBlockPayout,
   ArgonPrimitivesBlockSealMiningBidStats,
   ArgonPrimitivesBlockSealMiningRegistration,
@@ -261,6 +262,15 @@ declare module '@polkadot/api-base/types/storage' {
         (arg: u64 | AnyNumber | Uint8Array) => Observable<Option<PalletBitcoinLocksLockedBitcoin>>,
         [u64]
       >;
+      /**
+       * Unfunded locks whose pending securitization reservation expires at the indexed height.
+       * Expiry releases the reservation but leaves the lock address watched for late orphan output.
+       **/
+      locksPendingFundingByBitcoinHeight: AugmentedQuery<
+        ApiType,
+        (arg: u64 | AnyNumber | Uint8Array) => Observable<BTreeSet<u64>>,
+        [u64]
+      >;
       /**
        * History of target microgons per btc.
        **/
@@ -321,6 +331,14 @@ declare module '@polkadot/api-base/types/storage' {
         ) => Observable<Option<Null>>,
         [u32, u64]
       >;
+      /**
+       * The utxo funding this lock. In the current runtime, this is just the first utxo received
+       **/
+      utxoIdToFundingUtxoRef: AugmentedQuery<
+        ApiType,
+        (arg: u64 | AnyNumber | Uint8Array) => Observable<Option<ArgonPrimitivesBitcoinUtxoRef>>,
+        [u64]
+      >;
     };
     bitcoinUtxos: {
       /**
@@ -331,16 +349,6 @@ declare module '@polkadot/api-base/types/storage' {
         () => Observable<ArgonPrimitivesBitcoinBitcoinNetwork>,
         []
       >;
-      /**
-       * Candidate UTXOs associated with a lock (mismatches, extra funding, etc.).
-       **/
-      candidateUtxoRefsByUtxoId: AugmentedQuery<
-        ApiType,
-        (
-          arg: u64 | AnyNumber | Uint8Array,
-        ) => Observable<BTreeMap<ArgonPrimitivesBitcoinUtxoRef, u64>>,
-        [u64]
-      >;
       /**
        * An oracle-provided confirmed bitcoin block (eg, 6 blocks back)
        **/
@@ -349,43 +357,10 @@ declare module '@polkadot/api-base/types/storage' {
         () => Observable<Option<ArgonPrimitivesBitcoinBitcoinBlock>>,
         []
       >;
-      /**
-       * Pending funding entries that have expired. These remain watched until their additional
-       * orphan-detection window ends, then await bounded cleanup.
-       **/
-      expiredPendingFunding: AugmentedQuery<
-        ApiType,
-        () => Observable<BTreeMap<u64, ArgonPrimitivesBitcoinUtxoValue>>,
-        []
-      >;
       /**
        * Check if the inherent was included
        **/
       inherentIncluded: AugmentedQuery<ApiType, () => Observable<bool>, []>;
-      /**
-       * Locked Bitcoin UTXOs that have been funded with a UtxoRef from the Bitcoin network and
-       * amounts within the MinimumSatoshiThreshold of the expected. If a Bitcoin UTXO is moved
-       * before the expiration block, the funds are burned and the UTXO is unlocked.
-       **/
-      lockedUtxos: AugmentedQuery<
-        ApiType,
-        (
-          arg:
-            | ArgonPrimitivesBitcoinUtxoRef
-            | { txid?: any; outputIndex?: any }
-            | string
-            | Uint8Array,
-        ) => Observable<Option<ArgonPrimitivesBitcoinUtxoValue>>,
-        [ArgonPrimitivesBitcoinUtxoRef]
-      >;
-      /**
-       * Bitcoin locks that are pending full funding on the bitcoin network
-       **/
-      locksPendingFunding: AugmentedQuery<
-        ApiType,
-        () => Observable<BTreeMap<u64, ArgonPrimitivesBitcoinUtxoValue>>,
-        []
-      >;
       /**
        * Bitcoin Oracle Operator Account
        **/
@@ -408,11 +383,35 @@ declare module '@polkadot/api-base/types/storage' {
        **/
       tempParentHasSyncState: AugmentedQuery<ApiType, () => Observable<bool>, []>;
       /**
-       * A mapping of utxo id to the confirmed utxo reference
+       * Watched Lock addresses and the scan height needed to observe them.
        **/
-      utxoIdToFundingUtxoRef: AugmentedQuery<
+      utxoAddressByUtxoId: AugmentedQuery<
         ApiType,
-        (arg: u64 | AnyNumber | Uint8Array) => Observable<Option<ArgonPrimitivesBitcoinUtxoRef>>,
+        (
+          arg: u64 | AnyNumber | Uint8Array,
+        ) => Observable<Option<ArgonPrimitivesBitcoinUtxoAddress>>,
+        [u64]
+      >;
+      /**
+       * The Lock ID identified by each watched script pubkey.
+       **/
+      utxoIdByScriptPubkey: AugmentedQuery<
+        ApiType,
+        (
+          arg:
+            | ArgonPrimitivesBitcoinBitcoinCosignScriptPubkey
+            | { P2WSH: any }
+            | string
+            | Uint8Array,
+        ) => Observable<Option<u64>>,
+        [ArgonPrimitivesBitcoinBitcoinCosignScriptPubkey]
+      >;
+      /**
+       * Every output observed at a watched Lock address, retained until explicitly removed.
+       **/
+      utxoRefsByUtxoId: AugmentedQuery<
+        ApiType,
+        (arg: u64 | AnyNumber | Uint8Array) => Observable<BTreeSet<ArgonPrimitivesBitcoinUtxoRef>>,
         [u64]
       >;
     };

package/src/interfaces/augment-api-tx.ts

@@ -425,37 +425,6 @@ declare module '@polkadot/api-base/types/submittable' {
       >;
     };
     bitcoinUtxos: {
-      /**
-       * Bind a candidate UTXO ref as the funding UTXO for its lock.
-       * The locks pallet authorizes the promotion; this pallet binds the ref and begins
-       * tracking.
-       **/
-      fundWithUtxoCandidate: AugmentedSubmittable<
-        (
-          utxoId: u64 | AnyNumber | Uint8Array,
-          utxoRef:
-            | ArgonPrimitivesBitcoinUtxoRef
-            | { txid?: any; outputIndex?: any }
-            | string
-            | Uint8Array,
-        ) => SubmittableExtrinsic<ApiType>,
-        [u64, ArgonPrimitivesBitcoinUtxoRef]
-      >;
-      /**
-       * Reject a pending candidate UTXO and materialize it as an orphan through the locks
-       * pallet.
-       **/
-      rejectUtxoCandidate: AugmentedSubmittable<
-        (
-          utxoId: u64 | AnyNumber | Uint8Array,
-          utxoRef:
-            | ArgonPrimitivesBitcoinUtxoRef
-            | { txid?: any; outputIndex?: any }
-            | string
-            | Uint8Array,
-        ) => SubmittableExtrinsic<ApiType>,
-        [u64, ArgonPrimitivesBitcoinUtxoRef]
-      >;
       /**
        * Sets the most recent confirmed bitcoin block height (only executable by the Oracle
        * Operator account)