Build an Across specific transfer bridge test

hayesgm · hayesgm · commit 781dbd856053 · 2024-11-15T15:24:11.000-08:00
diff --git a/src/builder/actions/CometActionsBuilder.sol b/src/builder/actions/CometActionsBuilder.sol
@@ -27,6 +27,7 @@ contract CometActionsBuilder is QuarkBuilderBase {
         string[] collateralAssetSymbols;
         address comet;
         address repayer;
+        bool preferAcross;
     }
 
     function cometRepay(
@@ -84,7 +85,7 @@ contract CometActionsBuilder is QuarkBuilderBase {
                 useQuotecall: useQuotecall,
                 bridgeEnabled: true,
                 autoWrapperEnabled: true,
-                preferAcross: true
+                preferAcross: repayIntent.preferAcross
             });
         }
 
@@ -115,6 +116,7 @@ contract CometActionsBuilder is QuarkBuilderBase {
         uint256[] collateralAmounts;
         string[] collateralAssetSymbols;
         address comet;
+        bool preferAcross;
     }
 
     function cometBorrow(
@@ -162,7 +164,7 @@ contract CometActionsBuilder is QuarkBuilderBase {
                 useQuotecall: useQuotecall,
                 bridgeEnabled: true,
                 autoWrapperEnabled: true,
-                preferAcross: true
+                preferAcross: borrowIntent.preferAcross
             });
         }
 
@@ -191,6 +193,7 @@ contract CometActionsBuilder is QuarkBuilderBase {
         uint256 chainId;
         address comet;
         address sender;
+        bool preferAcross;
     }
 
     function cometSupply(
@@ -248,7 +251,7 @@ contract CometActionsBuilder is QuarkBuilderBase {
                     useQuotecall: isMaxSupply,
                     bridgeEnabled: true,
                     autoWrapperEnabled: true,
-                    preferAcross: true
+                    preferAcross: cometSupplyIntent.preferAcross
                 }),
                 chainAccountsList: chainAccountsList,
                 payment: payment,
@@ -273,6 +276,7 @@ contract CometActionsBuilder is QuarkBuilderBase {
         uint256 chainId;
         address comet;
         address withdrawer;
+        bool preferAcross;
     }
 
     function cometWithdraw(
@@ -334,7 +338,7 @@ contract CometActionsBuilder is QuarkBuilderBase {
                     useQuotecall: useQuotecall,
                     bridgeEnabled: true,
                     autoWrapperEnabled: true,
-                    preferAcross: true
+                    preferAcross: cometWithdrawIntent.preferAcross
                 }),
                 chainAccountsList: chainAccountsList,
                 payment: payment,
diff --git a/src/builder/actions/MorphoActionsBuilder.sol b/src/builder/actions/MorphoActionsBuilder.sol
@@ -26,6 +26,7 @@ contract MorphoActionsBuilder is QuarkBuilderBase {
         uint256 chainId;
         uint256 collateralAmount;
         string collateralAssetSymbol;
+        bool preferAcross;
     }
 
     function morphoBorrow(
@@ -72,7 +73,7 @@ contract MorphoActionsBuilder is QuarkBuilderBase {
                 useQuotecall: useQuotecall,
                 bridgeEnabled: true,
                 autoWrapperEnabled: true,
-                preferAcross: true
+                preferAcross: borrowIntent.preferAcross
             });
         }
 
@@ -102,6 +103,7 @@ contract MorphoActionsBuilder is QuarkBuilderBase {
         uint256 chainId;
         uint256 collateralAmount;
         string collateralAssetSymbol;
+        bool preferAcross;
     }
 
     function morphoRepay(
@@ -165,7 +167,7 @@ contract MorphoActionsBuilder is QuarkBuilderBase {
                     useQuotecall: useQuotecall,
                     bridgeEnabled: true,
                     autoWrapperEnabled: true,
-                    preferAcross: true
+                    preferAcross: repayIntent.preferAcross
                 }),
                 chainAccountsList: chainAccountsList,
                 payment: payment,
@@ -192,6 +194,7 @@ contract MorphoActionsBuilder is QuarkBuilderBase {
         address[] distributors;
         address[] rewards;
         bytes32[][] proofs;
+        bool preferAcross;
     }
 
     function morphoClaimRewards(
@@ -249,7 +252,7 @@ contract MorphoActionsBuilder is QuarkBuilderBase {
                 useQuotecall: useQuotecall,
                 bridgeEnabled: true,
                 autoWrapperEnabled: true,
-                preferAcross: true
+                preferAcross: claimIntent.preferAcross
             });
         }
 
