Integrated new contracts

integrationTests/relayers/slowTests/framework/multiversxHandler.go

@@ -336,36 +336,36 @@ func (handler *MultiversxHandler) wireWrapper(ctx context.Context) {
 		},
 	)
 	log.Info("Set in wrapper contract the safe contract", "transaction hash", hash, "status", txResult.Status)
+}
 
-	// setBridgeProxyContractAddress
-	hash, txResult = handler.ChainSimulator.ScCall(
+func (handler *MultiversxHandler) wireSafe(ctx context.Context) {
+	// setBridgedTokensWrapperAddress
+	hash, txResult := handler.ChainSimulator.ScCall(
 		ctx,
 		handler.OwnerKeys.MvxSk,
-		handler.WrapperAddress,
+		handler.SafeAddress,
 		zeroStringValue,
 		setCallsGasLimit,
-		setBridgeProxyContractAddressFunction,
+		setBridgedTokensWrapperAddressFunction,
 		[]string{
-			handler.ScProxyAddress.Hex(),
+			handler.WrapperAddress.Hex(),
 		},
 	)
-	log.Info("Set in wrapper contract the SC proxy contract", "transaction hash", hash, "status", txResult.Status)
-}
+	log.Info("Set in safe contract the wrapper contract", "transaction hash", hash, "status", txResult.Status)
 
-func (handler *MultiversxHandler) wireSafe(ctx context.Context) {
-	// setBridgedTokensWrapperAddress
-	hash, txResult := handler.ChainSimulator.ScCall(
+	//setBridgeProxyContractAddress
+	hash, txResult = handler.ChainSimulator.ScCall(
 		ctx,
 		handler.OwnerKeys.MvxSk,
 		handler.SafeAddress,
 		zeroStringValue,
 		setCallsGasLimit,
-		setBridgedTokensWrapperAddressFunction,
+		setBridgeProxyContractAddressFunction,
 		[]string{
-			handler.WrapperAddress.Hex(),
+			handler.ScProxyAddress.Hex(),
 		},
 	)
-	log.Info("Set in safe contract the wrapper contract", "transaction hash", hash, "status", txResult.Status)
+	log.Info("Set in safe contract the SC proxy contract", "transaction hash", hash, "status", txResult.Status)
 }
 
 func (handler *MultiversxHandler) changeOwners(ctx context.Context) {

integrationTests/relayers/slowTests/testdata/contracts/mvx/bridged-tokens-wrapper.abi.json

@@ -171,11 +171,6 @@
                 {
                     "name": "to",
                     "type": "EthAddress"
-                },
-                {
-                    "name": "opt_refunding_address",
-                    "type": "optional<Address>",
-                    "multi_arg": true
                 }
             ],
             "outputs": []
@@ -193,19 +188,6 @@
             ],
             "outputs": []
         },
-        {
-            "name": "setBridgeProxyContractAddress",
-            "onlyOwner": true,
-            "mutability": "mutable",
-            "inputs": [
-                {
-                    "name": "opt_new_address",
-                    "type": "optional<Address>",
-                    "multi_arg": true
-                }
-            ],
-            "outputs": []
-        },
         {
             "name": "getUniversalBridgedTokenIds",
             "mutability": "readonly",
@@ -273,16 +255,6 @@
                 }
             ]
         },
-        {
-            "name": "getBridgeProxyContractAddress",
-            "mutability": "readonly",
-            "inputs": [],
-            "outputs": [
-                {
-                    "type": "Address"
-                }
-            ]
-        },
         {
             "name": "pause",
             "onlyOwner": true,

integrationTests/relayers/slowTests/testdata/contracts/mvx/esdt-safe.abi.json

@@ -124,7 +124,7 @@
                     "type": "EthAddress"
                 },
                 {
-                    "name": "opt_refund_address",
+                    "name": "opt_refunding_address",
                     "type": "optional<Address>",
                     "multi_arg": true
                 }
@@ -164,6 +164,19 @@
             ],
             "outputs": []
         },
+        {
+            "name": "setBridgeProxyContractAddress",
+            "onlyOwner": true,
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "opt_new_address",
+                    "type": "optional<Address>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": []
+        },
         {
             "name": "withdrawRefundFeesForEthereum",
             "onlyOwner": true,
@@ -286,6 +299,16 @@
                 }
             ]
         },
+        {
+            "name": "getBridgeProxyContractAddress",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "Address"
+                }
+            ]
+        },
         {
             "name": "setFeeEstimatorContractAddress",
             "onlyOwner": true,
@@ -894,6 +917,26 @@
                     "type": "u64",
                     "indexed": true
                 },
+                {
+                    "name": "from",
+                    "type": "bytes",
+                    "indexed": true
+                },
+                {
+                    "name": "to",
+                    "type": "bytes",
+                    "indexed": true
+                },
+                {
+                    "name": "token_id",
+                    "type": "TokenIdentifier",
+                    "indexed": true
+                },
+                {
+                    "name": "amount",
+                    "type": "BigUint",
+                    "indexed": true
+                },
                 {
                     "name": "tx_id",
                     "type": "u64",