Arbitrum release zap tests

.env-example

@@ -5,7 +5,10 @@ GOERLI_RPC_URL=https://eth-goerli.g.alchemy.com/v2/KEY
 OPTIMISM_GOERLI_RPC_URL=https://opt-goerli.g.alchemy.com/v2/KEY
 BASE_GOERLI_RPC_URL=https://base-goerli.g.alchemy.com/v2/KEY
 BASE_SEPOLIA_RPC_URL=https://base-sepolia.g.alchemy.com/v2/KEY
-PRIVATE_KEY=0xKEY
+ARBITRUM_RPC_URL=https://arb-mainnet.g.alchemy.com/v2/KEY
+ARBITRUM_SEPOLIA_RPC_URL=https://arb-sepolia.g.alchemy.com/v2/KEY
+PRIVATE_KEY=KEY
 ETHERSCAN_API_KEY=KEY
 OPTIMISM_ETHERSCAN_API_KEY=KEY
-BASESCAN_API_KEY=KEY
+BASESCAN_API_KEY=KEY
+ARBISCAN_API_KEY=KEY

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/zap"]
-	path = lib/zap
-	url = https://github.com/JaredBorders/zap

deployments/Arbitrum.json

@@ -0,0 +1,6 @@
+{
+    "EngineImplementation": "0x149042fE4fBb741582125e709378F07b55D3eDF0",
+    "EngineProxy": "0x2712DeDE1d4Aac904b91D4a2426281A274971b7c",
+    "TestEngineImplementation": "0x5225dFdC934f9569d2612a082E1F66B16DD5d624",
+    "TestEngineProxy": "0x51D3F6bE4B8b6476346Fbc3ed8790Ef863af4b77"
+}

deployments/ArbitrumSepolia.json

@@ -0,0 +1,4 @@
+{
+    "EngineImplementation": "0x2211F4d112deF7e433e66e50Bd173803f9563086",
+    "EngineProxy": "0xaEd5977ed65d340b4B8e58Ec3EC3b04b19308f21"
+}

foundry.toml

@@ -3,9 +3,9 @@ src = 'src'
 test = 'test/'
 out = 'out'
 libs = ['lib']
-solc_version = "0.8.20"
+solc_version = "0.8.27"
 optimizer = true
-optimizer_runs = 1_000_000
+optimizer_runs = 1_000
 
 [fmt]
 line_length = 80

lcov.info

@@ -1,39 +1,61 @@
 TN:
 SF:script/Deploy.s.sol
-FN:22,Setup.deploySystem
-FNDA:4,Setup.deploySystem
-DA:30,103
-DA:30,103
-DA:40,100
-DA:40,100
-DA:40,100
-DA:43,100
-DA:43,100
-FN:51,DeployBase_Andromeda.run
+FN:113,DeployArbitrumSepolia.run
+FNDA:0,DeployArbitrumSepolia.run
+DA:114,0
+DA:114,0
+DA:114,0
+DA:115,0
+DA:115,0
+DA:117,0
+DA:117,0
+DA:126,0
+DA:126,0
+FN:92,DeployArbitrum.run
+FNDA:0,DeployArbitrum.run
+DA:93,0
+DA:93,0
+DA:93,0
+DA:94,0
+DA:94,0
+DA:96,0
+DA:96,0
+DA:105,0
+DA:105,0
+FN:50,DeployBase_Andromeda.run
 FNDA:0,DeployBase_Andromeda.run
+DA:51,0
+DA:51,0
+DA:51,0
 DA:52,0
 DA:52,0
-DA:52,0
-DA:53,0
-DA:53,0
-DA:55,0
-DA:55,0
-DA:64,0
-DA:64,0
-FN:72,DeployBaseSepolia_Andromeda.run
+DA:54,0
+DA:54,0
+DA:63,0
+DA:63,0
+FN:71,DeployBaseSepolia_Andromeda.run
 FNDA:0,DeployBaseSepolia_Andromeda.run
+DA:72,0
+DA:72,0
+DA:72,0
 DA:73,0
 DA:73,0
-DA:73,0
-DA:74,0
-DA:74,0
-DA:76,0
-DA:76,0
-DA:85,0
-DA:85,0
-FNF:3
+DA:75,0
+DA:75,0
+DA:84,0
+DA:84,0
+FN:21,Setup.deploySystem
+FNDA:4,Setup.deploySystem
+DA:29,103
+DA:29,103
+DA:39,100
+DA:39,100
+DA:39,100
+DA:42,100
+DA:42,100
+FNF:5
 FNH:1
-LF:11
+LF:19
 LH:3
 BRF:0
 BRH:0
