New feature 25 "Deterministic Finality and Ride V9" added.

.github/workflows/go.yml

@@ -46,12 +46,19 @@ jobs:
         with:
           version: latest
           args: -c .golangci.yml
+
       # Strict linter configuration, only checking new code from pull requests.
       - name: golangci-lint-strict
         run: golangci-lint run -c .golangci-strict.yml --new-from-rev=origin/master
+
       # Check for modern Go code patterns
-      - name: modernize check
-        run: go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@v0.20.0 ./...
+      - name: Run modernize
+        shell: bash
+        run: |
+          set +o pipefail
+          go run golang.org/x/tools/go/analysis/passes/modernize/cmd/modernize@latest ./... 2>&1 | \
+            grep -vE '\.(pb|gen)\.go|mock|_string.go|^exit status|^go: downloading' | \
+            { output=$(cat); [ -n "$output" ] && { echo "$output"; exit 1; } || exit 0; }
 
   build:
     name: ubuntu

.github/workflows/security.yml

@@ -35,15 +35,15 @@ jobs:
         uses: securego/gosec@223e19b8856e00f02cc67804499a83f77e208f3c # v2.25.0
         with:
           # with '-no-fail' we let the report trigger content trigger a failure using the GitHub Security features.
-          args: "-no-fail -fmt sarif -out gosec.sarif ./..."
+          args: "-no-fail -exclude-generated -fmt sarif -out gosec.sarif ./..."
       - name: Transform gosec SARIF to meet SARIF 2.1.0 schema requirements
         # Produces SARIF file has two incompatibilities with SARIF 2.1.0 schema all of them are in `fixes` object:
         #  1. Field `description` contains only `markdown` property, but `text` property is mandatory.
         #  2. Property `artifactChanges` must be non-empty array with valid `artifactChange` object.
         # To fix those issues the first part of jq query copies content of `markdown` field into `text` field
         # if it's not present. In the second part if the `fixes` object has null array as `artifactChanges` the empty
         # valid `artifactChange` object inserted.
-        # After fix of mentioned gosec issues this step can be removed. 
+        # After fix of mentioned gosec issues this step can be removed.
         run: |
           set -e
           jq 'walk(if type=="object" and has("markdown") and (.text == null or .text == "") then .text = .markdown else . end) | (.runs[].results[]? .fixes[]? .artifactChanges) |= (if . == null then [{"artifactLocation": { "uri": "" }, "replacements": [{"deletedRegion": {"byteOffset": 0, "byteLength": 0 }}]}] else . end)' gosec.sarif > gosec_fixed.sarif

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "pkg/grpc/protobuf-schemas"]
 	path = pkg/grpc/protobuf-schemas
 	url = https://github.com/wavesplatform/protobuf-schemas
+	branch = deterministic-finality

.golangci-strict.yml

@@ -156,6 +156,10 @@ linters:
         - github.com/jmoiron/sqlx
     usetesting:
       os-setenv: true
+    revive:
+      rules:
+        - name: var-naming
+          disable: true
   exclusions:
     generated: lax
     presets:

.golangci.yml

@@ -1,11 +1,16 @@
 version: "2"
 linters:
+  enable:
+    - exhaustive
   settings:
     cyclop:
       max-complexity: 30
       package-average: 10
     errcheck:
       check-type-assertions: false
+    exhaustive:
+      check:
+        - switch
     exhaustruct:
       exclude:
         - ^net/http.Client$

.semgrepignore

@@ -18,3 +18,6 @@ cmd/wmd/internal/swagger/
 
 # Ignore testdata folders
 pkg/state/testdata/
