Merge master in rc/v1.7.0 23nov

executor/executorMemory.go

@@ -50,10 +50,12 @@ func MemLoadFromMemory(memory Memory, memPtr MemPtr, length MemLength) ([]byte,
 		return nil, fmt.Errorf("mem load: %w", ErrMemoryNegativeLength)
 	}
 
-	result := make([]byte, length)
+	var result []byte
 	if isRequestedEndTooLarge {
+		result = make([]byte, memoryLength-uint32(memPtr))
 		copy(result, memoryView[memPtr:])
 	} else {
+		result = make([]byte, requestedEnd-memPtr)
 		copy(result, memoryView[memPtr:requestedEnd])
 	}
 

go.mod

@@ -8,11 +8,11 @@ require (
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1
 	github.com/gogo/protobuf v1.3.2
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/multiversx/mx-chain-core-go v1.2.17
+	github.com/multiversx/mx-chain-core-go v1.2.19-0.20231123115253-158315dc4238
 	github.com/multiversx/mx-chain-crypto-go v1.2.8
 	github.com/multiversx/mx-chain-logger-go v1.0.13
 	github.com/multiversx/mx-chain-scenario-go v1.2.1
-	github.com/multiversx/mx-chain-vm-common-go v1.5.6
+	github.com/multiversx/mx-chain-vm-common-go v1.5.9-0.20231123115741-c8a4816c447a
 	github.com/multiversx/mx-components-big-int v1.0.0
 	github.com/pelletier/go-toml v1.9.3
 	github.com/stretchr/testify v1.8.1

go.sum

@@ -81,16 +81,16 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
-github.com/multiversx/mx-chain-core-go v1.2.17 h1:/7YEuowxnpOtZLAJbuibNWE/8rDcG+WMhNVvrnljPg0=
-github.com/multiversx/mx-chain-core-go v1.2.17/go.mod h1:BILOGHUOIG5dNNX8cgkzCNfDaVtoYrJRYcPnpxRMH84=
+github.com/multiversx/mx-chain-core-go v1.2.19-0.20231123115253-158315dc4238 h1:nlDelmQou2635GW2YACZMAHTc+cRxBvtHE0dRQuVC0U=
+github.com/multiversx/mx-chain-core-go v1.2.19-0.20231123115253-158315dc4238/go.mod h1:BILOGHUOIG5dNNX8cgkzCNfDaVtoYrJRYcPnpxRMH84=
 github.com/multiversx/mx-chain-crypto-go v1.2.8 h1:wOgVlUaO5X4L8iEbFjcQcL8SZvv6WZ7LqH73BiRPhxU=
 github.com/multiversx/mx-chain-crypto-go v1.2.8/go.mod h1:fkaWKp1rbQN9wPKya5jeoRyC+c/SyN/NfggreyeBw+8=
 github.com/multiversx/mx-chain-logger-go v1.0.13 h1:eru/TETo0MkO4ZTnXsQDKf4PBRpAXmqjT02klNT/JnY=
 github.com/multiversx/mx-chain-logger-go v1.0.13/go.mod h1:MZJhTAtZTJxT+yK2EHc4ZW3YOHUc1UdjCD0iahRNBZk=
 github.com/multiversx/mx-chain-scenario-go v1.2.1 h1:9eC6VcOEAKRRKZ7EbSWPLzCdNIMWwuNBtAZlgR4cSMA=
 github.com/multiversx/mx-chain-scenario-go v1.2.1/go.mod h1:EuZY7DpNFHVNSxJR8dKE1z2I8gBYfEFFPSwNUOXptqE=
-github.com/multiversx/mx-chain-vm-common-go v1.5.6 h1:hAWCIkFc5vcweBzpataVsJf0PCPc7tfQBGW/q8nzQ8A=
-github.com/multiversx/mx-chain-vm-common-go v1.5.6/go.mod h1:S8bbBlbOVKgl8YBnlmmHakYiSXjKPcSd6WW+Nku/Xys=
+github.com/multiversx/mx-chain-vm-common-go v1.5.9-0.20231123115741-c8a4816c447a h1:LYEKM1wKOiT3SKqYIJEUDVZEV7VM5ISVjXkg1Jbxsk0=
+github.com/multiversx/mx-chain-vm-common-go v1.5.9-0.20231123115741-c8a4816c447a/go.mod h1:Uu29N9DDx6iWDrDVPRUiLosrzlbNsYgpNfyhOQztEfE=
 github.com/multiversx/mx-components-big-int v1.0.0 h1:Wkr8lSzK2nDqixOrrBa47VNuqdhV1m/aJhaP1EMaiS8=
 github.com/multiversx/mx-components-big-int v1.0.0/go.mod h1:maIEMgHlNE2u78JaDD0oLzri+ShgU4okHfzP3LWGdQM=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=

integrationTests/json/scenariosAdderLog_test.go

@@ -5,10 +5,10 @@ import (
 )
 
 const expectedAdderLog = `starting log:
-GetFunctionNames: [add callBack getSum init]
+GetFunctionNames: [add callBack getSum init upgrade]
 ValidateFunctionArities: true
-GetFunctionNames: [add callBack getSum init]
-GetFunctionNames: [add callBack getSum init]
+GetFunctionNames: [add callBack getSum init upgrade]
+GetFunctionNames: [add callBack getSum init upgrade]
 HasFunction(init): true
 CallFunction(init):
 VM hook begin: CheckNoPayment()
@@ -23,12 +23,12 @@ VM hook begin: BigIntGetUnsignedArgument(0, -101)
 GetPointsUsed: 249
 SetPointsUsed: 1249
 VM hook end:   BigIntGetUnsignedArgument(0, -101)
-VM hook begin: MBufferSetBytes(-102, 1048601, 3)
+VM hook begin: MBufferSetBytes(-102, 131097, 3)
 GetPointsUsed: 1289
 SetPointsUsed: 3289
 GetPointsUsed: 3289
 SetPointsUsed: 6289
-VM hook end:   MBufferSetBytes(-102, 1048601, 3)
+VM hook end:   MBufferSetBytes(-102, 131097, 3)
 VM hook begin: MBufferFromBigIntUnsigned(-103, -101)
 GetPointsUsed: 6333
 SetPointsUsed: 10333
@@ -52,7 +52,7 @@ GetPointsUsed: 135352
 GetPointsUsed: 135352
 Reset: true
 SetPointsUsed: 0
-SetGasLimit: 9223372036853567307
+SetGasLimit: 9223372036853566707
 SetBreakpointValue: 0
 HasFunction(getSum): true
 CallFunction(getSum):
@@ -64,12 +64,12 @@ VM hook begin: GetNumArguments()
 GetPointsUsed: 110
 SetPointsUsed: 210
 VM hook end:   GetNumArguments()
-VM hook begin: MBufferSetBytes(-101, 1048601, 3)
+VM hook begin: MBufferSetBytes(-101, 131097, 3)
 GetPointsUsed: 250
 SetPointsUsed: 2250
 GetPointsUsed: 2250
 SetPointsUsed: 5250
-VM hook end:   MBufferSetBytes(-101, 1048601, 3)
+VM hook end:   MBufferSetBytes(-101, 131097, 3)
 VM hook begin: MBufferStorageLoad(-101, -102)
 GetPointsUsed: 5291
 SetPointsUsed: 6291
@@ -97,7 +97,7 @@ GetPointsUsed: 71337
 GetPointsUsed: 71337
 Reset: true
 SetPointsUsed: 0
-SetGasLimit: 3791500
+SetGasLimit: 3790900
 SetBreakpointValue: 0
 HasFunction(add): true
 CallFunction(add):
@@ -113,12 +113,12 @@ VM hook begin: BigIntGetUnsignedArgument(0, -101)
 GetPointsUsed: 249
 SetPointsUsed: 1249
 VM hook end:   BigIntGetUnsignedArgument(0, -101)
-VM hook begin: MBufferSetBytes(-102, 1048601, 3)
+VM hook begin: MBufferSetBytes(-102, 131097, 3)
 GetPointsUsed: 1289
 SetPointsUsed: 3289
 GetPointsUsed: 3289
 SetPointsUsed: 6289
-VM hook end:   MBufferSetBytes(-102, 1048601, 3)
+VM hook end:   MBufferSetBytes(-102, 131097, 3)
 VM hook begin: MBufferStorageLoad(-102, -103)
 GetPointsUsed: 6333
 SetPointsUsed: 7333
@@ -161,7 +161,7 @@ Clean: true
 
 func TestRustAdderLog(t *testing.T) {
 	ScenariosTest(t).
-		Folder("adder/scenarios").
+		Folder("adder/scenarios/adder.scen.json").
 		WithExecutorLogs().
 		Run().
 		CheckNoError().

integrationTests/json/scenariosContracts_test.go

@@ -51,7 +51,7 @@ func TestESDTMultiTransferOnCallback(t *testing.T) {
 
 func TestCreateAsyncCall(t *testing.T) {
 	ScenariosTest(t).
-		Folder("features/composability/scenarios-promises").
+		Folder("features/composability/scenarios").
 		File("promises_single_transfer.scen.json").
 		Run().
 		CheckNoError()
@@ -60,6 +60,7 @@ func TestCreateAsyncCall(t *testing.T) {
 func TestMultisig(t *testing.T) {
 	ScenariosTest(t).
 		Folder("multisig/scenarios").
+		Exclude("multisig/scenarios/interactor*").
 		Run().
 		CheckNoError()
 }

integrationTests/json/scenariosExecutorLogs_test.go

@@ -149,7 +149,7 @@ func TestCreateAsyncCallLog(t *testing.T) {
 	}
 
 	expected := ScenariosTest(t).
-		Folder("features/composability/scenarios-promises").
+		Folder("features/composability/scenarios").
 		File("promises_single_transfer.scen.json").
 		WithExecutorFactory(wasmer.ExecutorFactory()).
 		WithExecutorLogs().
@@ -158,7 +158,7 @@ func TestCreateAsyncCallLog(t *testing.T) {
 		ExtractLog()
 
 	ScenariosTest(t).
-		Folder("features/composability/scenarios-promises").
+		Folder("features/composability/scenarios").
 		File("promises_single_transfer.scen.json").
 		WithExecutorFactory(wasmer2.ExecutorFactory()).
 		WithExecutorLogs().
@@ -198,6 +198,7 @@ func TestMultisigLog(t *testing.T) {
 
 	expected := ScenariosTest(t).
 		Folder("multisig/scenarios").
+		Exclude("multisig/scenarios/interactor*").
 		WithExecutorFactory(wasmer.ExecutorFactory()).
 		WithExecutorLogs().
 		Run().
@@ -206,6 +207,7 @@ func TestMultisigLog(t *testing.T) {
 
 	ScenariosTest(t).
 		Folder("multisig/scenarios").
+		Exclude("multisig/scenarios/interactor*").
 		WithExecutorFactory(wasmer2.ExecutorFactory()).
 		WithExecutorLogs().
 		Run().

integrationTests/json/scenariosFeatures_test.go

@@ -23,6 +23,7 @@ func TestRustBasicFeaturesLatest(t *testing.T) {
 	ScenariosTest(t).
 		Folder("features/basic-features/scenarios").
 		Exclude("features/basic-features/scenarios/storage_mapper_fungible_token.scen.json").
+		Exclude("features/basic-features/scenarios/get_shard_of_address.scen.json").
 		Run().
 		CheckNoError()
 }
@@ -90,21 +91,6 @@ func TestRustComposability(t *testing.T) {
 		CheckNoError()
 }
 
-func TestRustPromisesFeatures(t *testing.T) {
-	ScenariosTest(t).
-		Folder("features/composability/scenarios-promises").
-		Run().
-		CheckNoError()
-}
-
-// TODO: debug, then delete
-func TestRustPromisesFeaturesDebug(t *testing.T) {
-	ScenariosTest(t).
-		Folder("features/composability/scenarios-promises/promises_call_async_retrieve_egld.scen.json").
-		Run().
-		CheckNoError()
-}
-
 func TestRustFormattedMessageFeatures(t *testing.T) {
 	ScenariosTest(t).
 		Folder("features/formatted-message-features/scenarios").

mock/contracts/deployerSimpleSC.go

@@ -57,6 +57,12 @@ func InitMockMethod(instanceMock *mock.InstanceMock, config interface{}) {
 	instanceMock.AddMockMethod("init", testcommon.SimpleWasteGasMockMethod(instanceMock, testConfig.GasUsedByInit))
 }
 
+// UpgradeMockMethod -
+func UpgradeMockMethod(instanceMock *mock.InstanceMock, config interface{}) {
+	testConfig := config.(*testcommon.TestConfig)
+	instanceMock.AddMockMethod("upgrade", testcommon.SimpleWasteGasMockMethod(instanceMock, testConfig.GasUsedByInit))
+}
+
 // CallbackTestConfig -
 type CallbackTestConfig interface {
 	CallbackFails() bool

test/adder/scenarios/interactor_trace.scen.json

@@ -0,0 +1,80 @@
+{
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60": {
+                    "nonce": "481",
+                    "balance": "106274669842530000003",
+                    "esdt": {
+                        "str:CAN-14dc0a": "1000",
+                        "str:CAN-2abf4b": "1000",
+                        "str:CAN-6d39e6": "1000",
+                        "str:CAN-ac1592": "1000"
+                    },
+                    "username": ""
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "newAddresses": [
+                {
+                    "creatorAddress": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60",
+                    "creatorNonce": "481",
+                    "newAddress": "0x0000000000000000050028600ceb73ac22ec0b6f257aff7bed74dffa3ebfed60"
+                }
+            ]
+        },
+        {
+            "step": "scDeploy",
+            "id": "",
+            "tx": {
+                "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60",
+                "contractCode": "file:../output/adder.wasm",
+                "arguments": [
+                    "0x00"
+                ],
+                "gasLimit": "70,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60",
+                "to": "0x0000000000000000050028600ceb73ac22ec0b6f257aff7bed74dffa3ebfed60",
+                "function": "add",
+                "arguments": [
+                    "0x07"
+                ],
+                "gasLimit": "70,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60",
+                "to": "0x0000000000000000050028600ceb73ac22ec0b6f257aff7bed74dffa3ebfed60",
+                "function": "add",
+                "arguments": [
+                    "0x05"
+                ],
+                "gasLimit": "70,000,000",
+                "gasPrice": ""
+            },
+            "expect": {
+                "status": "0"
+            }
+        }
+    ]
+}

test/contracts/init-correct/init-correct.c

@@ -27,3 +27,7 @@ void init() {
 		}
 	}
 }
+
+void upgrade() {
+	init();
+}

test/contracts/init-correct/init-correct.export

@@ -1 +1,2 @@
 init
+upgrade