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

rc/v1.7.2 #859

Closed
wants to merge 34 commits into from
+25,108 −15,663
Closed

rc/v1.7.2 #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
f518b05
Managed Buffer <-> small int conversions VM hooks
andrei-marinica Jun 17, 2024
aa65cf7
basic-features EI 1.3 backup
andrei-marinica Jul 19, 2024
399ede1
Managed Buffer <-> small int conversions VM hooks fixes
andrei-marinica Jul 19, 2024
9b16039
basic-features test update, with ne wsmall int VM hooks
andrei-marinica Jul 19, 2024
4a1c679
Merge branch 'rc/v1.7.next1' into convert-small-int
andrei-marinica Jul 19, 2024
7fec3b6
update executor VM hooks
andrei-marinica Jul 25, 2024
dcd1c6d
revert composability tests
andrei-marinica Jul 25, 2024
24cacc7
Merge branch 'rc/v1.7.next1' into convert-small-int
andrei-marinica Jul 25, 2024
e706794
indentation fix
andrei-marinica Jul 26, 2024
791c302
Merge pull request #852 from multiversx/convert-small-int
andrei-marinica Jul 26, 2024
75f5a5c
Merge branch 'rc/v1.7.next1' of https://github.com/multiversx/mx-chai…
sstanculeanu Jul 30, 2024
e0bd348
updated deps after merge
sstanculeanu Jul 30, 2024
81045e4
Merge branch 'rc/v1.7.next1' of https://github.com/multiversx/mx-chai…
sstanculeanu Jul 30, 2024
1bbf725
Merge pull request #861 from multiversx/merge_rc17next1_into_rc172_20…
sstanculeanu Jul 30, 2024
247a786
Revert "Merge pull request #861 from multiversx/merge_rc17next1_into_…
sstanculeanu Aug 2, 2024
be6f994
Merge pull request #865 from multiversx/revert-last-merge-from-rc17next1
sstanculeanu Aug 2, 2024
cdfa4e1
update wasmer binaries
laurci Aug 21, 2024
4b34a52
Merge pull request #871 from multiversx/feat-new-wasmer2-binaries-1.7.2
sasurobert Aug 21, 2024
683085f
Merge branch 'rc/v1.7.next1' into 1.7.1-to-1.7.2
sasurobert Aug 21, 2024
16bbb45
fixing after merge
sasurobert Aug 21, 2024
ffe805c
Merge pull request #872 from multiversx/1.7.1-to-1.7.2
sasurobert Aug 21, 2024
af19be4
fixing after merge
sasurobert Aug 22, 2024
27ca176
fixing after merge
sasurobert Aug 22, 2024
123123b
fixing after refactor
sasurobert Aug 22, 2024
0032ebe
fixing after refactor
sasurobert Aug 22, 2024
7046731
fixing after refactor
sasurobert Aug 22, 2024
71bea6f
cleanup VM.
sasurobert Aug 22, 2024
a96ff8c
cleanup VM.
sasurobert Aug 22, 2024
8a661cb
fixes after refactor
sasurobert Aug 22, 2024
27310f3
Merge pull request #875 from multiversx/vm-cleanup
sasurobert Aug 22, 2024
66b0899
Merge branch 'rc/v1.7.2' into withFault-refactor
sasurobert Aug 22, 2024
b0ce92c
fix after review
sasurobert Aug 22, 2024
debe21f
Merge remote-tracking branch 'origin/withFault-refactor' into withFau…
sasurobert Aug 22, 2024
dd4237b
Merge pull request #873 from multiversx/withFault-refactor
sasurobert Aug 30, 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
5 changes: 0 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,9 @@ endif
cp ./cmd/vmserver/vmserver ${VMSERVER_PATH}

test:
go clean -cache -testcache
VMEXECUTOR="wasmer1" go test ./...
go clean -cache -testcache
VMEXECUTOR="wasmer2" go test ./...

test-w1: clean
VMEXECUTOR="wasmer1" go test ./...

test-w2: clean
VMEXECUTOR="wasmer2" go test ./...

