feat: Atlas v1.1

LICENSE

@@ -9,14 +9,10 @@ Parameters
 
 Licensor:             Fastlane Labs
 
-Licensed Work:        FastLane Protocol
-                      The Licensed Work is (c) 2023 Fastlane Labs
+Licensed Work:        Atlas Protocol
+                      The Licensed Work is (c) 2024 Fastlane Labs
 
-Additional Use Grant: Any uses listed and defined at
-                      fastlane-protocol-license.fastlane.finance
-
-Change Date:          The earlier of 2025-07-01 or a date specified at
-                      fastlane-protocol-license.fastlane.finance
+Change Date:          2026-07-01
 
 Change License:       GNU General Public License v2.0 or later
 

package.json

@@ -60,6 +60,8 @@
       "solver-deposit": "source .env && forge script script/solver-deposit.s.sol:SolverAtlasDepositScript --fork-url http://localhost:8545 --broadcast --non-interactive",
       "setup-demo": "npm run deploy-atlas-swap-intent-tx-builder && npm run deploy-solver && npm run solver-deposit",
 
+      "deploy-gas-calculator-base": "source .env && forge script script/deploy-gas-calculator.s.sol:DeployGasCalculatorScript --rpc-url ${BASE_RPC_URL} --broadcast --etherscan-api-key ${ETHERSCAN_API_KEY} --verify",
+
       "atlas-addr": "echo 'ATLAS:' && jq -r '.ATLAS' deployments.json",
       "swap-intent-addr": "echo 'SWAP INTENT DAPP CONTROL:' && jq -r '.SWAP_INTENT_DAPP_CONTROL' deployments.json",
       "tx-builder-addr": "echo 'TX BUILDER:' && jq -r '.TX_BUILDER' deployments.json",

script/base/deploy-base.s.sol

@@ -7,15 +7,15 @@ import "forge-std/StdJson.sol";
 
 import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 
-import { Atlas } from "src/contracts/atlas/Atlas.sol";
-import { AtlasVerification } from "src/contracts/atlas/AtlasVerification.sol";
-import { SwapIntentDAppControl } from "src/contracts/examples/intents-example/SwapIntentDAppControl.sol";
-import { TxBuilder } from "src/contracts/helpers/TxBuilder.sol";
-import { Simulator } from "src/contracts/helpers/Simulator.sol";
-import { Sorter } from "src/contracts/helpers/Sorter.sol";
-import { SimpleRFQSolver } from "test/SwapIntent.t.sol";
-
-import { Utilities } from "src/contracts/helpers/Utilities.sol";
+import { Atlas } from "../../src/contracts/atlas/Atlas.sol";
+import { AtlasVerification } from "../../src/contracts/atlas/AtlasVerification.sol";
+import { SwapIntentDAppControl } from "../../src/contracts/examples/intents-example/SwapIntentDAppControl.sol";
+import { TxBuilder } from "../../src/contracts/helpers/TxBuilder.sol";
+import { Simulator } from "../../src/contracts/helpers/Simulator.sol";
+import { Sorter } from "../../src/contracts/helpers/Sorter.sol";
+import { SimpleRFQSolver } from "../../test/SwapIntent.t.sol";
+
+import { Utilities } from "../../src/contracts/helpers/Utilities.sol";
 
 contract DeployBaseScript is Script {
     using stdJson for string;

script/create-oev-demo-positions.s.sol

@@ -6,11 +6,11 @@ import "forge-std/Test.sol";
 
 import { DeployBaseScript } from "script/base/deploy-base.s.sol";
 
-import { ChainlinkDAppControl } from "src/contracts/examples/oev-example/ChainlinkDAppControl.sol";
-import { ChainlinkAtlasWrapper } from "src/contracts/examples/oev-example/ChainlinkAtlasWrapper.sol";
+import { ChainlinkDAppControl } from "../src/contracts/examples/oev-example/ChainlinkDAppControl.sol";
+import { ChainlinkAtlasWrapper } from "../src/contracts/examples/oev-example/ChainlinkAtlasWrapper.sol";
 
-import { Token } from "src/contracts/helpers/DemoToken.sol";
-import { DemoLendingProtocol } from "src/contracts/helpers/DemoLendingProtocol.sol";
+import { Token } from "../src/contracts/helpers/DemoToken.sol";
+import { DemoLendingProtocol } from "../src/contracts/helpers/DemoLendingProtocol.sol";
 
 // Sets up a few liquidatable positions in the Lending Protocol. ETH for gas fees distributed by Lending Gov.
 contract CreateOEVDemoPositionsScript is DeployBaseScript {

script/deploy-atlas.s.sol

@@ -4,16 +4,20 @@ pragma solidity 0.8.25;
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";
 
-import { DeployBaseScript } from "script/base/deploy-base.s.sol";
+import { DeployBaseScript } from "./base/deploy-base.s.sol";
 
-import { Atlas } from "src/contracts/atlas/Atlas.sol";
-import { AtlasVerification } from "src/contracts/atlas/AtlasVerification.sol";
-import { TxBuilder } from "src/contracts/helpers/TxBuilder.sol";
-import { Simulator } from "src/contracts/helpers/Simulator.sol";
-import { Sorter } from "src/contracts/helpers/Sorter.sol";
-import { ExecutionEnvironment } from "src/contracts/common/ExecutionEnvironment.sol";
+import { Atlas } from "../src/contracts/atlas/Atlas.sol";
+import { AtlasVerification } from "../src/contracts/atlas/AtlasVerification.sol";
+import { TxBuilder } from "../src/contracts/helpers/TxBuilder.sol";
+import { Simulator } from "../src/contracts/helpers/Simulator.sol";
+import { Sorter } from "../src/contracts/helpers/Sorter.sol";
+import { ExecutionEnvironment } from "../src/contracts/common/ExecutionEnvironment.sol";
 
 contract DeployAtlasScript is DeployBaseScript {
+    uint256 ESCROW_DURATION = 64;
+    uint256 ATLAS_SURCHARGE_RATE = 1_000_000; // 10%
+    uint256 BUNDLER_SURCHARGE_RATE = 1_000_000; // 10%
+
     function run() external {
         console.log("\n=== DEPLOYING Atlas ===\n");
 
@@ -37,7 +41,9 @@ contract DeployAtlasScript is DeployBaseScript {
 
         ExecutionEnvironment execEnvTemplate = new ExecutionEnvironment(expectedAtlasAddr);
         atlas = new Atlas({
-            escrowDuration: 64,
+            escrowDuration: ESCROW_DURATION,
+            atlasSurchargeRate: ATLAS_SURCHARGE_RATE,
+            bundlerSurchargeRate: BUNDLER_SURCHARGE_RATE,
             verification: expectedAtlasVerificationAddr,
             simulator: expectedSimulatorAddr,
             executionTemplate: address(execEnvTemplate),

script/deploy-demo-tokens.s.sol

@@ -6,12 +6,12 @@ import "forge-std/Test.sol";
 
 import { DeployBaseScript } from "script/base/deploy-base.s.sol";
 
-import { Atlas } from "src/contracts/atlas/Atlas.sol";
-import { AtlasVerification } from "src/contracts/atlas/AtlasVerification.sol";
-import { V2RewardDAppControl } from "src/contracts/examples/v2-example-router/V2RewardDAppControl.sol";
-import { IUniswapV2Router02 } from "src/contracts/examples/v2-example-router/interfaces/IUniswapV2Router.sol";
+import { Atlas } from "../src/contracts/atlas/Atlas.sol";
+import { AtlasVerification } from "../src/contracts/atlas/AtlasVerification.sol";
+import { V2RewardDAppControl } from "../src/contracts/examples/v2-example-router/V2RewardDAppControl.sol";
+import { IUniswapV2Router02 } from "../src/contracts/examples/v2-example-router/interfaces/IUniswapV2Router.sol";
 
-import { Token } from "src/contracts/helpers/DemoToken.sol";
+import { Token } from "../src/contracts/helpers/DemoToken.sol";
 import { WETH } from "solady/tokens/WETH.sol";
 
 // Deploy 3 stablecoin tokens (DAI, USDA, USDB) - all 18 decimals

script/deploy-exec-env.s.sol

@@ -4,9 +4,9 @@ pragma solidity 0.8.25;
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";
 
-import { DeployBaseScript } from "script/base/deploy-base.s.sol";
+import { DeployBaseScript } from "./base/deploy-base.s.sol";
 
-import { ExecutionEnvironment } from "src/contracts/common/ExecutionEnvironment.sol";
+import { ExecutionEnvironment } from "../src/contracts/common/ExecutionEnvironment.sol";
 
 contract DeployExecEnvScript is DeployBaseScript {
     ExecutionEnvironment public execEnv;

script/deploy-fl-online-control.s.sol

@@ -4,11 +4,11 @@ pragma solidity 0.8.25;
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";
 
-import { DeployBaseScript } from "script/base/deploy-base.s.sol";
+import { DeployBaseScript } from "./base/deploy-base.s.sol";
 
-import { Atlas } from "src/contracts/atlas/Atlas.sol";
-import { AtlasVerification } from "src/contracts/atlas/AtlasVerification.sol";
-import { FastLaneOnlineOuter } from "src/contracts/examples/fastlane-online/FastLaneOnlineOuter.sol";
+import { Atlas } from "../src/contracts/atlas/Atlas.sol";
+import { AtlasVerification } from "../src/contracts/atlas/AtlasVerification.sol";
+import { FastLaneOnlineOuter } from "../src/contracts/examples/fastlane-online/FastLaneOnlineOuter.sol";
 
 contract DeployFLOnlineControlScript is DeployBaseScript {
     FastLaneOnlineOuter flOnline;

script/deploy-gas-calculator.s.sol

@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.25;
+
+import "forge-std/Test.sol";
+
+import { DeployBaseScript } from "script/base/deploy-base.s.sol";
+import { BaseGasCalculator } from "src/contracts/gasCalculator/BaseGasCalculator.sol";
+
+contract DeployGasCalculatorScript is DeployBaseScript {
+    // NOTE: Adjust the constructor parameters as needed here:
+    // - BASE_GAS_PRICE_ORACLE: The address of the gas price oracle contract
+    // - BASE_CALLDATA_LENGTH_OFFSET: The offset to be applied to the calldata length (can be negative or positive)
+    // -----------------------------------------------------------------------------------------------
+    address constant BASE_GAS_PRICE_ORACLE = address(0x420000000000000000000000000000000000000F);
+    int256 constant BASE_CALLDATA_LENGTH_OFFSET = 0; // can be negative or positive
+    // -----------------------------------------------------------------------------------------------
+
+    function run() external {
+        console.log("\n=== DEPLOYING GasCalculator ===\n");
+
+        console.log("Deploying to chain: \t\t", _getDeployChain());
+
+        uint256 deployerPrivateKey = vm.envUint("GOV_PRIVATE_KEY");
+        address deployer = vm.addr(deployerPrivateKey);
+
+        console.log("Deployer address: \t\t", deployer);
+
+        uint256 chainId = block.chainid;
+        address deploymentAddr;
+
+        vm.startBroadcast(deployerPrivateKey);
+
+        if (chainId == 8453 || chainId == 84_532) {
+            // Base or Base Sepolia
+            BaseGasCalculator gasCalculator = new BaseGasCalculator({
+                gasPriceOracle: BASE_GAS_PRICE_ORACLE,
+                calldataLenOffset: BASE_CALLDATA_LENGTH_OFFSET
+            });
+            deploymentAddr = address(gasCalculator);
+        } else {
+            revert("Error: Chain ID not supported");
+        }
+
+        vm.stopBroadcast();
+
+        _writeAddressToDeploymentsJson("L2_GAS_CALCULATOR", deploymentAddr);
+
+        console.log("\n");
+        console.log("-------------------------------------------------------------------------------");
+        console.log("| Contract                    | Address                                       |");
+        console.log("-------------------------------------------------------------------------------");
+        console.log("| L2_GAS_CALCULATOR (Base)    | ", address(deploymentAddr), "  |");
+        console.log("-------------------------------------------------------------------------------");
+        console.log("\n");
+        console.log("You can find a list of contract addresses from the latest deployment in deployments.json");
+    }
+}

script/deploy-oev-demo.s.sol

@@ -4,15 +4,15 @@ pragma solidity 0.8.25;
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";
 
-import { DeployBaseScript } from "script/base/deploy-base.s.sol";
+import { DeployBaseScript } from "./base/deploy-base.s.sol";
 
-import { Atlas } from "src/contracts/atlas/Atlas.sol";
-import { AtlasVerification } from "src/contracts/atlas/AtlasVerification.sol";
-import { ChainlinkDAppControl } from "src/contracts/examples/oev-example/ChainlinkDAppControl.sol";
-import { ChainlinkAtlasWrapper } from "src/contracts/examples/oev-example/ChainlinkAtlasWrapper.sol";
+import { Atlas } from "../src/contracts/atlas/Atlas.sol";
+import { AtlasVerification } from "../src/contracts/atlas/AtlasVerification.sol";
+import { ChainlinkDAppControl } from "../src/contracts/examples/oev-example/ChainlinkDAppControl.sol";
+import { ChainlinkAtlasWrapper } from "../src/contracts/examples/oev-example/ChainlinkAtlasWrapper.sol";
 
-import { Token } from "src/contracts/helpers/DemoToken.sol";
-import { DemoLendingProtocol } from "src/contracts/helpers/DemoLendingProtocol.sol";
+import { Token } from "../src/contracts/helpers/DemoToken.sol";
+import { DemoLendingProtocol } from "../src/contracts/helpers/DemoLendingProtocol.sol";
 
 contract DeployOEVDemoScript is DeployBaseScript {
     address public constant CHAINLINK_ETH_USD = 0x694AA1769357215DE4FAC081bf1f309aDC325306; // on Sepolia

script/deploy-sorter.s.sol

@@ -4,9 +4,9 @@ pragma solidity 0.8.25;
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";
 
-import { DeployBaseScript } from "script/base/deploy-base.s.sol";
+import { DeployBaseScript } from "./base/deploy-base.s.sol";
 
-import { Sorter } from "src/contracts/helpers/Sorter.sol";
+import { Sorter } from "../src/contracts/helpers/Sorter.sol";
 
 contract DeploySorterScript is DeployBaseScript {
     function run() external {

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

@@ -4,13 +4,13 @@ pragma solidity 0.8.25;
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";
 
-import { DeployBaseScript } from "script/base/deploy-base.s.sol";
+import { DeployBaseScript } from "./base/deploy-base.s.sol";
 
-import { Atlas } from "src/contracts/atlas/Atlas.sol";
-import { AtlasVerification } from "src/contracts/atlas/AtlasVerification.sol";
-import { SwapIntentDAppControl } from "src/contracts/examples/intents-example/SwapIntentDAppControl.sol";
-import { TxBuilder } from "src/contracts/helpers/TxBuilder.sol";
-import { Simulator } from "src/contracts/helpers/Simulator.sol";
+import { Atlas } from "../src/contracts/atlas/Atlas.sol";
+import { AtlasVerification } from "../src/contracts/atlas/AtlasVerification.sol";
+import { SwapIntentDAppControl } from "../src/contracts/examples/intents-example/SwapIntentDAppControl.sol";
+import { TxBuilder } from "../src/contracts/helpers/TxBuilder.sol";
+import { Simulator } from "../src/contracts/helpers/Simulator.sol";
 
 contract DeploySwapIntentControlScript is DeployBaseScript {
     function run() external {

script/deploy-tx-builder.s.sol

@@ -4,12 +4,12 @@ pragma solidity 0.8.25;
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";
 
-import { DeployBaseScript } from "script/base/deploy-base.s.sol";
+import { DeployBaseScript } from "./base/deploy-base.s.sol";
 
-import { Atlas } from "src/contracts/atlas/Atlas.sol";
-import { AtlasVerification } from "src/contracts/atlas/AtlasVerification.sol";
-import { TxBuilder } from "src/contracts/helpers/TxBuilder.sol";
-import { Simulator } from "src/contracts/helpers/Simulator.sol";
+import { Atlas } from "../src/contracts/atlas/Atlas.sol";
+import { AtlasVerification } from "../src/contracts/atlas/AtlasVerification.sol";
+import { TxBuilder } from "../src/contracts/helpers/TxBuilder.sol";
+import { Simulator } from "../src/contracts/helpers/Simulator.sol";
 
 contract DeployTxBuilderScript is DeployBaseScript {
     function run() external {

script/deploy-v2-reward-control.s.sol

@@ -4,11 +4,11 @@ pragma solidity 0.8.25;
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";
 
-import { DeployBaseScript } from "script/base/deploy-base.s.sol";
+import { DeployBaseScript } from "./base/deploy-base.s.sol";
 
-import { Atlas } from "src/contracts/atlas/Atlas.sol";
-import { AtlasVerification } from "src/contracts/atlas/AtlasVerification.sol";
-import { V2RewardDAppControl } from "src/contracts/examples/v2-example-router/V2RewardDAppControl.sol";
+import { Atlas } from "../src/contracts/atlas/Atlas.sol";
+import { AtlasVerification } from "../src/contracts/atlas/AtlasVerification.sol";
+import { V2RewardDAppControl } from "../src/contracts/examples/v2-example-router/V2RewardDAppControl.sol";
 
 contract DeployV2RewardControlScript is DeployBaseScript {
     V2RewardDAppControl v2RewardControl;

script/mint-demo-tokens.s.sol

@@ -4,8 +4,8 @@ pragma solidity 0.8.25;
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";
 
-import { DeployBaseScript } from "script/base/deploy-base.s.sol";
-import { Token } from "src/contracts/helpers/DemoToken.sol";
+import { DeployBaseScript } from "./base/deploy-base.s.sol";
+import { Token } from "../src/contracts/helpers/DemoToken.sol";
 import { WETH } from "solady/tokens/WETH.sol";
 
 contract MintDemoTokensScript is DeployBaseScript {

script/set-oev-demo-signers.s.sol

@@ -4,13 +4,13 @@ pragma solidity 0.8.25;
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";
 
-import { DeployBaseScript } from "script/base/deploy-base.s.sol";
+import { DeployBaseScript } from "./base/deploy-base.s.sol";
 
-import { ChainlinkDAppControl } from "src/contracts/examples/oev-example/ChainlinkDAppControl.sol";
-import { ChainlinkAtlasWrapper } from "src/contracts/examples/oev-example/ChainlinkAtlasWrapper.sol";
+import { ChainlinkDAppControl } from "../src/contracts/examples/oev-example/ChainlinkDAppControl.sol";
+import { ChainlinkAtlasWrapper } from "../src/contracts/examples/oev-example/ChainlinkAtlasWrapper.sol";
 
-import { Token } from "src/contracts/helpers/DemoToken.sol";
-import { DemoLendingProtocol } from "src/contracts/helpers/DemoLendingProtocol.sol";
+import { Token } from "../src/contracts/helpers/DemoToken.sol";
+import { DemoLendingProtocol } from "../src/contracts/helpers/DemoLendingProtocol.sol";
 
 // For the Chainlink OEV demo, when its difficult to find a real `transmit()` tx with a low enough ETH price.
 // We replace the real Sepolia Chainlink ETH/USD signers with a set of test signers, in ChainlinkDAppControl.

script/solver-deposit.s.sol

@@ -5,9 +5,9 @@ import "forge-std/Script.sol";
 import "forge-std/Test.sol";
 import "forge-std/StdJson.sol";
 
-import { DeployBaseScript } from "script/base/deploy-base.s.sol";
+import { DeployBaseScript } from "./base/deploy-base.s.sol";
 
-import { Atlas } from "src/contracts/atlas/Atlas.sol";
+import { Atlas } from "../src/contracts/atlas/Atlas.sol";
 
 // NOTE: When handling JSON with StdJson, prefix keys with '.' e.g. '.ATLAS'
 

src/contracts/atlas/AtlETH.sol

@@ -3,20 +3,30 @@ pragma solidity 0.8.25;
 
 import { SafeTransferLib } from "solady/utils/SafeTransferLib.sol";
 import { SafeCast } from "openzeppelin-contracts/contracts/utils/math/SafeCast.sol";
-import { Permit69 } from "src/contracts/atlas/Permit69.sol";
-import "src/contracts/types/EscrowTypes.sol";
+import { Permit69 } from "./Permit69.sol";
+import "../types/EscrowTypes.sol";
 
 /// @author FastLane Labs
 /// @dev Do not manually set balances without updating totalSupply, as the sum of all user balances must not exceed it.
 abstract contract AtlETH is Permit69 {
     constructor(
         uint256 escrowDuration,
+        uint256 atlasSurchargeRate,
+        uint256 bundlerSurchargeRate,
         address verification,
         address simulator,
         address initialSurchargeRecipient,
         address l2GasCalculator
     )
-        Permit69(escrowDuration, verification, simulator, initialSurchargeRecipient, l2GasCalculator)
+        Permit69(
+            escrowDuration,
+            atlasSurchargeRate,
+            bundlerSurchargeRate,
+            verification,
+            simulator,
+            initialSurchargeRecipient,
+            l2GasCalculator
+        )
     { }
 
     /*//////////////////////////////////////////////////////////////