diff --git a/src/builder/actions/MorphoVaultActionsBuilder.sol b/src/builder/actions/MorphoVaultActionsBuilder.sol
@@ -24,6 +24,7 @@ contract MorphoVaultActionsBuilder is QuarkBuilderBase {
         uint256 blockTimestamp;
         address sender;
         uint256 chainId;
+        bool preferAcross;
     }
 
     function morphoVaultSupply(
@@ -81,7 +82,7 @@ contract MorphoVaultActionsBuilder is QuarkBuilderBase {
                     useQuotecall: useQuotecall,
                     bridgeEnabled: true,
                     autoWrapperEnabled: true,
-                    preferAcross: true
+                    preferAcross: supplyIntent.preferAcross
                 }),
                 chainAccountsList: chainAccountsList,
                 payment: payment,
@@ -105,6 +106,7 @@ contract MorphoVaultActionsBuilder is QuarkBuilderBase {
         uint256 blockTimestamp;
         uint256 chainId;
         address withdrawer;
+        bool preferAcross;
     }
 
     function morphoVaultWithdraw(
@@ -168,7 +170,7 @@ contract MorphoVaultActionsBuilder is QuarkBuilderBase {
                 useQuotecall: useQuotecall,
                 bridgeEnabled: true,
                 autoWrapperEnabled: true,
-                preferAcross: true
+                preferAcross: withdrawIntent.preferAcross
             });
         }
 
diff --git a/src/builder/actions/SwapActionsBuilder.sol b/src/builder/actions/SwapActionsBuilder.sol
@@ -31,6 +31,7 @@ contract SwapActionsBuilder is QuarkBuilderBase {
         address sender;
         bool isExactOut;
         uint256 blockTimestamp;
+        bool preferAcross;
     }
 
     function swap(
@@ -112,7 +113,7 @@ contract SwapActionsBuilder is QuarkBuilderBase {
                     useQuotecall: isMaxSwap,
                     bridgeEnabled: true,
                     autoWrapperEnabled: true,
-                    preferAcross: true
+                    preferAcross: swapIntent.preferAcross
                 });
             }
 
@@ -146,6 +147,7 @@ contract SwapActionsBuilder is QuarkBuilderBase {
         uint256 interval;
         address sender;
         uint256 blockTimestamp;
+        bool preferAcross;
     }
 
     // Note: We don't currently bridge the input token or the payment token for recurring swaps. Recurring swaps
@@ -207,7 +209,7 @@ contract SwapActionsBuilder is QuarkBuilderBase {
                 useQuotecall: false,
                 bridgeEnabled: false,
                 autoWrapperEnabled: false,
-                preferAcross: true
+                preferAcross: swapIntent.preferAcross
             });
         }
 
diff --git a/src/builder/actions/TransferActionsBuilder.sol b/src/builder/actions/TransferActionsBuilder.sol
@@ -25,6 +25,7 @@ contract TransferActionsBuilder is QuarkBuilderBase {
         address sender;
         address recipient;
         uint256 blockTimestamp;
+        bool preferAcross;
     }
 
     function transfer(
@@ -82,7 +83,7 @@ contract TransferActionsBuilder is QuarkBuilderBase {
                 useQuotecall: useQuotecall,
                 bridgeEnabled: true,
                 autoWrapperEnabled: true,
-                preferAcross: true
+                preferAcross: transferIntent.preferAcross
             });
         }
 
diff --git a/test/builder/BridgingLogic.t.sol b/test/builder/BridgingLogic.t.sol
@@ -61,7 +61,8 @@ contract BridgingLogicTest is Test, QuarkBuilderTest {
                 amount: 1e18,
                 sender: address(0xb0b),
                 recipient: address(0xceecee),
-                blockTimestamp: BLOCK_TIMESTAMP
+                blockTimestamp: BLOCK_TIMESTAMP,
+                preferAcross: false
             }), // transfer 1e18 WETH on chain 8453 to 0xceecee
             chainAccountsList,
             paymentUsd_()
