speed up by combining scripts

Author: zhangchiqing

.claude/settings.json

@@ -0,0 +1,9 @@
+import "FlowYieldVaultsAutoBalancers"
+
+/// Returns the value of deposits tracked by the AutoBalancer related to the provided YieldVault ID or `nil` if none exists
+/// This is the historical cumulative value used to compute the rebalance ratio: currentValue / valueOfDeposits
+///
+access(all)
+fun main(id: UInt64): UFix64? {
+    return FlowYieldVaultsAutoBalancers.borrowAutoBalancer(id: id)?.valueOfDeposits() ?? nil
+}

cadence/scripts/flow-yield-vaults/get_auto_balancer_value_of_deposits_by_id.cdc

@@ -345,14 +345,13 @@ fun test_BtcDaily2025_DailyRebalancing() {
             a = a + 1
         }
 
-        // Calculate vault ratio BEFORE rebalancing
+        // Calculate vault ratio BEFORE rebalancing (single script call for efficiency)
         // vaultRatio = currentValue / valueOfDeposits
         // Triggers when ratio < 0.95 or ratio > 1.05
         var preVaultRatio: UFix64 = 1.0
-        let preCurrentValue = getAutoBalancerCurrentValue(id: vaultIds[0]) ?? 0.0
-        let preValueOfDeposits = getAutoBalancerValueOfDeposits(id: vaultIds[0]) ?? 0.0
-        if preValueOfDeposits > 0.0 {
-            preVaultRatio = preCurrentValue / preValueOfDeposits
+        let preMetrics = getAutoBalancerMetrics(id: vaultIds[0]) ?? [0.0, 0.0]
+        if preMetrics[1] > 0.0 {
+            preVaultRatio = preMetrics[0] / preMetrics[1]
         }
 
         // Potentially rebalance all agents (not forced)
@@ -371,12 +370,11 @@ fun test_BtcDaily2025_DailyRebalancing() {
         prevVaultRebalanceCount = currentVaultRebalanceCount
         prevPositionRebalanceCount = currentPositionRebalanceCount
 
-        // Calculate vault ratio AFTER rebalancing
+        // Calculate vault ratio AFTER rebalancing (single script call for efficiency)
         var postVaultRatio: UFix64 = 1.0
-        let postCurrentValue = getAutoBalancerCurrentValue(id: vaultIds[0]) ?? 0.0
-        let postValueOfDeposits = getAutoBalancerValueOfDeposits(id: vaultIds[0]) ?? 0.0
-        if postValueOfDeposits > 0.0 {
-            postVaultRatio = postCurrentValue / postValueOfDeposits
+        let postMetrics = getAutoBalancerMetrics(id: vaultIds[0]) ?? [0.0, 0.0]
+        if postMetrics[1] > 0.0 {
+            postVaultRatio = postMetrics[0] / postMetrics[1]
         }
 
         // Calculate HF AFTER rebalancing

cadence/tests/forked_btc_daily_2025_test.cdc

@@ -560,6 +560,15 @@ fun getAutoBalancerValueOfDeposits(id: UInt64): UFix64? {
     return res.returnValue as! UFix64?
 }
 
+/// Returns [currentValue, valueOfDeposits] for the AutoBalancer in a single script call.
+/// This is more efficient than calling getAutoBalancerCurrentValue and getAutoBalancerValueOfDeposits separately.
+access(all)
+fun getAutoBalancerMetrics(id: UInt64): [UFix64]? {
+    let res = _executeScript("../scripts/flow-yield-vaults/get_auto_balancer_metrics_by_id.cdc", [id])
+    Test.expect(res, Test.beSucceeded())
+    return res.returnValue as! [UFix64]?
+}
+
 access(all)
 fun getPositionDetails(pid: UInt64, beFailed: Bool): FlowALPv0.PositionDetails {
     let res = _executeScript("../../lib/FlowALP/cadence/scripts/flow-alp/position_details.cdc",
@@ -1222,64 +1231,3 @@ access(all) fun getMOETDebtFromPosition(pid: UInt64): UFix64 {
     }
     return 0.0
 }
-
-access(all)
-fun setupGenericVault(signer: Test.TestAccount, vaultIdentifier: String) {
-    let setupResult = _executeTransaction(
-        "../../lib/flow-evm-bridge/cadence/transactions/example-assets/setup/setup_generic_vault.cdc",
-        [vaultIdentifier],
-        signer
-    )
-    Test.expect(setupResult, Test.beSucceeded())
-}
-
-access(all)
-fun setERC20Balance(
-    signer: Test.TestAccount,
-    tokenAddress: String,
-    holderAddress: String,
-    balanceSlot: UInt256,
-    amount: UInt256
-) {
-    let res = _executeTransaction(
-        "transactions/set_erc20_balance.cdc",
-        [tokenAddress, holderAddress, balanceSlot, amount],
-        signer
-    )
-    Test.expect(res, Test.beSucceeded())
-}
-
-access(all)
-fun mintBTC(signer: Test.TestAccount, amount: UFix64) {
-    let wbtcAddress = "0x717dae2baf7656be9a9b01dee31d571a9d4c9579"
-    let wbtcTokenId = "A.1e4aa0b87d10b141.EVMVMBridgedToken_717dae2baf7656be9a9b01dee31d571a9d4c9579.Vault"
-    let wbtcBalanceSlot: UInt256 = 5
-
-    // Ensure signer has a COA (needs some FLOW for gas)
-    if getCOA(signer.address) == nil {
-        createCOA(signer, fundingAmount: 1.0)
-    }
-    let coaAddress = getCOA(signer.address)!
-
-    // Set wBTC ERC20 balance for the signer's COA on EVM
-    // wBTC has 8 decimals, so multiply amount by 1e8
-    // Split to avoid UFix64 overflow for large amounts
-    let whole = UInt256(amount)
-    let frac = amount - UFix64(UInt64(amount))
-    let amountSmallestUnit = whole * 100_000_000 + UInt256(frac * 100_000_000.0)
-    setERC20Balance(
-        signer: signer,
-        tokenAddress: wbtcAddress,
-        holderAddress: coaAddress,
-        balanceSlot: wbtcBalanceSlot,
-        amount: amountSmallestUnit
-    )
-
-    // Bridge wBTC from EVM to Cadence
-    let bridgeRes = _executeTransaction(
-        "../../lib/flow-evm-bridge/cadence/transactions/bridge/tokens/bridge_tokens_from_evm.cdc",
-        [wbtcTokenId, amountSmallestUnit],
-        signer
-    )
-    Test.expect(bridgeRes, Test.beSucceeded())
-}