Update scripts to compilable state

compound-finance · Sep 16, 2024 · 2b91662 · 2b91662
1 parent 8e03cb1
commit 2b91662
Show file tree

Hide file tree

Showing 99 changed files with 457 additions and 280 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: "nightly-de33b6af53005037b463318d2628b5cfcaf39916"
+          version: nightly
 
       - name: Install dependencies
         run: forge install

diff --git a/foundry.toml b/foundry.toml
@@ -2,8 +2,8 @@
 src = "src"
 out = "out"
 test = "test"
-solc = "0.8.23"
-evm_version = "paris"
+solc = "0.8.27"
+evm_version = "cancun"
 bytecode_hash = "none"
 cbor_metadata = false
 

diff --git a/script/DeployQuarkScripts.s.sol b/script/DeployQuarkScripts.s.sol
@@ -1,19 +1,14 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import "forge-std/Script.sol";
 import "forge-std/console.sol";
 
 import {CodeJar} from "codejar/src/CodeJar.sol";
 
-import {QuarkWallet} from "quark-core/src/QuarkWallet.sol";
-import {QuarkStateManager} from "quark-core/src/QuarkStateManager.sol";
-
 import {Ethcall} from "quark-core-scripts/src/Ethcall.sol";
 import {Multicall} from "quark-core-scripts/src/Multicall.sol";
 