Expand Down
5 changes: 0 additions & 5 deletions cmd/scenariostest/scenariosTest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ package main
import (
scenclibase "github.com/multiversx/mx-chain-scenario-go/clibase"
scenio "github.com/multiversx/mx-chain-scenario-go/scenario/io"

vmscenario "github.com/multiversx/mx-chain-vm-go/scenario"
"github.com/multiversx/mx-chain-vm-go/wasmer"
"github.com/multiversx/mx-chain-vm-go/wasmer2"
cli "github.com/urfave/cli/v2"
)
Expand Down Expand Up @@ -42,9 +40,6 @@ func (*vm15Flags) ParseFlags(cCtx *cli.Context) scenclibase.CLIRunOptions {
}

vmBuilder := vmscenario.NewScenarioVMHostBuilder()
if cCtx.Bool("wasmer1") {
vmBuilder.OverrideVMExecutor = wasmer.ExecutorFactory()
}
if cCtx.Bool("wasmer2") {
vmBuilder.OverrideVMExecutor = wasmer2.ExecutorFactory()
}
Expand Down
4 changes: 4 additions & 0 deletions config/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,10 @@
MBufferToBigIntSigned = 10
MBufferFromBigIntUnsigned = 10
MBufferFromBigIntSigned = 10
MBufferToSmallIntUnsigned = 10
MBufferToSmallIntSigned = 10
MBufferFromSmallIntUnsigned = 10
MBufferFromSmallIntSigned = 10
MBufferToBigFloat = 10
MBufferFromBigFloat = 10
MBufferStorageStore = 10
Expand Down
46 changes: 25 additions & 21 deletions config/gasCost.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ type BaseOpsAPICost struct {
DeleteFromReturnData uint64
GetCodeMetadata uint64
IsBuiltinFunction uint64
IsReservedFunctionName uint64
IsReservedFunctionName uint64
}