diff --git a/test/builder/QuarkBuilderCometBorrow.t.sol b/test/builder/QuarkBuilderCometBorrow.t.sol
@@ -33,7 +33,8 @@ contract QuarkBuilderCometBorrowTest is Test, QuarkBuilderTest {
             chainId: chainId,
             collateralAmounts: collateralAmounts,
             collateralAssetSymbols: collateralAssetSymbols,
-            comet: cometUsdc_(1)
+            comet: cometUsdc_(1),
+            preferAcross: false
         });
     }
 
diff --git a/test/builder/QuarkBuilderCometRepay.t.sol b/test/builder/QuarkBuilderCometRepay.t.sol
@@ -34,7 +34,8 @@ contract QuarkBuilderCometRepayTest is Test, QuarkBuilderTest {
             collateralAmounts: collateralAmounts,
             collateralAssetSymbols: collateralAssetSymbols,
             comet: comet,
-            repayer: address(0xa11ce)
+            repayer: address(0xa11ce),
+            preferAcross: false
         });
     }
 
diff --git a/test/builder/QuarkBuilderCometSupply.t.sol b/test/builder/QuarkBuilderCometSupply.t.sol
@@ -31,7 +31,8 @@ contract QuarkBuilderCometSupplyTest is Test, QuarkBuilderTest {
             blockTimestamp: BLOCK_TIMESTAMP,
             chainId: chainId,
             comet: COMET_ETH,
-            sender: address(0xa11ce)
+            sender: address(0xa11ce),
+            preferAcross: false
         });
     }
 
@@ -54,7 +55,8 @@ contract QuarkBuilderCometSupplyTest is Test, QuarkBuilderTest {
             blockTimestamp: BLOCK_TIMESTAMP,
             chainId: chainId,
             comet: COMET,
-            sender: sender
+            sender: sender,
+            preferAcross: false
         });
     }
 
diff --git a/test/builder/QuarkBuilderCometWithdraw.t.sol b/test/builder/QuarkBuilderCometWithdraw.t.sol
@@ -41,7 +41,8 @@ contract QuarkBuilderCometWithdrawTest is Test, QuarkBuilderTest {
             blockTimestamp: BLOCK_TIMESTAMP,
             chainId: chainId,
             comet: comet,
-            withdrawer: withdrawer
+            withdrawer: withdrawer,
+            preferAcross: false
         });
     }
 
diff --git a/test/builder/QuarkBuilderMorphoBorrow.t.sol b/test/builder/QuarkBuilderMorphoBorrow.t.sol
@@ -52,7 +52,8 @@ contract QuarkBuilderMorphoBorrowTest is Test, QuarkBuilderTest {
             borrower: borrower,
             chainId: chainId,
             collateralAmount: collateralAmount,
-            collateralAssetSymbol: collateralAssetSymbol
+            collateralAssetSymbol: collateralAssetSymbol,
+            preferAcross: false
         });
     }
 
diff --git a/test/builder/QuarkBuilderMorphoClaimRewards.t.sol b/test/builder/QuarkBuilderMorphoClaimRewards.t.sol
@@ -72,7 +72,8 @@ contract QuarkBuilderMorphoClaimRewardsTest is Test, QuarkBuilderTest {
             claimables: claimables,
             distributors: distributors,
             rewards: rewards,
-            proofs: proofs
+            proofs: proofs,
+            preferAcross: false
         });
     }
 
diff --git a/test/builder/QuarkBuilderMorphoRepay.t.sol b/test/builder/QuarkBuilderMorphoRepay.t.sol
@@ -53,7 +53,8 @@ contract QuarkBuilderMorphoRepayTest is Test, QuarkBuilderTest {
             repayer: repayer,
             chainId: chainId,
             collateralAmount: collateralAmount,
-            collateralAssetSymbol: collateralAssetSymbol
+            collateralAssetSymbol: collateralAssetSymbol,
+            preferAcross: false
         });
     }
 
diff --git a/test/builder/QuarkBuilderMorphoVaultSupply.t.sol b/test/builder/QuarkBuilderMorphoVaultSupply.t.sol
@@ -39,7 +39,8 @@ contract QuarkBuilderMorphoVaultTest is Test, QuarkBuilderTest {
             assetSymbol: assetSymbol,
             blockTimestamp: BLOCK_TIMESTAMP,
             chainId: chainId,
-            sender: sender
+            sender: sender,
+            preferAcross: false
         });
     }
 