@@ -51,10 +73,6 @@ DA:46,0
 DA:46,0
 DA:55,0
 DA:55,0
-FN:19,Setup.deployImplementation
-FNDA:0,Setup.deployImplementation
-DA:27,0
-DA:27,0
 FN:63,DeployBaseSepolia_Andromeda.run
 FNDA:0,DeployBaseSepolia_Andromeda.run
 DA:64,0
@@ -66,6 +84,10 @@ DA:67,0
 DA:67,0
 DA:76,0
 DA:76,0
+FN:19,Setup.deployImplementation
+FNDA:0,Setup.deployImplementation
+DA:27,0
+DA:27,0
 FNF:3
 FNH:0
 LF:9
@@ -865,23 +887,15 @@ BRH:0
 end_of_record
 TN:
 SF:test/utils/Bootstrap.sol
-FN:58,Bootstrap.initializeBase
+FN:62,Bootstrap.initializeBase
 FNDA:0,Bootstrap.initializeBase
-DA:59,99
-DA:59,99
-DA:59,99
-DA:60,99
-DA:60,99
-DA:69,99
-DA:69,99
-DA:71,99
-DA:71,99
-DA:72,99
-DA:72,99
+DA:63,99
+DA:63,99
+DA:63,99
+DA:64,99
+DA:64,99
 DA:73,99
 DA:73,99
-DA:74,99
-DA:74,99
 DA:75,99
 DA:75,99
 DA:76,99
@@ -892,26 +906,34 @@ DA:78,99
 DA:78,99
 DA:79,99
 DA:79,99
+DA:80,99
+DA:80,99
 DA:81,99
 DA:81,99
 DA:82,99
 DA:82,99
 DA:83,99
 DA:83,99
-DA:88,99
-DA:88,99
-DA:90,99
-DA:90,99
-FN:95,BootstrapBase.init
+DA:85,99
+DA:85,99
+DA:86,99
+DA:86,99
+DA:87,99
+DA:87,99
+DA:92,99
+DA:92,99
+DA:94,99
+DA:94,99
+FN:99,BootstrapBase.init
 FNDA:99,BootstrapBase.init
-DA:108,99
-DA:108,99
-DA:108,99
-DA:117,99
-DA:117,99
-DA:117,99
-DA:126,99
-DA:126,99
+DA:112,99
+DA:112,99
+DA:112,99
+DA:121,99
+DA:121,99
+DA:121,99
+DA:130,99
+DA:130,99
 FNF:2
 FNH:1
 LF:20
@@ -1082,6 +1104,10 @@ BRH:0
 end_of_record
 TN:
 SF:test/utils/mocks/EIP7412Mock.sol
+FN:24,EIP7412MockRevert.fulfillOracleQuery
+FNDA:256,EIP7412MockRevert.fulfillOracleQuery
+DA:25,256
+DA:25,256
 FN:9,EIP7412Mock.fulfillOracleQuery
 FNDA:769,EIP7412Mock.fulfillOracleQuery
 DA:10,769
@@ -1090,10 +1116,6 @@ BRDA:10,0,0,-
 BRDA:10,0,1,769
 DA:11,769
 DA:11,769
-FN:24,EIP7412MockRevert.fulfillOracleQuery
-FNDA:256,EIP7412MockRevert.fulfillOracleQuery
-DA:25,256
-DA:25,256
 FN:16,EIP7412MockRefund.fulfillOracleQuery
 FNDA:256,EIP7412MockRefund.fulfillOracleQuery
 DA:17,256

package.json

