Merge pull request #453 from FastLane-Labs/base-sepolia-deployment

feat: base sepolia deployment
FastLane-Labs · Nov 13, 2024 · 1b7df52 · 1b7df52
2 parents ee19471 + 3eb1d58
commit 1b7df52
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/deployments.json b/deployments.json
@@ -54,11 +54,18 @@
     "SORTER": "",
     "FL_ONLINE_DAPP_CONTROL": ""
   },
+  "BASE SEPOLIA": {
+    "ATLAS": "0xa55051bd82eFeA1dD487875C84fE9c016859659B",
+    "ATLAS_VERIFICATION": "0xf0E388C7DFfE14a61280a4E5b84d77be3d2875e3",
+    "SIMULATOR": "0xD72D821dA82964c0546a5501347a3959808E072f",
+    "SORTER": "0xAb665f032e6A20Ef7D43FfD4E92a2f4fd6d5771e",
+    "L2_GAS_CALCULATOR": "0x3b7B38362bB7E2F000Cd2432343F3483F785F435"
+  },
   "BASE": {
     "ATLAS": "0x3efbaBE0ee916A4677D281c417E895a3e7411Ac2",
     "ATLAS_VERIFICATION": "0x16839b7Bb46136B204Bcb7eA71c9226952c02b34",
     "SIMULATOR": "0xa55051bd82eFeA1dD487875C84fE9c016859659B",
     "SORTER": "0xD72D821dA82964c0546a5501347a3959808E072f",
     "L2_GAS_CALCULATOR": "0xf9436C4b1353D5B411AD5bb65B9826f34737BbC7"
   }
-}
+}
diff --git a/package.json b/package.json
@@ -23,6 +23,8 @@
 
       "deploy-atlas-bsc": "source .env && forge script script/deploy-atlas.s.sol:DeployAtlasScript --rpc-url ${BSC_RPC_URL} --legacy --broadcast --etherscan-api-key ${BSCSCAN_API_KEY} --verify --delay 30",
       "deploy-atlas-bsc-testnet": "source .env && forge script script/deploy-atlas.s.sol:DeployAtlasScript --rpc-url ${BSC_TESTNET_RPC_URL} --legacy --broadcast --etherscan-api-key ${BSCSCAN_API_KEY} --verify --delay 30",
+
+      "deploy-atlas-base-sepolia": "source .env && forge script script/deploy-atlas.s.sol:DeployAtlasScript --rpc-url ${BASE_SEPOLIA_RPC_URL} --legacy --broadcast --etherscan-api-key ${BASESCAN_API_KEY} --verify --delay 30",
 
       "deploy-atlas-sepolia": "source .env && forge script script/deploy-atlas.s.sol:DeployAtlasScript --rpc-url ${SEPOLIA_RPC_URL} --legacy --gas-estimate-multiplier 150 --broadcast --etherscan-api-key ${ETHERSCAN_API_KEY} --verify --delay 30",
       "deploy-atlas-local": "source .env && forge script script/deploy-atlas.s.sol:DeployAtlasScript --fork-url http://localhost:8545 --broadcast",
@@ -62,7 +64,7 @@
       "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",
+      "deploy-gas-calculator-base": "source .env && forge script script/deploy-gas-calculator.s.sol:DeployGasCalculatorScript --rpc-url ${BASE_RPC_URL} --broadcast --etherscan-api-key ${BASESCAN_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",

diff --git a/src/contracts/gasCalculator/BaseGasCalculator.sol b/src/contracts/gasCalculator/BaseGasCalculator.sol
@@ -1,7 +1,7 @@
 //SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.28;
 
-import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
+import { Ownable } from "openzeppelin-contracts/contracts/access/Ownable.sol";
 import { IL2GasCalculator } from "src/contracts/interfaces/IL2GasCalculator.sol";
 
 /// @notice Implementation: