Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update vmcommon and use LegacyBlockchainHook interface #67

Open
wants to merge 3 commits into
base: rc/barnard
Choose a base branch
from
+27 −25
Open

update vmcommon and use LegacyBlockchainHook interface #67

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84c237b
update vmcommon and use LegacyBlockchainHook interface
laurci Jul 16, 2024
0f900cb
Merge remote-tracking branch 'origin/rc/v1.7.2' into new-blockchain-h…
laurci Jul 26, 2024
dfe4847
Merge remote-tracking branch 'origin/rc/v1.7.2' into new-blockchain-h…
laurci Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/multiversx/mx-chain-core-go v1.2.21-0.20240725065431-6e9bfee5a4c6
github.com/multiversx/mx-chain-crypto-go v1.2.12-0.20240725071000-c3212540166f
github.com/multiversx/mx-chain-logger-go v1.0.15-0.20240725065747-176bd697c775
github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240725072715-8806f1301087
github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240726094554-651b1b43c6aa
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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ github.com/multiversx/mx-chain-crypto-go v1.2.12-0.20240725071000-c3212540166f h
github.com/multiversx/mx-chain-crypto-go v1.2.12-0.20240725071000-c3212540166f/go.mod h1:9aSp//uBSvqFdzh4gvYISraoruhr1FCTXgPQalQ687k=
github.com/multiversx/mx-chain-logger-go v1.0.15-0.20240725065747-176bd697c775 h1:a8LOfz3p4MQfRtbF00rGDAJiebziwtSfVmBHIaHBDdY=
github.com/multiversx/mx-chain-logger-go v1.0.15-0.20240725065747-176bd697c775/go.mod h1:owPYyrK7RcsLx9eOCAZQ22fIyW6BE7ttJr4XIhFIbQw=
github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240725072715-8806f1301087 h1:ovxs8X50iBL9TOkn0qHrkuXrBS1Y/EWfQOYmFEaXRNs=
github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240725072715-8806f1301087/go.mod h1:nNGN+rdLRN8Nd6OhFGrkEZS5Ipj5IQCvFT0L/iQbOpU=
github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240726094554-651b1b43c6aa h1:PsLO4gn0Q5qF4HDN7Zdrws3kVAY2RmMQe+/38zGNMAs=
github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240726094554-651b1b43c6aa/go.mod h1:nNGN+rdLRN8Nd6OhFGrkEZS5Ipj5IQCvFT0L/iQbOpU=
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/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
Expand Down
6 changes: 3 additions & 3 deletions ipc/nodepart/part.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import (
"os"
"time"

"github.com/multiversx/mx-chain-vm-common-go"
vmcommon "github.com/multiversx/mx-chain-vm-common-go"
"github.com/multiversx/mx-chain-vm-v1_3-go/ipc/common"
"github.com/multiversx/mx-chain-vm-v1_3-go/ipc/marshaling"
)

