Merge pull request #928 from multiversx/timestamps-ms-blockchain-hooks

add blockchain hooks for timestamps in millis

Author: sstanculeanu

executor/vmHooks.go

@@ -11,9 +11,9 @@ require (
 	github.com/multiversx/mx-chain-core-go v1.3.2-0.20250520074139-18b645ad397a
 	github.com/multiversx/mx-chain-crypto-go v1.2.13-0.20250520075055-8ab2a164945d
 	github.com/multiversx/mx-chain-logger-go v1.0.16-0.20250520074859-b2faf3c90273
-	github.com/multiversx/mx-chain-scenario-go v1.5.1-0.20250520075713-734e46b4c66d
+	github.com/multiversx/mx-chain-scenario-go v1.5.1-0.20250617131039-b09f258a9f6c
 	github.com/multiversx/mx-chain-storage-go v1.0.20-0.20250520075958-65fd4c7bcaae
-	github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250520075408-c94bee9ee163
+	github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250604100541-1efc3d1b1314
 	github.com/multiversx/mx-components-big-int v1.0.1-0.20250218162530-b4e4d7442408
 	github.com/pelletier/go-toml v1.9.3
 	github.com/stretchr/testify v1.8.1

executor/wrapper/wrapperVMHooks.go

@@ -89,12 +89,12 @@ github.com/multiversx/mx-chain-crypto-go v1.2.13-0.20250520075055-8ab2a164945d h
 github.com/multiversx/mx-chain-crypto-go v1.2.13-0.20250520075055-8ab2a164945d/go.mod h1:yekQt4uB5LYXtimbhpdUbnFexjucWrQG/t+AX55bdM8=
 github.com/multiversx/mx-chain-logger-go v1.0.16-0.20250520074859-b2faf3c90273 h1:1I2CgGDAMINxrKI6yzSP/Y6Wow2YUmqegUXcltpGXQA=
 github.com/multiversx/mx-chain-logger-go v1.0.16-0.20250520074859-b2faf3c90273/go.mod h1:M/uRv1kpmkzxS5HsgofdRcOHzzvagD7nTmFqiPKt89U=
-github.com/multiversx/mx-chain-scenario-go v1.5.1-0.20250520075713-734e46b4c66d h1:BEJHmDMqoDzgNWx/jWn191WoSHLCIQmKszyJGEYWlyA=
-github.com/multiversx/mx-chain-scenario-go v1.5.1-0.20250520075713-734e46b4c66d/go.mod h1:/bgycTrJGk6n6VlgW+onXRQKiCM3GFM+INENvj/PRgU=
+github.com/multiversx/mx-chain-scenario-go v1.5.1-0.20250617131039-b09f258a9f6c h1:FiEuVVRJdFZZQ6YX+sx6GAU90LlscfZKKpxV2JVvt0w=
+github.com/multiversx/mx-chain-scenario-go v1.5.1-0.20250617131039-b09f258a9f6c/go.mod h1:MAnOkKa27CXLwDPLFcYOGpZv8JVGe/CDKHT0TTtXHXM=
 github.com/multiversx/mx-chain-storage-go v1.0.20-0.20250520075958-65fd4c7bcaae h1:wgiIjyoynLQPs8QkEOXjAU8AoZlLA5w4rWPykLS2BSo=
 github.com/multiversx/mx-chain-storage-go v1.0.20-0.20250520075958-65fd4c7bcaae/go.mod h1:uiXDLvpznajMubl+OBhODo6jmtwo8kyUF9iujEhOIgI=
-github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250520075408-c94bee9ee163 h1:I6WEqu3ysY41nRV7mUvdCsKyuBZlHyKngIjW4ncEcLI=
-github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250520075408-c94bee9ee163/go.mod h1:HlpJgCTYVvHE1nrEJLIsR/AJx0gqzg3m+qdJwf7jOjU=
+github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250604100541-1efc3d1b1314 h1:C2nlGnUyAoP2dBOEXBYwt7KXAv96m5tl3l2H208NVoA=
+github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250604100541-1efc3d1b1314/go.mod h1:HlpJgCTYVvHE1nrEJLIsR/AJx0gqzg3m+qdJwf7jOjU=
 github.com/multiversx/mx-components-big-int v1.0.1-0.20250218162530-b4e4d7442408 h1:FbpVQJg14ry25DiBBZIvBoKiSrTHWkUSlYMOOW/iQJQ=
 github.com/multiversx/mx-components-big-int v1.0.1-0.20250218162530-b4e4d7442408/go.mod h1:kcWw7hDe6cSz1wcBAqj/6sFH6ouSPsNeH9P7XlpZRcw=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=

go.mod

@@ -1,6 +1,7 @@
 package vmjsonintegrationtest
 
 import (
+	"path/filepath"
 	"testing"
 )
 
@@ -15,6 +16,18 @@ 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")
@@ -28,6 +41,23 @@ 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")
@@ -84,7 +114,7 @@ func TestRustManagedMapFeatures(t *testing.T) {
 		CheckNoError()
 }
 
-func TestRustPayableFeaturesLatest(t *testing.T) {
+func TestRustPayableFeatures(t *testing.T) {
 	if testing.Short() {
 		t.Skip("not a short test")
 	}
@@ -95,6 +125,26 @@ func TestRustPayableFeaturesLatest(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").
@@ -116,18 +166,10 @@ func TestTimelocks(t *testing.T) {
 		CheckNoError()
 }
 
-func TestForwarderTransfExec(t *testing.T) {
-	ScenariosTest(t).
-		Folder("features/composability/scenarios").
-		File("forwarder_call_transf_exec_reject_nft.scen.json").
-		Run().
-		CheckNoError()
-}
-
-func TestForwarderTransfExecMultiReject(t *testing.T) {
+func TestForwarderTransfExecFallibleMultiReject(t *testing.T) {
 	ScenariosTest(t).
 		Folder("features/composability/scenarios").
-		File("forwarder_call_transf_exec_reject_multi_transfer.scen.json").
+		File("forw_raw_transf_exec_fallible_multi_egld_reject.scen.json").
 		Run().
 		CheckNoError()
 }

go.sum

@@ -40,6 +40,7 @@ type ScenariosTestBuilder struct {
 	folder              string
 	singleFile          string
 	exclusions          []string
+	pathReplacements    map[string]string
 	executorLogger      executorwrapper.ExecutorLogger
 	executorFactory     executor.ExecutorAbstractFactory
 	enableEpochsHandler vmcommon.EnableEpochsHandler
@@ -53,6 +54,7 @@ func ScenariosTest(t *testing.T) *ScenariosTestBuilder {
 		t:                   t,
 		folder:              "",
 		singleFile:          "",
+		pathReplacements:    make(map[string]string),
 		executorLogger:      nil,
 		executorFactory:     nil,
 		enableEpochsHandler: worldmock.EnableEpochsHandlerStubAllFlags(),
@@ -77,6 +79,13 @@ func (mtb *ScenariosTestBuilder) Exclude(path string) *ScenariosTestBuilder {
 	return mtb
 }
 
+// ReplacePath allows a test to override the path to a contract, as expressed in a mandos test.
+// This is very helpful when running the same scenarios on multiple contracts.
+func (fr *ScenariosTestBuilder) ReplacePath(pathInTest, actualPath string) *ScenariosTestBuilder {
+	fr.pathReplacements[pathInTest] = actualPath
+	return fr
+}
+
 // WithExecutorLogs sets a StringLogger
 func (mtb *ScenariosTestBuilder) WithExecutorLogs() *ScenariosTestBuilder {
 	mtb.executorLogger = executorwrapper.NewStringLogger()
@@ -129,9 +138,14 @@ func (mtb *ScenariosTestBuilder) Run() *ScenariosTestBuilder {
 
 	scenarioExecutor.World.EnableEpochsHandler = mtb.enableEpochsHandler
 
+	fileResolver := scenio.NewDefaultFileResolver()
+	for pathInTest, actualPath := range mtb.pathReplacements {
+		fileResolver.ReplacePath(pathInTest, actualPath)
+	}
+
 	runner := scenio.NewScenarioController(
 		scenarioExecutor,
-		scenio.NewDefaultFileResolver(),
+		fileResolver,
 		vmBuilder.GetVMType(),
 	)
 

integrationTests/json/scenariosFeatures_test.go

@@ -11,24 +11,26 @@ var _ vmcommon.BlockchainHook = (*BlockchainHookStub)(nil)
 
 // BlockchainHookStub is used in tests to check that interface methods were called
 type BlockchainHookStub struct {
-	NewAddressCalled               func(creatorAddress []byte, creatorNonce uint64, vmType []byte) ([]byte, error)
-	GetStorageDataCalled           func(accountsAddress []byte, index []byte) ([]byte, uint32, error)
-	GetBlockHashCalled             func(nonce uint64) ([]byte, error)
-	LastNonceCalled                func() uint64
-	LastRoundCalled                func() uint64
-	LastTimeStampCalled            func() uint64
-	LastRandomSeedCalled           func() []byte
-	LastEpochCalled                func() uint32
-	GetStateRootHashCalled         func() []byte
-	CurrentNonceCalled             func() uint64
-	CurrentRoundCalled             func() uint64
-	CurrentTimeStampCalled         func() uint64
-	CurrentRandomSeedCalled        func() []byte
-	CurrentEpochCalled             func() uint32
-	RoundTimeCalled                func() uint64
-	EpochStartBlockTimeStampCalled func() uint64
-	EpochStartBlockNonceCalled     func() uint64
-	EpochStartBlockRoundCalled     func() uint64
+	NewAddressCalled                 func(creatorAddress []byte, creatorNonce uint64, vmType []byte) ([]byte, error)
+	GetStorageDataCalled             func(accountsAddress []byte, index []byte) ([]byte, uint32, error)
+	GetBlockHashCalled               func(nonce uint64) ([]byte, error)
+	LastNonceCalled                  func() uint64
+	LastRoundCalled                  func() uint64
+	LastTimeStampCalled              func() uint64
+	LastTimeStampMsCalled            func() uint64
+	LastRandomSeedCalled             func() []byte
+	LastEpochCalled                  func() uint32
+	GetStateRootHashCalled           func() []byte
+	CurrentNonceCalled               func() uint64
+	CurrentRoundCalled               func() uint64
+	CurrentTimeStampCalled           func() uint64
+	CurrentTimeStampMsCalled         func() uint64
+	CurrentRandomSeedCalled          func() []byte
+	CurrentEpochCalled               func() uint32
+	RoundTimeCalled                  func() uint64
+	EpochStartBlockTimeStampMsCalled func() uint64
+	EpochStartBlockNonceCalled       func() uint64
+	EpochStartBlockRoundCalled       func() uint64
 
 	ProcessBuiltInFunctionCalled            func(input *vmcommon.ContractCallInput) (*vmcommon.VMOutput, error)
 	GetBuiltinFunctionNamesCalled           func() vmcommon.FunctionNames
@@ -94,6 +96,14 @@ func (b *BlockchainHookStub) LastTimeStamp() uint64 {
 	return 0
 }
 
+// LastTimeStampMs mocked method
+func (b *BlockchainHookStub) LastTimeStampMs() uint64 {
+	if b.LastTimeStampMsCalled != nil {
+		return b.LastTimeStampMsCalled()
+	}
+	return 0
+}
+
 // LastRandomSeed mocked method
 func (b *BlockchainHookStub) LastRandomSeed() []byte {
 	if b.LastRandomSeedCalled != nil {
@@ -142,6 +152,14 @@ func (b *BlockchainHookStub) CurrentTimeStamp() uint64 {
 	return 0
 }
 
+// CurrentTimeStampMs mocked method
+func (b *BlockchainHookStub) CurrentTimeStampMs() uint64 {
+	if b.CurrentTimeStampMsCalled != nil {
+		return b.CurrentTimeStampMsCalled()
+	}
+	return 0
+}
+
 // CurrentRandomSeed mocked method
 func (b *BlockchainHookStub) CurrentRandomSeed() []byte {
 	if b.CurrentRandomSeedCalled != nil {
@@ -166,10 +184,10 @@ func (b *BlockchainHookStub) RoundTime() uint64 {
 	return 0
 }
 
-// EpochStartBlockTimeStamp mocked method
-func (b *BlockchainHookStub) EpochStartBlockTimeStamp() uint64 {
-	if b.EpochStartBlockTimeStampCalled != nil {
-		return b.EpochStartBlockTimeStampCalled()
+// EpochStartBlockTimeStampMs mocked method
+func (b *BlockchainHookStub) EpochStartBlockTimeStampMs() uint64 {
+	if b.EpochStartBlockTimeStampMsCalled != nil {
+		return b.EpochStartBlockTimeStampMsCalled()
 	}
 	return 0
 }