fix(protocol): tstore is not suppported on L2 now

packages/protocol/contracts/common/OwnerUUPSUpgradable.sol

@@ -30,7 +30,7 @@ abstract contract OwnerUUPSUpgradable is UUPSUpgradeable, OwnableUpgradeable {
     bytes32 private constant _REENTRY_SLOT =
         0xa5054f728453d3dbe953bdc43e4d0cb97e662ea32d7958190f3dc2da31d9721a;
 
-    uint8 private _reentryDeprecated; // slot 1
+    uint8 private _reentry; // slot 1
     uint8 private _paused;
     uint256[49] private __gap;
 
@@ -88,21 +88,23 @@ abstract contract OwnerUUPSUpgradable is UUPSUpgradeable, OwnableUpgradeable {
         _paused = _FALSE;
     }
 
-    function _inNonReentrant() internal view returns (bool) {
-        return _loadReentryLock() == _TRUE;
-    }
-
     // Stores the reentry lock
-    function _storeReentryLock(uint8 reentry) private {
-        assembly {
-            tstore(_REENTRY_SLOT, reentry)
-        }
+    function _storeReentryLock(uint8 reentry) internal virtual {
+        _reentry = reentry;
+        // assembly {
+        //     tstore(_REENTRY_SLOT, reentry)
+        // }
     }
 
     // Loads the reentry lock
-    function _loadReentryLock() private view returns (uint8 reentry) {
-        assembly {
-            reentry := tload(_REENTRY_SLOT)
-        }
+    function _loadReentryLock() internal view virtual returns (uint8 reentry) {
+        reentry = _reentry;
+        // assembly {
+        //     reentry := tload(_REENTRY_SLOT)
+        // }
+    }
+
+    function _inNonReentrant() internal view returns (bool) {
+        return _loadReentryLock() == _TRUE;
     }
 }

packages/protocol/foundry.toml

@@ -11,7 +11,6 @@ optimizer_runs = 200
 ffi = true
 gas_limit = '18446744073709551615'
 memory_limit = 2073741824
-evm_version = 'cancun'
 
 # Do not change the block_gas_limit value, TaikoL2.t.sol depends on it.
 block_gas_limit = 80000000 #80M

packages/protocol/genesis/generate_genesis.test.sh

@@ -101,5 +101,6 @@ forge test \
   --fork-url http://localhost:18545 \
   --fork-retry-backoff 120 \
   --no-storage-caching \
+  --evm-version cancun \
   --match-path genesis/*.g.sol \
   --block-gas-limit 1000000000

packages/protocol/package.json

@@ -5,18 +5,18 @@
   "scripts": {
     "buildMerkle": "ts-node ./utils/airdrop/buildMerkleTree.ts ./utils/airdrop/airdrop_db/example_claimList.json",
     "clean": "rm -rf abis cache* && forge clean",
-    "compile": "forge build --build-info --extra-output storage-layout",
+    "compile": "forge build --evm-version cancun --build-info --extra-output storage-layout",
     "test:deploy": "./script/download_solc.sh && ./script/test_deploy_on_l1.sh",
     "eslint": "pnpm exec eslint --ignore-path .eslintignore --ext .js,.ts .",
     "eslint:fix": "pnpm exec eslint --ignore-path .eslintignore --ext .js,.ts . --fix",
     "fmt:sol": "forge fmt",
     "generate:genesis": "ts-node ./utils/generate_genesis/main.ts",
     "lint:sol": "forge fmt && pnpm solhint 'contracts/**/*.sol' --fix",
-    "snapshot": "forge snapshot --match-path 'test/**/*.t.sol'",
-    "test": "forge test -vvv --match-path test/*.t.sol",
+    "snapshot": "forge snapshot --evm-version cancun --match-path 'test/**/*.t.sol'",
+    "test": "forge test -vvv --evm-version cancun --match-path test/*.t.sol",
     "test:coverage": "mkdir -p coverage && forge coverage --report lcov && lcov --remove ./lcov.info -o ./coverage/lcov.info 'test/' 'script/' 'contracts/thirdparty/' && genhtml coverage/lcov.info --branch-coverage --output-dir coverage --ignore-errors category && open coverage/index.html",
     "test:genesis": "pnpm compile && FOUNDRY_PROFILE=genesis ./genesis/generate_genesis.test.sh",
-    "export:simconf": "forge test --match-test 'test_simulation' -vv > simulation/out/simconf_$(date +%s).txt"
+    "export:simconf": "forge test --evm-version cancun --match-test 'test_simulation' -vv > simulation/out/simconf_$(date +%s).txt"
   },
   "keywords": [
     "ZKP",