Merge pull request #72 from FastLane-Labs/gas-surcharge-test

Gas surcharge flashloan test

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "solidity.packageDefaultDependenciesContractsDirectory": "src",
   "solidity.packageDefaultDependenciesDirectory": "lib",
-  "solidity.compileUsingRemoteVersion": "v0.8.21",
+  "solidity.compileUsingRemoteVersion": "v0.8.22+commit.4fc1097e",
   "solidity.formatter": "forge",
   "search.exclude": { "lib": true },
   "files.associations": {

foundry.toml

@@ -5,7 +5,7 @@
   block_gas_limit = 300000000
   gas_limit = 3000000000
   gas_price = 1500000000
-  solc_version = "0.8.21"
+  solc_version = "0.8.22"
   evm_version = 'paris'
   gas_reports = ["Atlas", "AtlasVerification", "Simulator", "ExecutionEnvironment"]
 

script/base/deploy-base.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";

script/deploy-atlas.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";

script/deploy-exec-env.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";

script/deploy-solver.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";

script/deploy-swap-intent-control.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";

script/deploy-tx-builder.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";

script/log-balances.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";

script/solver-deposit.s.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";

src/contracts/atlas/AtlETH.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { SafeTransferLib } from "solmate/utils/SafeTransferLib.sol";
 

src/contracts/atlas/Atlas.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IExecutionEnvironment } from "../interfaces/IExecutionEnvironment.sol";
 import { IDAppControl } from "../interfaces/IDAppControl.sol";

src/contracts/atlas/AtlasVerification.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "openzeppelin-contracts/contracts/utils/cryptography/EIP712.sol";
 

src/contracts/atlas/DAppIntegration.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IDAppControl } from "../interfaces/IDAppControl.sol";
 

src/contracts/atlas/Escrow.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IExecutionEnvironment } from "../interfaces/IExecutionEnvironment.sol";
 
@@ -18,6 +18,8 @@ import { EscrowBits } from "../libraries/EscrowBits.sol";
 import { CallBits } from "../libraries/CallBits.sol";
 import { SafetyBits } from "../libraries/SafetyBits.sol";
 
+import "forge-std/Test.sol";
+
 // import "forge-std/Test.sol";
 
 abstract contract Escrow is AtlETH {

src/contracts/atlas/ExecutionEnvironment.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { ISolverContract } from "../interfaces/ISolverContract.sol";
 import { ISafetyLocks } from "../interfaces/ISafetyLocks.sol";

src/contracts/atlas/Factory.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IDAppControl } from "../interfaces/IDAppControl.sol";
 import { Mimic } from "./Mimic.sol";

src/contracts/atlas/GasAccounting.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { SafetyLocks } from "../atlas/SafetyLocks.sol";
 

src/contracts/atlas/Mimic.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 contract Mimic {
     /*

src/contracts/atlas/SafetyLocks.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { SafetyBits } from "../libraries/SafetyBits.sol";
 import { CallBits } from "../libraries/CallBits.sol";

src/contracts/atlas/Storage.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../types/EscrowTypes.sol";
 import "../types/LockTypes.sol";

src/contracts/common/ExecutionBase.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IPermit69 } from "../interfaces/IPermit69.sol";
 import { ISafetyLocks } from "../interfaces/ISafetyLocks.sol";

src/contracts/common/Permit69.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { SafeTransferLib, ERC20 } from "solmate/utils/SafeTransferLib.sol";
 

src/contracts/dapp/ControlTemplate.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../types/SolverCallTypes.sol";
 import "../types/UserCallTypes.sol";

src/contracts/dapp/DAppControl.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { ExecutionPhase } from "../types/LockTypes.sol";
 

src/contracts/examples/intents-example/StateIntent.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 // Base Imports
 import { SafeTransferLib, ERC20 } from "solmate/utils/SafeTransferLib.sol";

src/contracts/examples/intents-example/SwapIntent.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 // Base Imports
 import { SafeTransferLib, ERC20 } from "solmate/utils/SafeTransferLib.sol";

src/contracts/examples/v2-example/V2DAppControl.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 // Base Imports
 import { SafeTransferLib, ERC20 } from "solmate/utils/SafeTransferLib.sol";

src/contracts/examples/v4-example/IHooks.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IPoolManager } from "./IPoolManager.sol";
 

src/contracts/examples/v4-example/IPoolManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IHooks } from "./IHooks.sol";
 

src/contracts/examples/v4-example/UniV4Hook.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 // Base Imports
 import { SafeTransferLib, ERC20 } from "solmate/utils/SafeTransferLib.sol";

src/contracts/examples/v4-example/V4DAppControl.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 // Base Imports
 import { SafeTransferLib, ERC20 } from "solmate/utils/SafeTransferLib.sol";

src/contracts/helpers/Simulator.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IAtlas } from "../interfaces/IAtlas.sol";
 

src/contracts/helpers/Sorter.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IDAppControl } from "../interfaces/IDAppControl.sol";
 import { IAtlETH } from "../interfaces/IAtlETH.sol";

src/contracts/helpers/TxBuilder.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IDAppControl } from "../interfaces/IDAppControl.sol";
 import { IDAppIntegration } from "../interfaces/IDAppIntegration.sol";
@@ -82,7 +82,8 @@ contract TxBuilder {
         bytes memory solverOpData,
         address solverEOA,
         address solverContract,
-        uint256 bidAmount
+        uint256 bidAmount,
+        uint256 value
     )
         public
         view
@@ -91,7 +92,7 @@ contract TxBuilder {
         solverOp = SolverOperation({
             from: solverEOA,
             to: atlas,
-            value: 0,
+            value: value,
             gas: gas,
             maxFeePerGas: userOp.maxFeePerGas,
             deadline: userOp.deadline,

src/contracts/helpers/Utilities.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";

src/contracts/interfaces/IAtlETH.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 interface IAtlETH {
     function deposit() external payable;

src/contracts/interfaces/IAtlas.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../types/SolverCallTypes.sol";
 import "../types/UserCallTypes.sol";

src/contracts/interfaces/IAtlasVerification.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../types/UserCallTypes.sol";
 import "../types/DAppApprovalTypes.sol";

src/contracts/interfaces/IDAppControl.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../types/UserCallTypes.sol";
 import "../types/SolverCallTypes.sol";

src/contracts/interfaces/IDAppIntegration.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 interface IDAppIntegration {
     function initializeGovernance(address controller) external;

src/contracts/interfaces/IEscrow.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { Party } from "../types/EscrowTypes.sol";
 

src/contracts/interfaces/IExecutionEnvironment.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../types/SolverCallTypes.sol";
 import "../types/UserCallTypes.sol";

src/contracts/interfaces/IFactory.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { DAppConfig } from "src/contracts/types/DAppApprovalTypes.sol";
 import { UserOperation } from "../types/UserCallTypes.sol";

src/contracts/interfaces/IPermit69.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 interface IPermit69 {
     // NOTE: IPermit69 only works inside of the Atlas environment - specifically

src/contracts/interfaces/ISafetyLocks.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../types/SolverCallTypes.sol";
 import "../types/UserCallTypes.sol";

src/contracts/interfaces/ISimulator.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../types/SolverCallTypes.sol";
 import "../types/UserCallTypes.sol";

src/contracts/interfaces/ISolverContract.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../types/SolverCallTypes.sol";
 

src/contracts/libraries/CallBits.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IDAppControl } from "../interfaces/IDAppControl.sol";
 

src/contracts/libraries/CallVerification.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import { IDAppControl } from "../interfaces/IDAppControl.sol";
 

src/contracts/libraries/EscrowBits.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../types/EscrowTypes.sol";
 

src/contracts/libraries/SafetyBits.sol

@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.21;
+pragma solidity 0.8.22;
 
 import "../types/LockTypes.sol";