@@ -5,7 +5,7 @@
   "homepage": "https://github.com/Kwenta/smart-margin-v3#readme",
   "scripts": {
     "compile": "forge build",
-    "test": "forge test --fork-url $(grep BASE_RPC_URL .env | cut -d '=' -f2) --etherscan-api-key $(grep BASESCAN_API_KEY .env | cut -d '=' -f2) --gas-report -vvv",
+    "test": "forge test --fork-url $(grep ARBITRUM_RPC_URL .env | cut -d '=' -f2) --etherscan-api-key $(grep ARBISCAN_API_KEY .env | cut -d '=' -f2) --gas-report -vvv",
     "test:hh": "npx hardhat test",
     "format": "forge fmt",
     "coverage": "forge coverage --fork-url $(grep BASE_RPC_URL .env | cut -d '=' -f2)",

script/Deploy.s.sol

@@ -1,17 +1,16 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.20;
+pragma solidity 0.8.27;
 
-// proxy
 import {ERC1967Proxy as Proxy} from
     "lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-
-// contracts
 import {Engine} from "src/Engine.sol";
-
-// parameters
 import {BaseParameters} from "script/utils/parameters/BaseParameters.sol";
 import {BaseSepoliaParameters} from
     "script/utils/parameters/BaseSepoliaParameters.sol";
+import {ArbitrumParameters} from
+    "script/utils/parameters/ArbitrumParameters.sol";
+import {ArbitrumSepoliaParameters} from
+    "script/utils/parameters/ArbitrumSepoliaParameters.sol";
 
 // forge utils
 import {Script} from "lib/forge-std/src/Script.sol";
@@ -24,16 +23,18 @@ contract Setup is Script {
         address spotMarketProxy,
         address sUSDProxy,
         address pDAO,
+        address zap,
         address usdc,
-        uint128 sUSDCId
+        address weth
     ) public returns (Engine engine) {
         engine = new Engine({
             _perpsMarketProxy: perpsMarketProxy,
             _spotMarketProxy: spotMarketProxy,
             _sUSDProxy: sUSDProxy,
             _pDAO: pDAO,
+            _zap: zap,
             _usdc: usdc,
-            _sUSDCId: sUSDCId
+            _weth: weth
         });
 
         // deploy ERC1967 proxy and set implementation to engine
@@ -44,42 +45,44 @@ contract Setup is Script {
     }
 }
 
-/// @dev steps to deploy and verify on Base:
+/// @dev steps to deploy and verify on Arbitrum:
 /// (1) load the variables in the .env file via `source .env`
-/// (2) run `forge script script/Deploy.s.sol:DeployBase_Andromeda --rpc-url $BASE_RPC_URL --etherscan-api-key $BASESCAN_API_KEY --broadcast --verify -vvvv`
-contract DeployBase_Andromeda is Setup, BaseParameters {
+/// (2) run `forge script script/Deploy.s.sol:DeployArbitrum --rpc-url $ARBITRUM_RPC_URL --etherscan-api-key $ARBISCAN_API_KEY --broadcast --verify -vvvv`
+contract DeployArbitrum is Setup, ArbitrumParameters {
     function run() public {
         uint256 privateKey = vm.envUint("PRIVATE_KEY");
         vm.startBroadcast(privateKey);
 
         Setup.deploySystem({
-            perpsMarketProxy: PERPS_MARKET_PROXY_ANDROMEDA,
-            spotMarketProxy: SPOT_MARKET_PROXY_ANDROMEDA,
-            sUSDProxy: USD_PROXY_ANDROMEDA,
+            perpsMarketProxy: PERPS_MARKET_PROXY,
+            spotMarketProxy: SPOT_MARKET_PROXY,
+            sUSDProxy: USD_PROXY,
             pDAO: PDAO,
+            zap: ZAP,
             usdc: USDC,
-            sUSDCId: SUSDC_SPOT_MARKET_ID
+            weth: WETH
         });
 
         vm.stopBroadcast();
     }
 }
 
-/// @dev steps to deploy and verify on Base Goerli:
+/// @dev steps to deploy and verify on Arbitrum Sepolia:
 /// (1) load the variables in the .env file via `source .env`
-/// (2) run `forge script script/Deploy.s.sol:DeployBaseSepolia_Andromeda --rpc-url $BASE_SEPOLIA_RPC_URL --etherscan-api-key $BASESCAN_API_KEY --broadcast --verify -vvvv`
-contract DeployBaseSepolia_Andromeda is Setup, BaseSepoliaParameters {
+/// (2) run `forge script script/Deploy.s.sol:DeployArbitrumSepolia --rpc-url $ARBITRUM_SEPOLIA_RPC_URL --etherscan-api-key $ARBISCAN_API_KEY --broadcast --verify -vvvv`
+contract DeployArbitrumSepolia is Setup, ArbitrumSepoliaParameters {
     function run() public {
         uint256 privateKey = vm.envUint("PRIVATE_KEY");
         vm.startBroadcast(privateKey);
 
         Setup.deploySystem({
-            perpsMarketProxy: PERPS_MARKET_PROXY_ANDROMEDA,
-            spotMarketProxy: SPOT_MARKET_PROXY_ANDROMEDA,
-            sUSDProxy: USD_PROXY_ANDROMEDA,
+            perpsMarketProxy: PERPS_MARKET_PROXY,
+            spotMarketProxy: SPOT_MARKET_PROXY,
+            sUSDProxy: USD_PROXY,
             pDAO: PDAO,
+            zap: ZAP,
             usdc: USDC,
-            sUSDCId: SUSDC_SPOT_MARKET_ID
+            weth: WETH
         });
 
         vm.stopBroadcast();