From 9ef4f4a0dd54f57be5289d55447178954874c838 Mon Sep 17 00:00:00 2001
From: Nicolas Lecouflet <lecoufletnicolas@gmail.com>
Date: Fri, 20 Dec 2024 12:12:10 +0100
Subject: [PATCH] refactor: revert to JsonReader to fix build issue

---
 bun.lockb                         | Bin 197148 -> 196134 bytes
 package.json                      |   2 +-
 scripts/DistributionCreator.s.sol |  12 ++++++++----
 test/DistributionCreator.t.sol    |   2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bun.lockb b/bun.lockb
index 17580e39fc6eda7e31d59861fe726b8e82d69381..eb67f44f89a74189122f95e3e4d7c7ff05d71c45 100755
GIT binary patch
delta 2429
zcmdUv`%~0a7{<Tn3nH-K0;WJ-SQbz$S~VyEB^S*Ji44U?j2XwKk(?dFY_hB-7Y7p<
zwWvi78b6rRI9`4zhnaRtB~+ZI>ttREFO7y{sNCcdi|$s>v-|!Ny~D$K&gYyx-*b7-
zY1tlg&~IsQ%&LFU@q;V+;Ek7Ko1+q}T|YJ!_w?P&o4veaMa1hR$zugg0n=a%ezYpZ
zJkoP)OS82#DXzh)&#hC=)`64@?|M4&b3DFJay>SCc<UQ2yR5CRwKP~;_aARMvhdKC
zA0EBiIa;+j|FejDZKZdzTyHx(le23!@4oa-V_#<1;)dJ<XZKmR9PUodzP<Czr!!Y?
zJM}_k-Hy*soZGV`^A)|hQdQ^+>(o;3+FE5%o;kK~Z}ocBp5dvpXX1lVEZH_-{(t}L
z>aD6WxS+Tb^P>lPRB*!^hxD;t<<!HyYJq!F5E;f-XybW=LsNwv7d8&{H^V~kBp8Q@
zfKEw!o0Q|h&ax5Fj*>PK`c@eG(?&txhgg+y8ipT^hJFe`qXQ+a1^QVS2j=8rpkIW2
zhmtlH`c)VQ=Hw<ojl$TU)~e_BtBLM7SSQ5c_%k-eL(?I~d0`3gO;|VAe?izp_*D=;
zaZ%Vq@a4iT3FE$2;<wzB-@v%U$xv~au_(AHozgK8uv9kpvalquA~5dB6=BKn)4{kW
zSM@!tqu`n}O#!k=(;r~`7SAw4*mdbQ4J;0fTX;hk4qz+(l%^D*Z4jeNm<_&$0C5wH
z+m#A!CqQ&dKRY~^$ha*m4gPmwcZ8*bafOV#A?7wRP~j38%um`G5a-P36*d$820V|t
zPgo}WEn)pAu{2{A^cOs1Q2IRrKPqepCHLo1$fw-+j~J1TS@2`h@o!;|fz`uXQF0JA
zJD_2R;S)9+-UTtaI0pO8fu4mJ_W?M;xljefL<+d2<Kw6>tC%(a2+M|NR+0THEC)Uj
zqcD@W3}E94sGK7sl&~k^%fOgirm%VNPA(l0CQO$Os&IFq&~Tx7=rIq!X3C8dmJiP_
zGlwFC&4=Fs*`V>l7QojEixgIXx>aTv1xEW6)CrGp8!^&xA!?UH(1;c01iLD1g0Moc
zYr?F;7J*%aXF|mZTMXX@&qRqA_B8xA!V-cEC%XjjIfw@~QNJ{V%QXpY_%oh?cwRiB
z#9)8iP56!QTv(E@rSNY40FkVZVF>pWX<`c0O4C$fC169srU~N=m<628bYaWjnFVAi
z!k&jOgBUhprSK==IknUft1y<Mau^lP%`P2Rz#o7wMwupzgVn)vqUpj`!gJl6REDs2
z-X27`U-u2G;$jOtACp*!?=9~L^Pi6?A5Z2uA4jGzQ<mw-w~dMQFf;|?Lp9CtZXHn{
zt5m+ge2Q#PDrAS!AU+*D*csl~QB|XKvrny!Vw&<)vh|2hUD4OaRJ;D-zG~D(4^)Y6
zd7#R*5C7tMp;kh?#k`?edbM9Ij%VgFQ|q95=zYD{ujcD+zjBV-jrvZV5m0Fn9a#Hm
zQ@aAnp$`R=%~I#bIEZwMsr!dj2JV;len9P;5M6FTU&Jz(z7=B@=HSMqqKZ{lmqiqn
zCco9UH&U(1apXCWXSry>(yD#ui_RpxH}Z9)3O0BvV$Gv#qMKczp>j9qo3ENqZ)TOb
iUs={~2+<D$ruY0t)8C--^rk(gea~Q6mfo~gHU9_dX_n#u

delta 2554
zcmXw*2~d?)7>3XJS=4)hi@4wdak+{M0s<mPf`XbNnM<ytW&;9FluMbk>ZQqXDV<Sq
zJfx<Mj+vUKp<T7o%5`cg3sgjz)XdDm1%bc->wV$#8{T`~|2gOUXZy~tpETJwFZEj!
z)A#hM6Bj2`bl!M9GUvql8>1WUooyIfTHW#1fvDocA<d;PtkPbJQL}bxn6>Nf!8eN?
zJ`OwwmG}o1Ioh5&7WHDcrv3BHtGPO@<XTwSJ4J_L6N+wc8dT(Tw)O9|R;fIt3N7?-
z6&-Z-FX_2?m7{3eUT+;#61utQiB0|Lqdi0ITME6pMW2}y<;pmIc#<PF^_RNc^>5S$
zOgV8Qe!i>Aj*%r5^Aft}-rG7o+=|}*+L9$RKfH9ueWmo|yDz2P`ncS5%F{C@YxUUi
zSS$4qdJ^7cl{4E^UO3<TxTAPr%9PiA*DPARuW7;AOy|zgFPHkfZQJ-(x5W!5%?zx6
ze{5DsN>%Qrd55>>?C6@1vvb0Lg|qJzb9H0PwgP>MKclcTZ_l|o`rC+ggFBj|t96_Q
zKh?8X8E1QNw{_^7wdPQjPBYb2dZ@dd%;hNRSnUlRY~5LP41gQt1050ewJ=|>0%6Cc
zZyT`hr2d4IZNW~%GgwE<G0(O#xB6b74e*Cns7|8fz;@^-VSEX#AM~@ZGblM>f9Sk0
zzJoRZ`c2r6D7gsc$9iFGua#S=K)_`Je{F$EwFgUs*oiM;br7@xE9S~eg>`_R3UTFS
z!aBlF6LvvZCp_n&FL&c27#G(W${Yd6?I@Rq!SLf{TQ3Xi0+s>B-KY@O75*tO?#2~U
zeNT5ty((4Rft*rR3C6KPpa@~VOS@38Krn9JHIsf{cW_^qsxYAUAjS=0PWVgkj6Z~h
z!*k}0o5Ec1oF(H=VLjll2)iY$C)hP%f3-5ViU8y!czCy^VJ~=gBKsR9rmT8H?8K;&
zc75RMg)!5)?!Hiiu=~<366}$%2g3S+g)$i!)qp(sC}<@-6XYLh7!6+wF*q3hR1B04
zF=;p$S%2tRh{3@)=~!q6#H4AGc5(1bASOt&TVOmMm_da6WZ+K?fP(QBX3c-X65yxt
z%?vD;?FK><!I(%|SR#BHw*z4bOM*`q<|WLGuh!n~B=lx_c?(U3=g7<#A7M|!J7i>E
zFxtV;Wq3wAX_o?DA<QN$73``oyRac(m95OJ`~(gKya3+=rN6K=_@^KqSb(r}c&9Lj
zuwi%(7ZxaNIG&kxjP_vsa*TkObc{}57QYeC;NdxlhZt<K9^!I!ZK+dg6cEpl=hj``
zn*l!`o|_UPY&5(Zo)Kye;uY>NsbX3zmnx^QF<>>q!i8}LOf62^C2TA_XGPXS*f@Bm
zR?G5)jmI<dyk&W<%&jH>FxR-eUefS+c%~XzZ($SRDMlY*li<IB=UV#;n+(4jo@<R1
zHU)k=d?w0%!Z_v%3%7|Yj}pj1xsjYyw6MTBX0TG{n$4CPojG!smr|cXyP-YMUg$Gu
zAG9C(96A8;->Wa666g?g82S?OKu5eh@wIxL_S~-1h1!?bDO8!fdYx^`>UFvQGK{wz
zS^=#zyBqY$02gczh`AD>O#UOiL9aH=kMuZS-pm2YWd5tCTQ+63qii<`ujFSU-}pD`
z;U=e14+>(6@+0bm!l7QuY;4rS%*{sabn&~wOT}x+1LlG90GU%fw0_FinsiLSlQwK0
zrA%UzcG(-6F%sgcpJlez=m_hf_I%K!HwKtPO*+FC$a{jQm}_F}R=OT&7TB%ekfa!V
zJ_dnfS%nRy87G4l*BxuC6Jk)|*<rW#&hixaS!LSRXI^XnbMwu#d@GGNM0twyt!+BE
zfhmqyD*x}Yr7RjW#2IJO>{b`goL8*!H72{za+$1VE847{Yo$aE?4L9{D>gAHCpj-E
lHaRXgJ9~Cga!yuWLVR9wUUG6=*6jF1{Km&+nY9JF_<uzXkgxy%

diff --git a/package.json b/package.json
index 76a1f5d..af7e1f2 100644
--- 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
index 3c4eb67..5b17e78 100644
--- 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
index a095f6a..5c1dbe2 100644
--- 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,