update vmcommon and use LegacyBlockchainHook interface

multiversx · Jul 16, 2024 · f233906 · f233906
1 parent 8e7a57e
commit f233906
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/multiversx/mx-chain-logger-go v1.0.15-0.20240508072523-3f00a726af57
 	github.com/multiversx/mx-chain-scenario-go v1.4.4-0.20240509103754-9e8129721f00
 	github.com/multiversx/mx-chain-storage-go v1.0.16-0.20240508073549-dcb8e6e0370f
-	github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240509103544-247ce5639c7a
+	github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240716084819-890cf285a584
 	github.com/multiversx/mx-components-big-int v1.0.0
 	github.com/pelletier/go-toml v1.9.3
 	github.com/stretchr/testify v1.8.3

diff --git a/go.sum b/go.sum
@@ -120,8 +120,8 @@ github.com/multiversx/mx-chain-scenario-go v1.4.4-0.20240509103754-9e8129721f00
 github.com/multiversx/mx-chain-scenario-go v1.4.4-0.20240509103754-9e8129721f00/go.mod h1:pnIIfWopbDMQ1EW5Ddc6KDMqv8Qtx+hxbH9rorHpCyo=
 github.com/multiversx/mx-chain-storage-go v1.0.16-0.20240508073549-dcb8e6e0370f h1:yd/G8iPBGOEAwbaS8zndJpO6bQk7Tk72ZhmlqRasThI=
 github.com/multiversx/mx-chain-storage-go v1.0.16-0.20240508073549-dcb8e6e0370f/go.mod h1:E6nfj9EQzGxWDGM3Dn6eZWRC3qFy1G8IqOsYsBOcgWw=
-github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240509103544-247ce5639c7a h1:7M+jXVlnl43zd2NuimL1KnAVAdpUr/QoHqG0TUKoyaM=
-github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240509103544-247ce5639c7a/go.mod h1:RgGmPei0suQcFTHfO4cS5dxJSiokp2SM5lmNgp1icMo=
+github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240716084819-890cf285a584 h1:f4ybUYrES2XzumD9KsLzXfy/QdR9LiX1nJ4Nz2eBID4=
+github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240716084819-890cf285a584/go.mod h1:RgGmPei0suQcFTHfO4cS5dxJSiokp2SM5lmNgp1icMo=
 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=

diff --git a/mock/context/blockChainHookStub.go b/mock/context/blockChainHookStub.go
@@ -5,10 +5,10 @@ import (
 	"math/big"
 
 	"github.com/multiversx/mx-chain-core-go/data/esdt"
-	"github.com/multiversx/mx-chain-vm-common-go"
+	vmcommon "github.com/multiversx/mx-chain-vm-common-go"
 )
 
-var _ vmcommon.BlockchainHook = (*BlockchainHookStub)(nil)
+var _ vmcommon.LegacyBlockchainHook = (*BlockchainHookStub)(nil)
 
 // BlockchainHookStub is used in tests to check that interface methods were called
 type BlockchainHookStub struct {

diff --git a/testcommon/testInitializer_inputs.go b/testcommon/testInitializer_inputs.go
@@ -344,15 +344,15 @@ func DefaultTestVMWithWorldMockWithGasSchedule(tb testing.TB, customGasSchedule
 }
 
 // DefaultTestVM creates a host configured with a blockchain hook
-func DefaultTestVM(tb testing.TB, blockchain vmcommon.BlockchainHook) vmhost.VMHost {
+func DefaultTestVM(tb testing.TB, blockchain vmcommon.LegacyBlockchainHook) vmhost.VMHost {
 	customGasSchedule := config.GasScheduleMap(nil)
 	return DefaultTestVMWithGasSchedule(tb, blockchain, customGasSchedule, false)
 }
 
 // DefaultTestVMWithGasSchedule creates a host with the provided blockchain hook and gas schedule
 func DefaultTestVMWithGasSchedule(
 	tb testing.TB,
-	blockchain vmcommon.BlockchainHook,
+	blockchain vmcommon.LegacyBlockchainHook,
 	customGasSchedule config.GasScheduleMap,
 	wasmerSIGSEGVPassthrough bool,
 ) vmhost.VMHost {

diff --git a/vmhost/contexts/blockchain.go b/vmhost/contexts/blockchain.go
@@ -13,14 +13,14 @@ var log = logger.GetOrCreate("vm/blockchainContext")
 
 type blockchainContext struct {
 	host           vmhost.VMHost
-	blockChainHook vmcommon.BlockchainHook
+	blockChainHook vmcommon.LegacyBlockchainHook
 	stateStack     []int
 }
 
 // NewBlockchainContext creates a new blockchainContext
 func NewBlockchainContext(
 	host vmhost.VMHost,
-	blockChainHook vmcommon.BlockchainHook,
+	blockChainHook vmcommon.LegacyBlockchainHook,
 ) (*blockchainContext, error) {
 
 	context := &blockchainContext{

diff --git a/vmhost/contexts/storage.go b/vmhost/contexts/storage.go
@@ -14,7 +14,7 @@ var logStorage = logger.GetOrCreate("vm/storage")
 
 type storageContext struct {
 	host                       vmhost.VMHost
-	blockChainHook             vmcommon.BlockchainHook
+	blockChainHook             vmcommon.LegacyBlockchainHook
 	address                    []byte
 	stateStack                 [][]byte
 	protectedKeyPrefix         []byte
@@ -24,7 +24,7 @@ type storageContext struct {
 // NewStorageContext creates a new storageContext
 func NewStorageContext(
 	host vmhost.VMHost,
-	blockChainHook vmcommon.BlockchainHook,
+	blockChainHook vmcommon.LegacyBlockchainHook,
 	protectedKeyPrefix []byte,
 ) (*storageContext, error) {
 	if len(protectedKeyPrefix) == 0 {

diff --git a/vmhost/hostCore/host.go b/vmhost/hostCore/host.go
@@ -72,7 +72,7 @@ type vmHost struct {
 
 // NewVMHost creates a new VM vmHost
 func NewVMHost(
-	blockChainHook vmcommon.BlockchainHook,
+	blockChainHook vmcommon.LegacyBlockchainHook,
 	hostParameters *vmhost.VMHostParameters,
 ) (vmhost.VMHost, error) {