Release candidate: after supernova

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/multiversx/mx-chain-core-go v1.4.0
 	github.com/multiversx/mx-chain-crypto-go v1.3.0
 	github.com/multiversx/mx-chain-logger-go v1.1.0
-	github.com/multiversx/mx-chain-scenario-go v1.6.0
+	github.com/multiversx/mx-chain-scenario-go v1.7.0
 	github.com/multiversx/mx-chain-storage-go v1.1.0
 	github.com/multiversx/mx-chain-vm-common-go v1.6.0
 	github.com/multiversx/mx-components-big-int v1.1.0
@@ -36,6 +36,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.8.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	golang.org/x/sys v0.2.0 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect

go.sum

@@ -89,8 +89,8 @@ github.com/multiversx/mx-chain-crypto-go v1.3.0 h1:0eK2bkDOMi8VbSPrB1/vGJSYT81IB
 github.com/multiversx/mx-chain-crypto-go v1.3.0/go.mod h1:nPIkxxzyTP8IquWKds+22Q2OJ9W7LtusC7cAosz7ojM=
 github.com/multiversx/mx-chain-logger-go v1.1.0 h1:97x84A6L4RfCa6YOx1HpAFxZp1cf/WI0Qh112whgZNM=
 github.com/multiversx/mx-chain-logger-go v1.1.0/go.mod h1:K9XgiohLwOsNACETMNL0LItJMREuEvTH6NsoXWXWg7g=
-github.com/multiversx/mx-chain-scenario-go v1.6.0 h1:cwDFuS1pSc4YXnfiKKDTEb+QDY4fulPQaiRgIebnKxI=
-github.com/multiversx/mx-chain-scenario-go v1.6.0/go.mod h1:GrSYu1SnMvsIm9djUz1X13224HcvdY6Nb5KHNT3xZPA=
+github.com/multiversx/mx-chain-scenario-go v1.7.0 h1:7hEuvLPDZw2xA7YlzrjORxIK4lTTT34QL6O06JiotWE=
+github.com/multiversx/mx-chain-scenario-go v1.7.0/go.mod h1:GrSYu1SnMvsIm9djUz1X13224HcvdY6Nb5KHNT3xZPA=
 github.com/multiversx/mx-chain-storage-go v1.1.0 h1:M1Y9DqMrJ62s7Zw31+cyuqsnPIvlG4jLBJl5WzeZLe8=
 github.com/multiversx/mx-chain-storage-go v1.1.0/go.mod h1:o6Jm7cjfPmcc6XpyihYWrd6sx3sgqwurrunw3ZrfyxI=
 github.com/multiversx/mx-chain-vm-common-go v1.6.0 h1:M2zmf/ptEINciWxYCPLIkwOMTvvzWjELYYB+0MMQ5Gw=
@@ -118,6 +118,7 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=

integrationTests/json/scenariosFeatures_test.go

@@ -1,7 +1,6 @@
 package vmjsonintegrationtest
 
 import (
-	"path/filepath"
 	"testing"
 )
 
@@ -16,18 +15,6 @@ func TestRustAllocFeatures(t *testing.T) {
 		CheckNoError()
 }
 
