fix: use bytes32 for encoding network

axieinfinity · Jun 17, 2024 · 46822c4 · 46822c4
1 parent 2c141ee
commit 46822c4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/script/configs/ContractConfig.sol b/script/configs/ContractConfig.sol
@@ -156,7 +156,7 @@ abstract contract ContractConfig is IContractConfig {
 
     for (uint256 i; i < deployments.length; ++i) {
       string[] memory s = vm.split(deployments[i].path, "/");
-      TNetwork network = TNetwork.wrap(bytes20(LibString.packOne(s[s.length - 1])));
+      TNetwork network = TNetwork.wrap(LibString.packOne(s[s.length - 1]));
 
       string memory exportedAddress;
       try vm.readFile(string.concat(deployments[i].path, "/exported_address")) returns (string memory data) {

diff --git a/script/configs/RuntimeConfig.sol b/script/configs/RuntimeConfig.sol
@@ -62,7 +62,7 @@ abstract contract RuntimeConfig is IRuntimeConfig {
           _option.disablePrecheck = true;
         } else if (args[i].startsWith("network")) {
           string memory network = vm.split(args[i], ".")[1];
-          _option.network = TNetwork.wrap(bytes20(LibString.packOne(network)));
+          _option.network = TNetwork.wrap(LibString.packOne(network));
         } else if (args[i].startsWith("fork-block-number")) {
           string memory blockNumber = vm.split(args[i], ".")[1];
           _option.forkBlockNumber = vm.parseUint(blockNumber);

diff --git a/script/types/TNetwork.sol b/script/types/TNetwork.sol
@@ -6,14 +6,14 @@ import { LibString } from "../../dependencies/solady-0.0.206/src/utils/LibString
 import { LibSharedAddress } from "../libraries/LibSharedAddress.sol";
 import { Vm } from "../../dependencies/forge-std-1.8.2/src/Vm.sol";
 
-type TNetwork is bytes20;
+type TNetwork is bytes32;
 
 using LibString for bytes32;
 
 using { chainAlias, eq as ==, neq as !=, env, dir } for TNetwork global;
 
 function chainAlias(TNetwork network) pure returns (string memory) {
-  return bytes32(TNetwork.unwrap(network)).unpackOne();
+  return TNetwork.unwrap(network).unpackOne();
 }
 
 function env(TNetwork network) pure returns (string memory) {

diff --git a/script/utils/DefaultNetwork.sol b/script/utils/DefaultNetwork.sol
@@ -44,7 +44,7 @@ function explorer(DefaultNetwork network) pure returns (string memory link) {
 }
 
 function key(DefaultNetwork network) pure returns (TNetwork) {
-  return TNetwork.wrap(bytes20(LibString.packOne(chainAlias(network))));
+  return TNetwork.wrap(LibString.packOne(chainAlias(network)));
 }
 
 function chainAlias(DefaultNetwork network) pure returns (string memory) {