From 749e897be004a22ad3ce414338924eb58653a4a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kaya=20G=C3=B6kalp?= Date: Sun, 18 Aug 2024 19:53:42 -0700 Subject: [PATCH] fix: use proxy bin with storage slots in a namespace (#6429) --- .../proxy_abi/proxy_contract-abi.json | 6 +++--- .../proxy_contract-storage_slots.json | 6 +++--- .../forc-client/proxy_abi/proxy_contract.bin | Bin 13752 -> 14096 bytes forc-plugins/forc-client/tests/deploy.rs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json b/forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json index 011be5632e1..f19a27bdf39 100644 --- a/forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json +++ b/forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json @@ -514,7 +514,7 @@ { "name": "doc-comment", "arguments": [ - " * When `storage.proxy_owner` is not [State::Uninitialized]." + " * When `storage::SRC14.proxy_owner` is not [State::Uninitialized]." ] }, { @@ -713,12 +713,12 @@ { "name": "INITIAL_TARGET", "concreteTypeId": "0d79387ad3bacdc3b7aad9da3a96f4ce60d9a1b6002df254069ad95a3931d5c8", - "offset": 13272 + "offset": 13616 }, { "name": "INITIAL_OWNER", "concreteTypeId": "192bc7098e2fe60635a9918afb563e4e5419d386da2bdbf0d716b4bc8549802c", - "offset": 13224 + "offset": 13568 } ] } \ No newline at end of file diff --git a/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json b/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json index c648477bc2a..7401f63e638 100644 --- a/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json +++ b/forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json @@ -1,10 +1,10 @@ [ { - "key": "72fc5f2af3af1d5912212382d8323bd34e899429c427791cee5428ab6d77afe7", + "key": "35fa5b7532d53cf687e13e3db014eaf208c5b8c534ab693dd7090d5e02675f3e", "value": "0000000000000000000000000000000000000000000000000000000000000000" }, { - "key": "72fc5f2af3af1d5912212382d8323bd34e899429c427791cee5428ab6d77afe8", + "key": "35fa5b7532d53cf687e13e3db014eaf208c5b8c534ab693dd7090d5e02675f3f", "value": "0000000000000000000000000000000000000000000000000000000000000000" }, { @@ -15,4 +15,4 @@ "key": "7bb458adc1d118713319a5baa00a2d049dd64d2916477d2688d76970c898cd56", "value": "0000000000000000000000000000000000000000000000000000000000000000" } -] \ No newline at end of file +] diff --git a/forc-plugins/forc-client/proxy_abi/proxy_contract.bin b/forc-plugins/forc-client/proxy_abi/proxy_contract.bin index 44b17e30c4ceecbb9e0085d7aaf078e8781672bf..ca4f22d13320e98c4a769dc826f66e827db191ca 100644 GIT binary patch delta 2466 zcmZ`*TTC2P82-<&%MSG7M7D*Dy$l8FNLyH1Xh|&Xth1W|7s9DjC8ZRIO)u$fODJL` zE@@Oq9~3#g8F?VlD5)kc4419;VPC3!FfEBUj3#bvHKn0uV_F64ga4VG-EN6)vYfMX z{_~yh|NiekL*!8ZQAv(_paVbv>r(+E(nTUH+G$=UiwJp{Nf~bQC*eIpF0(GjDPd6_ z`^WK`ATBezox6yTnaid#4H9CC>!jeSVuP-Fa+uA!zL2x2tN|3^SDD)cjSpf1eGqeW zK=#+{EAbaW44C1p$6Tbvj7q1Sp{zVv9|E~42Gp2P+pD2k^*ef~KGr4ANFe{Z5Jf1F z^(mk)hU4u%@Tku_G}30ny7B_=lhOVgFx%U;r892sC7kA z8kk7TYbv5NR6m|4&nS41X93*|pB%u0>cdm1jWr-zbH1@g65DG*Rcjnksz($g?oqw& zo(>>YkEShLms=1=AL&O@8>tZqVyw!Olv@Ep%e`+zk#!-01gSBmB^R6Zk)=6a&~R;W zvmWllIpADq*5mn`QCrNe5wkml-(xf|IfQC(GFk_~5>!v4UJ&sxig=2ps9}mopv@+( zSi}R9D~H-OzR`{HPhPd={z5>I8wfJYl)T(fgbR-Fl6n`#)-Q?HoFAc^SCez32sT}U zyOC!2q)j;+=dYx#W$-oJC**h?JUu~b>(NdC_&GK;%xR=7ampw`evbDUOM@h6w+-q= zkXILgcK-+HE==R9mBuN{H%6E%Y{4V_h&9KuA)2@Vtt$;Jlj@^=sNN1#n&R`M(z#gH z7*=3woBx!CzUoIypt9~LR&p+3E6KJMyXMHM`cO8|3V|?9#re@ve2>2nefba@i_w)< zj0(&m!m~IMu(OaJW-)dkEejO&5xw5B_2L<{Vg|K%in<_!2xhPaGswUUf+=Rk*ffhe za@mi0t3qje(wWgfB$l#|K)u9<4g_hfo zYE)v@1}YM;jBm3>PxM>N5}ug1)yzYGwA)IicVNHWWziHtW0ZH9mj*_|IKDvZl*E-$ z=ZsQs$i6eYRV2q zQGHUuoNi%s7mH>tZ_YTKD9{MM{gN%!W6dr3;)TsdIM^HrA1^14=kVex*o+rfqT9)V zgb^OzhW7KL1AwoD`Bt-c#Q}l*V8&PdMaU6$TUkfCm^=SE+rD&hNR;&$wE2MK)S#=X z!I|TiG<27hI(HiKMaKcy>zVd?s&;KYlEGsT!ztgFU;sdr=K(H=0OtW*&&~my1z3F! zf6KEJ-T~;b-cv?D$bnGok#_~&U2Em~DOk3{5$&W%Dlu+o^9qnthxW$?$5F%4jWy-> zUbIsKY{{^Of{L`kx)3B4_aP}4KIbp4Odi{E*W*fG$M;cddq_jM>wG**4uVyY9Qbuw zi886u>U zol)13`z)%Kl4cfHzr=qZB2P82()CUz6>lMZth#uQ;3DR5@tgP`#!Az(UdFM8)owUX zrr0g~yO(vBJdJ^ok`VcsRhIUW-&nNtQ}R9wdfpOT&VjNmq={9Qy@YNVEbGMs3O8O8 zvfOOAcsHY);!4HeO(!;fyYE6We dQpq0CL;O?HXOBbn*l3T`9uor;4YOcH^}jT*(aHb- delta 2131 zcmZ`)ZERCz6h7}=*OoEamCdqTMebb3$~Ly{gGmJ9ZSG1t%iPOH<^=0HnLzyDqs}o9 zX+uKl&X_ig+9Ako%XG)zHtwUhx3jLrzX zc@@yskr0d37Dc*2x~>E;aBFN}&ahdw&lxs@J-h*2uI8d7^^N(lEH^K!8%RMXCNA^> z^fZCB&;uG4K^hT3s>k;#nk*2_=m7WGNkKhb(x^cMIw{FP=t(DqT&fR+u!Aa0bP5x> zcp@bP;PAW+7~Dzqu~XD%BxZjL>aiPU;(XNiqt5MSgJU5EM+jreT{IBCgvend77g<~ zfWIZECjxd%){6mE0k&^=0t?tiIRYE-yJkyLIBEg`985eN=DOF(yE{wu5m}jxf^zl# z5lb)eaRsp;v-5?RTq^WhG(^iTeEyI@-8qjJ(i_V5ad;iz3Dc=mIC;=X%W|6Uv)lCX zA$lq7bZw{ih=#MC$TYymHlnelWeKZS9*wld2LuW&0)+}}p!k0psF`aZgQ^wzWk+y4 z2uN=hk`BzSPhFS50*8EZSuu5 zksEm?;s)YchU_?YePn=*FLqQ&Wx_NN3(YY?A9V}e!@(V;Liak8EM#92nda6wuAK;1 zJHiq`$XW$&OhO~^R*RxMMNuT}uO@+uQQ!F=1YS)&f}?-V73v$p^@c_o7vCeH~P%tlAwhE^(&q;uSr)B^?0RDboT| zF{&(A8%vj7mvXMKl(Ui?X8C0`WQVb~>|sKxS^M(ML}#BakC5%Gs{CW}9=lwALb4df zE3OD3Dw|qSNxo#o6*Xi9^H*HN|8nJKvX6CDt|4`7pz?XidVaX-9egETH2PL5C~vT{ z)hEe8wzlRZS;Q{aa68!@A;(z1`zYyW#kGTE54%+RzGNL_?RAfna@JqBojk^F)*Z$0 zhw6Wj?4KX6dXAlINUPzy9ThhQmp;3=r1Z!{-I|}CKK9{?Z^{oma(#>I{Hyy1ud&1` zRlQQUY185A)Uqe<9aw+yYsbjdjX(Fd{qE?xaAD7h*V@P}HnXZ{YyBB~P2uC-l94s$ j=j!~-=amUl#!TrprQehp0aZ8#{#2dINGD~N8vXwQQ6_F} diff --git a/forc-plugins/forc-client/tests/deploy.rs b/forc-plugins/forc-client/tests/deploy.rs index 1f40025596d..faba22f143a 100644 --- a/forc-plugins/forc-client/tests/deploy.rs +++ b/forc-plugins/forc-client/tests/deploy.rs @@ -294,7 +294,7 @@ async fn test_deploy_fresh_proxy() { .unwrap(), proxy: Some( ContractId::from_str( - "ca196e29217545f6e676d93bbd03219aef6ee4adf96ce960b5005a67aa04fb5d", + "f2d67efbd6038c85ddaffdcdc859770d8bd20eeec8e3909911f1446b2ec9f764", ) .unwrap(), ),