Interest Rate Boundary Conditions Testing

cadence/contracts/FlowALPModels.cdc

@@ -553,7 +553,7 @@ access(all) contract FlowALPModels {
             effectiveDebt: {Type: UFix128}
         ) {
             // Enforce single balance per token invariant: if a type appears in one map, it must not appear in the other.
-            for collateralType in effectiveCollateral {
+            for collateralType in effectiveCollateral.keys {
                 assert(effectiveDebt[collateralType] == nil, message: "cannot construct BalanceSheet: observed both credit and debit balance for \(collateralType.identifier)")
             }
 

cadence/tests/adversarial_recursive_withdraw_source_test.cdc

@@ -119,10 +119,13 @@ fun testRecursiveWithdrawSource() {
     //
     // In this test, the topUpSource behavior is adversarial: it attempts to re-enter
     // the pool during the pull/deposit flow. We expect the transaction to fail.
-    let withdrawRes = executeTransaction(
-        "./transactions/flow-alp/epositionadmin/withdraw_from_position.cdc",
-        [positionID, flowTokenIdentifier, 1500.0, true], // pullFromTopUpSource: true
-        userAccount
+    let withdrawRes = withdrawFromPosition(
+        signer: userAccount,
+        positionId: positionID,
+        tokenTypeIdentifier: flowTokenIdentifier,
+        receiverVaultStoragePath: FLOW_VAULT_STORAGE_PATH,
+        amount: 1500.0,
+        pullFromTopUpSource: true
     )
     Test.expect(withdrawRes, Test.beFailed())
 

cadence/tests/adversarial_type_spoofing_test.cdc

@@ -58,10 +58,13 @@ fun testMaliciousSource() {
     Test.expect(openRes, Test.beSucceeded())
 
     // withdraw 1337 Flow from the position
-    let withdrawRes = executeTransaction(
-        "./transactions/flow-alp/epositionadmin/withdraw_from_position.cdc",
-        [1 as UInt64, flowTokenIdentifier, 1337.0, true],
-        hackerAccount
+    let withdrawRes = withdrawFromPosition(
+        signer: hackerAccount,
+        positionId: 1,
+        tokenTypeIdentifier: flowTokenIdentifier,
+        receiverVaultStoragePath: FLOW_VAULT_STORAGE_PATH,
+        amount: 1337.0,
+        pullFromTopUpSource: true
     )
     Test.expect(withdrawRes, Test.beFailed())
 

cadence/tests/governance_parameters_test.cdc

@@ -17,7 +17,8 @@ fun test_setGovernanceParams_and_exercise_paths() {
     // 1) Set insurance swapper
     let res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
     Test.expect(res, Test.beSucceeded())

cadence/tests/insurance_collection_formula_test.cdc

@@ -58,7 +58,12 @@ fun test_collectInsurance_success_fullAmount() {
     mintMoet(signer: PROTOCOL_ACCOUNT, to: PROTOCOL_ACCOUNT.address, amount: 10000.0, beFailed: false)
 
     // configure insurance swapper (1:1 ratio)
-    let swapperResult = setInsuranceSwapper(signer: PROTOCOL_ACCOUNT, tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER, priceRatio: 1.0)
+    let swapperResult = setInsuranceSwapper(
+        signer: PROTOCOL_ACCOUNT,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        priceRatio: 1.0,
+    )
     Test.expect(swapperResult, Test.beSucceeded())
 
     // set 10% annual debit rate

cadence/tests/insurance_collection_test.cdc

@@ -87,7 +87,12 @@ fun test_collectInsurance_zeroDebitBalance_returnsNil() {
     mintMoet(signer: PROTOCOL_ACCOUNT, to: PROTOCOL_ACCOUNT.address, amount: 10000.0, beFailed: false)
 
     // configure insurance swapper (1:1 ratio)
-    let swapperResult = setInsuranceSwapper(signer: PROTOCOL_ACCOUNT, tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER, priceRatio: 1.0)
+    let swapperResult = setInsuranceSwapper(
+        signer: PROTOCOL_ACCOUNT, 
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        priceRatio: 1.0,
+    )
     Test.expect(swapperResult, Test.beSucceeded())
 
     // verify initial insurance fund balance is 0
@@ -112,7 +117,7 @@ fun test_collectInsurance_zeroDebitBalance_returnsNil() {
 access(all)
 fun test_collectInsurance_insufficientReserves() {
     // configure insurance swapper (1:1 ratio)
-    let swapperResult = setInsuranceSwapper(signer: PROTOCOL_ACCOUNT, tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER, priceRatio: 1.0)
+    let swapperResult = setInsuranceSwapper(signer: PROTOCOL_ACCOUNT, swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER, swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER, priceRatio: 1.0)
     Test.expect(swapperResult, Test.beSucceeded())
 
     // set 90% annual debit rate
@@ -192,7 +197,12 @@ fun test_collectInsurance_tinyAmount_roundsToZero_returnsNil() {
     mintMoet(signer: PROTOCOL_ACCOUNT, to: PROTOCOL_ACCOUNT.address, amount: 10000.0, beFailed: false)
 
     // configure insurance swapper with very low rate
-    let swapperResult = setInsuranceSwapper(signer: PROTOCOL_ACCOUNT, tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER, priceRatio: 1.0)
+    let swapperResult = setInsuranceSwapper(
+        signer: PROTOCOL_ACCOUNT, 
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        priceRatio: 1.0,
+    )
     Test.expect(swapperResult, Test.beSucceeded())
 
     // set a very low insurance rate
@@ -242,7 +252,12 @@ fun test_collectInsurance_success_fullAmount() {
     mintMoet(signer: PROTOCOL_ACCOUNT, to: PROTOCOL_ACCOUNT.address, amount: 10000.0, beFailed: false)
 
     // configure insurance swapper (1:1 ratio)
-    let swapperResult = setInsuranceSwapper(signer: PROTOCOL_ACCOUNT, tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER, priceRatio: 1.0)
+    let swapperResult = setInsuranceSwapper(
+        signer: PROTOCOL_ACCOUNT, 
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        priceRatio: 1.0,
+    )
     Test.expect(swapperResult, Test.beSucceeded())
 
     // set 10% annual debit rate
@@ -328,10 +343,20 @@ fun test_collectInsurance_multipleTokens() {
     mintMoet(signer: PROTOCOL_ACCOUNT, to: PROTOCOL_ACCOUNT.address, amount: 20000.0, beFailed: false)
 
     // configure insurance swappers for both tokens (both swap to MOET at 1:1)
-    let moetSwapperResult = setInsuranceSwapper(signer: PROTOCOL_ACCOUNT, tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER, priceRatio: 1.0)
+    let moetSwapperResult = setInsuranceSwapper(
+        signer: PROTOCOL_ACCOUNT, 
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        priceRatio: 1.0,
+    )
     Test.expect(moetSwapperResult, Test.beSucceeded())
 
-    let flowSwapperResult = setInsuranceSwapper(signer: PROTOCOL_ACCOUNT, tokenTypeIdentifier: FLOW_TOKEN_IDENTIFIER, priceRatio: 1.0)
+    let flowSwapperResult = setInsuranceSwapper(
+        signer: PROTOCOL_ACCOUNT, 
+        swapperInTypeIdentifier: FLOW_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        priceRatio: 1.0,
+    )
     Test.expect(flowSwapperResult, Test.beSucceeded())
 
     // set 10% annual debit rates
@@ -431,7 +456,12 @@ fun test_collectInsurance_dexOracleSlippageProtection() {
 
     // Oracle says FLOW = 1.0 MOET (already set in setup())
     // Configure insurance swapper with price ratio = 0.5 (50% deviation from oracle)
-    let swapperResult = setInsuranceSwapper(signer: PROTOCOL_ACCOUNT, tokenTypeIdentifier: FLOW_TOKEN_IDENTIFIER, priceRatio: 0.5)
+    let swapperResult = setInsuranceSwapper(
+        signer: PROTOCOL_ACCOUNT, 
+        swapperInTypeIdentifier: FLOW_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        priceRatio: 0.5,
+    )
     Test.expect(swapperResult, Test.beSucceeded())
 
     // set 10% annual debit rate and 10% insurance rate
@@ -451,7 +481,12 @@ fun test_collectInsurance_dexOracleSlippageProtection() {
     Test.assertEqual(0.0, balanceAfterFailure)
 
     // Now reconfigure swapper with price ratio = 1.0 (matches oracle, 0% deviation)
-    let swapperResult2 = setInsuranceSwapper(signer: PROTOCOL_ACCOUNT, tokenTypeIdentifier: FLOW_TOKEN_IDENTIFIER, priceRatio: 1.0)
+    let swapperResult2 = setInsuranceSwapper(
+        signer: PROTOCOL_ACCOUNT, 
+        swapperInTypeIdentifier: FLOW_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        priceRatio: 1.0,
+    )
     Test.expect(swapperResult2, Test.beSucceeded())
 
     // collect insurance for FLOW - should SUCCEED now
@@ -472,7 +507,7 @@ fun test_collectInsurance_midPeriodRateChange() {
     // configure the protocol FLOW wallet and the insurance swapper
     setupMoetVault(PROTOCOL_ACCOUNT, beFailed: false)
     mintMoet(signer: PROTOCOL_ACCOUNT, to: PROTOCOL_ACCOUNT.address, amount: 10000.0, beFailed: false)
-    let swapperResult = setInsuranceSwapper(signer: PROTOCOL_ACCOUNT, tokenTypeIdentifier: FLOW_TOKEN_IDENTIFIER, priceRatio: 1.0)
+    let swapperResult = setInsuranceSwapper(signer: PROTOCOL_ACCOUNT, swapperInTypeIdentifier: FLOW_TOKEN_IDENTIFIER, swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER, priceRatio: 1.0)
     Test.expect(swapperResult, Test.beSucceeded())
 
     // set interest curve

cadence/tests/insurance_rate_test.cdc

@@ -11,7 +11,6 @@ access(all)
 fun setup() {
     deployContracts()
     createAndStorePool(signer: PROTOCOL_ACCOUNT, defaultTokenIdentifier: MOET_TOKEN_IDENTIFIER, beFailed: false)
-
     // take snapshot first, then advance time so reset() target is always lower than current height
     snapshot = getCurrentBlockHeight()
     // move time by 1 second so Test.reset() works properly before each test
@@ -32,7 +31,8 @@ fun test_setInsuranceRate_withoutEGovernanceEntitlement() {
     // set insurance swapper
     var res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
     Test.expect(res, Test.beSucceeded())
@@ -56,7 +56,8 @@ fun test_setInsuranceRate_withEGovernanceEntitlement() {
     // set insurance swapper
     var res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
     Test.expect(res, Test.beSucceeded())
@@ -104,7 +105,8 @@ fun test_setInsuranceRate_rateGreaterThanOne_fails() {
     // set insurance swapper
     var res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
     Test.expect(res, Test.beSucceeded())
@@ -131,7 +133,8 @@ fun test_setInsuranceRate_combinedRateExceedsOne_fails() {
     // set insurance swapper
     var res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
     Test.expect(res, Test.beSucceeded())
@@ -164,7 +167,8 @@ fun test_setStabilityFeeRate_combinedRateExceedsOne_fails() {
     // set insurance swapper
     var res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
     Test.expect(res, Test.beSucceeded())
@@ -197,7 +201,8 @@ fun test_setInsuranceRate_rateLessThanZero_fails() {
     // set insurance swapper
     var res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
     Test.expect(res, Test.beSucceeded())
@@ -223,7 +228,8 @@ fun test_setInsuranceRate_invalidTokenType_fails() {
     // set insurance swapper
     var res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
     Test.expect(res, Test.beSucceeded())

cadence/tests/insurance_swapper_test.cdc

@@ -20,7 +20,8 @@ access(all)
 fun test_setInsuranceSwapper_success() {
     let res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
     Test.expect(res, Test.beSucceeded())
@@ -39,7 +40,8 @@ fun test_setInsuranceSwapper_updateExistingSwapper_success() {
     let initialPriceRatio = 1.0
     let res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: initialPriceRatio,
     )
     Test.expect(res, Test.beSucceeded())
@@ -48,7 +50,8 @@ fun test_setInsuranceSwapper_updateExistingSwapper_success() {
     let updatedPriceRatio = 2.0
     let updatedRes = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: updatedPriceRatio,
     )
     Test.expect(updatedRes, Test.beSucceeded())
@@ -66,7 +69,8 @@ fun test_removeInsuranceSwapper_success() {
     // set a swapper
     let res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
     Test.expect(res, Test.beSucceeded())
@@ -94,7 +98,8 @@ fun test_remove_insuranceSwapper_failed() {
     // set a swapper
     var res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
     Test.expect(res, Test.beSucceeded())
@@ -130,7 +135,8 @@ access(all)
 fun test_setInsuranceSwapper_withoutEGovernanceEntitlement_fails() {
     let res = setInsuranceSwapper(
         signer: alice,
-        tokenTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperInTypeIdentifier: MOET_TOKEN_IDENTIFIER,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
 
@@ -148,7 +154,8 @@ fun test_setInsuranceSwapper_invalidTokenTypeIdentifier_fails() {
 
     let res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: invalidTokenIdentifier,
+        swapperInTypeIdentifier: invalidTokenIdentifier,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )
 
@@ -166,7 +173,8 @@ fun test_setInsuranceSwapper_emptyTokenTypeIdentifier_fails() {
 
     let res = setInsuranceSwapper(
         signer: PROTOCOL_ACCOUNT,
-        tokenTypeIdentifier: emptyTokenIdentifier,
+        swapperInTypeIdentifier: emptyTokenIdentifier,
+        swapperOutTypeIdentifier: MOET_TOKEN_IDENTIFIER,
         priceRatio: 1.0,
     )