Zksync [DO-NOT-MERGE]

.github/workflows/ci.yml

@@ -0,0 +1,51 @@
+name: CI
+
+on:
+    push:
+    pull_request:
+    workflow_dispatch:
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install ZKSync Foundry
+        uses: dutterbutter/foundry-zksync-toolchain@v1
+
+      - name: Check out the repo
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: actions/checkout@v4
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+            version: 9
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: "pnpm"
+
+      - name: Install Dependencies
+        run: pnpm install
+
+      - name: Build Hardhat
+        run: pnpm compile
+
+      - name: Forge Build
+        run: pnpm compile:forge
+
+      - name: Forge Fmt
+        run: pnpm style:solidity
+
+      - name: Test Hardhat
+        run: pnpm test:hardhat
+
+      - name: Forge Test
+        run: pnpm test:forge
+
+
+

.gitignore

@@ -13,6 +13,12 @@ report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 #foundry
 cache
 out
+cache_forge
+zkout
+
+cache_hardhat-zk
+artifacts-zk
+cache-zk
 
 *.zip
 .last_confs

.gitmodules

@@ -1,10 +1,10 @@
-[submodule "lib/forge-std"]
-	path = lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
 	branch = v4.8.0
 [submodule "lib/solmate"]
 	path = lib/solmate
 	url = https://github.com/rari-capital/solmate
+[submodule "lib/forge-std"]
+	path = lib/forge-std
+	url = https://github.com/foundry-rs/forge-std

src/Rewards/test/PackedUint144.t.sol → contracts/Rewards/test/PackedUint144.t.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.11;
+pragma solidity 0.8.20;
 
-import "ds-test/test.sol";
+import {Test} from "forge-std/Test.sol";
 import "../libraries/PackedUint144.sol";
 
-contract PackedUintTest is DSTest {
+contract PackedUintTest is Test {
     using PackedUint144 for uint144;
 
     function testCountStoredUint24Values(uint24 a) public {

src/Rewards/test/StakingContractMainnet.t.sol → contracts/Rewards/test/StakingContractMainnet.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.11;
+pragma solidity 0.8.20;
 
 import "./TestSetup.sol";
 

src/Rewards/test/TestSetup.sol → contracts/Rewards/test/TestSetup.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.11;
+pragma solidity 0.8.20;
 
 import "forge-std/Test.sol";
 import "../StakingContractMainnet.sol";
@@ -26,17 +26,22 @@ contract TestSetup is Test {
     bytes4 panic = 0x4e487b71;
     bytes overflow = abi.encodePacked(panic, bytes32(uint256(0x11)));
 
-    StakingContractMainnet stakingContract = new StakingContractMainnet();
+    StakingContractMainnet stakingContract;
 
-    Token tokenA = new Token();
-    Token tokenB = new Token();
-    Token tokenC = new Token();
+    Token tokenA;
+    Token tokenB;
+    Token tokenC;
 
     uint256 pastIncentive;
     uint256 ongoingIncentive;
     uint256 futureIncentive;
 
     function setUp() public {
+        stakingContract = new StakingContractMainnet();
+        tokenA = new Token();
+        tokenB = new Token();
+        tokenC = new Token();
+
         tokenA.mint(MAX_UINT256);
         tokenB.mint(MAX_UINT256);
         tokenC.mint(MAX_UINT256);

src/Rewards/test/mock/Token.sol → contracts/Rewards/test/mock/Token.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.11;
+pragma solidity 0.8.20;
 
 import "lib/solmate/src/tokens/ERC20.sol";
 

src/Router/IMagicSwapV2Router.sol → contracts/Router/IMagicSwapV2Router.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.18;
+pragma solidity 0.8.20;
 
 import "../UniswapV2/periphery/interfaces/IUniswapV2Router01.sol";
 import "../Vault/INftVault.sol";

src/Router/MagicSwapV2Router.sol → contracts/Router/MagicSwapV2Router.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.18;
+pragma solidity 0.8.20;
 
 import "lib/openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
 import "lib/openzeppelin-contracts/contracts/token/ERC721/IERC721.sol";
@@ -9,6 +9,40 @@ import "./IMagicSwapV2Router.sol";
 import "../UniswapV2/periphery/UniswapV2Router02.sol";
 import "../UniswapV2/core/interfaces/IUniswapV2Pair.sol";
 
+//                      ▓▓▓▓▓▓▓▓▓
+//                  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//               ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//            ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//         ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//      ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//    ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▓▓▓▓▓▓▓▓▓▓▓▒░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒░▒▓▓▓▓▓▓▓▓▓▓░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒░░░▓▓▓▓▓▓▓▓▓▒░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▓▓▓▒░░░░░░░▒▓▓▓▓▓▓░░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒░▒▓▓▓▓▓▓▓▓▓░░░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒░▒▓▓▓▓▓▓▓▓▒░░░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▓▓▓▓▓▓▓▓▓░░░░░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒░░░░░░░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒░░░░░░░░░░░░░░░░░▒▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▓▒▓▓▓▓▓▒░░░░░░░░░░░░░░░░░░░░░░░░░▒▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▓░▒▓▓▓▓▓▓▓▓▒░░░░░░░░░░░░░░░░░▒▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▒░▒▓▓▓▓▓▓▓▓▓▓▓▓▒░░░░░░░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▒░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▒░░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▒░░░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▒░░░░░░░░░░░▒▓▓▓▓▓▓▓▓▓▓░░░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▒░░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▒░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//  ▓▓▓▓▓▓▓▓▓▓▒░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//   ▓▓▓▓▓▓▓▓▓▓░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//    ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//      ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//         ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//            ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//               ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//                  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
+//                      ▓▓▓▓▓▓▓▓▓
+
 contract MagicSwapV2Router is IMagicSwapV2Router, UniswapV2Router02 {
     uint256 public constant ONE = 1e18;
     address public constant BURN_ADDRESS = address(0xdead);