-import {QuarkWalletProxyFactory} from "quark-proxy/src/QuarkWalletProxyFactory.sol";
-
 import {
     CometSupplyActions,
     CometWithdrawActions,

diff --git a/src/BridgeScripts.sol b/src/BridgeScripts.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import {IERC20} from "openzeppelin/token/ERC20/IERC20.sol";
 import {ITokenMessenger} from "./interfaces/ITokenMessenger.sol";

diff --git a/src/ConditionalMulticall.sol b/src/ConditionalMulticall.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import "./lib/ConditionalChecker.sol";
 

diff --git a/src/DeFiScripts.sol b/src/DeFiScripts.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import {IERC20} from "openzeppelin/token/ERC20/IERC20.sol";
 import {SafeERC20} from "openzeppelin/token/ERC20/utils/SafeERC20.sol";

diff --git a/src/Ethcall.sol b/src/Ethcall.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 /**
  * @title Ethcall Core Script

diff --git a/src/GetDrip.sol b/src/GetDrip.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 // To handle loading up new accounts on stage and dev
 interface Fauceteer {

diff --git a/src/MorphoScripts.sol b/src/MorphoScripts.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import {IERC20} from "openzeppelin/token/ERC20/IERC20.sol";
 import {SafeERC20} from "openzeppelin/token/ERC20/utils/SafeERC20.sol";

diff --git a/src/Multicall.sol b/src/Multicall.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 /**
  * @title Multicall Core Script

diff --git a/src/Paycall.sol b/src/Paycall.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import "./vendor/chainlink/AggregatorV3Interface.sol";
 import "openzeppelin/token/ERC20/utils/SafeERC20.sol";

diff --git a/src/Quotecall.sol b/src/Quotecall.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import "./vendor/chainlink/AggregatorV3Interface.sol";
 import "openzeppelin/token/ERC20/utils/SafeERC20.sol";

diff --git a/src/RecurringSwap.sol b/src/RecurringSwap.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import {IERC20} from "openzeppelin/token/ERC20/IERC20.sol";
 import {SafeERC20} from "openzeppelin/token/ERC20/utils/SafeERC20.sol";
@@ -41,7 +41,7 @@ contract RecurringSwap is QuarkScript {
     uint256 public constant PRECISION_FACTOR = 1e18;
 
     /**
-     * @dev Note: This script uses the following storage layout in the QuarkStateManager:
+     * @dev Note: This script uses the following storage layout in the QuarkNonceManager:
      *         mapping(bytes32 hashedSwapConfig => uint256 nextSwapTime)
      *             where hashedSwapConfig = keccak256(SwapConfig)
      */
@@ -82,16 +82,15 @@ contract RecurringSwap is QuarkScript {
 
     /// @notice Cancel the recurring swap for the current nonce
     function cancel() external {
-        // Not explicitly clearing the nonce just cancels the replayable txn
+        // A no-op that can be called with `QuarkOperation.isReplayable = false` to cancel the
+        // replayable operation
     }
 
     /**
      * @notice Execute a swap given a configuration for a recurring swap
      * @param config The configuration for a recurring swap order
      */
     function swap(SwapConfig calldata config) public {
-        allowReplay();
-
         if (config.slippageParams.priceFeeds.length == 0) {
             revert InvalidInput();
         }

diff --git a/src/UniswapFlashLoan.sol b/src/UniswapFlashLoan.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import "openzeppelin/token/ERC20/utils/SafeERC20.sol";
 import "v3-core/contracts/interfaces/IUniswapV3Pool.sol";

diff --git a/src/UniswapFlashSwapExactOut.sol b/src/UniswapFlashSwapExactOut.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import "openzeppelin/token/ERC20/utils/SafeERC20.sol";
 import "v3-core/contracts/interfaces/callback/IUniswapV3SwapCallback.sol";

diff --git a/src/WrapperScripts.sol b/src/WrapperScripts.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import {IERC20} from "openzeppelin/token/ERC20/IERC20.sol";
 import {IWETH} from "./interfaces/IWETH.sol";

diff --git a/src/builder/Accounts.sol b/src/builder/Accounts.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.27;
 
 import {Math} from "src/lib/Math.sol";
 import {PaymentInfo} from "./PaymentInfo.sol";

diff --git a/src/builder/Actions.sol b/src/builder/Actions.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.27;
 
 import {Accounts} from "./Accounts.sol";
 import {BridgeRoutes, CCTP} from "./BridgeRoutes.sol";
@@ -593,7 +593,8 @@ library Actions {
 
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: false,
             scriptAddress: CodeJarHelper.getCodeAddress(scriptSources[0]),
             scriptCalldata: CCTP.encodeBridgeUSDC(
                 bridge.srcChainId, bridge.destinationChainId, bridge.amount, bridge.recipient, srcUSDCPositions.asset
@@ -668,7 +669,8 @@ library Actions {
 
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: false,
             scriptAddress: CodeJarHelper.getCodeAddress(type(CometSupplyMultipleAssetsAndBorrow).creationCode),
             scriptCalldata: scriptCalldata,
             scriptSources: scriptSources,
@@ -742,7 +744,8 @@ library Actions {
 
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: false,
             scriptAddress: CodeJarHelper.getCodeAddress(type(CometRepayAndWithdrawMultipleAssets).creationCode),
             scriptCalldata: scriptCalldata,
             scriptSources: scriptSources,
@@ -804,7 +807,8 @@ library Actions {
         }
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: false,
             scriptAddress: CodeJarHelper.getCodeAddress(type(CometSupplyActions).creationCode),
             scriptCalldata: scriptCalldata,
             scriptSources: scriptSources,
@@ -863,7 +867,8 @@ library Actions {
         }
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: false,
             scriptAddress: CodeJarHelper.getCodeAddress(type(CometWithdrawActions).creationCode),
             scriptCalldata: scriptCalldata,
             scriptSources: scriptSources,
@@ -925,7 +930,8 @@ library Actions {
         }
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: false,
             scriptAddress: CodeJarHelper.getCodeAddress(type(TransferActions).creationCode),
             scriptCalldata: scriptCalldata,
             scriptSources: scriptSources,
@@ -987,7 +993,8 @@ library Actions {
 
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: false,
             scriptAddress: CodeJarHelper.getCodeAddress(type(MorphoActions).creationCode),
             scriptCalldata: scriptCalldata,
             scriptSources: scriptSources,
@@ -1054,7 +1061,8 @@ library Actions {
 
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: false,
             scriptAddress: CodeJarHelper.getCodeAddress(type(MorphoActions).creationCode),
             scriptCalldata: scriptCalldata,
             scriptSources: scriptSources,
@@ -1118,7 +1126,8 @@ library Actions {
 
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: false,
             scriptAddress: CodeJarHelper.getCodeAddress(type(MorphoVaultActions).creationCode),
             scriptCalldata: scriptCalldata,
             scriptSources: scriptSources,
@@ -1175,7 +1184,8 @@ library Actions {
 
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: false,
             scriptAddress: CodeJarHelper.getCodeAddress(type(MorphoVaultActions).creationCode),
             scriptCalldata: scriptCalldata,
             scriptSources: scriptSources,
@@ -1226,7 +1236,8 @@ library Actions {
         Accounts.QuarkState memory accountState = Accounts.findQuarkState(wrapOrUnwrap.sender, accounts.quarkStates);
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: false,
             scriptAddress: CodeJarHelper.getCodeAddress(type(WrapperActions).creationCode),
             scriptCalldata: TokenWrapper.encodeActionToWrapOrUnwrap(
                 wrapOrUnwrap.chainId, wrapOrUnwrap.assetSymbol, wrapOrUnwrap.amount
@@ -1296,7 +1307,8 @@ library Actions {
 
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: false,
             scriptAddress: CodeJarHelper.getCodeAddress(type(ApproveAndSwap).creationCode),
             scriptCalldata: scriptCalldata,
             scriptSources: scriptSources,
@@ -1385,7 +1397,8 @@ library Actions {
 
         // Construct QuarkOperation
         IQuarkWallet.QuarkOperation memory quarkOperation = IQuarkWallet.QuarkOperation({
-            nonce: accountState.quarkNextNonce,
+            nonce: bytes32(uint256(accountState.quarkNextNonce)),
+            isReplayable: true,
             scriptAddress: CodeJarHelper.getCodeAddress(type(RecurringSwap).creationCode),
             scriptCalldata: scriptCalldata,
             scriptSources: scriptSources,

diff --git a/src/builder/BridgeRoutes.sol b/src/builder/BridgeRoutes.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.27;
 
 import {QuarkBuilder} from "./QuarkBuilder.sol";
 import {CCTPBridgeActions} from "../BridgeScripts.sol";

diff --git a/src/builder/CodeJarHelper.sol b/src/builder/CodeJarHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.27;
 
 library CodeJarHelper {
     /* ===== Constants ===== */

diff --git a/src/builder/EIP712Helper.sol b/src/builder/EIP712Helper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import {IQuarkWallet} from "quark-core/src/interfaces/IQuarkWallet.sol";
 import {QuarkWalletMetadata} from "quark-core/src/QuarkWallet.sol";

diff --git a/src/builder/Errors.sol b/src/builder/Errors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 /// Library of shared errors used across Quark Builder files
 library Errors {

diff --git a/src/builder/HashMap.sol b/src/builder/HashMap.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import {List} from "./List.sol";
 

diff --git a/src/builder/List.sol b/src/builder/List.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.23;
+pragma solidity 0.8.27;
 
 import {IQuarkWallet} from "quark-core/src/interfaces/IQuarkWallet.sol";
 import {Actions} from "./Actions.sol";

diff --git a/src/builder/MorphoInfo.sol b/src/builder/MorphoInfo.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.27;
 
 import {MarketParams} from "src/interfaces/IMorpho.sol";
 import {HashMap} from "./HashMap.sol";

diff --git a/src/builder/PaycallWrapper.sol b/src/builder/PaycallWrapper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.27;
 
 import {CodeJarHelper} from "./CodeJarHelper.sol";
 import {IQuarkWallet} from "quark-core/src/interfaces/IQuarkWallet.sol";
@@ -25,6 +25,7 @@ library PaycallWrapper {
 
         return IQuarkWallet.QuarkOperation({
             nonce: operation.nonce,
+            isReplayable: operation.isReplayable,
             scriptAddress: CodeJarHelper.getCodeAddress(paycallSource),
             scriptCalldata: abi.encodeWithSelector(
                 Paycall.run.selector, operation.scriptAddress, operation.scriptCalldata, maxPaymentCost

diff --git a/src/builder/PaymentInfo.sol b/src/builder/PaymentInfo.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.27;
 
 import {Strings} from "./Strings.sol";
 

diff --git a/src/builder/PriceFeeds.sol b/src/builder/PriceFeeds.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.27;
 
 import {Strings} from "./Strings.sol";
 

diff --git a/src/builder/QuarkBuilder.sol b/src/builder/QuarkBuilder.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.27;
 
 import {IQuarkWallet} from "quark-core/src/interfaces/IQuarkWallet.sol";
 

diff --git a/src/builder/QuarkBuilderHelper.sol b/src/builder/QuarkBuilderHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.27;
 
 import {BridgeRoutes} from "./BridgeRoutes.sol";