Skip to content

Commit 46822c4

Browse files
committed
fix: use bytes32 for encoding network
1 parent 2c141ee commit 46822c4

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

script/configs/ContractConfig.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ abstract contract ContractConfig is IContractConfig {
156156

157157
for (uint256 i; i < deployments.length; ++i) {
158158
string[] memory s = vm.split(deployments[i].path, "/");
159-
TNetwork network = TNetwork.wrap(bytes20(LibString.packOne(s[s.length - 1])));
159+
TNetwork network = TNetwork.wrap(LibString.packOne(s[s.length - 1]));
160160

161161
string memory exportedAddress;
162162
try vm.readFile(string.concat(deployments[i].path, "/exported_address")) returns (string memory data) {

script/configs/RuntimeConfig.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ abstract contract RuntimeConfig is IRuntimeConfig {
6262
_option.disablePrecheck = true;
6363
} else if (args[i].startsWith("network")) {
6464
string memory network = vm.split(args[i], ".")[1];
65-
_option.network = TNetwork.wrap(bytes20(LibString.packOne(network)));
65+
_option.network = TNetwork.wrap(LibString.packOne(network));
6666
} else if (args[i].startsWith("fork-block-number")) {
6767
string memory blockNumber = vm.split(args[i], ".")[1];
6868
_option.forkBlockNumber = vm.parseUint(blockNumber);

script/types/TNetwork.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import { LibString } from "../../dependencies/solady-0.0.206/src/utils/LibString
66
import { LibSharedAddress } from "../libraries/LibSharedAddress.sol";
77
import { Vm } from "../../dependencies/forge-std-1.8.2/src/Vm.sol";
88

9-
type TNetwork is bytes20;
9+
type TNetwork is bytes32;
1010

1111
using LibString for bytes32;
1212

1313
using { chainAlias, eq as ==, neq as !=, env, dir } for TNetwork global;
1414

1515
function chainAlias(TNetwork network) pure returns (string memory) {
16-
return bytes32(TNetwork.unwrap(network)).unpackOne();
16+
return TNetwork.unwrap(network).unpackOne();
1717
}
1818

1919
function env(TNetwork network) pure returns (string memory) {

script/utils/DefaultNetwork.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function explorer(DefaultNetwork network) pure returns (string memory link) {
4444
}
4545

4646
function key(DefaultNetwork network) pure returns (TNetwork) {
47-
return TNetwork.wrap(bytes20(LibString.packOne(chainAlias(network))));
47+
return TNetwork.wrap(LibString.packOne(chainAlias(network)));
4848
}
4949

5050
function chainAlias(DefaultNetwork network) pure returns (string memory) {

0 commit comments

Comments
 (0)