Merge branch 'main' into manySmallContractImprovements

.gitignore

@@ -41,4 +41,6 @@ artifacts/*
 cache_hardhat/
 .openzeppelin/
 deployment/deploy_output.json
+report
+lcov.info
 

README.md

@@ -113,3 +113,10 @@ run tests:
 ```
 forge test
 ```
+
+run coverage tools:
+```
+forge coverage --ir-minimum --report lcov
+genhtml -o report  lcov.info 
+open index.html in browser
+```

contracts/ForkonomicToken.sol

@@ -74,14 +74,6 @@ contract ForkonomicToken is
         );
     }
 
-    /// @dev Allows anyone to prepare the splitting of tokens
-    /// by burning them
-    /// @param amount The amount of tokens to burn
-    function prepareSplittingTokens(uint256 amount) public onlyAfterForking {
-        _burn(msg.sender, amount);
-        childTokenAllowances[msg.sender][false] += amount;
-        childTokenAllowances[msg.sender][true] += amount;
-    }
 
     /// @inheritdoc IForkonomicToken
     function splitTokensIntoChildTokens(uint256 amount) external {

foundry.toml

@@ -3,7 +3,7 @@ src = "contracts"
 out = "out"
 libs = ["node_modules", "lib"]
 optimizer = true
-optimizer_runs = 200
+optimizer_runs = 500
 evm_version = "london"
 solc_version = "0.8.20"
 

hardhat.config.js

@@ -49,7 +49,7 @@ module.exports = {
                 settings: {
                     optimizer: {
                         enabled: true,
-                        runs: 200,
+                        runs: 500,
                     },
                 },
             },

test/ForkableBridge.t.sol

@@ -844,5 +844,27 @@ contract ForkableBridgeWrapperTest is Test {
         ForkableBridgeWrapper(child1).setAndCheckClaimed(index);
         vm.expectRevert(selector);
         ForkableBridgeWrapper(child2).setAndCheckClaimed(index);
+
+        // check that the _verify function within PolygonZkEVMBridge calls really
+        // the _setAndCheckClaimed function of the ForkableBridge contract
+        // and not the _setAndCheckClaimed function of the PolygonZkEVMBridge contract
+        bytes32[32] memory smtProof;
+        for (uint256 i = 0; i < 32; i++) {
+            smtProof[i] = forkableBridge.branch(i);
+        }
+        vm.expectRevert(selector);
+        // forkableBridgeWrapper.claimAsset will call the PolygonZkEVMBridge.claimAsset function
+        ForkableBridgeWrapper(child1).claimAsset(
+            smtProof,
+            uint32(index),
+            bytes32(0),
+            bytes32(0),
+            uint32(0),
+            address(0x1),
+            uint32(1),
+            address(0),
+            uint256(1),
+            bytes("0x")
+        );
     }
 }