Skip to content

Commit 04774e4

Browse files
sstanculeanusstanculeanu
authored
Merge pull request #7082 from multiversx/update-deps
updated deps
2 parents 53d15db + 961b864 commit 04774e4

File tree

4 files changed

+40
-59
lines changed

4 files changed

+40
-59
lines changed

‎go.mod

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ require (
1616
github.com/libp2p/go-libp2p v0.38.2
1717
github.com/libp2p/go-libp2p-pubsub v0.13.0
1818
github.com/mitchellh/mapstructure v1.5.0
19-
github.com/multiversx/mx-chain-communication-go v1.2.1-0.20250520083403-3f2bad6d5476
20-
github.com/multiversx/mx-chain-core-go v1.3.2-0.20250618133541-d246102f0c43
21-
github.com/multiversx/mx-chain-crypto-go v1.2.13-0.20250520075055-8ab2a164945d
22-
github.com/multiversx/mx-chain-es-indexer-go v1.8.3-0.20250618152922-9ff735e4f26d
23-
github.com/multiversx/mx-chain-logger-go v1.0.16-0.20250520074859-b2faf3c90273
24-
github.com/multiversx/mx-chain-scenario-go v1.5.1-0.20250617131039-b09f258a9f6c
25-
github.com/multiversx/mx-chain-storage-go v1.0.20-0.20250520075958-65fd4c7bcaae
26-
github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250618152408-dbe5ad03bfc1
27-
github.com/multiversx/mx-chain-vm-go v1.5.41-0.20250623142621-8a9e3b7a9f9c
28-
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69-0.20250520080927-410c413d962f
29-
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70-0.20250520081414-edf8b75e054d
30-
github.com/multiversx/mx-chain-vm-v1_4-go v1.4.99-0.20250520081749-516b5ae0e49c
19+
github.com/multiversx/mx-chain-communication-go v1.3.0
20+
github.com/multiversx/mx-chain-core-go v1.4.0
21+
github.com/multiversx/mx-chain-crypto-go v1.3.0
22+
github.com/multiversx/mx-chain-es-indexer-go v1.9.0
23+
github.com/multiversx/mx-chain-logger-go v1.1.0
24+
github.com/multiversx/mx-chain-scenario-go v1.6.0
25+
github.com/multiversx/mx-chain-storage-go v1.1.0
26+
github.com/multiversx/mx-chain-vm-common-go v1.6.0
27+
github.com/multiversx/mx-chain-vm-go v1.5.41
28+
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69
29+
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70
30+
github.com/multiversx/mx-chain-vm-v1_4-go v1.4.99
3131
github.com/pelletier/go-toml v1.9.3
3232
github.com/pkg/errors v0.9.1
3333
github.com/prometheus/client_golang v1.20.5
@@ -134,7 +134,7 @@ require (
134134
github.com/multiformats/go-multistream v0.6.0 // indirect
135135
github.com/multiformats/go-varint v0.0.7 // indirect
136136
github.com/multiversx/concurrent-map v0.1.4 // indirect
137-
github.com/multiversx/mx-components-big-int v1.0.1-0.20250218162530-b4e4d7442408 // indirect
137+
github.com/multiversx/mx-components-big-int v1.1.0 // indirect
138138
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
139139
github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d // indirect
140140
github.com/onsi/ginkgo/v2 v2.22.0 // indirect

‎go.sum

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -399,32 +399,32 @@ github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/n
399399
github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
400400
github.com/multiversx/concurrent-map v0.1.4 h1:hdnbM8VE4b0KYJaGY5yJS2aNIW9TFFsUYwbO0993uPI=
401401
github.com/multiversx/concurrent-map v0.1.4/go.mod h1:8cWFRJDOrWHOTNSqgYCUvwT7c7eFQ4U2vKMOp4A/9+o=
402-
github.com/multiversx/mx-chain-communication-go v1.2.1-0.20250520083403-3f2bad6d5476 h1:Dn73bH1AdG+7+3/FFRfOiivOEvwPyzZUBWWxpk8QVxc=
403-
github.com/multiversx/mx-chain-communication-go v1.2.1-0.20250520083403-3f2bad6d5476/go.mod h1:99+FW6f7X0Ri5tph+2l2GaDVrdej1do89exkfh7gilE=
404-
github.com/multiversx/mx-chain-core-go v1.3.2-0.20250618133541-d246102f0c43 h1:ezQzIZIbRwruPyqm/fOxQlZhUvEA8jncn7SpG71HlcU=
405-
github.com/multiversx/mx-chain-core-go v1.3.2-0.20250618133541-d246102f0c43/go.mod h1:IO+vspNan+gT0WOHnJ95uvWygiziHZvfXpff6KnxV7g=
406-
github.com/multiversx/mx-chain-crypto-go v1.2.13-0.20250520075055-8ab2a164945d h1:NI5uKpkwP5XZu9gtDiWxmbbb07T9hXegPist17WAzY4=
407-
github.com/multiversx/mx-chain-crypto-go v1.2.13-0.20250520075055-8ab2a164945d/go.mod h1:yekQt4uB5LYXtimbhpdUbnFexjucWrQG/t+AX55bdM8=
408-
github.com/multiversx/mx-chain-es-indexer-go v1.8.3-0.20250618152922-9ff735e4f26d h1:d+IarzDG3UVxZcvHc9jw8uTYpwelYlk61Ac977wQIHw=
409-
github.com/multiversx/mx-chain-es-indexer-go v1.8.3-0.20250618152922-9ff735e4f26d/go.mod h1:p+0pI3rOj2Q5G8ZhYoniJgD7BhVyno4j/NP++76A1ZM=
410-
github.com/multiversx/mx-chain-logger-go v1.0.16-0.20250520074859-b2faf3c90273 h1:1I2CgGDAMINxrKI6yzSP/Y6Wow2YUmqegUXcltpGXQA=
411-
github.com/multiversx/mx-chain-logger-go v1.0.16-0.20250520074859-b2faf3c90273/go.mod h1:M/uRv1kpmkzxS5HsgofdRcOHzzvagD7nTmFqiPKt89U=
412-
github.com/multiversx/mx-chain-scenario-go v1.5.1-0.20250617131039-b09f258a9f6c h1:FiEuVVRJdFZZQ6YX+sx6GAU90LlscfZKKpxV2JVvt0w=
413-
github.com/multiversx/mx-chain-scenario-go v1.5.1-0.20250617131039-b09f258a9f6c/go.mod h1:MAnOkKa27CXLwDPLFcYOGpZv8JVGe/CDKHT0TTtXHXM=
414-
github.com/multiversx/mx-chain-storage-go v1.0.20-0.20250520075958-65fd4c7bcaae h1:wgiIjyoynLQPs8QkEOXjAU8AoZlLA5w4rWPykLS2BSo=
415-
github.com/multiversx/mx-chain-storage-go v1.0.20-0.20250520075958-65fd4c7bcaae/go.mod h1:uiXDLvpznajMubl+OBhODo6jmtwo8kyUF9iujEhOIgI=
416-
github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250618152408-dbe5ad03bfc1 h1:2QQRrabfJNnJZnj/+0AwhNhavrY2TyKAtdMooaRtxYc=
417-
github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250618152408-dbe5ad03bfc1/go.mod h1:HlpJgCTYVvHE1nrEJLIsR/AJx0gqzg3m+qdJwf7jOjU=
418-
github.com/multiversx/mx-chain-vm-go v1.5.41-0.20250623142621-8a9e3b7a9f9c h1:3ou9tTA6tXn+aoJJzz2PTEOM4Cg2Q2gkqADRsOu8wUM=
419-
github.com/multiversx/mx-chain-vm-go v1.5.41-0.20250623142621-8a9e3b7a9f9c/go.mod h1:YrvJxTjaFOMm+iG8MY2JcfF4rou4hyp3mrgyDvMP17E=
420-
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69-0.20250520080927-410c413d962f h1:Sg1SZWm90IeliVPce3w0CtLjr+a+mcWAFVHW2VGR0nA=
421-
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69-0.20250520080927-410c413d962f/go.mod h1:aeGXPTVkUDsPcHwuSer2VXEnMow7iofEvuDGPd47Cj8=
422-
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70-0.20250520081414-edf8b75e054d h1:DFYWypkQs7BYepsLPz/IIN8cGsEf4+fWM9L0a6mnfKU=
423-
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70-0.20250520081414-edf8b75e054d/go.mod h1:SQbB1KY4qt2HngdqcBvu9wV0pERXKP5eP+rRxciyL84=
424-
github.com/multiversx/mx-chain-vm-v1_4-go v1.4.99-0.20250520081749-516b5ae0e49c h1:mazIPF6FgwBImN8YNorP3kjG3nygbDXbNkuBf5ILUvM=
425-
github.com/multiversx/mx-chain-vm-v1_4-go v1.4.99-0.20250520081749-516b5ae0e49c/go.mod h1:Fi6zq++lc9cFhLVKULa6HVVD2P4Ya3GD1Lua60u/rpY=
426-
github.com/multiversx/mx-components-big-int v1.0.1-0.20250218162530-b4e4d7442408 h1:FbpVQJg14ry25DiBBZIvBoKiSrTHWkUSlYMOOW/iQJQ=
427-
github.com/multiversx/mx-components-big-int v1.0.1-0.20250218162530-b4e4d7442408/go.mod h1:kcWw7hDe6cSz1wcBAqj/6sFH6ouSPsNeH9P7XlpZRcw=
402+
github.com/multiversx/mx-chain-communication-go v1.3.0 h1:ziNM1dRuiR/7al2L/jGEA/a/hjurtJ/HEqgazHNt9P8=
403+
github.com/multiversx/mx-chain-communication-go v1.3.0/go.mod h1:gDVWn6zUW6aCN1YOm/FbbT5MUmhgn/L1Rmpl8EoH3Yg=
404+
github.com/multiversx/mx-chain-core-go v1.4.0 h1:p6FbfCzvMXF54kpS0B5mrjNWYpq4SEQqo0UvrMF7YVY=
405+
github.com/multiversx/mx-chain-core-go v1.4.0/go.mod h1:IO+vspNan+gT0WOHnJ95uvWygiziHZvfXpff6KnxV7g=
406+
github.com/multiversx/mx-chain-crypto-go v1.3.0 h1:0eK2bkDOMi8VbSPrB1/vGJSYT81IBtfL4zw+C4sWe/k=
407+
github.com/multiversx/mx-chain-crypto-go v1.3.0/go.mod h1:nPIkxxzyTP8IquWKds+22Q2OJ9W7LtusC7cAosz7ojM=
408+
github.com/multiversx/mx-chain-es-indexer-go v1.9.0 h1:mWWDNVQJybaUDspe0yQa6iW2rV/V09yMPb4u7sdhwlw=
409+
github.com/multiversx/mx-chain-es-indexer-go v1.9.0/go.mod h1:t1rkD2vHXSI4EClig0h7+kRCSUCRrMF+emr4DHxFtfA=
410+
github.com/multiversx/mx-chain-logger-go v1.1.0 h1:97x84A6L4RfCa6YOx1HpAFxZp1cf/WI0Qh112whgZNM=
411+
github.com/multiversx/mx-chain-logger-go v1.1.0/go.mod h1:K9XgiohLwOsNACETMNL0LItJMREuEvTH6NsoXWXWg7g=
412+
github.com/multiversx/mx-chain-scenario-go v1.6.0 h1:cwDFuS1pSc4YXnfiKKDTEb+QDY4fulPQaiRgIebnKxI=
413+
github.com/multiversx/mx-chain-scenario-go v1.6.0/go.mod h1:GrSYu1SnMvsIm9djUz1X13224HcvdY6Nb5KHNT3xZPA=
414+
github.com/multiversx/mx-chain-storage-go v1.1.0 h1:M1Y9DqMrJ62s7Zw31+cyuqsnPIvlG4jLBJl5WzeZLe8=
415+
github.com/multiversx/mx-chain-storage-go v1.1.0/go.mod h1:o6Jm7cjfPmcc6XpyihYWrd6sx3sgqwurrunw3ZrfyxI=
416+
github.com/multiversx/mx-chain-vm-common-go v1.6.0 h1:M2zmf/ptEINciWxYCPLIkwOMTvvzWjELYYB+0MMQ5Gw=
417+
github.com/multiversx/mx-chain-vm-common-go v1.6.0/go.mod h1:Lc7r4VDPYRDS0CVIaWAoLtf3YQn6PZEYHv4QtaOE2Z0=
418+
github.com/multiversx/mx-chain-vm-go v1.5.41 h1:FeIFZnmatgT3eQ8gp6Bbvu+FOvd+d/imfVlHhtVxmk0=
419+
github.com/multiversx/mx-chain-vm-go v1.5.41/go.mod h1:Qc2Sckw+EfQwnapkzghFfhuUAOGv29oSZgvj8LJ+xWQ=
420+
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69 h1:5gSR3IMw1mcp/v5oO+vZ5YOyWO8w7O2qKhCKNPwsWNE=
421+
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69/go.mod h1:Qqn+B6IBlOi5huybKlvqNYDMsAHognVI6a6uiSZvaj0=
422+
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70 h1:UnTw+KJcLLqkqTR6EoZksqiM8PP4/BI6RcJlx25H9hc=
423+
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70/go.mod h1:tJahRJl5i+O0uT19lTeWPou5zSeVvQldSjp3wxXCpMA=
424+
github.com/multiversx/mx-chain-vm-v1_4-go v1.4.99 h1:Pma2GGUk0JsM2dSc5+ZD1LCDo9/8sDd/mIwPNxBOyRc=
425+
github.com/multiversx/mx-chain-vm-v1_4-go v1.4.99/go.mod h1:Z2cSyVE36NN7rYL2mGaP7yE6plzh5iIzis6HbyXSEFo=
426+
github.com/multiversx/mx-components-big-int v1.1.0 h1:7aSJKago6vJQy9JeMOBRDYKHvsrj9OmrFWOucFUV+Kg=
427+
github.com/multiversx/mx-components-big-int v1.1.0/go.mod h1:kcWw7hDe6cSz1wcBAqj/6sFH6ouSPsNeH9P7XlpZRcw=
428428
github.com/multiversx/protobuf v1.3.2 h1:RaNkxvGTGbA0lMcnHAN24qE1G1i+Xs5yHA6MDvQ4mSM=
429429
github.com/multiversx/protobuf v1.3.2/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
430430
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=

‎process/block/interceptedBlocks/interceptedEquivalentProof.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/multiversx/mx-chain-core-go/hashing"
1212
"github.com/multiversx/mx-chain-core-go/marshal"
1313
logger "github.com/multiversx/mx-chain-logger-go"
14-
"github.com/multiversx/mx-chain-vm-v1_2-go/ipc/marshaling"
1514

1615
"github.com/multiversx/mx-chain-go/common"
1716
"github.com/multiversx/mx-chain-go/consensus"
@@ -40,7 +39,7 @@ type interceptedEquivalentProof struct {
4039
isForCurrentShard bool
4140
headerSigVerifier consensus.HeaderSigVerifier
4241
proofsPool dataRetriever.ProofsPool
43-
marshaller marshaling.Marshalizer
42+
marshaller marshal.Marshalizer
4443
hasher hashing.Hasher
4544
hash []byte
4645
proofSizeChecker common.FieldsSizeChecker

‎process/factory/shard/vmContainerFactory_test.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
vmcommonBuiltInFunctions "github.com/multiversx/mx-chain-vm-common-go/builtInFunctions"
2020
"github.com/multiversx/mx-chain-vm-common-go/parsers"
2121
wasmConfig "github.com/multiversx/mx-chain-vm-go/config"
22-
ipcNodePart1p2 "github.com/multiversx/mx-chain-vm-v1_2-go/ipc/nodepart"
2322
"github.com/stretchr/testify/assert"
2423
"github.com/stretchr/testify/require"
2524
)
@@ -235,35 +234,27 @@ func TestVmContainerFactory_ResolveWasmVMVersion(t *testing.T) {
235234
_ = container.Close()
236235
}()
237236
require.Equal(t, "v1.2", getWasmVMVersion(t, container))
238-
require.False(t, isOutOfProcess(t, container))
239237

240238
epochNotifierInstance.CheckEpoch(makeHeaderHandlerStub(1))
241239
require.Equal(t, "v1.2", getWasmVMVersion(t, container))
242-
require.False(t, isOutOfProcess(t, container))
243240

244241
epochNotifierInstance.CheckEpoch(makeHeaderHandlerStub(6))
245242
require.Equal(t, "v1.2", getWasmVMVersion(t, container))
246-
require.False(t, isOutOfProcess(t, container))
247243

248244
epochNotifierInstance.CheckEpoch(makeHeaderHandlerStub(10))
249245
require.Equal(t, "v1.2", getWasmVMVersion(t, container))
250-
require.False(t, isOutOfProcess(t, container))
251246

252247
epochNotifierInstance.CheckEpoch(makeHeaderHandlerStub(11))
253248
require.Equal(t, "v1.2", getWasmVMVersion(t, container))
254-
require.False(t, isOutOfProcess(t, container))
255249

256250
epochNotifierInstance.CheckEpoch(makeHeaderHandlerStub(12))
257251
require.Equal(t, "v1.3", getWasmVMVersion(t, container))
258-
require.False(t, isOutOfProcess(t, container))
259252

260253
epochNotifierInstance.CheckEpoch(makeHeaderHandlerStub(13))
261254
require.Equal(t, "v1.3", getWasmVMVersion(t, container))
262-
require.False(t, isOutOfProcess(t, container))
263255

264256
epochNotifierInstance.CheckEpoch(makeHeaderHandlerStub(20))
265257
require.Equal(t, "v1.4", getWasmVMVersion(t, container))
266-
require.False(t, isOutOfProcess(t, container))
267258

268259
require.Equal(t, numCalled, 1)
269260
}
@@ -274,15 +265,6 @@ func makeHeaderHandlerStub(epoch uint32) data.HeaderHandler {
274265
}
275266
}
276267

277-
func isOutOfProcess(t testing.TB, container process.VirtualMachinesContainer) bool {
278-
vm, err := container.Get(factory.WasmVirtualMachine)
279-
require.Nil(t, err)
280-
require.NotNil(t, vm)
281-
282-
_, ok := vm.(*ipcNodePart1p2.VMDriver)
283-
return ok
284-
}
285-
286268
func getWasmVMVersion(t testing.TB, container process.VirtualMachinesContainer) string {
287269
vm, err := container.Get(factory.WasmVirtualMachine)
288270
require.Nil(t, err)

0 commit comments

Comments
 (0)