Support rollback draft #1610

esuwu · 2025-02-19T09:24:51Z

No description provided.

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.69.2 to 1.69.4. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.69.2...v1.69.4) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps google.golang.org/protobuf from 1.36.2 to 1.36.3. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps golang from 1.23.4-alpine3.20 to 1.23.5-alpine3.20. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.2.0 to 5.3.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v5.2.0...v5.3.0) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

#1579) * Add NewHeader constructor function. Remove duplicat functions MakeHeader and buildHeader. Use NewHeader everywhere is possible. * WIP. Add WriteTo and ReadFrom functions to message payloads. Move message payload types to separate file payloads.go. Add Header validation function. Add ChecksumReader that wraps io.Reader and calculates checksum then reading payloads. Functions ParseMessage, ReadMessage and WriteMessage made public. ReadFrom functions of all messages reimplemented using ReadMessage function. Fix linter issues. Unused functions removed. * Fixed ReadFrom function of BlockID. Fixed read and write of BlockIDsPayload (list of BlockIDs). Added PeersPayload. Fixed writing of messages with empty payloads. U8String moved to payloads.go. Writing of all messages implemented usign function WriteMessage. Unused BulkMessage type removed. Test on mixed BlockIDs in GetBlockIDsMessage added. TestProtocolMarshaling test reimplemented to check all possible ways of serialization/deserialization of messages and fixed to deserialize in empty structures. * Fixed PR issues. BlockID ReadFrom completely reimplemented. Tests on BlockID ReadFrom added. * Update pkg/proto/block.go Co-authored-by: Nikolay Eskov <[email protected]> * Message length check clarified. --------- Co-authored-by: Nikolay Eskov <[email protected]>

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.69.4 to 1.70.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.69.4...v1.70.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [github.com/throttled/throttled/v2](https://github.com/throttled/throttled) from 2.12.0 to 2.13.0. - [Release notes](https://github.com/throttled/throttled/releases) - [Changelog](https://github.com/throttled/throttled/blob/master/CHANGELOG.md) - [Commits](throttled/throttled@v2.12.0...v2.13.0) --- updated-dependencies: - dependency-name: github.com/throttled/throttled/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps google.golang.org/protobuf from 1.36.3 to 1.36.4. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Signed-off-by: chuangjinglu <[email protected]> Co-authored-by: Alexey Kiselev <[email protected]>

Bumps [github.com/spf13/pflag](https://github.com/spf13/pflag) from 1.0.5 to 1.0.6. - [Release notes](https://github.com/spf13/pflag/releases) - [Commits](spf13/pflag@v1.0.5...v1.0.6) --- updated-dependencies: - dependency-name: github.com/spf13/pflag dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump github.com/consensys/gnark-crypto from 0.14.0 to 0.16.0

Bumps golang from 1.23.5-alpine3.20 to 1.24rc2-alpine3.20. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.29.0 to 0.30.0. - [Commits](golang/sys@v0.29.0...v0.30.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexey Kiselev <[email protected]>

Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.10.0 to 0.11.0. - [Commits](golang/sync@v0.10.0...v0.11.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…of NTP errors in scala logs. (#1599)

Bumps google.golang.org/protobuf from 1.36.4 to 1.36.5. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: Alexey Kiselev <[email protected]>

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.32.0 to 0.33.0. - [Commits](golang/crypto@v0.32.0...v0.33.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps golang from 1.24rc2-alpine3.20 to 1.24rc3-alpine3.20. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexey Kiselev <[email protected]>

* Deprecated linter "tenv" replaced with "usetesting". * Update GolangCI-Lint version to 1.64.4.

Co-authored-by: Nikolay Eskov <[email protected]>

Bumps alpine from 3.21.2 to 3.21.3. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

nickeskov · 2025-02-19T12:15:50Z

pkg/blockchaininfo/bupdates.go

+func (e *BlockchainUpdatesExtension) Close() {
+	if e.BUpdatesChannel != nil {
+		close(e.BUpdatesChannel)
+	}
+	if e.BuPatchChannel != nil {
+		close(e.BuPatchChannel)
 	}
-	close(e.bUpdatesChannel)
-	e.bUpdatesChannel = nil
+	e.BUpdatesChannel = nil
+	e.BuPatchChannel = nil
 }


Data race. Must be protected by a mutex.

nickeskov · 2025-02-19T12:17:42Z

cmd/node/node.go

+						patch = append(patch, dataEntry)
+					}
+					bUpdatesExtension.WriteBUPatch(patch)
+				case <-bUpdatesExtension.Ctx.Done():


I think here you should rely on ctx about, not bUpdatesExtension.Ctx

nickeskov · 2025-02-19T12:17:53Z

cmd/node/node.go

+			for {
+				var patch []proto.DataEntry
+				select {
+				case dataEntryKeys := <-bUpdatesExtension.BuPatchRequestChannel:


No handling of closed channel

nickeskov · 2025-02-19T12:23:43Z

pkg/blockchaininfo/types.go

+	size           int
+}
+
+// NewHistoryJournal создаёт и инициализирует новый экземпляр HistoryJournal.


nickeskov · 2025-02-19T14:04:41Z

pkg/blockchaininfo/types.go

+// FetchKeysUntilBlockID goes from top to bottom and fetches all keys.
+// If the blockID is found, it returns the keys up to and including that element and true.
+// If the blockID is not found - nil and false.
+func (hj *HistoryJournal) FetchKeysUntilBlockID(blockID proto.BlockID) ([]string, bool) {


Is this method really necessary? For what do you want to use it?

nickeskov · 2025-02-19T14:48:26Z

pkg/blockchaininfo/nats_publisher.go

+	if updates.BlockUpdatesInfo.Height > previousState.BlockUpdatesInfo.Height {
+		return false
+	}


The height can be the same, so that's not always true. Especially when node is on a top of blockchain.

nickeskov · 2025-02-19T14:54:04Z

pkg/blockchaininfo/nats_publisher.go

+	if _, _, blockIDFound := bu.historyJournal.SearchByBlockID(updates.BlockUpdatesInfo.BlockID); blockIDFound {
+		return true
+	}


BlockID can't be found if it's a new block or a block from fork. You should check the parent blockID of a new block.

nickeskov · 2025-02-19T14:54:44Z

pkg/blockchaininfo/bupdates.go

@@ -11,30 +12,35 @@ import (
 const ChannelWriteTimeout = 10 * time.Second

 type BlockchainUpdatesExtension struct {
-	ctx                           context.Context
+	Ctx                           context.Context


It's internal think, should not be public I think

nickeskov · 2025-02-19T14:54:59Z

cmd/node/node.go

+					}
+					bUpdatesExtension.WriteBUPatch(patch)
+				case <-bUpdatesExtension.Ctx.Done():
+					bUpdatesExtension.Close()


Only writer should close a channel, though it's applicable here because channel closing logic is placed inside. But a bit scary

Bumps [appleboy/ssh-action](https://github.com/appleboy/ssh-action) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/appleboy/ssh-action/releases) - [Changelog](https://github.com/appleboy/ssh-action/blob/master/.goreleaser.yaml) - [Commits](appleboy/ssh-action@v1.2.0...v1.2.1) --- updated-dependencies: - dependency-name: appleboy/ssh-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.5 to 1.21.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.20.5...v1.21.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nikolay Eskov <[email protected]>

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.33.0 to 0.34.0. - [Commits](golang/crypto@v0.33.0...v0.34.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.34.0 to 0.35.0. - [Commits](golang/crypto@v0.34.0...v0.35.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Other style fixes.

Test on escape sequences updated.

Signed-off-by: huochexizhan <[email protected]>

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.70.0 to 1.71.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.70.0...v1.71.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.21.0 to 1.21.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.21.0...v1.21.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nikolay Eskov <[email protected]>

Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.30.0 to 0.31.0. - [Commits](golang/sys@v0.30.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.35.0 to 0.36.0. - [Commits](golang/crypto@v0.35.0...v0.36.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nikolay Eskov <[email protected]>

Bumps [securego/gosec](https://github.com/securego/gosec) from 2.22.1 to 2.22.2. - [Release notes](https://github.com/securego/gosec/releases) - [Changelog](https://github.com/securego/gosec/blob/master/.goreleaser.yml) - [Commits](securego/gosec@v2.22.1...v2.22.2) --- updated-dependencies: - dependency-name: securego/gosec dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexey Kiselev <[email protected]>

Signed-off-by: StevenMia <[email protected]>

* Replace deprecated 'golang.org/x/exp/rand' to 'math/rand/v2' For more info see https://go.dev/issue/61716. * Add 'nosec' comment for gosec linter.

Add new rulesets for semgrep.

* Fix incorrect error return. * Changed err handling a bit.

Signed-off-by: kevincatty <[email protected]> Co-authored-by: Alexey Kiselev <[email protected]>

Excluded because rules in this ruleset contain 'security-severity' field with a string type value, while SARIF format accepts only numerical. For more info see semgrep/semgrep#10834. Co-authored-by: Alexey Kiselev <[email protected]>

* Add semgrep rule 'if-inplace-func-incorrect-nil-err-return'. * Add experimental semgrep rule 'if-incorrect-nil-err-return' Put in experimental directory because of huge count of false positives. * Add '.semgrep/rules' config to semgrep CI job. * Semgrep rule 'if-incorrect-nil-err-return' moved to regular rules. --------- Co-authored-by: Alexey Kiselev <[email protected]>

Signed-off-by: dockercui <[email protected]>

dependabot bot and others added 26 commits January 15, 2025 14:32

chore: fix some comments (#1591)

c8a14a7

Signed-off-by: chuangjinglu <[email protected]> Co-authored-by: Alexey Kiselev <[email protected]>

Bump github.com/consensys/gnark from 0.11.0 to 0.12.0 (#1594)

5954a92

Bump github.com/consensys/gnark-crypto from 0.14.0 to 0.16.0

Remove invalid NTP server address from itest scala config to get rid …

1a39636

…of NTP errors in scala logs. (#1599)

Update LICENSE (#1598)

9ba2781

Co-authored-by: Alexey Kiselev <[email protected]>

Bump golang from 1.24rc3-alpine3.20 to 1.24-alpine3.20 (#1603)

5252d79

Deprecated linter "tenv" replaced with "usetesting". (#1604)

a3a26fa

* Deprecated linter "tenv" replaced with "usetesting". * Update GolangCI-Lint version to 1.64.4.

Update Go version to 1.23. (#1605)

8a6aab2

Co-authored-by: Nikolay Eskov <[email protected]>

Bump securego/gosec from 2.22.0 to 2.22.1 (#1606)

2fa5491

Update Go version to 1.24 in 'deploy_node' workflow. (#1609)

e85fcdb

Support rollback draft

3c96588

nickeskov reviewed Feb 19, 2025

View reviewed changes

dependabot bot and others added 3 commits February 20, 2025 12:21

esuwu and others added 30 commits February 25, 2025 12:19

Moved state to extension

fe0c741

Fixed incorrect error usage in error message. (#1615)

c7bc05a

Other style fixes.

Lost escape sequence for back slash added to compiler. (#1616)

c039a0e

Test on escape sequences updated.

Added cache for retrieving contract values after rollback

92c4c86

Fixed linter issues

733877b

fix: fix incorrect nil return value (#1617)

69d5022

Signed-off-by: huochexizhan <[email protected]>

refactor: replace golang.org/x/exp with stdlib (#1624)

797d6ad

Signed-off-by: StevenMia <[email protected]>

Replace deprecated 'golang.org/x/exp/rand' to 'math/rand/v2' (#1625)

7639a8a

* Replace deprecated 'golang.org/x/exp/rand' to 'math/rand/v2' For more info see https://go.dev/issue/61716. * Add 'nosec' comment for gosec linter.

Exported functions for mocking

cf38df8

Bump appleboy/ssh-action from 1.2.1 to 1.2.2 (#1626)

d9af5dc

Changed the mock interface

fc73cfc

Update semgrep job of security CI workflow. (#1627)

9c043ab

Add new rulesets for semgrep.

Fix wrong error return (#1628)

adfbb59

* Fix incorrect error return. * Changed err handling a bit.

chore: fix some typos (#1630)

e18fe57

Signed-off-by: kevincatty <[email protected]> Co-authored-by: Alexey Kiselev <[email protected]>

Bump github.com/ccoveille/go-safecast from 1.5.0 to 1.6.0 (#1631)

8dc277c

Bump golang.org/x/net from 0.34.0 to 0.36.0 (#1632)

c059757

Added a rollback test

115dbde

chore: fix struct name in comment (#1634)

8c0fe73

Signed-off-by: dockercui <[email protected]>

Fixed linter issues

4c72e74

Merged from master

5c688d1

Publish the first 100 history entries before start

dcc26ff

Added constant keys handling

671e4a3

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support rollback draft #1610

Support rollback draft #1610

esuwu commented Feb 19, 2025

nickeskov Feb 19, 2025

nickeskov Feb 19, 2025

nickeskov Feb 19, 2025

nickeskov Feb 19, 2025

nickeskov Feb 19, 2025

nickeskov Feb 19, 2025

nickeskov Feb 19, 2025

nickeskov Feb 19, 2025

nickeskov Feb 19, 2025

Support rollback draft #1610

Are you sure you want to change the base?

Support rollback draft #1610

Conversation

esuwu commented Feb 19, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment