Merge pull request #975 from multiversx/merge-main-into-feat-16-oct

Merge main into feat 16 oct

Author: sasurobert

.github/workflows/build-test.yml

@@ -11,16 +11,16 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.20.7]
+        go-version: [1.23.6]
         os: [ubuntu-latest, macos-13]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Install Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Test (Linux)
       if: runner.os == 'Linux'

.github/workflows/code-coverage.yml

@@ -16,13 +16,13 @@ jobs:
     name: Build
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.20.7
+          go-version: 1.23.6
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Get dependencies
         run: |
@@ -33,9 +33,12 @@ jobs:
           fi
       - name: Run unit tests
         run: |
-          TESTS_TO_RUN=$(go list ./... | grep -v /integrationTests/ | grep -v /fuzz/ | grep -v /mandos-go/json/integrationTests | grep -v /mandos-go/expression/integrationTests)
+          TESTS_TO_RUN=$(go list ./... | grep -v /integrationTests/ | grep -v /fuzz/)
           go test -short -cover -coverprofile=coverage.txt -covermode=atomic -v ${TESTS_TO_RUN}
 
       - name: Upload coverage
-        run: bash <(curl -s https://codecov.io/bash) -f coverage.txt -y codecov.yml
-
+        uses: codecov/codecov-action@v5
+        with:
+          fail_ci_if_error: true
+          files: coverage.txt
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/golangci-lint.yml

@@ -14,15 +14,15 @@ jobs:
     name: golangci linter
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.20.7
-      - uses: actions/checkout@v3
+          go-version: 1.23.6
+      - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.53.2
+          version: v1.64.5
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

Makefile

@@ -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 ./...
 

cmd/scenariostest/scenariosTest.go

@@ -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"
 )
@@ -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()
 	}

codecov.yml

@@ -1,3 +1,10 @@
 ignore:
-  - "**/*.pb.go"       # wildcards accepted
-
+    - "**/*.pb.go"
+    - "**testInitializerInputs.go"
+    - "**testInitializerVMOutput.go"
+    - "**hosttest/**"
+    - "**mock/**"
+    - "**scenario/**"
+    - "**test/**"
+    - "**testcommon/**"
+    - "**testgen/**"

config/config.toml

@@ -56,8 +56,13 @@
     CleanReturnData = 10
     DeleteFromReturnData = 10
     GetCodeMetadata = 10
+    GetCodeHash = 10
     IsBuiltinFunction = 10
     IsReservedFunctionName = 10
+    GetRoundTime = 10
+    EpochStartBlockTimeStamp = 10
+    EpochStartBlockNonce = 10
+    EpochStartBlockRound = 10
 
 [EthAPICost]
     UseGas = 10
@@ -148,6 +153,7 @@
     BigFloatAbs = 10
     BigFloatSqrt = 10
     BigFloatPow = 10
+    BigFloatPowPerIteration = 10
     BigFloatFloor = 10
     BigFloatCeil = 10
     BigFloatIsInt = 10
@@ -184,6 +190,10 @@
     MBufferToBigIntSigned = 10
     MBufferFromBigIntUnsigned = 10
     MBufferFromBigIntSigned = 10
+    MBufferToSmallIntUnsigned = 10
+    MBufferToSmallIntSigned = 10
+    MBufferFromSmallIntUnsigned = 10
+    MBufferFromSmallIntSigned = 10
     MBufferToBigFloat = 10
     MBufferFromBigFloat = 10
     MBufferStorageStore = 10
@@ -192,6 +202,13 @@
     MBufferFinish = 10
     MBufferSetRandom = 10
 
+[ManagedMapAPICost]
+    ManagedMapNew      = 10
+    ManagedMapPut      = 10
+    ManagedMapGet      = 10
+    ManagedMapRemove   = 10
+    ManagedMapContains = 10
+
 [WASMOpcodeCost]
     AtomicFence = 1
     AtomicNotify = 1

config/gasCost.go

