From 53b3b879e2d30cca9a5d5fcaaacbec7623dd923d Mon Sep 17 00:00:00 2001 From: Iulian Pascalau Date: Wed, 6 Nov 2024 12:19:57 +0200 Subject: [PATCH] - integrated new contracts --- .../slowTests/framework/multiversxHandler.go | 18 +----------- .../mvx/bridged-tokens-wrapper.abi.json | 27 +++--------------- .../contracts/mvx/bridged-tokens-wrapper.wasm | Bin 12262 -> 11745 bytes 3 files changed, 5 insertions(+), 40 deletions(-) diff --git a/integrationTests/relayers/slowTests/framework/multiversxHandler.go b/integrationTests/relayers/slowTests/framework/multiversxHandler.go index 3e934f06..66d1b617 100644 --- a/integrationTests/relayers/slowTests/framework/multiversxHandler.go +++ b/integrationTests/relayers/slowTests/framework/multiversxHandler.go @@ -133,7 +133,6 @@ func (handler *MultiversxHandler) DeployAndSetContracts(ctx context.Context) { handler.wireMultiTransfer(ctx) handler.wireSCProxy(ctx) - handler.wireWrapper(ctx) handler.wireSafe(ctx) handler.changeOwners(ctx) @@ -325,22 +324,6 @@ func (handler *MultiversxHandler) wireSCProxy(ctx context.Context) { log.Info("Set in SC proxy contract the safe contract", "transaction hash", hash, "status", txResult.Status) } -func (handler *MultiversxHandler) wireWrapper(ctx context.Context) { - // setEsdtSafeOnWrapper - hash, txResult := handler.ChainSimulator.ScCall( - ctx, - handler.OwnerKeys.MvxSk, - handler.WrapperAddress, - zeroStringValue, - setCallsGasLimit, - setEsdtSafeOnWrapperFunction, - []string{ - handler.SafeAddress.Hex(), - }, - ) - log.Info("Set in wrapper contract the safe contract", "transaction hash", hash, "status", txResult.Status) -} - func (handler *MultiversxHandler) wireSafe(ctx context.Context) { // setBridgedTokensWrapperAddress hash, txResult := handler.ChainSimulator.ScCall( @@ -981,6 +964,7 @@ func (handler *MultiversxHandler) unwrapCreateTransaction(ctx context.Context, t hex.EncodeToString(value.Bytes()), hex.EncodeToString([]byte(unwrapTokenCreateTransactionFunction)), hex.EncodeToString([]byte(token.MvxChainSpecificToken)), + hex.EncodeToString(handler.SafeAddress.Bytes()), hex.EncodeToString(handler.TestKeys.EthAddress.Bytes()), } dataField := strings.Join(params, "@") diff --git a/integrationTests/relayers/slowTests/testdata/contracts/mvx/bridged-tokens-wrapper.abi.json b/integrationTests/relayers/slowTests/testdata/contracts/mvx/bridged-tokens-wrapper.abi.json index 1287c24b..4be70732 100644 --- a/integrationTests/relayers/slowTests/testdata/contracts/mvx/bridged-tokens-wrapper.abi.json +++ b/integrationTests/relayers/slowTests/testdata/contracts/mvx/bridged-tokens-wrapper.abi.json @@ -168,6 +168,10 @@ "name": "requested_token", "type": "TokenIdentifier" }, + { + "name": "safe_address", + "type": "Address" + }, { "name": "to", "type": "EthAddress" @@ -175,19 +179,6 @@ ], "outputs": [] }, - { - "name": "setEsdtSafeContractAddress", - "onlyOwner": true, - "mutability": "mutable", - "inputs": [ - { - "name": "opt_new_address", - "type": "optional
", - "multi_arg": true - } - ], - "outputs": [] - }, { "name": "getUniversalBridgedTokenIds", "mutability": "readonly", @@ -245,16 +236,6 @@ } ] }, - { - "name": "getEsdtSafeContractAddress", - "mutability": "readonly", - "inputs": [], - "outputs": [ - { - "type": "Address" - } - ] - }, { "name": "pause", "onlyOwner": true, diff --git a/integrationTests/relayers/slowTests/testdata/contracts/mvx/bridged-tokens-wrapper.wasm b/integrationTests/relayers/slowTests/testdata/contracts/mvx/bridged-tokens-wrapper.wasm index 736abdd233219539cd8b5c71772c953c6640c6c2..99dd409687bb472b5425e3202c207c3d0af10cdc 100755 GIT binary patch delta 4027 zcma)9dvKK16~FiU_7%R}&D}hAmre5Rmj{6)AP%HVrbs?UKt?;3mfAl$Ek?4yZg|8z zw4lQ-5FS=a3kRv97VLnuW$0LFnbNTo#3xFj@+fbCS`;l7C{?S~^qhOY-NXpf!pyh# zoO93lo!340=Hj&T-+3Ay>rh({+~@M!L$h5QizQO74a4yXwYnUg0y+%zh4k zyg%1VJ#!Ls=5@^1m@7Fq*~K2=-tP999WAX1_5+^Z(%Sm%j+XZJMC;UfZHc+;Q8?!+ z9=ehjbfD4$i7&{0$b%2gN_Hh?Cp){;?p09kj@WNWz5JvT=)fQQ@_d@by9mzO-oLo*W!pig@pTy|Ga{s|AG zX!@*{6FD9wT*DZb4B}j8NBT6=6~ApRp0Nq_f#g6Vd6A= zmbVaHe0Wf}d=qI{Y(jw9ZFVpI^O|gMzF{+)H?d7SwhyY|WaFeU!}v2PGsD!yn{cOp zZE-(ZN%EL@8m{}(lLj%9iRX!FjOIM8HQQW~788#W+cqa6;Q7Vmt>0cEe}(vi1Hg0^|c8b#$Sc&qKW?nMuftYqRAnXpM+GXq3~Y{)YNJ&P+1IV(o;angQrkrmv3XyMeaTwYQiW*K5-}pamKuzIrQ=(eB zO25VIyvYc}`+%UUu*Z8l7R!En5$r9v%`=!>I|`o{R##^ooBs80>%2SO^Et zbl;6J4p1kL&;MGIX%wh(sf4IDEAGcKwQWKb z@w?dSh>s9Hi}e3a`qTuJ1zlw!?ouweY>r3U374yIP2FUcI6+#3kJ*sP5y~YaUx8kN zi6!5vJRo;*O#VT&-xjGVT%qrNweL09T@u4HaH^!6AA~8TRk(hjv|Q_51nWxI^8+w4 zyt(ir(hzUc*XEsuVD>?{6t3hSK_C)!x*uJkq~V9UzbP`3e+aW9wb4(cRxiKb=3fh- zx9H2K(%fnIRiw1`KeWcatWTL3j(ApzKBKSY#;u>rl}G#)E=SCC&env0OZLH8M?0Ld zm&%3rePUSbmmRiGvIVh=5bssR###`^FJ70lTlo>!?01(@Uj@WJh%YSi zzE^J1QTYRSDr(u6oddC*_}F@TmXJzJWa-nAF3Hi?Bwd-Kk3w&>A-!7yRfyeWC5{!7 z$rP6*7&j&{IxC2tp{XSPMr=CI{pkq-ZhzWC;59kp&nzW6o~4Zrw3D-Pj;vVHibt9~ z2frR1OD~e^BP0|X=k01rtA$3?}x$?y_Ma zC1&D}#EobO`;cCraa+XqlRU}2JM>{ z_G7ZtxzhFrfdl2ECrFnN%5lo#jhaBRst>t}kl%GYD#8PZ(?Kj%ZV_5ooPkLdWBD0a zTG52xJr$Popg0bfDysNJ2%6z0b(-ZBfELV@(~^?m$NN)S8qd`9Qy8j=kHfv@==8wM z?Ucu#H+Kq-sR7GplT*hfBcX@>z z=y4CyX3AcZozyU|s-#v8W@YO^k*C!Vavb9Y;S#UN z8o5#91JJ6gA_Jx|x{duZ%Esr~xaw*ADr~53&y#OG^!+M?Yrax9AotW=GVlME4an{L z#0u31q6Ze#B-3x|x;M=i@^mG#GZ;~u#nhc@>p~jK9=SLdduU5s6MN+^CWPE6lBF$5 z2?^1N=j^vqjF-OcOWB)c^M;(845RnO-IN4>+=H_dW)1PDbe#<}fEQRVK$#{dqeMyfV3k%*Wm@W{~N6`Ll;4y8~=!oL{X4$DpbNxlft=vm%jB{Ctog~5LP)*|8CH4#Qy2B?1oEv7T zFmR8&XY317mXESXT}(}M(eE*~O>82QhQcFpT-nUR==e@1sCIy-j+8+LIxJA4WZACZJ7M~u(gh<}8;#^7Iw{{<2{mLmWF delta 4635 zcma(VYj9N6`J8+A74B|wl8|Jxd2n|(F+ma(2U5m5$^j#Vu~SFEwqt8%VHd~>Nyu(w zm~q@qbPyw+jMT)3srQi3RySpLaw14hB z-*>+Ay&vb^gEt)M_*KB=8sJ&3N?g@m!)Lm@-hgU#)tTH^s;+iL4b!U@yDHT(S5@Zy zL7$aj@;JP_hsvPvY<1aSlF3L>(i@wWnWK*j^{RVj1@1QvoJRI zrULQ3T*MPS-Koy>)t!s`I^&(`rR+XFY6+-A+*0g*ZuNELVfFy89R^P8O@NxSdShLw z*xYnycNbg3L#af%y*?FBUl*H~nAY8u?u9KGkM|~0DfSayGe41@t=?{_s$y$-DF7s= zApJqL&E3d*Th!F~?j?9$7Jxvw*I4PxW$5$>BCTexs4 z7|ho3Q5_xNlUPThD{gYDqhmoL*3&U3mP(k$s68{XJi>WKY|Lh}EW)QU0gJ3!;0XnW z1_!fDW|9%sW(=vjJ;#k-uT=fsKK|OKPrc7^@7s7pyrX_wbZh9fl}Otl1`x-rHehK? zk*t*+Ro9HFZvtiNg^+Z1mokN@6^VX)pQVq(2|%Ad*H#Epz(VZ)eW zOtE>h!6K$)&Bh_r>{|gQdD!rC%jUKzd9ux5z;ZLPh;VTSzNLK?Pz~IM%9Y5+2JkJ! z9~}A2=52<{X0`!Gtx?Qo`m~kgW=3+cSuF`n46mZohTPvzTym#n4!=w72()B&(Qa{W z*ETj;-=(IPJRR834@Ate z(Edl2M_kB1P!q(Ze4kn5s*~y%8FS5K*^k+-o-5jq1$Mc1K#FBE4CK#Aq#13{-oHCpmhO5%^3m1_CPeL`fRV*i)g=T$&*xq`ONxX zurb93{>0P$9Vn6!$8FGn*={Wct;v9Jm+gjrAl|}LaNcd3P+pK*UeM2TqTzG#7Zmetw z>ngeodJ!l`(F~)SIVJ$y=@vILW#s8dx@ep-csA*X)e zFj@i+te@$@3H)=lG}!$8|In#3e6i%;4uBb;a4Y8gfntlkykTy#iu~x}v&r*2~U@FNr!r@i!Zz zf&E`J8lr?4zt~BzTZ;`Faswq`K%78)1hpSP1;7qNe5@X?jz~qVv`jpW6wH!G2(Hb; z1Iw^ER_5U~1V{7mXUZRH{oWTVkZO$Bf?UE7N^+(+PU>)LI@1*-ZbRwfD59~7hr{gw zE+1KrY%a(%-=qzyz@b}rrGnnZ8~GKUrb;WPvR0dC2`Yv_D3<%qnGa1N8U#R~)*HW-D&nTzEp3=)I94Ei2K0?^Hs6u0XwSOVQK z)mAsD^c=S8mb#ith|rjVVfO>6(=6ogDObX|a1IxuUa6bZPRu}*qh$m%5&$+7BsZYs z4;+m~Lw!MO5QADRlok{RRDXR?-B8~ML$<&EQh08zk2v?BH`U?#hU=*H`C*uX&8T3T zVFMpK=@c?e1&z>&MhHz00^s&V15b-~DAW(eOv;RO#XjHcM>34L1sp6D`+(6~`JS+GNsm_j#3z+Q9PSjx<;S>ol#47Kxd<+3^LJY68&yC?e zb-P{Hs@odr0Vyx{Q|wy4Mi2FdJ?X~tgwKyYF4$%0+kp=2c{SCsHS}!OM{_=&A8zI^ zs(ZrGF}i6Q;)wPpbT2L-2eSGOHKcZjTP#uryNvi;6-A!lE7dcR%O{gj1^0q>F6YAH zYBOemyf+y7MK^8J>CSHG&f}t?_z;PJrb$#@L0vrT0oYE;XL9YCh?opQayDaTH5&~e zME7e4Z8=@q4aZ+0u5LK-vHB|7P(7kcgB_4e z6D3>(zuC~iPpStSdWz_>2F9FJqZ_|5ZbWb}^(Zi3B4_9abHt$5T&z?#H+J&9YN#Y)?{*o+Ip8AB|? z%@B+^uJ6F&2}C#}8*d1jU@A7HPjRcT8g}Sj65$0AFHi*hVh3W-ohD!G3~y7lG}UoK&1`C# zrU~6)PJO~Vb?C&>Tj0v&o%-;dp6hEMfV+s35BljQT#5U&l8`wKu!4bbpW0d*$uRw) z(WXD2#Gf51_`1ti(jPSr>+)>pVw z;YBxU`31u>=d7`d75CAkP++5DzQG?A+ zchp!Eg|h}{ip_HE8wbowxCQw9eJ?sx)#iK+6U!*Xd@4!^2)%uYu>!isngCY&tPE%1gU@(j8ri uB^~e&27gebyEjG0{f<{A&il_nz14E98sEA=t!}-lXb67oxF(-DbLPJkT171Y