Merge pull request #373 from multiversx/new-contracts-2024.11.06

Integrated new contracts
multiversx · Nov 7, 2024 · 78b4646 · 78b4646
2 parents ca34306 + 53b3b87
commit 78b4646
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 40 deletions.
diff --git 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
@@ -168,26 +168,17 @@
                     "name": "requested_token",
                     "type": "TokenIdentifier"
                 },
+                {
+                    "name": "safe_address",
+                    "type": "Address"
+                },
                 {
                     "name": "to",
                     "type": "EthAddress"
                 }
             ],
             "outputs": []
         },
-        {
-            "name": "setEsdtSafeContractAddress",
-            "onlyOwner": true,
-            "mutability": "mutable",
-            "inputs": [
-                {
-                    "name": "opt_new_address",
-                    "type": "optional<Address>",
-                    "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