@@ -31,58 +31,63 @@ type BaseOperationCost struct {
 
 // BaseOpsAPICost defines the API operations gas cost config structure
 type BaseOpsAPICost struct {
-	GetSCAddress            uint64
-	GetOwnerAddress         uint64
-	IsSmartContract         uint64
-	GetShardOfAddress       uint64
-	GetExternalBalance      uint64
-	GetBlockHash            uint64
-	GetOriginalTxHash       uint64
-	GetCurrentTxHash        uint64
-	GetPrevTxHash           uint64
-	TransferValue           uint64
-	GetArgument             uint64
-	GetFunction             uint64
-	GetNumArguments         uint64
-	StorageStore            uint64
-	StorageLoad             uint64
-	CachedStorageLoad       uint64
-	GetCaller               uint64
-	GetCallValue            uint64
-	Log                     uint64
-	Finish                  uint64
-	SignalError             uint64
-	GetBlockTimeStamp       uint64
-	GetGasLeft              uint64
-	Int64GetArgument        uint64
-	Int64StorageStore       uint64
-	Int64StorageLoad        uint64
-	Int64Finish             uint64
-	GetStateRootHash        uint64
-	GetBlockNonce           uint64
-	GetBlockEpoch           uint64
-	GetBlockRound           uint64
-	GetBlockRandomSeed      uint64
-	ExecuteOnSameContext    uint64
-	ExecuteOnDestContext    uint64
-	DelegateExecution       uint64
-	ExecuteReadOnly         uint64
-	AsyncCallStep           uint64
-	AsyncCallbackGasLock    uint64
-	CreateAsyncCall         uint64
-	SetAsyncCallback        uint64
-	SetAsyncGroupCallback   uint64
-	SetAsyncContextCallback uint64
-	GetCallbackClosure      uint64
-	CreateContract          uint64
-	GetReturnData           uint64
-	GetNumReturnData        uint64
-	GetReturnDataSize       uint64
-	CleanReturnData         uint64
-	DeleteFromReturnData    uint64
-	GetCodeMetadata         uint64
-	IsBuiltinFunction       uint64
-	IsReservedFunctionName 	uint64
+	GetSCAddress             uint64
+	GetOwnerAddress          uint64
+	IsSmartContract          uint64
+	GetShardOfAddress        uint64
+	GetExternalBalance       uint64
+	GetBlockHash             uint64
+	GetOriginalTxHash        uint64
+	GetCurrentTxHash         uint64
+	GetPrevTxHash            uint64
+	TransferValue            uint64
+	GetArgument              uint64
+	GetFunction              uint64
+	GetNumArguments          uint64
+	StorageStore             uint64
+	StorageLoad              uint64
+	CachedStorageLoad        uint64
+	GetCaller                uint64
+	GetCallValue             uint64
+	Log                      uint64
+	Finish                   uint64
+	SignalError              uint64
+	GetBlockTimeStamp        uint64
+	GetGasLeft               uint64
+	Int64GetArgument         uint64
+	Int64StorageStore        uint64
+	Int64StorageLoad         uint64
+	Int64Finish              uint64
+	GetStateRootHash         uint64
+	GetBlockNonce            uint64
+	GetBlockEpoch            uint64
+	GetBlockRound            uint64
+	GetBlockRandomSeed       uint64
+	ExecuteOnSameContext     uint64
+	ExecuteOnDestContext     uint64
+	DelegateExecution        uint64
+	ExecuteReadOnly          uint64
+	AsyncCallStep            uint64
+	AsyncCallbackGasLock     uint64
+	CreateAsyncCall          uint64
+	SetAsyncCallback         uint64
+	SetAsyncGroupCallback    uint64
+	SetAsyncContextCallback  uint64
+	GetCallbackClosure       uint64
+	CreateContract           uint64
+	GetReturnData            uint64
+	GetNumReturnData         uint64
+	GetReturnDataSize        uint64
+	CleanReturnData          uint64
+	DeleteFromReturnData     uint64
+	GetCodeMetadata          uint64
+	GetCodeHash              uint64
+	IsBuiltinFunction        uint64
+	IsReservedFunctionName   uint64
+	GetRoundTime             uint64
+	EpochStartBlockTimeStamp uint64
+	EpochStartBlockNonce     uint64
+	EpochStartBlockRound     uint64
 }
 
 // DynamicStorageLoadCostCoefficients holds the signed coefficients of the func that will compute the gas cost
@@ -152,24 +157,25 @@ type BigIntAPICost struct {
 
 // BigFloatAPICost defines the big float operations gas cost config structure
 type BigFloatAPICost struct {
-	BigFloatNewFromParts uint64
-	BigFloatAdd          uint64
-	BigFloatSub          uint64
-	BigFloatMul          uint64
-	BigFloatDiv          uint64
-	BigFloatTruncate     uint64
-	BigFloatNeg          uint64
-	BigFloatClone        uint64
-	BigFloatCmp          uint64
-	BigFloatAbs          uint64
-	BigFloatSqrt         uint64
-	BigFloatPow          uint64
-	BigFloatFloor        uint64
-	BigFloatCeil         uint64
-	BigFloatIsInt        uint64
-	BigFloatSetBigInt    uint64
-	BigFloatSetInt64     uint64
-	BigFloatGetConst     uint64
+	BigFloatNewFromParts    uint64
+	BigFloatAdd             uint64
+	BigFloatSub             uint64
+	BigFloatMul             uint64
+	BigFloatDiv             uint64
+	BigFloatTruncate        uint64
+	BigFloatNeg             uint64
+	BigFloatClone           uint64
+	BigFloatCmp             uint64
+	BigFloatAbs             uint64
+	BigFloatSqrt            uint64
+	BigFloatPow             uint64
+	BigFloatPowPerIteration uint64
+	BigFloatFloor           uint64
+	BigFloatCeil            uint64
+	BigFloatIsInt           uint64
+	BigFloatSetBigInt       uint64
+	BigFloatSetInt64        uint64
+	BigFloatGetConst        uint64
 }
 
 // CryptoAPICost defines the crypto operations gas cost config structure
@@ -198,26 +204,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