-func TestRustBarnardFeatures(t *testing.T) {
-	// TODO: will get merged into basic-features after barnard mainnet release
-	if testing.Short() {
-		t.Skip("not a short test")
-	}
-
-	ScenariosTest(t).
-		Folder("features/barnard-features/scenarios").
-		Run().
-		CheckNoError()
-}
-
 func TestRustBasicFeaturesLatest(t *testing.T) {
 	if testing.Short() {
 		t.Skip("not a short test")
@@ -41,23 +28,6 @@ func TestRustBasicFeaturesLatest(t *testing.T) {
 		CheckNoError()
 }
 
-func TestRustBasicFeaturesBarnard(t *testing.T) {
-	if testing.Short() {
-		t.Skip("not a short test")
-	}
-
-	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").
-		ReplacePath(
-			"../output/basic-features.mxsc.json",
-			filepath.Join(getTestRoot(), "features/basic-features/output/basic-features-barnard.mxsc.json"),
-		).
-		Run().
-		CheckNoError()
-}
-
 func TestRustBasicFeaturesNoSmallIntApi(t *testing.T) {
 	if testing.Short() {
 		t.Skip("not a short test")
@@ -125,26 +95,6 @@ func TestRustPayableFeatures(t *testing.T) {
 		CheckNoError()
 }
 
-func TestRustPayableFeaturesBarnard(t *testing.T) {
-	if testing.Short() {
-		t.Skip("not a short test")
-	}
-
-	// we run the exact same tests, but on a different compiled contract,
-	// this contract uses the new "managedGetAllTransfersCallValue" VM hook,
-	// which is only available in Barnard
-	// this will become the only test
-
-	ScenariosTest(t).
-		Folder("features/payable-features/scenarios").
-		ReplacePath(
-			"../output/payable-features.mxsc.json",
-			filepath.Join(getTestRoot(), "features/payable-features/output/payable-features-barnard.mxsc.json"),
-		).
-		Run().
-		CheckNoError()
-}
-
 func TestRustComposability(t *testing.T) {
 	ScenariosTest(t).
 		Folder("features/composability/scenarios").
@@ -181,3 +131,11 @@ func TestBalanceAfterGet(t *testing.T) {
 		Run().
 		CheckNoError()
 }
+
+func TestNFTDecode(t *testing.T) {
+	ScenariosTest(t).
+		Folder("features/composability/scenarios").
+		File("forwarder_nft_decode_complex_attributes.scen.json").
+		Run().
+		CheckNoError()
+}

mock/context/runtimeContextMock.go

@@ -19,6 +19,7 @@ type RuntimeContextMock struct {
 	CallFunction             string
 	VMType                   []byte
 	ReadOnlyFlag             bool
+	UnsafeModeFlag           bool
 	VerifyCode               bool
 	CurrentBreakpointValue   vmhost.BreakpointValue
 	PointsUsed               uint64
@@ -52,7 +53,7 @@ func (r *RuntimeContextMock) GetVMExecutor() executor.Executor {
 }
 
 // ReplaceVMExecutor mocked method
-func (context *RuntimeContextMock) ReplaceVMExecutor(vmExecutor executor.Executor) {
+func (context *RuntimeContextMock) ReplaceVMExecutor(_ executor.Executor) {
 }
 
 // GetInstanceTracker mocked method
@@ -196,14 +197,8 @@ func (r *RuntimeContextMock) GetOriginalTxHash() []byte {
 	return r.OriginalTxHash
 }
 
-// ExtractCodeUpgradeFromArgs mocked method
-func (r *RuntimeContextMock) ExtractCodeUpgradeFromArgs() ([]byte, []byte, error) {
-	arguments := r.VMInput.Arguments
-	if len(arguments) < 2 {
-		panic("ExtractCodeUpgradeFromArgs: bad test setup")
-	}
-
-	return r.VMInput.Arguments[0], r.VMInput.Arguments[1], nil
+// RemoveCodeUpgradeFromArgs mocked method
+func (r *RuntimeContextMock) RemoveCodeUpgradeFromArgs() {
 }
 
 // SignalExit mocked method
@@ -259,7 +254,7 @@ func (r *RuntimeContextMock) GetInstance() executor.Instance {
 }
 
 // GetWarmInstance mocked method
-func (r *RuntimeContextMock) GetWarmInstance(codeHash []byte) (executor.Instance, bool) {
+func (r *RuntimeContextMock) GetWarmInstance(_ []byte) (executor.Instance, bool) {
 	return nil, false
 }
 
@@ -320,6 +315,16 @@ func (r *RuntimeContextMock) UseGasBoundedShouldFailExecution() bool {
 	return true
 }
 
+// IsUnsafeMode mocked method
+func (r *RuntimeContextMock) IsUnsafeMode() bool {
+	return r.UnsafeModeFlag
+}
+
+// SetUnsafeMode mocked method
+func (r *RuntimeContextMock) SetUnsafeMode(unsafeMode bool) {
+	r.UnsafeModeFlag = unsafeMode
+}
+
 // FailExecution mocked method
 func (r *RuntimeContextMock) FailExecution(_ error) {
 }

mock/context/runtimeContextWrapper.go

@@ -42,7 +42,7 @@ type RuntimeContextWrapper struct {
 	// function that will be called by the corresponding RuntimeContext function implementation (by default this will call the same wrapped context function)
 	GetOriginalTxHashFunc func() []byte
 	// function that will be called by the corresponding RuntimeContext function implementation (by default this will call the same wrapped context function)
-	ExtractCodeUpgradeFromArgsFunc func() ([]byte, []byte, error)
+	RemoveCodeUpgradeFromArgsFunc func()
 	// function that will be called by the corresponding RuntimeContext function implementation (by default this will call the same wrapped context function)
 	SignalUserErrorFunc func(message string)
 	// function that will be called by the corresponding RuntimeContext function implementation (by default this will call the same wrapped context function)
@@ -72,6 +72,10 @@ type RuntimeContextWrapper struct {
 	// function that will be called by the corresponding RuntimeContext function implementation (by default this will call the same wrapped context function)
 	SetReadOnlyFunc func(readOnly bool)
 	// function that will be called by the corresponding RuntimeContext function implementation (by default this will call the same wrapped context function)
+	IsUnsafeModeFunc func() bool
+	// function that will be called by the corresponding RuntimeContext function implementation (by default this will call the same wrapped context function)
+	SetUnsafeModeFunc func(readOnly bool)
+	// function that will be called by the corresponding RuntimeContext function implementation (by default this will call the same wrapped context function)
 	StartWasmerInstanceFunc func(contract []byte, gasLimit uint64, newCode bool) error
 	// function that will be called by the corresponding RuntimeContext function implementation (by default this will call the same wrapped context function)
 	ClearWarmInstanceCacheFunc func()
@@ -184,8 +188,8 @@ func NewRuntimeContextWrapper(inputRuntimeContext *vmhost.RuntimeContext) *Runti
 		return runtimeWrapper.runtimeContext.GetOriginalTxHash()
 	}
 
-	runtimeWrapper.ExtractCodeUpgradeFromArgsFunc = func() ([]byte, []byte, error) {
-		return runtimeWrapper.runtimeContext.ExtractCodeUpgradeFromArgs()
+	runtimeWrapper.RemoveCodeUpgradeFromArgsFunc = func() {
+		runtimeWrapper.runtimeContext.RemoveCodeUpgradeFromArgs()
 	}
 
 	runtimeWrapper.SignalUserErrorFunc = func(message string) {
@@ -224,6 +228,14 @@ func NewRuntimeContextWrapper(inputRuntimeContext *vmhost.RuntimeContext) *Runti
 		runtimeWrapper.runtimeContext.SetReadOnly(readOnly)
 	}
 
+	runtimeWrapper.IsUnsafeModeFunc = func() bool {
+		return runtimeWrapper.runtimeContext.IsUnsafeMode()
+	}
+
+	runtimeWrapper.SetUnsafeModeFunc = func(unSafe bool) {
+		runtimeWrapper.runtimeContext.SetUnsafeMode(unSafe)
+	}
+
 	runtimeWrapper.StartWasmerInstanceFunc = func(contract []byte, gasLimit uint64, newCode bool) error {
 		return runtimeWrapper.runtimeContext.StartWasmerInstance(contract, gasLimit, newCode)
 	}
@@ -374,9 +386,9 @@ func (contextWrapper *RuntimeContextWrapper) GetOriginalTxHash() []byte {
 	return contextWrapper.GetOriginalTxHashFunc()
 }
 
-// ExtractCodeUpgradeFromArgs calls corresponding xxxFunc function, that by default in turn calls the original method of the wrapped RuntimeContext
-func (contextWrapper *RuntimeContextWrapper) ExtractCodeUpgradeFromArgs() ([]byte, []byte, error) {
-	return contextWrapper.ExtractCodeUpgradeFromArgsFunc()
+// RemoveCodeUpgradeFromArgs calls corresponding xxxFunc function, that by default in turn calls the original method of the wrapped RuntimeContext
+func (contextWrapper *RuntimeContextWrapper) RemoveCodeUpgradeFromArgs() {
+	contextWrapper.RemoveCodeUpgradeFromArgsFunc()
 }
 
 // SignalUserError calls corresponding xxxFunc function, that by default in turn calls the original method of the wrapped RuntimeContext
@@ -429,6 +441,16 @@ func (contextWrapper *RuntimeContextWrapper) SetReadOnly(readOnly bool) {
 	contextWrapper.SetReadOnlyFunc(readOnly)
 }
 
+// IsUnsafeMode calls corresponding xxxFunc function, that by default in turn calls the original method of the wrapped RuntimeContext
+func (contextWrapper *RuntimeContextWrapper) IsUnsafeMode() bool {
+	return contextWrapper.IsUnsafeModeFunc()
+}
+
+// SetUnsafeMode calls corresponding xxxFunc function, that by default in turn calls the original method of the wrapped RuntimeContext
+func (contextWrapper *RuntimeContextWrapper) SetUnsafeMode(unsafeMode bool) {
+	contextWrapper.SetUnsafeModeFunc(unsafeMode)
+}
+
 // StartWasmerInstance calls corresponding xxxFunc function, that by default in turn calls the original method of the wrapped RuntimeContext
 func (contextWrapper *RuntimeContextWrapper) StartWasmerInstance(contract []byte, gasLimit uint64, newCode bool) error {
 	return contextWrapper.StartWasmerInstanceFunc(contract, gasLimit, newCode)

mock/context/vmHostStub.go

@@ -1,7 +1,9 @@
 package mock
 
 import (
+	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/data/vm"
+	"github.com/multiversx/mx-chain-scenario-go/worldmock"
 	vmcommon "github.com/multiversx/mx-chain-vm-common-go"
 	"github.com/multiversx/mx-chain-vm-go/config"
 	"github.com/multiversx/mx-chain-vm-go/crypto"
@@ -165,7 +167,9 @@ func (vhs *VMHostStub) EnableEpochsHandler() vmhost.EnableEpochsHandler {
 	if vhs.EnableEpochsHandlerCalled != nil {
 		return vhs.EnableEpochsHandlerCalled()
 	}
-	return nil
+	return &worldmock.EnableEpochsHandlerStub{IsFlagEnabledCalled: func(flag core.EnableEpochFlag) bool {
+		return true
+	}}
 }
 
 // Async mocked method

mock/contracts/deployerSimpleSC.go

@@ -1,6 +1,9 @@
 package contracts
 
 import (
+	"errors"
+	vmcommon "github.com/multiversx/mx-chain-vm-common-go"
+	"github.com/multiversx/mx-chain-vm-go/vmhost"
 	"math/big"
 
 	mock "github.com/multiversx/mx-chain-vm-go/mock/context"
@@ -39,7 +42,12 @@ func DeployContractFromSourceMock(instanceMock *mock.InstanceMock, _ interface{}
 			)
 
 		if err != nil {
-			host.Runtime().FailExecution(err)
+			if errors.Is(err, vmhost.ErrNotEnoughGas) {
+				host.Output().SetReturnCode(vmcommon.OutOfGas)
+			} else {
+				host.Runtime().FailExecution(err)
+			}
+
 			return instance
 		}