// NodePart is the endpoint that implements the message loop on Node's side
type NodePart struct {
Messenger *NodeMessenger
blockchain vmcommon.BlockchainHook
blockchain vmcommon.LegacyBlockchainHook
Repliers []common.MessageReplier
config Config
}
Expand All @@ -22,7 +22,7 @@ type NodePart struct {
func NewNodePart(
input *os.File,
output *os.File,
blockchain vmcommon.BlockchainHook,
blockchain vmcommon.LegacyBlockchainHook,
config Config,
marshalizer marshaling.Marshalizer,
) (*NodePart, error) {
Expand Down
6 changes: 3 additions & 3 deletions ipc/nodepart/vmDriver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

logger "github.com/multiversx/mx-chain-logger-go"
"github.com/multiversx/mx-chain-logger-go/pipes"
"github.com/multiversx/mx-chain-vm-common-go"
vmcommon "github.com/multiversx/mx-chain-vm-common-go"
"github.com/multiversx/mx-chain-vm-v1_3-go/ipc/common"
"github.com/multiversx/mx-chain-vm-v1_3-go/ipc/marshaling"
)
Expand All @@ -20,7 +20,7 @@ var _ vmcommon.VMExecutionHandler = (*VMDriver)(nil)

// VMDriver manages the execution of the VM process
type VMDriver struct {
blockchainHook vmcommon.BlockchainHook
blockchainHook vmcommon.LegacyBlockchainHook
vmArguments common.VMArguments
config Config
logsMarshalizer marshaling.Marshalizer
Expand Down Expand Up @@ -52,7 +52,7 @@ type VMDriver struct {

// NewVMDriver creates a new driver
func NewVMDriver(
blockchainHook vmcommon.BlockchainHook,
blockchainHook vmcommon.LegacyBlockchainHook,
vmArguments common.VMArguments,
config Config,
) (*VMDriver, error) {
Expand Down
4 changes: 2 additions & 2 deletions ipc/tests/vmPart_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/multiversx/mx-chain-core-go/core"
"github.com/multiversx/mx-chain-vm-common-go"
vmcommon "github.com/multiversx/mx-chain-vm-common-go"
"github.com/multiversx/mx-chain-vm-common-go/builtInFunctions"
"github.com/multiversx/mx-chain-vm-v1_3-go/config"
"github.com/multiversx/mx-chain-vm-v1_3-go/ipc/common"
Expand Down Expand Up @@ -61,7 +61,7 @@ func doContractRequest(
t *testing.T,
tag string,
request common.MessageHandler,
blockchain vmcommon.BlockchainHook,
blockchain vmcommon.LegacyBlockchainHook,
) (common.MessageHandler, error) {
files := createTestFiles(t, tag)
var response common.MessageHandler
Expand Down
5 changes: 3 additions & 2 deletions ipc/vmpart/blockchainGateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package vmpart

import (
"errors"

"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"
"github.com/multiversx/mx-chain-vm-v1_3-go/ipc/common"
)

var _ vmcommon.BlockchainHook = (*BlockchainHookGateway)(nil)
var _ vmcommon.LegacyBlockchainHook = (*BlockchainHookGateway)(nil)

// BlockchainHookGateway forwards requests to the actual hook
type BlockchainHookGateway struct {
Expand Down
4 changes: 2 additions & 2 deletions mock/context/blockChainHookStub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 3 additions & 2 deletions mock/world/worldCallbacks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import (
"encoding/hex"
"errors"
"fmt"
vmcommon "github.com/multiversx/mx-chain-vm-common-go"
"math/big"

vmcommon "github.com/multiversx/mx-chain-vm-common-go"

"github.com/multiversx/mx-chain-core-go/data/esdt"
)

var _ vmcommon.BlockchainHook = (*MockWorld)(nil)
var _ vmcommon.LegacyBlockchainHook = (*MockWorld)(nil)

// ErrBuiltinFuncWrapperNotInitialized means that the builtin function wrapper was used before initialization.
var ErrBuiltinFuncWrapperNotInitialized = errors.New("builtin function not found or container not initialized")
Expand Down
4 changes: 2 additions & 2 deletions testcommon/testInitializer_inputs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ func DefaultTestVMWithWorldMock(tb testing.TB) (vmhost.VMHost, *worldmock.MockWo
}

// DefaultTestVM creates a host configured with a configured blockchain hook
func DefaultTestVM(tb testing.TB, blockchain vmcommon.BlockchainHook) vmhost.VMHost {
func DefaultTestVM(tb testing.TB, blockchain vmcommon.LegacyBlockchainHook) vmhost.VMHost {
gasSchedule := customGasSchedule
if gasSchedule == nil {
gasSchedule = config.MakeGasMapForTests()
Expand All @@ -352,7 +352,7 @@ func DefaultTestVM(tb testing.TB, blockchain vmcommon.BlockchainHook) vmhost.VMH

func DefaultTestVMWithGasSchedule(
tb testing.TB,
blockchain vmcommon.BlockchainHook,
blockchain vmcommon.LegacyBlockchainHook,
customGasSchedule config.GasScheduleMap,
wasmerSIGSEGVPassthrough bool,
) vmhost.VMHost {
Expand Down
6 changes: 3 additions & 3 deletions vmhost/contexts/blockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ import (

"github.com/multiversx/mx-chain-core-go/data/esdt"
logger "github.com/multiversx/mx-chain-logger-go"
"github.com/multiversx/mx-chain-vm-common-go"
vmcommon "github.com/multiversx/mx-chain-vm-common-go"
"github.com/multiversx/mx-chain-vm-v1_3-go/vmhost"
)

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{
Expand Down
4 changes: 2 additions & 2 deletions vmhost/contexts/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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
Expand All @@ -25,7 +25,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 {
Expand Down
2 changes: 1 addition & 1 deletion vmhost/hostCore/host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ type vmHost struct {

// NewVMHost creates a new VM vmHost
func NewVMHost(
blockChainHook vmcommon.BlockchainHook,
blockChainHook vmcommon.LegacyBlockchainHook,
hostParameters *vmhost.VMHostParameters,
) (vmhost.VMHost, error) {
if check.IfNil(hostParameters.EnableEpochsHandler) {
Expand Down
Loading