Cleanup (#52)

Author: dvc94ch

.gitmodules

@@ -1,15 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/solmate"]
-	path = lib/solmate
-	url = https://github.com/transmissions11/solmate
 [submodule "lib/frost-evm"]
 	path = lib/frost-evm
 	url = https://github.com/Analog-Labs/frost-evm
-[submodule "lib/universal-factory"]
-	path = lib/universal-factory
-	url = https://github.com/Analog-Labs/universal-factory
-[submodule "lib/evm-interpreter"]
-	path = lib/evm-interpreter
-	url = https://github.com/Analog-Labs/evm-interpreter

lib/evm-interpreter

@@ -122,13 +122,9 @@ contract Gateway is IGateway, IExecutor, IUpgradable, GatewayEIP712 {
         // Load shard from storage
         ShardStore.ShardInfo storage signer = ShardStore.getMainStorage().get(signature);
 
-        // Load y parity bit, it must be 27 (even), or 28 (odd)
-        // ref: https://ethereum.github.io/yellowpaper/paper.pdf
-        uint8 yParity = BranchlessMath.ternaryU8(signer.yParity > 0, 28, 27);
-
         // Verify Signature
         require(
-            Schnorr.verify(yParity, signature.xCoord, uint256(message), signature.e, signature.s),
+            Schnorr.verify(signer.yParity, signature.xCoord, uint256(message), signature.e, signature.s),
             "invalid tss signature"
         );
     }

lib/solmate

@@ -195,23 +195,23 @@ library ShardStore {
      */
     function register(MainStorage storage store, TssKey calldata newKey) internal returns (bool) {
         // Check y-parity
-        require((newKey.yParity == 2 || newKey.yParity == 3), "y parity bit must be 2 or 3, cannot register shard");
+        require((newKey.yParity == 27 || newKey.yParity == 28), "y parity bit must be 27 or 28, cannot register shard");
 
         // Read shard from storage
         ShardID id = ShardID.wrap(bytes32(newKey.xCoord));
         (bool created, ShardInfo storage stored) = getOrAdd(store, id);
 
         // Check if the shard is already registered
         if (!created) {
-            require(stored.nonce == 1 || newKey.yParity == (stored.yParity | 2), "tsskey.yParity mismatch");
+            require(stored.nonce == 1 || newKey.yParity == stored.yParity, "tsskey.yParity mismatch");
             return false;
         }
 
         // Get the current status and nonce
         ShardInfo memory shard = stored;
 
         require(
-            shard.createdAtBlock == 0 || (shard.yParity | 2) == newKey.yParity,
+            shard.createdAtBlock == 0 || shard.yParity == newKey.yParity,
             "the provided y-parity doesn't match the existing y-parity, cannot register shard"
         );
 
@@ -222,7 +222,7 @@ library ShardStore {
         stored.createdAtBlock =
             BranchlessMath.ternaryU64(shard.createdAtBlock > 0, shard.createdAtBlock, uint64(block.number));
         stored.nonce = shard.nonce;
-        stored.yParity = newKey.yParity & 1;
+        stored.yParity = newKey.yParity;
         return true;
     }
 
@@ -311,7 +311,7 @@ library ShardStore {
 
         if (exists) {
             // Check y-parity
-            require(stored.yParity == (key.yParity & 1), "y parity mismatch, cannot revoke key");
+            require(stored.yParity == key.yParity, "y parity mismatch, cannot revoke key");
             return _revoke(store, id);
         }
         return false;
@@ -374,7 +374,7 @@ library ShardStore {
             if (!success) {
                 revert ShardNotExists(id);
             }
-            shards[i] = TssKey(shard.yParity + 2, uint256(ShardID.unwrap(id)));
+            shards[i] = TssKey(shard.yParity, uint256(ShardID.unwrap(id)));
         }
         return shards;
     }

lib/universal-factory

@@ -43,18 +43,7 @@ library GasUtils {
     /**
      * @dev Base cost of the `IExecutor.execute` method.
      */
-    uint256 internal constant EXECUTION_BASE_COST = EXECUTION_SELECTOR_OVERHEAD + 46960 + 144 + 22;
-
-    /**
-     * @dev Base cost of the `IGateway.submitMessage` method.
-     */
-    uint256 internal constant SUBMIT_BASE_COST = 24064 - 66 + 133 + 44;
-
-    /**
-     * @dev Extra gas cost that any account `Contract or EOA` must pay when calling `IGateway.submitMessage` method.
-     * This cost is necessary for initialize the account's `nonce` storage slot.
-     */
-    uint256 internal constant FIRST_MESSAGE_EXTRA_COST = 17100 + 6000;
+    uint256 internal constant EXECUTION_BASE_COST = EXECUTION_SELECTOR_OVERHEAD + 46960 + 144 + 22 - 28 + 43;
 
     /**
      * @dev Solidity's reserved location for the free memory pointer.
@@ -87,7 +76,7 @@ library GasUtils {
      * @dev Compute the gas cost of memory expansion.
      * @param words number of words, where a word is 32 bytes
      */
-    function memoryExpansionGasCost(uint256 words) internal pure returns (uint256) {
+    function memoryExpansionGasCost(uint256 words) private pure returns (uint256) {
         unchecked {
             return (words.saturatingMul(words) >> 9).saturatingAdd(words.saturatingMul(3));
         }
@@ -121,67 +110,6 @@ library GasUtils {
         }
     }
 
-    /**
-     * @dev Compute the gas cost of the `IGateway.submitMessage` method, without the `GatewayProxy` overhead.
-     * @param messageSize The size of the message in bytes. This is the `gmp.data.length`.
-     */
-    function _submitMessageGasCost(uint16 messageSize) private pure returns (uint256 gasCost) {
-        unchecked {
-            gasCost = SUBMIT_BASE_COST;
-
-            // `countNonZeros` gas cost
-            uint256 words = (messageSize + 31) >> 5;
-            gasCost += (words * 106) + (((words + 254) / 255) * 214);
-
-            // CALLDATACOPY
-            gasCost += words * 3;
-
-            // emit GmpCreated() gas cost (8 gas per byte)
-            gasCost += words << 8;
-
-            // Memory expansion cost
-            words += 17 - 1 + 2;
-            gasCost += ((words * words) >> 9) + (words * 3);
-
-            return gasCost;
-        }
-    }
-
-    /**
-     * @dev Compute the gas cost of the `IGateway.submitMessage` method including the `GatewayProxy` overhead.
-     * @param messageSize The size of the message in bytes. This is the `gmp.data.length`.
-     */
-    function submitMessageGasCost(uint16 messageSize) internal pure returns (uint256 gasCost) {
-        unchecked {
-            // Compute the gas cost of the `IGateway.submitMessage` method.
-            gasCost = _submitMessageGasCost(messageSize);
-
-            // Convert `gmp.data.length` to `abi.encodeCall(IGateway.submitMessage, (...)).length`.
-            uint256 calldataSize = ((messageSize + 31) & 0xffe0) + 164;
-
-            // Compute the `GatewayProxy` gas overhead.
-            gasCost += proxyOverheadGasCost(uint16(calldataSize), 32);
-
-            return gasCost;
-        }
-    }
-
-    /**
-     * @dev Compute the minimal gas needed to execute the `IGateway.submitMessage` method.
-     * @param messageSize The size of the message in bytes. This is the `gmp.data.length`.
-     */
-    function submitMessageGasNeeded(uint16 messageSize) internal pure returns (uint256 gasNeeded) {
-        unchecked {
-            // Compute the gas cost of the `IGateway.submitMessage` method.
-            gasNeeded = _submitMessageGasCost(messageSize);
-            // gasNeeded = gasNeeded.saturatingSub(2114);
-            // gasNeeded = _inverseOfAllButOne64th();
-            uint256 calldataSize = ((messageSize + 31) & 0xffe0) + 164;
-            gasNeeded = gasNeeded.saturatingAdd(proxyOverheadGasCost(calldataSize, 32));
-            gasNeeded = gasNeeded.saturatingSub(36);
-        }
-    }
-
     /**
      * @dev Estimate the price in wei for send an GMP message.
      * @param gasPrice The gas price in UFloat9x56 format.
@@ -213,7 +141,7 @@ library GasUtils {
         unchecked {
             // add execution cost
             uint256 gasCost =
-                computeExecutionRefund(uint16(BranchlessMath.min(messageSize, type(uint16).max)), gasLimit);
+                executionGasUsed(uint16(BranchlessMath.min(messageSize, type(uint16).max)), gasLimit);
             // add base cost
             gasCost = gasCost.saturatingAdd(21000);
 
@@ -274,28 +202,12 @@ library GasUtils {
         }
     }
 
-    /**
-     * @dev Compute the gas needed for the transaction, this is different from the gas used.
-     * `gas needed > gas used` because of EIP-150
-     */
-    function executionGasNeeded(uint256 messageSize, uint256 gasLimit) internal pure returns (uint256 gasNeeded) {
-        unchecked {
-            gasNeeded = _executionGasCost(messageSize, gasLimit);
-            gasNeeded = gasNeeded.saturatingAdd(2300 - 184);
-            gasNeeded = inverseOfAllButOne64th(gasNeeded);
-            messageSize = messageSize.align32().saturatingAdd(388);
-            gasNeeded = gasNeeded.saturatingAdd(proxyOverheadGasCost(messageSize, 64));
-            // Remove the proxy final overhead, once the message requires (2300 - 184) extra gas.
-            gasNeeded = gasNeeded.saturatingSub(38);
-        }
-    }
-
     /**
      * @dev Compute the gas that should be refunded to the executor for the execution.
      * @param messageSize The size of the message.
      * @param gasUsed The gas used by the gmp message.
      */
-    function computeExecutionRefund(uint16 messageSize, uint256 gasUsed)
+    function executionGasUsed(uint16 messageSize, uint256 gasUsed)
         internal
         pure
         returns (uint256 executionCost)
@@ -311,6 +223,17 @@ library GasUtils {
         }
     }
 
+    /**
+     * @dev Compute the transaction base cost.
+     */
+    function txBaseCost() internal pure returns (uint256) {
+        unchecked {
+            uint256 nonZeros = countNonZerosCalldata(msg.data);
+            uint256 zeros = msg.data.length - nonZeros;
+            return 21000 + (nonZeros * 16) + (zeros * 4);
+        }
+    }
+
     /**
      * @dev Count the number of non-zero bytes in a byte sequence from memory.
      * gas cost = 217 + (words * 112) + ((words - 1) * 193)
@@ -398,15 +321,4 @@ library GasUtils {
             }
         }
     }
-
-    /**
-     * @dev Compute the transaction base cost.
-     */
-    function txBaseCost() internal pure returns (uint256) {
-        unchecked {
-            uint256 nonZeros = countNonZerosCalldata(msg.data);
-            uint256 zeros = msg.data.length - nonZeros;
-            return 21000 + (nonZeros * 16) + (zeros * 4);
-        }
-    }
 }