@@ -52,7 +53,8 @@ contract QuarkBuilderMorphoVaultTest is Test, QuarkBuilderTest {
                 assetSymbol: "USDC",
                 blockTimestamp: BLOCK_TIMESTAMP,
                 sender: address(0xa11ce),
-                chainId: 1
+                chainId: 1,
+                preferAcross: false
             }),
             chainAccountsList_(0e6), // but we are holding 0 USDC in total across 1, 8453
             paymentUsd_()
@@ -69,7 +71,8 @@ contract QuarkBuilderMorphoVaultTest is Test, QuarkBuilderTest {
                 assetSymbol: "USDC",
                 blockTimestamp: BLOCK_TIMESTAMP,
                 sender: address(0xa11ce),
-                chainId: 1
+                chainId: 1,
+                preferAcross: false
             }),
             chainAccountsList_(2e6), // holding 2 USDC in total across 1, 8453
             paymentUsdc_(maxCosts_(1, 1_000e6)) // but costs 1,000 USDC
@@ -112,7 +115,8 @@ contract QuarkBuilderMorphoVaultTest is Test, QuarkBuilderTest {
                 assetSymbol: "USDC",
                 blockTimestamp: BLOCK_TIMESTAMP,
                 sender: address(0xa11ce),
-                chainId: 1
+                chainId: 1,
+                preferAcross: false
             }),
             chainAccountsList,
             paymentUsd_()
@@ -127,7 +131,8 @@ contract QuarkBuilderMorphoVaultTest is Test, QuarkBuilderTest {
                 assetSymbol: "USDC",
                 blockTimestamp: BLOCK_TIMESTAMP,
                 sender: address(0xa11ce),
-                chainId: 1
+                chainId: 1,
+                preferAcross: false
             }),
             chainAccountsList_(3e6), // holding 3 USDC in total across chains 1, 8453
             paymentUsd_()
@@ -202,7 +207,8 @@ contract QuarkBuilderMorphoVaultTest is Test, QuarkBuilderTest {
                 assetSymbol: "USDC",
                 blockTimestamp: BLOCK_TIMESTAMP,
                 sender: address(0xa11ce),
-                chainId: 1
+                chainId: 1,
+                preferAcross: false
             }),
             chainAccountsList, // holding 3 USDC in total across chains 1, 8453
             paymentUsd_()
diff --git a/test/builder/QuarkBuilderMorphoVaultWithdraw.t.sol b/test/builder/QuarkBuilderMorphoVaultWithdraw.t.sol
@@ -40,7 +40,8 @@ contract QuarkBuilderMorphoVaultWithdrawTest is Test, QuarkBuilderTest {
             assetSymbol: assetSymbol,
             blockTimestamp: BLOCK_TIMESTAMP,
             chainId: chainId,
-            withdrawer: withdrawer
+            withdrawer: withdrawer,
+            preferAcross: false
         });
     }
 
diff --git a/test/builder/QuarkBuilderRecurringSwap.t.sol b/test/builder/QuarkBuilderRecurringSwap.t.sol
@@ -72,7 +72,8 @@ contract QuarkBuilderRecurringSwapTest is Test, QuarkBuilderTest {
             path: path,
             interval: interval,
             sender: sender,
-            blockTimestamp: blockTimestamp
+            blockTimestamp: blockTimestamp,
+            preferAcross: false
         });
     }
 
diff --git a/test/builder/QuarkBuilderSwap.t.sol b/test/builder/QuarkBuilderSwap.t.sol
@@ -92,7 +92,8 @@ contract QuarkBuilderSwapTest is Test, QuarkBuilderTest {
             feeAmount: 10,
             sender: sender,
             isExactOut: false,
-            blockTimestamp: blockTimestamp
+            blockTimestamp: blockTimestamp,
+            preferAcross: false
         });
     }
 
