@argonprotocol/mainchain 1.5.2-dev.75aac80b → 1.5.2-dev.7cc5fb12

package/package.json

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

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

@@ -101,7 +101,7 @@ declare module '@polkadot/api-base/types/consts' {
        **/
       orphanedUtxoReleaseExpiryFrames: u64 & AugmentedConst<ApiType>;
       /**
-       * Number of Bitcoin blocks to reserve securitization that has not yet been activated.
+       * Initial Bitcoin deposit window, measured in Bitcoin blocks.
        **/
       securitizationHoldBlocks: u64 & AugmentedConst<ApiType>;
       /**

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

@@ -102,6 +102,10 @@ declare module '@polkadot/api-base/types/errors' {
        * A source Lock's securitization does not cover the requested allocation and liability.
        **/
       InsufficientSecuritization: AugmentedError<ApiType>;
+      /**
+       * The fee coupon is invalid, expired, or already consumed.
+       **/
+      InvalidFeeCoupon: AugmentedError<ApiType>;
       /**
        * The requested source Lock does not exist.
        **/
@@ -138,6 +142,10 @@ declare module '@polkadot/api-base/types/errors' {
        * The Fission's ratchet counter cannot be incremented.
        **/
       RatchetNumberOverflow: AugmentedError<ApiType>;
+      /**
+       * The Vault could not upgrade the guarantee assigned to this Fission.
+       **/
+      ResecuritizationFailed: AugmentedError<ApiType>;
       /**
        * The source Lock already has the maximum number of active Fissions.
        **/
@@ -221,10 +229,6 @@ declare module '@polkadot/api-base/types/errors' {
        * The requested Lock securitization has fewer satoshis than its active Fissions.
        **/
       InsufficientSatoshisForFissions: AugmentedError<ApiType>;
-      /**
-       * The requested Lock securitization does not cover its active Fission liabilities.
-       **/
-      InsufficientSecuritizationForFissions: AugmentedError<ApiType>;
       InsufficientVaultFunds: AugmentedError<ApiType>;
       /**
        * The external destination amount must be nonzero and fit with the network fee.
@@ -247,7 +251,7 @@ declare module '@polkadot/api-base/types/errors' {
        **/
       LockHasActiveFissions: AugmentedError<ApiType>;
       /**
-       * A Lock in the release process cannot be resecuritized.
+       * A Lock's guarantee cannot be changed while release is pending.
        **/
       LockInProcessOfRelease: AugmentedError<ApiType>;
       /**
@@ -279,13 +283,13 @@ declare module '@polkadot/api-base/types/errors' {
        **/
       NoBitcoinPricesAvailable: AugmentedError<ApiType>;
       /**
-       * The user does not have permissions to perform this action
+       * The requested securitization matches the Lock's current securitization.
        **/
-      NoPermissions: AugmentedError<ApiType>;
+      NoGuaranteeChange: AugmentedError<ApiType>;
       /**
-       * The requested securitization matches the Lock's current securitization.
+       * The user does not have permissions to perform this action
        **/
-      NoResecuritizationChange: AugmentedError<ApiType>;
+      NoPermissions: AugmentedError<ApiType>;
       /**
        * No Vault public keys are available
        **/

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

@@ -401,7 +401,7 @@ declare module '@polkadot/api-base/types/events' {
           lockId: u64,
           vaultId: u32,
           securitizationBasis: ArgonPrimitivesVaultBitcoinSecuritizationBasis,
-          collateralRequired: u128,
+          securitizationMicrogons: u128,
           accountId: AccountId32,
           securityFee: u128,
         ],
@@ -409,7 +409,7 @@ declare module '@polkadot/api-base/types/events' {
           lockId: u64;
           vaultId: u32;
           securitizationBasis: ArgonPrimitivesVaultBitcoinSecuritizationBasis;
-          collateralRequired: u128;
+          securitizationMicrogons: u128;
           accountId: AccountId32;
           securityFee: u128;
         }
@@ -419,7 +419,7 @@ declare module '@polkadot/api-base/types/events' {
         [lockId: u64, vaultId: u32, isFlexible: bool],
         { lockId: u64; vaultId: u32; isFlexible: bool }
       >;
-      BitcoinLockResecuritized: AugmentedEvent<
+      BitcoinLockGuaranteeSet: AugmentedEvent<
         ApiType,
         [
           lockId: u64,
@@ -2261,14 +2261,14 @@ declare module '@polkadot/api-base/types/events' {
         [
           vaultId: u32,
           locker: AccountId32,
-          securitizationCoverageMicrogons: u128,
+          securitizationMicrogons: u128,
           feeRevenue: u128,
           didUseFeeCoupon: bool,
         ],
         {
           vaultId: u32;
           locker: AccountId32;
-          securitizationCoverageMicrogons: u128;
+          securitizationMicrogons: u128;
           feeRevenue: u128;
           didUseFeeCoupon: bool;
         }
@@ -2299,30 +2299,13 @@ declare module '@polkadot/api-base/types/events' {
       >;
       VaultCreated: AugmentedEvent<
         ApiType,
-        [
-          vaultId: u32,
-          securitization: u128,
-          securitizationRatio: u128,
-          operatorAccountId: AccountId32,
-          openedTick: u64,
-        ],
-        {
-          vaultId: u32;
-          securitization: u128;
-          securitizationRatio: u128;
-          operatorAccountId: AccountId32;
-          openedTick: u64;
-        }
+        [vaultId: u32, securitization: u128, operatorAccountId: AccountId32, openedTick: u64],
+        { vaultId: u32; securitization: u128; operatorAccountId: AccountId32; openedTick: u64 }
       >;
       VaultModified: AugmentedEvent<
         ApiType,
-        [vaultId: u32, securitization: u128, securitizationTarget: u128, securitizationRatio: u128],
-        {
-          vaultId: u32;
-          securitization: u128;
-          securitizationTarget: u128;
-          securitizationRatio: u128;
-        }
+        [vaultId: u32, securitization: u128, securitizationTarget: u128],
+        { vaultId: u32; securitization: u128; securitizationTarget: u128 }
       >;
       /**
        * Vault revenue was not collected within the required window, so has been burned

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

@@ -50,7 +50,7 @@ import type {
   ArgonPrimitivesNotaryNotaryRecord,
   ArgonPrimitivesProvidersBlockSealerInfo,
   ArgonPrimitivesTickTicker,
-  ArgonPrimitivesTreasuryPositionQuantities,
+  ArgonPrimitivesTreasuryNetworkPositionQuantities,
   ArgonPrimitivesVault,
   ArgonPrimitivesVaultVaultArgonotSecuritization,
   FrameSupportDispatchPerDispatchClassWeight,
@@ -113,6 +113,7 @@ import type {
   PalletTreasuryBondLot,
   PalletTreasuryBondLotSummary,
   PalletTreasuryFrameArgonotBondParticipants,
+  PalletTreasuryFrameVaultBitcoin,
   PalletTreasuryFrameVaultCapital,
   PalletTreasuryPositionsPosition,
   PalletTreasuryVaultBondState,
@@ -255,13 +256,17 @@ declare module '@polkadot/api-base/types/storage' {
         [u32, AccountId32]
       >;
       /**
-       * Highest Bitcoin UTXO sync height processed for securitization hold expirations.
+       * Highest Bitcoin UTXO sync height checked for funding expirations; failures remain pending.
        **/
       lastProcessedSecuritizationHoldBitcoinHeight: AugmentedQuery<
         ApiType,
         () => Observable<Option<u64>>,
         []
       >;
+      /**
+       * Resume retries after this Lock so a persistent failure cannot starve other expirations.
+       **/
+      lastRetriedLockExpiration: AugmentedQuery<ApiType, () => Observable<Option<u64>>, []>;
       /**
        * Utxos that have been requested to be cosigned for releasing
        **/
@@ -367,6 +372,14 @@ declare module '@polkadot/api-base/types/storage' {
         ) => Observable<Option<PalletBitcoinLocksOrphanedUtxo>>,
         [AccountId32, ArgonPrimitivesBitcoinUtxoRef]
       >;
+      /**
+       * Locks whose funding-window or terminal expiration failed and must be retried.
+       **/
+      pendingLockExpirations: AugmentedQuery<
+        ApiType,
+        (arg: u64 | AnyNumber | Uint8Array) => Observable<Option<Null>>,
+        [u64]
+      >;
       /**
        * Cosigned partial releases awaiting confirmation on Bitcoin.
        **/
@@ -1833,6 +1846,14 @@ declare module '@polkadot/api-base/types/storage' {
         () => Observable<Option<PalletTreasuryFrameArgonotBondParticipants>>,
         []
       >;
+      /**
+       * Covered Bitcoin locked alongside vault capital for frames using independent reward tiers.
+       **/
+      currentFrameVaultBitcoin: AugmentedQuery<
+        ApiType,
+        () => Observable<Option<PalletTreasuryFrameVaultBitcoin>>,
+        []
+      >;
       /**
        * The network bond total and vault capital locked for the current frame's payout.
        **/
@@ -1895,12 +1916,12 @@ declare module '@polkadot/api-base/types/storage' {
     };
     treasuryPositions: {
       /**
-       * Maintained network quantities, updated together with their account contributions.
-       * Treasury reads these when freezing frame inputs. This replaces its live Argonot stake total.
+       * Account contribution totals and Vault Bitcoin coverage, maintained as sources change.
+       * Treasury freezes these network quantities at each frame boundary.
        **/
       networkTotals: AugmentedQuery<
         ApiType,
-        () => Observable<ArgonPrimitivesTreasuryPositionQuantities>,
+        () => Observable<ArgonPrimitivesTreasuryNetworkPositionQuantities>,
         []
       >;
       /**

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

@@ -49,6 +49,7 @@ import type {
   ArgonRuntimeProxyType,
   ArgonRuntimeSessionKeys,
   PalletBalancesAdjustmentDirection,
+  PalletBitcoinLocksFeeCoupon,
   PalletBitcoinLocksLockOptions,
   PalletBootstrapEndpointPubkey,
   PalletBootstrapRecoveryProof,
@@ -300,8 +301,28 @@ declare module '@polkadot/api-base/types/submittable' {
           lockId: Compact<u64> | AnyNumber | Uint8Array,
           satoshis: Compact<u64> | AnyNumber | Uint8Array,
           microgonsAtTargetPerBtc: Compact<u128> | AnyNumber | Uint8Array,
+          feeCoupon:
+            | Option<PalletBitcoinLocksFeeCoupon>
+            | null
+            | Uint8Array
+            | PalletBitcoinLocksFeeCoupon
+            | {
+                feeDiscount?: any;
+                securitizationSpaceToUnreserve?: any;
+                expiresAtFrame?: any;
+                nonce?: any;
+                signature?: any;
+              }
+            | string,
         ) => SubmittableExtrinsic<ApiType>,
-        [Compact<u64>, Compact<u64>, Compact<u64>, Compact<u64>, Compact<u128>]
+        [
+          Compact<u64>,
+          Compact<u64>,
+          Compact<u64>,
+          Compact<u64>,
+          Compact<u128>,
+          Option<PalletBitcoinLocksFeeCoupon>,
+        ]
       >;
       /**
        * Ratchet an active Fission to a replacement target-normalized BTC value.
@@ -310,8 +331,21 @@ declare module '@polkadot/api-base/types/submittable' {
         (
           fissionId: Compact<u64> | AnyNumber | Uint8Array,
           microgonsAtTargetPerBtc: Compact<u128> | AnyNumber | Uint8Array,
+          feeCoupon:
+            | Option<PalletBitcoinLocksFeeCoupon>
+            | null
+            | Uint8Array
+            | PalletBitcoinLocksFeeCoupon
+            | {
+                feeDiscount?: any;
+                securitizationSpaceToUnreserve?: any;
+                expiresAtFrame?: any;
+                nonce?: any;
+                signature?: any;
+              }
+            | string,
         ) => SubmittableExtrinsic<ApiType>,
-        [Compact<u64>, Compact<u128>]
+        [Compact<u64>, Compact<u128>, Option<PalletBitcoinLocksFeeCoupon>]
       >;
     };
     bitcoinLocks: {
@@ -410,10 +444,17 @@ declare module '@polkadot/api-base/types/submittable' {
         ) => SubmittableExtrinsic<ApiType>,
         [u64, Bytes, u64, u64]
       >;
+      setFlexible: AugmentedSubmittable<
+        (
+          lockId: u64 | AnyNumber | Uint8Array,
+          isFlexible: bool | boolean | Uint8Array,
+        ) => SubmittableExtrinsic<ApiType>,
+        [u64, bool]
+      >;
       /**
-       * Replace this Lock's BTC coverage and target value for its remaining term.
+       * Replace the Lock's guarantee, leaving active Fission guarantees unchanged.
        **/
-      resecuritize: AugmentedSubmittable<
+      setGuarantee: AugmentedSubmittable<
         (
           lockId: u64 | AnyNumber | Uint8Array,
           satoshis: Compact<u64> | AnyNumber | Uint8Array,
@@ -427,13 +468,6 @@ declare module '@polkadot/api-base/types/submittable' {
         ) => SubmittableExtrinsic<ApiType>,
         [u64, Compact<u64>, Option<PalletBitcoinLocksLockOptions>]
       >;
-      setFlexible: AugmentedSubmittable<
-        (
-          lockId: u64 | AnyNumber | Uint8Array,
-          isFlexible: bool | boolean | Uint8Array,
-        ) => SubmittableExtrinsic<ApiType>,
-        [u64, bool]
-      >;
     };
     bitcoinUtxos: {
       /**
@@ -2326,13 +2360,7 @@ declare module '@polkadot/api-base/types/submittable' {
         (
           vaultConfig:
             | PalletVaultsVaultConfig
-            | {
-                terms?: any;
-                delegateAccountId?: any;
-                securitization?: any;
-                bitcoinXpubkey?: any;
-                securitizationRatio?: any;
-              }
+            | { terms?: any; delegateAccountId?: any; securitization?: any; bitcoinXpubkey?: any }
             | string
             | Uint8Array,
         ) => SubmittableExtrinsic<ApiType>,
@@ -2341,8 +2369,6 @@ declare module '@polkadot/api-base/types/submittable' {
       /**
        * Modify funds allocated by the vault without changing existing Bitcoin locks.
        *
-       * The securitization percent must be maintained or increased.
-       *
        * Funds not yet used in a reward snapshot may leave without notice if not needed for
        * Bitcoin commitments. Reward-committed funds require a one-year Bitcoin-height exit
        * notice and remain held until both the notice and any Bitcoin commitment have ended.
@@ -2352,9 +2378,8 @@ declare module '@polkadot/api-base/types/submittable' {
         (
           vaultId: u32 | AnyNumber | Uint8Array,
           securitization: u128 | AnyNumber | Uint8Array,
-          securitizationRatio: u128 | AnyNumber | Uint8Array,
         ) => SubmittableExtrinsic<ApiType>,
-        [u32, u128, u128]
+        [u32, u128]
       >;
       /**
        * Change the terms of this vault. The change will be applied at the next mining frame