refactor: revert to JsonReader to fix build issue

AngleProtocol · Dec 20, 2024 · 9ef4f4a · 9ef4f4a
1 parent 28550c5
commit 9ef4f4a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "url": "https://github.com/AngleProtocol/merkl-contracts/issues"
   },
   "devDependencies": {
-    "@angleprotocol/sdk": "2.34.5",
+    "@angleprotocol/sdk": "2.34.7",
     "@openzeppelin/contracts": "^4.9.0",
     "@openzeppelin/contracts-upgradeable": "4.9.0",
     "prettier": "^2.0.0",

diff --git a/scripts/DistributionCreator.s.sol b/scripts/DistributionCreator.s.sol
@@ -5,7 +5,7 @@ import { console } from "forge-std/console.sol";
 import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import { ITransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { CommonUtils } from "@utils/CommonUtils.sol";
+import { JsonReader } from "@utils/JsonReader.sol";
 import { ContractType } from "@utils/Constants.sol";
 
 import { BaseScript } from "./utils/Base.s.sol";
@@ -15,7 +15,7 @@ import { CampaignParameters } from "../contracts/struct/CampaignParameters.sol";
 import { MockToken } from "../contracts/mock/MockToken.sol";
 
 // Base contract with shared utilities
-contract DistributionCreatorScript is BaseScript, CommonUtils {
+contract DistributionCreatorScript is BaseScript, JsonReader {
     struct CampaignInput {
         address creator;
         address rewardToken;
@@ -525,7 +525,7 @@ contract SignAndCreateCampaign is DistributionCreatorScript {
 contract UpgradeAndBuildUpgradeToPayload is DistributionCreatorScript {
     function run() external {
         uint256 chainId = block.chainid;
-        address distributionCreator = this.chainToContract(chainId, ContractType.DistributionCreator);
+        address distributionCreator = readAddress(chainId, "Merkl.DistributionCreator");
 
         address distributionCreatorImpl = address(new DistributionCreator());
 
@@ -534,7 +534,7 @@ contract UpgradeAndBuildUpgradeToPayload is DistributionCreatorScript {
             distributionCreatorImpl
         );
 
-        try this.chainToContract(chainId, ContractType.AngleLabsMultisig) returns (address safe) {
+        try this.externalReadAddress(chainId, "Merkl.AngleLabs") returns (address safe) {
             _serializeJson(
                 chainId,
                 distributionCreator, // target address (the proxy)
@@ -546,4 +546,8 @@ contract UpgradeAndBuildUpgradeToPayload is DistributionCreatorScript {
             );
         } catch {}
     }
+
+    function externalReadAddress(uint256 chainId, string memory key) external view returns (address) {
+        return readAddress(chainId, key);
+    }
 }
diff --git a/test/DistributionCreator.t.sol b/test/DistributionCreator.t.sol
@@ -853,7 +853,7 @@ contract DistributionCreatorOverrideTest is Fixture {
         // Silo distrib
         address[] memory whitelist = new address[](1);
         whitelist[0] = 0x8095806d8753C0443C118D1C5e5eEC472e30BFeC;
-        bytes memory campaignData = abi.encode(
+        campaignData = abi.encode(
             0x04C0599Ae5A44757c0af6F9eC3b93da8976c150A,
             2,
             0xa42001D6d2237d2c74108FE360403C4b796B7170,