From af023d816ddcdbb142649403e87d64ca5522282a Mon Sep 17 00:00:00 2001
From: Nicolas Lecouflet <lecoufletnicolas@gmail.com>
Date: Fri, 20 Dec 2024 14:14:10 +0100
Subject: [PATCH] feat: update upgrade script

---
 bun.lockb                         | Bin 196105 -> 198320 bytes
 package.json                      |   2 +-
 scripts/DistributionCreator.s.sol |   4 ++--
 scripts/Distributor.s.sol         |  28 ++++++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/bun.lockb b/bun.lockb
index 1417aac17fbd9fca83ba16c6859ee849fe9f9aaf..ea7b5d138e10f97992091a691e37aa1517a4b735 100755
GIT binary patch
delta 3013
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

delta 2096
zcmXYydu$X{7{%vK3x(ZwXL+_*+FeRlL9s0gv}!F|6l|+v0TVXS0EtP1O%sFSi)bcB
zEhTDfLt!dX<>enrOw^T3i~<ETq6q{QRG#5s5VW*}#qtOR&)Gd+_T--Xn>%;z{pOpy
zU%Z#Q>PE1=Z1T%59IQ*#9^IH)6z<!5e))y7OV4aeoO`Cc=Jo!TcjlCQ{_3D@F)np1
zjM$&`e)&q5lbjT8cf5`!6HkVt@z++LjASQAcfac-!`<ypa>;iUTfNREQ|}*WGeNVu
zF`DgPeAe{D{NDFX$>PApUXz}%Gv#gVH*v4G-&DI}(#W#D!8JZF8yYY6t=JIsU&_kB
z?O>c{D6~u0cc{$)`+*k`J!ol%K|hLdJneAk=L~bL-7tJ`0NR&<*7s;>gV264PRzyS
zLI=ctLQ9(m{VK+ZxwsJ2DaP@%4%904OPaZs6$Xq$oSc*J`Ut2PV*DmH5`HbRz-$~8
z8wI}*;sXzfjfPK%{Vv8VH{o7p=npV%cr4W50y0I1H83B(QK>#6RsdE9#ta=58wXzu
z#ta=3yA3{~dyk71f<-m%1Q;L8*BcXaPikNhU>K0;Jtf8rAVKLkEfzuV4Y4y~QS{#w
z`wNVjoB+Kgc246;(C6+M=QGT;CZhAF;6EBz3dY?t{uPVCbN37uGVSdUH^8_cb_YB+
zz?$e2n*@JWtRF4*X-$UyHrn1L4ZIWZ3Opl)mg%|+x+?ac#!UgcCN>~;H`pq878&Q@
z<ud3p#NZrc<xn%ky1V8IR-p4J#JCQ|6;6eof>>mO8g~yo3yuYKQ|w-N7980vv1#!6
zn1n^fT>x9tp#&#J7%_JSItu_<c(!0Ae4JZHWQkS5*NSC}-3L~Qds&P_#O{aZgIP~Q
z#U6lfg`!Z7ST+1gmKWhL!3W_Tt#CLPZ4Go7o{_6@GvSYj<%z|?j){fDYQc_+IbyTG
z4#BgY!ZzMNQ}YnC1CWI>LIWR$-zhdyY&O{A5MS3QF#N1JP$R?`BlZY9UmagpzV5Aq
ze-56TED)<_{kiBc#-XKcfZi4>M9T%THdcy_7kdmWB~~QH#j!rP&|<N<@T?EAh}aYG
z3!rrUM+Lcy?eJXb1hIMWpTgIpEfJd!zX_fTohZi1+Tgj+Qn4rDnFTH?Cf38x3X!;x
zZoNGNW_CjmfCo<=#B-aUP#EGd%wv~d0FPBxI4hdP%2Sbr$5XEm;;B|-dGoKB))`%x
z`vYhl^dYn!>V`goK87|x8=+0mW@roaiSa{M%?dk@|9VO2YiOIl=DI1*^7amzr~N56
zO~M4*G7Gm#gSNMGz{K#;_+Q;J>q3D<5PL+-ZT9*?_ROqlWtDz~W1m<Q=xWYfscP{q
qFSFx*)${fSlfSejLzn4~K2ZH)RZVp2TE{N%bC%nI4)2s}y8Z{y|LWfW

diff --git a/package.json b/package.json
index 7b2744f..2fc505b 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "url": "https://github.com/AngleProtocol/merkl-contracts/issues"
   },
   "devDependencies": {
-    "@angleprotocol/sdk": "2.34.7",
+    "@angleprotocol/sdk": "2.35.0",
     "@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 5b17e78..55100a3 100644
--- a/scripts/DistributionCreator.s.sol
+++ b/scripts/DistributionCreator.s.sol
@@ -523,7 +523,7 @@ contract SignAndCreateCampaign is DistributionCreatorScript {
 }
 
 contract UpgradeAndBuildUpgradeToPayload is DistributionCreatorScript {
-    function run() external {
+    function run() external broadcast {
         uint256 chainId = block.chainid;
         address distributionCreator = readAddress(chainId, "Merkl.DistributionCreator");
 
@@ -534,7 +534,7 @@ contract UpgradeAndBuildUpgradeToPayload is DistributionCreatorScript {
             distributionCreatorImpl
         );
 
-        try this.externalReadAddress(chainId, "Merkl.AngleLabs") returns (address safe) {
+        try this.externalReadAddress(chainId, "AngleLabs") returns (address safe) {
             _serializeJson(
                 chainId,
                 distributionCreator, // target address (the proxy)
diff --git a/scripts/Distributor.s.sol b/scripts/Distributor.s.sol
index d72aa32..2f21738 100644
--- a/scripts/Distributor.s.sol
+++ b/scripts/Distributor.s.sol
@@ -5,6 +5,7 @@ import { console } from "forge-std/console.sol";
 import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { JsonReader } from "@utils/JsonReader.sol";
+import { ITransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
 import { BaseScript } from "./utils/Base.s.sol";
 import { Distributor, MerkleTree } from "../contracts/Distributor.sol";
@@ -295,3 +296,30 @@ contract Claim is DistributorScript {
         console.log("Claimed rewards for", users.length, "users");
     }
 }
+
+contract BuildUpgradeToPayload is DistributorScript {
+    function run() external broadcast {
+        uint256 chainId = block.chainid;
+        address distributor = readAddress(chainId, "Merkl.Distributor");
+
+        address distributorImpl = address(new Distributor());
+
+        bytes memory payload = abi.encodeWithSelector(ITransparentUpgradeableProxy.upgradeTo.selector, distributorImpl);
+
+        try this.externalReadAddress(chainId, "AngleLabs") returns (address safe) {
+            _serializeJson(
+                chainId,
+                distributor, // target address (the proxy)
+                0, // value
+                payload, // direct upgrade call
+                Operation.Call, // standard call (not delegate)
+                hex"", // signature
+                safe // safe address
+            );
+        } catch {}
+    }
+
+    function externalReadAddress(uint256 chainId, string memory key) external view returns (address) {
+        return readAddress(chainId, key);
+    }
+}