@argonprotocol/mainchain 1.4.10-dev.f355ccc1 → 1.4.11-dev.1acff0b2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argonprotocol/mainchain",
-  "version": "1.4.10-dev.f355ccc1",
+  "version": "1.4.11-dev.1acff0b2",
   "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.10-dev.f355ccc1",
+    "@argonprotocol/testing": "1.4.11-dev.1acff0b2",
     "@polkadot/typegen": "^16.5.6",
     "@substrate/ss58-registry": "^1.51.0",
     "@types/node": "^20",

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

@@ -103,7 +103,8 @@ declare module '@polkadot/api-base/types/consts' {
        **/
       maximumSatoshiThresholdFromExpected: u64 & AugmentedConst<ApiType>;
       /**
-       * Maximum bitcoin blocks to watch a Utxo for confirmation before canceling
+       * 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>;
       /**

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

@@ -1272,17 +1272,13 @@ declare module '@polkadot/api-base/types/errors' {
        **/
       BondLotAlreadyReleasing: AugmentedError<ApiType>;
       /**
-       * Only an active vault bond owned by its operator can be used as backfill.
+       * Only an active vault bond owned by its operator can be used as flexible.
        **/
-      BondLotNotEligibleForBackfill: AugmentedError<ApiType>;
+      BondLotCannotBeFlexible: AugmentedError<ApiType>;
       /**
        * The bond lot could not be found.
        **/
       BondLotNotFound: AugmentedError<ApiType>;
-      /**
-       * The vault doesn't have enough bitcoin security to support this bond purchase
-       **/
-      BondPurchaseAboveSecurity: AugmentedError<ApiType>;
       /**
        * The purchase is below the minimum amount.
        **/
@@ -1292,9 +1288,13 @@ declare module '@polkadot/api-base/types/errors' {
        **/
       BondPurchaseRejected: AugmentedError<ApiType>;
       /**
-       * The beneficiary already has a bond lot for this vault.
+       * The bonus approval nonce has already been consumed or superseded.
+       **/
+      BonusApprovalAlreadyUsed: AugmentedError<ApiType>;
+      /**
+       * The approved bonus plus the vault's profit sharing exceeds 100%.
        **/
-      BonusApprovalExistingBondLot: AugmentedError<ApiType>;
+      BonusApprovalExceedsProfitSharing: AugmentedError<ApiType>;
       /**
        * The bonus approval already expired.
        **/
@@ -1307,6 +1307,10 @@ declare module '@polkadot/api-base/types/errors' {
        * The bonus approval was signed for a different vault.
        **/
       BonusApprovalWrongVault: AugmentedError<ApiType>;
+      /**
+       * The vault doesn't have enough bitcoin security to support this bond purchase
+       **/
+      InsufficientBondSpace: AugmentedError<ApiType>;
       /**
        * An internal error occurred.
        **/
@@ -1395,10 +1399,6 @@ declare module '@polkadot/api-base/types/errors' {
        * The bitcoin script to lock this bitcoin has errors
        **/
       InvalidBitcoinScript: AugmentedError<ApiType>;
-      /**
-       * Treasury bond sharing plus bonus cannot exceed 100%.
-       **/
-      InvalidBondSharingTerms: AugmentedError<ApiType>;
       /**
        * An invalid securitization percent was provided for the vault. NOTE: it cannot be
        * decreased (or negative)

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

@@ -317,11 +317,6 @@ declare module '@polkadot/api-base/types/events' {
         [utxoId: u64, vaultId: u32, compensationAmount: u128, compensatedAccountId: AccountId32],
         { utxoId: u64; vaultId: u32; compensationAmount: u128; compensatedAccountId: AccountId32 }
       >;
-      BitcoinLockBackfillChanged: AugmentedEvent<
-        ApiType,
-        [utxoId: u64, vaultId: u32, isBackfill: bool],
-        { utxoId: u64; vaultId: u32; isBackfill: bool }
-      >;
       BitcoinLockBurned: AugmentedEvent<
         ApiType,
         [utxoId: u64, vaultId: u32, wasUtxoSpent: bool],
@@ -348,6 +343,11 @@ declare module '@polkadot/api-base/types/events' {
           securityFee: u128;
         }
       >;
+      BitcoinLockFlexibleChanged: AugmentedEvent<
+        ApiType,
+        [utxoId: u64, vaultId: u32, isFlexible: bool],
+        { utxoId: u64; vaultId: u32; isFlexible: bool }
+      >;
       BitcoinLockRatcheted: AugmentedEvent<
         ApiType,
         [
@@ -1847,15 +1847,10 @@ declare module '@polkadot/api-base/types/events' {
       >;
     };
     treasury: {
-      BackfillBondsReservedChanged: AugmentedEvent<
-        ApiType,
-        [vaultId: u32, backfillBondsReserved: u32],
-        { vaultId: u32; backfillBondsReserved: u32 }
-      >;
-      BondLotBackfillChanged: AugmentedEvent<
+      BondLotFlexibilityChanged: AugmentedEvent<
         ApiType,
-        [vaultId: u32, bondLotId: u64, isBackfill: bool],
-        { vaultId: u32; bondLotId: u64; isBackfill: bool }
+        [vaultId: u32, bondLotId: u64, isFlexible: bool],
+        { vaultId: u32; bondLotId: u64; isFlexible: bool }
       >;
       /**
        * A bond purchase entered its active program set.
@@ -2030,6 +2025,11 @@ declare module '@polkadot/api-base/types/events' {
         [frameId: u64, totalEligibleBonds: u128, participatingVaults: u32],
         { frameId: u64; totalEligibleBonds: u128; participatingVaults: u32 }
       >;
+      ReservedBondSpaceChanged: AugmentedEvent<
+        ApiType,
+        [vaultId: u32, reservedBondSpace: u32],
+        { vaultId: u32; reservedBondSpace: u32 }
+      >;
     };
     txPause: {
       /**
@@ -2101,11 +2101,6 @@ declare module '@polkadot/api-base/types/events' {
       >;
     };
     vaults: {
-      BackfillSecuritizationReservedChanged: AugmentedEvent<
-        ApiType,
-        [vaultId: u32, backfillSecuritizationReserved: u128],
-        { vaultId: u32; backfillSecuritizationReserved: u128 }
-      >;
       CommittedArgonotsSet: AugmentedEvent<
         ApiType,
         [vaultId: u32, operatorAccountId: AccountId32, amount: u128],
@@ -2155,6 +2150,11 @@ declare module '@polkadot/api-base/types/events' {
         [vaultId: u32, beneficiary: AccountId32, toBeneficiary: u128, burned: u128],
         { vaultId: u32; beneficiary: AccountId32; toBeneficiary: u128; burned: u128 }
       >;
+      ReservedSecuritizationSpaceChanged: AugmentedEvent<
+        ApiType,
+        [vaultId: u32, reservedSecuritizationSpace: u128],
+        { vaultId: u32; reservedSecuritizationSpace: u128 }
+      >;
       TreasuryRecordingError: AugmentedEvent<
         ApiType,
         [vaultId: u32, frameId: u64, vaultEarnings: u128, error: SpRuntimeDispatchError],

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

@@ -350,7 +350,8 @@ declare module '@polkadot/api-base/types/storage' {
         []
       >;
       /**
-       * Pending funding entries that have expired and are awaiting bounded cleanup.
+       * Pending funding entries that have expired. These remain watched until their additional
+       * orphan-detection window ends, then await bounded cleanup.
        **/
       expiredPendingFunding: AugmentedQuery<
         ApiType,
@@ -1757,7 +1758,7 @@ declare module '@polkadot/api-base/types/storage' {
        * The active bond state for a vault.
        *
        * The bounded payout set keeps the largest bond amount first, then lower `bond_lot_id` first
-       * when amounts tie. Backfill lots remain in `BondLotById` and are represented here by their
+       * when amounts tie. Flexible lots remain in `BondLotById` and are represented here by their
        * aggregate.
        **/
       bondLotsByVault: AugmentedQuery<
@@ -1798,6 +1799,14 @@ declare module '@polkadot/api-base/types/storage' {
         (arg: AccountId32 | string | Uint8Array) => Observable<u128>,
         [AccountId32]
       >;
+      lastBonusApprovalNonceByVaultAndAccount: AugmentedQuery<
+        ApiType,
+        (
+          arg1: u32 | AnyNumber | Uint8Array,
+          arg2: AccountId32 | string | Uint8Array,
+        ) => Observable<Option<u64>>,
+        [u32, AccountId32]
+      >;
       /**
        * The next bond lot id.
        **/

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

@@ -416,10 +416,10 @@ declare module '@polkadot/api-base/types/submittable' {
         ) => SubmittableExtrinsic<ApiType>,
         [u64, Bytes, u64]
       >;
-      setAsBackfill: AugmentedSubmittable<
+      setFlexible: AugmentedSubmittable<
         (
           utxoId: u64 | AnyNumber | Uint8Array,
-          isBackfill: bool | boolean | Uint8Array,
+          isFlexible: bool | boolean | Uint8Array,
         ) => SubmittableExtrinsic<ApiType>,
         [u64, bool]
       >;
@@ -2050,8 +2050,10 @@ declare module '@polkadot/api-base/types/submittable' {
             | {
                 vaultId?: any;
                 beneficiary?: any;
+                bonusPercent?: any;
                 expiresAtFrame?: any;
-                backfillBondsToUnreserve?: any;
+                bondSpaceToUnreserve?: any;
+                nonce?: any;
                 signature?: any;
               }
             | string,
@@ -2067,19 +2069,22 @@ declare module '@polkadot/api-base/types/submittable' {
         (bondLotId: u64 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>,
         [u64]
       >;
-      setBackfillBondsReserved: AugmentedSubmittable<
+      setBondLotFlexible: AugmentedSubmittable<
         (
-          vaultId: u32 | AnyNumber | Uint8Array,
-          backfillBondsReserved: u32 | AnyNumber | Uint8Array,
+          bondLotId: u64 | AnyNumber | Uint8Array,
+          isFlexible: bool | boolean | Uint8Array,
         ) => SubmittableExtrinsic<ApiType>,
-        [u32, u32]
+        [u64, bool]
       >;
-      setBondLotAsBackfill: AugmentedSubmittable<
+      /**
+       * Reserve vault bond space for future bond purchases.
+       **/
+      setReservedBondSpace: AugmentedSubmittable<
         (
-          bondLotId: u64 | AnyNumber | Uint8Array,
-          isBackfill: bool | boolean | Uint8Array,
+          vaultId: u32 | AnyNumber | Uint8Array,
+          reservedBondSpace: u32 | AnyNumber | Uint8Array,
         ) => SubmittableExtrinsic<ApiType>,
-        [u64, bool]
+        [u32, u32]
       >;
     };
     txPause: {
@@ -2340,12 +2345,7 @@ declare module '@polkadot/api-base/types/submittable' {
           vaultId: u32 | AnyNumber | Uint8Array,
           terms:
             | ArgonPrimitivesVaultVaultTerms
-            | {
-                bitcoinAnnualPercentRate?: any;
-                bitcoinBaseFee?: any;
-                treasuryProfitSharing?: any;
-                treasuryBonusProfitSharing?: any;
-              }
+            | { bitcoinAnnualPercentRate?: any; bitcoinBaseFee?: any; treasuryProfitSharing?: any }
             | string
             | Uint8Array,
         ) => SubmittableExtrinsic<ApiType>,
@@ -2363,13 +2363,6 @@ declare module '@polkadot/api-base/types/submittable' {
         ) => SubmittableExtrinsic<ApiType>,
         [u32, ArgonPrimitivesBitcoinOpaqueBitcoinXpub]
       >;
-      setBackfillSecuritizationReserved: AugmentedSubmittable<
-        (
-          vaultId: u32 | AnyNumber | Uint8Array,
-          backfillSecuritizationReserved: u128 | AnyNumber | Uint8Array,
-        ) => SubmittableExtrinsic<ApiType>,
-        [u32, u128]
-      >;
       setCommittedArgonots: AugmentedSubmittable<
         (amount: Compact<u128> | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>,
         [Compact<u128>]
@@ -2380,6 +2373,15 @@ declare module '@polkadot/api-base/types/submittable' {
         ) => SubmittableExtrinsic<ApiType>,
         [Option<AccountId32>]
       >;
+      /**
+       * Reserve vault securitization space for future Bitcoin locks.
+       **/
+      setReservedSecuritizationSpace: AugmentedSubmittable<
+        (
+          reservedSecuritizationSpace: u128 | AnyNumber | Uint8Array,
+        ) => SubmittableExtrinsic<ApiType>,
+        [u128]
+      >;
     };
   } // AugmentedSubmittables
 } // declare module

package/src/interfaces/lookup.ts

@@ -469,9 +469,9 @@ export default {
       VaultBitcoinXpubChange: {
         vaultId: 'u32',
       },
-      BackfillSecuritizationReservedChanged: {
+      ReservedSecuritizationSpaceChanged: {
         vaultId: 'u32',
-        backfillSecuritizationReserved: 'u128',
+        reservedSecuritizationSpace: 'u128',
       },
       VaultRevenueUncollected: {
         vaultId: 'u32',
@@ -613,10 +613,10 @@ export default {
         newSatoshis: 'u64',
         accountId: 'AccountId32',
       },
-      BitcoinLockBackfillChanged: {
+      BitcoinLockFlexibleChanged: {
         utxoId: 'u64',
         vaultId: 'u32',
-        isBackfill: 'bool',
+        isFlexible: 'bool',
       },
     },
   },
@@ -1392,14 +1392,14 @@ export default {
         accountId: 'AccountId32',
         bonds: 'u32',
       },
-      BondLotBackfillChanged: {
+      BondLotFlexibilityChanged: {
         vaultId: 'u32',
         bondLotId: 'u64',
-        isBackfill: 'bool',
+        isFlexible: 'bool',
       },
-      BackfillBondsReservedChanged: {
+      ReservedBondSpaceChanged: {
         vaultId: 'u32',
-        backfillBondsReserved: 'u32',
+        reservedBondSpace: 'u32',
       },
       EncumberedBondMicrogonsBurned: {
         accountId: 'AccountId32',
@@ -2193,9 +2193,8 @@ export default {
       set_committed_argonots: {
         amount: 'Compact<u128>',
       },
-      set_backfill_securitization_reserved: {
-        vaultId: 'u32',
-        backfillSecuritizationReserved: 'u128',
+      set_reserved_securitization_space: {
+        reservedSecuritizationSpace: 'u128',
       },
     },
   },
@@ -2216,7 +2215,6 @@ export default {
     bitcoinAnnualPercentRate: 'Compact<u128>',
     bitcoinBaseFee: 'Compact<u128>',
     treasuryProfitSharing: 'Compact<Permill>',
-    treasuryBonusProfitSharing: 'Compact<Permill>',
   },
   /**
    * Lookup214: argon_primitives::bitcoin::OpaqueBitcoinXpub
@@ -2265,9 +2263,9 @@ export default {
         utxoId: 'u64',
         newSatoshis: 'Compact<u64>',
       },
-      set_as_backfill: {
+      set_flexible: {
         utxoId: 'u64',
-        isBackfill: 'bool',
+        isFlexible: 'bool',
       },
     },
   },
@@ -2297,7 +2295,7 @@ export default {
     genesisHash: 'H256',
     beneficiary: 'AccountId32',
     feeDiscount: 'Compact<u128>',
-    backfillSecuritizationToUnreserve: 'Compact<u128>',
+    securitizationSpaceToUnreserve: 'Compact<u128>',
     expiresAtFrame: 'Compact<u64>',
     nonce: 'Compact<u64>',
     signature: 'SpRuntimeMultiSignature',
@@ -2741,13 +2739,13 @@ export default {
       buy_argonot_bonds: {
         bonds: 'u32',
       },
-      set_bond_lot_as_backfill: {
+      set_bond_lot_flexible: {
         bondLotId: 'u64',
-        isBackfill: 'bool',
+        isFlexible: 'bool',
       },
-      set_backfill_bonds_reserved: {
+      set_reserved_bond_space: {
         vaultId: 'u32',
-        backfillBondsReserved: 'u32',
+        reservedBondSpace: 'u32',
       },
     },
   },
@@ -2757,8 +2755,10 @@ export default {
   ArgonPrimitivesVaultTreasuryBonusApprovalProof: {
     vaultId: 'Compact<u32>',
     beneficiary: 'AccountId32',
+    bonusPercent: 'Compact<Permill>',
     expiresAtFrame: 'Compact<u64>',
-    backfillBondsToUnreserve: 'Compact<u32>',
+    bondSpaceToUnreserve: 'Compact<u32>',
+    nonce: 'Compact<u64>',
     signature: 'SpRuntimeMultiSignature',
   },
   /**
@@ -3328,12 +3328,12 @@ export default {
     securitization: 'Compact<u128>',
     securitizationTarget: 'Compact<u128>',
     securitizationLocked: 'Compact<u128>',
-    backfillSecuritizationLocked: 'Compact<u128>',
-    backfillSecuritizationReserved: 'Compact<u128>',
+    flexibleSecuritizationLocked: 'Compact<u128>',
+    reservedSecuritizationSpace: 'Compact<u128>',
     securitizationPendingActivation: 'Compact<u128>',
     lockedSatoshis: 'Compact<u64>',
     securitizedSatoshis: 'Compact<u64>',
-    backfillSecuritizedSatoshis: 'Compact<u64>',
+    flexibleSecuritizedSatoshis: 'Compact<u64>',
     securitizationReleaseSchedule: 'BTreeMap<u64, u128>',
     securitizationRatio: 'Compact<u128>',
     isClosed: 'bool',
@@ -3418,7 +3418,6 @@ export default {
       'InternalError',
       'UnableToGenerateVaultBitcoinPubkey',
       'FundingChangeAlreadyScheduled',
-      'InvalidBondSharingTerms',
       'PendingCosignsBeforeCollect',
       'PendingOrphanedUtxoCosignsBeforeCollect',
       'OverdueCollectBlockersBeforeCollect',
@@ -3449,7 +3448,7 @@ export default {
     createdAtHeight: 'Compact<u64>',
     utxoScriptPubkey: 'ArgonPrimitivesBitcoinBitcoinCosignScriptPubkey',
     isFunded: 'bool',
-    isBackfill: 'bool',
+    isFlexible: 'bool',
     fundHoldExtensions: 'BTreeMap<u64, u128>',
     createdAtArgonBlock: 'Compact<u32>',
   },
@@ -3934,9 +3933,9 @@ export default {
    * Lookup528: pallet_treasury::pallet::VaultCapital<T>
    **/
   PalletTreasuryVaultCapital: {
-    bondLotAllocations: 'Vec<PalletTreasuryBondLotAllocation>',
-    backfillBondsEligible: 'Compact<u32>',
-    backfillProrata: 'u128',
+    regularBondAllocations: 'Vec<PalletTreasuryBondLotAllocation>',
+    flexibleBondsEligible: 'Compact<u32>',
+    flexibleProrata: 'u128',
     eligibleBonds: 'Compact<u32>',
   },
   /**
@@ -3968,7 +3967,7 @@ export default {
     owner: 'AccountId32',
     program: 'PalletTreasuryBondProgram',
     bonds: 'Compact<u32>',
-    isBackfill: 'bool',
+    isFlexible: 'bool',
     createdFrameId: 'Compact<u64>',
     participatedFrames: 'Compact<u32>',
     lastFrameEarningsFrameId: 'Option<u64>',
@@ -3994,9 +3993,9 @@ export default {
    * Lookup543: pallet_treasury::pallet::VaultBondState<T>
    **/
   PalletTreasuryVaultBondState: {
-    bondLots: 'Vec<PalletTreasuryBondLotSummary>',
-    backfillBonds: 'Compact<u32>',
-    backfillBondsReserved: 'Compact<u32>',
+    regularBondLots: 'Vec<PalletTreasuryBondLotSummary>',
+    flexibleBonds: 'Compact<u32>',
+    reservedBondSpace: 'Compact<u32>',
   },
   /**
    * Lookup545: pallet_treasury::pallet::Error<T>
@@ -4012,16 +4011,17 @@ export default {
       'BondLotNotFound',
       'NotBondLotOwner',
       'BondLotAlreadyReleasing',
-      'BondPurchaseAboveSecurity',
+      'InsufficientBondSpace',
       'ActiveBondAmountBelowEncumberedBacking',
       'BonusApprovalWrongVault',
       'BonusApprovalWrongAccount',
       'BonusApprovalExpired',
-      'BonusApprovalExistingBondLot',
+      'BonusApprovalAlreadyUsed',
       'InvalidBonusApprovalSignature',
+      'BonusApprovalExceedsProfitSharing',
       'ArgonotBondPurchaseBelowCutoff',
       'ArgonotBondPurchaseAboveCap',
-      'BondLotNotEligibleForBackfill',
+      'BondLotCannotBeFlexible',
       'NoPermissions',
     ],
   },