+
+# Ignore generated files
+**/*.pb.go

Makefile

@@ -257,7 +257,27 @@ dist-convert: release-convert
 	@cd ./build/bin/darwin-amd64/; tar pzcvf ../../dist/convert_$(VERSION)_macOS-amd64.tar.gz ./convert*
 	@cd ./build/bin/darwin-arm64/; tar pzcvf ../../dist/convert_$(VERSION)_macOS-arm64.tar.gz ./convert*
 
-dist: clean dist-chaincmp dist-importer dist-node dist-wallet dist-compiler
+build-commit-native:
+	@go build -o build/bin/native/commit ./cmd/commit
+build-commit-linux:
+	@CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o build/bin/linux-amd64/commit ./cmd/commit
+build-commit-darwin-amd64:
+	@CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o build/bin/darwin-amd64/commit ./cmd/commit
+build-commit-darwin-arm64:
+	@CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o build/bin/darwin-arm64/commit ./cmd/commit
+build-commit-windows:
+	@CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o build/bin/windows-amd64/commit.exe ./cmd/commit
+
+release-commit: ver build-commit-linux build-commit-darwin-amd64 build-commit-darwin-arm64 build-commit-windows
+
+dist-commit: release-commit
+	@mkdir -p build/dist
+	@cd ./build/; zip -j ./dist/commit_$(VERSION)_Windows-amd64.zip ./bin/windows-amd64/commit*
+	@cd ./build/bin/linux-amd64/; tar pzcvf ../../dist/commit_$(VERSION)_Linux-amd64.tar.gz ./commit*
+	@cd ./build/bin/darwin-amd64/; tar pzcvf ../../dist/commit_$(VERSION)_macOS-amd64.tar.gz ./commit*
+	@cd ./build/bin/darwin-arm64/; tar pzcvf ../../dist/commit_$(VERSION)_macOS-arm64.tar.gz ./commit*
+
+dist: clean dist-chaincmp dist-importer dist-node dist-wallet dist-compiler dist-convert dist-commit
 
 build: vendor ver build-chaincmp-native build-blockcmp-native build-node-native build-importer-native build-wallet-native build-rollback-native build-compiler-native build-statehash-native build-convert-native
 

README.md

@@ -206,3 +206,4 @@ make release-node
 
 * [chaincmp](https://github.com/wavesplatform/gowaves/blob/master/cmd/chaincmp/README.md) - utility to compare blockchains on few nodes
 * [wmd](https://github.com/wavesplatform/gowaves/blob/master/cmd/wmd/README.md) - service to provide a market data for Waves DEX transactions
+* [commit](https://github.com/wavesplatform/gowaves/blob/master/cmd/commit/README.md) - utility to create CommitToGeneration transactions

cmd/commit/README.md

@@ -0,0 +1,39 @@
+# Utility `commit`
+
+The `commit` utility creates `CommitToGeneration` transaction with signed proof of possession (PoP) and
+writes it's JSON to stdout.
+
+## Command Line Options
+
+```
+  -height uint
+        Height of generation period start
+  -private-key string
+        Waves private key in Base58 encoding
+  -fee uint
+        Transaction fee in wavelets (default: 0.1 Waves)
+  -timestamp string
+        Transaction timestamp. Accepts:
+          (empty)       current time in UNIX milliseconds
+          HH            today at the given hour, e.g. "14"
+          HH:MM         today at the given hour and minute, e.g. "14:30"
+          HH:MM:SS      today at the given time, e.g. "14:30:45"
+          +<duration>   current time shifted forward, e.g. "+1h", "+30m"
+          -<duration>   current time shifted backward, e.g. "-30m"
+```
+
+## Example
+
+```bash
+./commit -private-key <base58-private-key> -height 1000000
+```
+
+The transaction JSON is written to stdout and can be piped to `convert` utility for signing and
+later to the node broadcast endpoint:
+
+```bash
+./commit -private-key <base58-private-key> -height <height> | \
+  ./convert -private-key <base58-private-key> -to-json | \
+  curl -X POST -H 'Content-Type: application/json' --data-binary @- \
+  https://<node-host>/transactions/broadcast
+```

cmd/commit/config.go

@@ -0,0 +1,139 @@
+package main
+
+import (
+	"errors"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+	"time"
+
+	"github.com/ccoveille/go-safecast/v2"
+
+	"github.com/wavesplatform/gowaves/pkg/crypto"
+	"github.com/wavesplatform/gowaves/pkg/state"
+)
+
+const baseFee = state.CommitmentFeeInFeeUnits * state.FeeUnit
+
+type config struct {
+	height    uint32
+	sk        crypto.SecretKey
+	pk        crypto.PublicKey
+	fee       uint64
+	timestamp uint64
+}
+
+func (c *config) parse(args []string) error {
+	if len(args) < 1 {
+		return errors.New("invalid number of arguments")
+	}
+	fs := flag.NewFlagSet(args[0], flag.ContinueOnError)
+	fs.SetOutput(io.Discard) // suppress automatic output; we print usage ourselves below
+	var (
+		height     uint64
+		privateKey string
+		fee        uint64
+		ts         string
+	)
+	fs.Uint64Var(&height, "height", 0, "Height of generation period start")
+	fs.StringVar(&privateKey, "private-key", "", "Waves private key in Base58")
+	fs.Uint64Var(&fee, "fee", baseFee, "Transaction fee (default: 0.1 Waves)")
+	fs.StringVar(&ts, "timestamp", "",
+		"Transaction timestamp (default: current time), can be absolute (e.g. '15:04') or relative "+
+			"(e.g. '+1h30m' or '-45s')")
+	if err := fs.Parse(args[1:]); err != nil {
+		fs.SetOutput(os.Stderr)
+		fs.Usage()
+		return err
+	}
+
+	if height == 0 {
+		return errors.New("option -height is required and must be positive")
+	}
+	h, err := safecast.Convert[uint32](height)
+	if err != nil {
+		return err
+	}
+	c.height = h
+
+	if len(privateKey) == 0 {
+		return errors.New("option -private-key is required")
+	}
+	sk, err := crypto.NewSecretKeyFromBase58(privateKey)
+	if err != nil {
+		return fmt.Errorf("failed to parse private key: %w", err)
+	}
+	c.sk = sk
+	c.pk = crypto.GeneratePublicKey(sk)
+
+	if fee < baseFee {
+		return fmt.Errorf("option -fee must be equal or more than base fee %d", baseFee)
+	}
+	c.fee = fee
+
+	timestamp, tsErr := parseTimestamp(ts)
+	if tsErr != nil {
+		return tsErr
+	}
+	c.timestamp = timestamp
+	return nil
+}
+
+func parseTimestamp(ts string) (uint64, error) {
+	now := time.Now()
+	if len(ts) == 0 {
+		ms, err := safecast.Convert[uint64](now.UnixMilli())
+		if err != nil {
+			return 0, fmt.Errorf("failed to get current timestamp: %w", err)
+		}
+		return ms, nil
+	}
+	if strings.HasPrefix(ts, "+") || strings.HasPrefix(ts, "-") {
+		return parseTimestampShift(ts, now)
+	}
+	return parseTimeString(ts, now)
+}
+
+func parseTimestampShift(ts string, now time.Time) (uint64, error) {
+	d, err := time.ParseDuration(ts)
+	if err != nil {
+		return 0, fmt.Errorf("invalid time shift: %w", err)
+	}
+	ms, convErr := safecast.Convert[uint64](now.Add(d).UnixMilli())
+	if convErr != nil {
+		return 0, fmt.Errorf("invalid timestamp from time shift %q: %w", ts, convErr)
+	}
+	return ms, nil
+}
+
+func parseTimeString(ts string, now time.Time) (uint64, error) {
+	const (
+		layoutHours   = "15"
+		layoutMinutes = "15:04"
+		layoutSeconds = "15:04:05"
+	)
+	var layout string
+	switch strings.Count(ts, ":") {
+	case 0:
+		layout = layoutHours
+	case 1:
+		layout = layoutMinutes
+	case 2:
+		layout = layoutSeconds
+	default:
+		return 0, fmt.Errorf("invalid timestamp format %q", ts)
+	}
+	t, err := time.Parse(layout, ts)
+	if err != nil {
+		return 0, fmt.Errorf("invalid timestamp %q: %w", ts, err)
+	}
+	y, m, d := now.Date()
+	combined := time.Date(y, m, d, t.Hour(), t.Minute(), t.Second(), 0, now.Location())
+	ms, convErr := safecast.Convert[uint64](combined.UnixMilli())
+	if convErr != nil {
+		return 0, fmt.Errorf("failed to convert timestamp: %w", convErr)
+	}
+	return ms, nil
+}