// DynamicStorageLoadCostCoefficients holds the signed coefficients of the func that will compute the gas cost
Expand Down Expand Up @@ -198,26 +198,30 @@ type CryptoAPICost struct {

// ManagedBufferAPICost defines the managed buffer operations gas cost config structure
type ManagedBufferAPICost struct {
MBufferNew uint64
MBufferNewFromBytes uint64
MBufferGetLength uint64
MBufferGetBytes uint64
MBufferGetByteSlice uint64
MBufferCopyByteSlice uint64
MBufferSetBytes uint64
MBufferAppend uint64
MBufferAppendBytes uint64
MBufferToBigIntUnsigned uint64
MBufferToBigIntSigned uint64
MBufferFromBigIntUnsigned uint64
MBufferFromBigIntSigned uint64
MBufferToBigFloat uint64
MBufferFromBigFloat uint64
MBufferStorageStore uint64
MBufferStorageLoad uint64
MBufferGetArgument uint64
MBufferFinish uint64
MBufferSetRandom uint64
MBufferNew uint64
MBufferNewFromBytes uint64
MBufferGetLength uint64
MBufferGetBytes uint64
MBufferGetByteSlice uint64
MBufferCopyByteSlice uint64
MBufferSetBytes uint64
MBufferAppend uint64
MBufferAppendBytes uint64
MBufferToBigIntUnsigned uint64
MBufferToBigIntSigned uint64
MBufferFromBigIntUnsigned uint64
MBufferFromBigIntSigned uint64
MBufferToSmallIntUnsigned uint64
MBufferToSmallIntSigned uint64
MBufferFromSmallIntUnsigned uint64
MBufferFromSmallIntSigned uint64
MBufferToBigFloat uint64
MBufferFromBigFloat uint64
MBufferStorageStore uint64
MBufferStorageLoad uint64
MBufferGetArgument uint64
MBufferFinish uint64
MBufferSetRandom uint64
}

// ManagedMapAPICost defines the managed map operations gas cost config structure
Expand Down
4 changes: 4 additions & 0 deletions config/gasSchedule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,10 @@ func FillGasMapManagedBufferAPICosts(value uint64) map[string]uint64 {
gasMap["MBufferAppend"] = value
gasMap["MBufferAppendBytes"] = value
gasMap["MBufferToBigIntUnsigned"] = value
gasMap["MBufferToSmallIntUnsigned"] = value
gasMap["MBufferToSmallIntSigned"] = value
gasMap["MBufferFromSmallIntUnsigned"] = value
gasMap["MBufferFromSmallIntSigned"] = value
gasMap["MBufferToBigIntSigned"] = value
gasMap["MBufferFromBigIntUnsigned"] = value
gasMap["MBufferFromBigIntSigned"] = value
Expand Down
4 changes: 4 additions & 0 deletions executor/vmHooks.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions executor/wrapper/wrapperVMHooks.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ require (
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1
github.com/gogo/protobuf v1.3.2
github.com/mitchellh/mapstructure v1.5.0
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.4
github.com/multiversx/mx-chain-storage-go v1.0.16
github.com/multiversx/mx-chain-vm-common-go v1.5.14-0.20240812082318-afa839968da3
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-scenario-go v1.4.4-0.20240725072925-89c927c8b6a6
github.com/multiversx/mx-chain-storage-go v1.0.16-0.20240725070753-aa7fb322ebdf
github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240725072715-8806f1301087
github.com/multiversx/mx-components-big-int v1.0.0
github.com/pelletier/go-toml v1.9.3
github.com/stretchr/testify v1.8.1
Expand Down
24 changes: 12 additions & 12 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,18 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
github.com/multiversx/mx-chain-core-go v1.2.21 h1:+XVKznPTlUU5EFS1A8chtS8fStW60upRIyF4Pgml19I=
github.com/multiversx/mx-chain-core-go v1.2.21/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE=
github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk=
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.4 h1:DVE2V+FPeyD/yWoC+KEfPK3jsFzHeruelESfpTlf460=
github.com/multiversx/mx-chain-scenario-go v1.4.4/go.mod h1:kI+TWR3oIEgUkbwkHCPo2CQ3VjIge+ezGTibiSGwMxo=
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.20240812082318-afa839968da3 h1:RlHKl5enbGrleB0Aea9TinZLLymS4WvG0/xAt/iRb6E=
github.com/multiversx/mx-chain-vm-common-go v1.5.14-0.20240812082318-afa839968da3/go.mod h1:OSvFbzdWThfRbLZbUsEr7bikBSaLrPJQ2iUm9jw9nXQ=
github.com/multiversx/mx-chain-core-go v1.2.21-0.20240725065431-6e9bfee5a4c6 h1:Q7uUjTYTrt8Mw9oq5JWPv+WHhpxHTv6lhZZlhPuNcoQ=
github.com/multiversx/mx-chain-core-go v1.2.21-0.20240725065431-6e9bfee5a4c6/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE=
github.com/multiversx/mx-chain-crypto-go v1.2.12-0.20240725071000-c3212540166f h1:jydjrmVFvSllBOTppveOAkLITpOYKk0kma5z0bfDImI=
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-scenario-go v1.4.4-0.20240725072925-89c927c8b6a6 h1:QGQjSlPix5nBtCkcdyKo0b2sRYXwYF/GBtccOqDbU6Y=
github.com/multiversx/mx-chain-scenario-go v1.4.4-0.20240725072925-89c927c8b6a6/go.mod h1:MvJiMtuyGq43aS9eOgF+xQUWk0hYxvCQqLrT77bhBaE=
github.com/multiversx/mx-chain-storage-go v1.0.16-0.20240725070753-aa7fb322ebdf h1:L9K7Xzq5SZz6k55R7HrafiRcU+c8/PqozJxys65G4bI=
github.com/multiversx/mx-chain-storage-go v1.0.16-0.20240725070753-aa7fb322ebdf/go.mod h1:ptvW/8r6bam55mVpeVZbyvvvydYM0DQwcPOH0W4Xyx8=
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-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=
Expand Down
Loading
Loading