diff --git a/test/builder/QuarkBuilderTransfer.t.sol b/test/builder/QuarkBuilderTransfer.t.sol

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ contract TransferActionsBuilder is QuarkBuilderBase {`
`25`	`25`	`address sender;`
`26`	`26`	`address recipient;`
`27`	`27`	`uint256 blockTimestamp;`
	`28`	`+ bool preferAcross;`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`function transfer(`
`@@ -82,7 +83,7 @@ contract TransferActionsBuilder is QuarkBuilderBase {`
`82`	`83`	`useQuotecall: useQuotecall,`
`83`	`84`	`bridgeEnabled: true,`
`84`	`85`	`autoWrapperEnabled: true,`
`85`		`- preferAcross: true`
	`86`	`+ preferAcross: transferIntent.preferAcross`
`86`	`87`	`});`
`87`	`88`	`}`
`88`	`89`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ contract QuarkBuilderCometBorrowTest is Test, QuarkBuilderTest {`
`33`	`33`	`chainId: chainId,`
`34`	`34`	`collateralAmounts: collateralAmounts,`
`35`	`35`	`collateralAssetSymbols: collateralAssetSymbols,`
`36`		`- comet: cometUsdc_(1)`
	`36`	`+ comet: cometUsdc_(1),`
	`37`	`+ preferAcross: false`
`37`	`38`	`});`
`38`	`39`	`}`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ contract QuarkBuilderCometRepayTest is Test, QuarkBuilderTest {`
`34`	`34`	`collateralAmounts: collateralAmounts,`
`35`	`35`	`collateralAssetSymbols: collateralAssetSymbols,`
`36`	`36`	`comet: comet,`
`37`		`- repayer: address(0xa11ce)`
	`37`	`+ repayer: address(0xa11ce),`
	`38`	`+ preferAcross: false`
`38`	`39`	`});`
`39`	`40`	`}`
`40`	`41`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ contract QuarkBuilderCometWithdrawTest is Test, QuarkBuilderTest {`
`41`	`41`	`blockTimestamp: BLOCK_TIMESTAMP,`
`42`	`42`	`chainId: chainId,`
`43`	`43`	`comet: comet,`
`44`		`- withdrawer: withdrawer`
	`44`	`+ withdrawer: withdrawer,`
	`45`	`+ preferAcross: false`
`45`	`46`	`});`
`46`	`47`	`}`
`47`	`48`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ contract QuarkBuilderMorphoBorrowTest is Test, QuarkBuilderTest {`
`52`	`52`	`borrower: borrower,`
`53`	`53`	`chainId: chainId,`
`54`	`54`	`collateralAmount: collateralAmount,`
`55`		`- collateralAssetSymbol: collateralAssetSymbol`
	`55`	`+ collateralAssetSymbol: collateralAssetSymbol,`
	`56`	`+ preferAcross: false`
`56`	`57`	`});`
`57`	`58`	`}`
`58`	`59`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ contract QuarkBuilderMorphoClaimRewardsTest is Test, QuarkBuilderTest {`
`72`	`72`	`claimables: claimables,`
`73`	`73`	`distributors: distributors,`
`74`	`74`	`rewards: rewards,`
`75`		`- proofs: proofs`
	`75`	`+ proofs: proofs,`
	`76`	`+ preferAcross: false`
`76`	`77`	`});`
`77`	`78`	`}`
`78`	`79`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ contract QuarkBuilderMorphoRepayTest is Test, QuarkBuilderTest {`
`53`	`53`	`repayer: repayer,`
`54`	`54`	`chainId: chainId,`
`55`	`55`	`collateralAmount: collateralAmount,`
`56`		`- collateralAssetSymbol: collateralAssetSymbol`
	`56`	`+ collateralAssetSymbol: collateralAssetSymbol,`
	`57`	`+ preferAcross: false`
`57`	`58`	`});`
`58`	`59`	`}`
`59`	`60`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ contract QuarkBuilderMorphoVaultWithdrawTest is Test, QuarkBuilderTest {`
`40`	`40`	`assetSymbol: assetSymbol,`
`41`	`41`	`blockTimestamp: BLOCK_TIMESTAMP,`
`42`	`42`	`chainId: chainId,`
`43`		`- withdrawer: withdrawer`
	`43`	`+ withdrawer: withdrawer,`
	`44`	`+ preferAcross: false`
`44`	`45`	`});`
`45`	`46`	`}`
`46`	`47`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@ contract QuarkBuilderSwapTest is Test, QuarkBuilderTest {`
`92`	`92`	`feeAmount: 10,`
`93`	`93`	`sender: sender,`
`94`	`94`	`isExactOut: false,`
`95`		`- blockTimestamp: blockTimestamp`
	`95`	`+ blockTimestamp: blockTimestamp,`
	`96`	`+ preferAcross: false`
`96`	`97`	`});`
`97`	`98`	`}`
`98`	`99`