diff --git a/go.mod b/go.mod index 178a9e22..912a302d 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,9 @@ require ( github.com/multiversx/mx-chain-core-go v1.2.21 github.com/multiversx/mx-chain-crypto-go v1.2.12 github.com/multiversx/mx-chain-logger-go v1.0.15 - github.com/multiversx/mx-chain-scenario-go v1.4.5-0.20240730075009-580861ec046b + github.com/multiversx/mx-chain-scenario-go v1.4.5-0.20240802080531-0906745c04b2 github.com/multiversx/mx-chain-storage-go v1.0.16 - github.com/multiversx/mx-chain-vm-common-go v1.5.14-0.20240729085843-b5bdcbe337f9 + github.com/multiversx/mx-chain-vm-common-go v1.5.14-0.20240802080126-92fc435bbbef 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 index 2d848ea9..902b6762 100644 --- a/go.sum +++ b/go.sum @@ -116,12 +116,12 @@ github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPj github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4= github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc= github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ= -github.com/multiversx/mx-chain-scenario-go v1.4.5-0.20240730075009-580861ec046b h1:u8T5KH/xQ2c7PSQPwEeBkOVXYGPbWn+HBalcGWt96bI= -github.com/multiversx/mx-chain-scenario-go v1.4.5-0.20240730075009-580861ec046b/go.mod h1:rf+svhT2ffjBhHQjZyoxkpla+x/nj+kwjo3QYBF9+f4= +github.com/multiversx/mx-chain-scenario-go v1.4.5-0.20240802080531-0906745c04b2 h1:7/4jvB5DBQqKL4udY4RjcwHZ7sRH20fXM3Nj830Rv84= +github.com/multiversx/mx-chain-scenario-go v1.4.5-0.20240802080531-0906745c04b2/go.mod h1:5lkUsHiCCX1rJOx0d763OIlD85y85xCYU0Zlzasq6OM= github.com/multiversx/mx-chain-storage-go v1.0.16 h1:l2lJq+EAN3YwLbjJrnoKfFd1/1Xmo9DcAUECND2obLs= github.com/multiversx/mx-chain-storage-go v1.0.16/go.mod h1:uM/z7YyqTOD3wgyH8TfapyEl5sb+7x/Jaxne4cfG4HI= -github.com/multiversx/mx-chain-vm-common-go v1.5.14-0.20240729085843-b5bdcbe337f9 h1:8njAzsFUUAMkj7TxTT0Zco5h6LzCvTcZMioHYtySNyc= -github.com/multiversx/mx-chain-vm-common-go v1.5.14-0.20240729085843-b5bdcbe337f9/go.mod h1:OSvFbzdWThfRbLZbUsEr7bikBSaLrPJQ2iUm9jw9nXQ= +github.com/multiversx/mx-chain-vm-common-go v1.5.14-0.20240802080126-92fc435bbbef h1:6fxfLOgKwZ2Rn5MIl9TMaeYmyPigC2XQRCASC4P0PHQ= +github.com/multiversx/mx-chain-vm-common-go v1.5.14-0.20240802080126-92fc435bbbef/go.mod h1:OSvFbzdWThfRbLZbUsEr7bikBSaLrPJQ2iUm9jw9nXQ= 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 index aa66e4a8..330771d4 100644 --- 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 index 5121bdee..08315cd6 100644 --- a/testcommon/testInitializer_inputs.go +++ b/testcommon/testInitializer_inputs.go @@ -344,7 +344,7 @@ 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) } @@ -352,7 +352,7 @@ func DefaultTestVM(tb testing.TB, blockchain vmcommon.BlockchainHook) vmhost.VMH // 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 index ce663b5e..0467908f 100644 --- 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 index 774ae569..b450e6b1 100644 --- 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 index e9de5a30..e10fce84 100644 --- 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) {