Skip to content

Commit

Permalink
feat: scripts works even if addresses.json doesn't exists
Browse files Browse the repository at this point in the history
  • Loading branch information
0xtekgrinder committed May 10, 2024
1 parent 2cffd77 commit 774babc
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 20 deletions.
28 changes: 18 additions & 10 deletions scripts/DeployAgTokenSideChainMultiBridge.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,23 @@ contract DeployAgTokenSideChainMultiBridge is Script, CommonUtils {
bytes memory initCode = jsonVanity.readBytes("$.initCode");
uint256 chainId = vm.envUint("CHAIN_ID");

string memory json = vm.readFile(JSON_ADDRESSES_PATH);
string memory json;
address proxyAdmin;
address coreBorrow;
if (vm.keyExistsJson(json, ".proxyAdmin")) {
proxyAdmin = vm.parseJsonAddress(json, ".proxyAdmin");
if (vm.isFile(JSON_ADDRESSES_PATH)) {
json = vm.readFile(JSON_ADDRESSES_PATH);
if (vm.keyExistsJson(json, ".proxyAdmin")) {
proxyAdmin = vm.parseJsonAddress(json, ".proxyAdmin");
} else {
proxyAdmin = _chainToContract(chainId, ContractType.ProxyAdmin);
}
if (vm.keyExistsJson(json, ".coreBorrow")) {
coreBorrow = vm.parseJsonAddress(json, ".coreBorrow");
} else {
coreBorrow = _chainToContract(chainId, ContractType.CoreBorrow);
}
} else {
proxyAdmin = _chainToContract(chainId, ContractType.ProxyAdmin);
}
if (vm.keyExistsJson(json, ".coreBorrow")) {
coreBorrow = vm.parseJsonAddress(json, ".coreBorrow");
} else {
coreBorrow = _chainToContract(chainId, ContractType.CoreBorrow);
}
ILayerZeroEndpoint lzEndpoint = _lzEndPoint(chainId);
Expand Down Expand Up @@ -128,9 +134,11 @@ contract DeployAgTokenSideChainMultiBridge is Script, CommonUtils {
}

string memory json2 = "output";
string[] memory keys = vm.parseJsonKeys(json, "");
for (uint256 i = 0; i < keys.length; i++) {
json2.serialize(keys[i], json.readAddress(string.concat(".", keys[i])));
if (vm.isFile(JSON_ADDRESSES_PATH)) {
string[] memory keys = vm.parseJsonKeys(json, "");
for (uint256 i = 0; i < keys.length; i++) {
json2.serialize(keys[i], json.readAddress(string.concat(".", keys[i])));
}
}
json2.serialize("agToken", address(agToken));
json2.serialize("treasury", address(treasuryProxy));
Expand Down
28 changes: 18 additions & 10 deletions scripts/DeployAngleSideChainMultiBridge.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,23 @@ contract DeployAngleSideChainMultiBridge is Script, CommonUtils {
uint256 chainId = vm.envUint("CHAIN_ID");
vm.startBroadcast(deployerPrivateKey);

string memory json = vm.readFile(JSON_ADDRESSES_PATH);
string memory json;
address proxyAdmin;
address coreBorrow;
if (vm.keyExistsJson(json, ".proxyAdmin")) {
proxyAdmin = vm.parseJsonAddress(json, ".proxyAdmin");
if (vm.isFile(JSON_ADDRESSES_PATH)) {
json = vm.readFile(JSON_ADDRESSES_PATH);
if (vm.keyExistsJson(json, ".proxyAdmin")) {
proxyAdmin = vm.parseJsonAddress(json, ".proxyAdmin");
} else {
proxyAdmin = _chainToContract(chainId, ContractType.ProxyAdmin);
}
if (vm.keyExistsJson(json, ".coreBorrow")) {
coreBorrow = vm.parseJsonAddress(json, ".coreBorrow");
} else {
coreBorrow = _chainToContract(chainId, ContractType.CoreBorrow);
}
} else {
proxyAdmin = _chainToContract(chainId, ContractType.ProxyAdmin);
}
if (vm.keyExistsJson(json, ".coreBorrow")) {
coreBorrow = vm.parseJsonAddress(json, ".coreBorrow");
} else {
coreBorrow = _chainToContract(chainId, ContractType.CoreBorrow);
}
ILayerZeroEndpoint lzEndpoint = _lzEndPoint(chainId);
Expand Down Expand Up @@ -117,9 +123,11 @@ contract DeployAngleSideChainMultiBridge is Script, CommonUtils {
}

string memory json2 = "output";
string[] memory keys = vm.parseJsonKeys(json, "");
for (uint256 i = 0; i < keys.length; i++) {
json2.serialize(keys[i], json.readAddress(string.concat(".", keys[i])));
if (vm.isFile(JSON_ADDRESSES_PATH)) {
string[] memory keys = vm.parseJsonKeys(json, "");
for (uint256 i = 0; i < keys.length; i++) {
json2.serialize(keys[i], json.readAddress(string.concat(".", keys[i])));
}
}
json2.serialize("angle", address(angleProxy));
json2 = json2.serialize("lzAngle", address(lzProxy));
Expand Down

0 comments on commit 774babc

Please sign in to comment.