From cdae21d5a231843a8f20d17ae1562427fcba440f Mon Sep 17 00:00:00 2001 From: Tutus Development Date: Sun, 21 Dec 2025 05:41:12 -0500 Subject: [PATCH] Use tutus-consensus fork for dBFT Replace nspcc-dev/dbft with tutus-one/tutus-consensus v1.0.0 for full control over the consensus library. --- go.mod | 4 ++-- go.sum | 4 ++-- pkg/consensus/block.go | 2 +- pkg/consensus/block_test.go | 2 +- pkg/consensus/change_view.go | 2 +- pkg/consensus/change_view_test.go | 2 +- pkg/consensus/commit.go | 2 +- pkg/consensus/consensus.go | 4 ++-- pkg/consensus/consensus_test.go | 2 +- pkg/consensus/payload.go | 2 +- pkg/consensus/payload_test.go | 2 +- pkg/consensus/prepare_request.go | 2 +- pkg/consensus/prepare_response.go | 2 +- pkg/consensus/recovery_message.go | 2 +- pkg/consensus/recovery_message_test.go | 2 +- pkg/consensus/recovery_request.go | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index d4927e3..9f0a178 100644 --- a/go.mod +++ b/go.mod @@ -15,8 +15,8 @@ require ( github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/mr-tron/base58 v1.2.0 github.com/nspcc-dev/bbolt v0.0.0-20250911202005-807225ebb0c8 - github.com/nspcc-dev/dbft v0.4.0 github.com/nspcc-dev/go-ordered-json v0.0.0-20250911084817-6fb4472993d1 + github.com/nspcc-dev/neo-go v0.113.0 github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.16 github.com/nspcc-dev/rfc6979 v0.2.4 github.com/pierrec/lz4 v2.6.1+incompatible @@ -24,6 +24,7 @@ require ( github.com/stretchr/testify v1.11.1 github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 github.com/tutus-one/tutus-chain/pkg/interop v0.0.0-20251217090505-857f951d81a9 + github.com/tutus-one/tutus-consensus v1.0.0 github.com/twmb/murmur3 v1.1.8 github.com/urfave/cli/v2 v2.27.7 go.uber.org/zap v1.27.0 @@ -50,7 +51,6 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/nspcc-dev/hrw/v2 v2.0.4 // indirect - github.com/nspcc-dev/neo-go v0.113.0 // indirect github.com/nspcc-dev/tzhash v1.8.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.6.2 // indirect diff --git a/go.sum b/go.sum index f4d9d32..2b951a6 100644 --- a/go.sum +++ b/go.sum @@ -147,8 +147,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/nspcc-dev/bbolt v0.0.0-20250911202005-807225ebb0c8 h1:lYMHisGPtL70vqCe/M+cU27HMZcV2PTYTaRmO7qxhMQ= github.com/nspcc-dev/bbolt v0.0.0-20250911202005-807225ebb0c8/go.mod h1:iYl+DCkSLXgVCeQWyC+kqS9V1fAQCA74JZtptwjNYpc= -github.com/nspcc-dev/dbft v0.4.0 h1:4/atD4GrrMEtrYBDiZPrPzdKZ6ws7PR/cg0M4DEdVeI= -github.com/nspcc-dev/dbft v0.4.0/go.mod h1:msYlF5GIGwOZ9jUIHttBAAtiqJ29jzV8PPKKv1avXAI= github.com/nspcc-dev/go-ordered-json v0.0.0-20250911084817-6fb4472993d1 h1:U3wvYzJi07NzN4I0fwt1Uznp92xKkfkTcAyC+TsxP9E= github.com/nspcc-dev/go-ordered-json v0.0.0-20250911084817-6fb4472993d1/go.mod h1:CHwf1nwquA6ecSfxmNF0YuemOPHAnRGoLuZUv/WPjeY= github.com/nspcc-dev/hrw/v2 v2.0.4 h1:o3Zh/2aF+IgGpvt414f46Ya20WG9u9vWxVd16ErFI8w= @@ -213,6 +211,8 @@ github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8O github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4= github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso= github.com/tklauser/numcpus v0.10.0/go.mod h1:BiTKazU708GQTYF4mB+cmlpT2Is1gLk7XVuEeem8LsQ= +github.com/tutus-one/tutus-consensus v1.0.0 h1:PFMXSSSYjTnbymoIjU2L30ckf92j2kVwrmtRnkuGlnY= +github.com/tutus-one/tutus-consensus v1.0.0/go.mod h1:hpA/0rPM0Frdh9cowAp//vQTMN8j6Q0GYq1BFlpCLVM= github.com/twmb/murmur3 v1.1.8 h1:8Yt9taO/WN3l08xErzjeschgZU2QSrwm1kclYq+0aRg= github.com/twmb/murmur3 v1.1.8/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= github.com/urfave/cli/v2 v2.27.7 h1:bH59vdhbjLv3LAvIu6gd0usJHgoTTPhCFib8qqOwXYU= diff --git a/pkg/consensus/block.go b/pkg/consensus/block.go index 048eb20..c6a4eda 100644 --- a/pkg/consensus/block.go +++ b/pkg/consensus/block.go @@ -3,7 +3,7 @@ package consensus import ( "errors" - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/tutus-one/tutus-chain/pkg/config/netmode" coreb "github.com/tutus-one/tutus-chain/pkg/core/block" "github.com/tutus-one/tutus-chain/pkg/core/transaction" diff --git a/pkg/consensus/block_test.go b/pkg/consensus/block_test.go index 765c596..9a55272 100644 --- a/pkg/consensus/block_test.go +++ b/pkg/consensus/block_test.go @@ -3,7 +3,7 @@ package consensus import ( "testing" - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/tutus-one/tutus-chain/pkg/core/transaction" "github.com/tutus-one/tutus-chain/pkg/crypto/keys" "github.com/tutus-one/tutus-chain/pkg/util" diff --git a/pkg/consensus/change_view.go b/pkg/consensus/change_view.go index 59b59c0..9cb875c 100644 --- a/pkg/consensus/change_view.go +++ b/pkg/consensus/change_view.go @@ -1,7 +1,7 @@ package consensus import ( - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/tutus-one/tutus-chain/pkg/io" ) diff --git a/pkg/consensus/change_view_test.go b/pkg/consensus/change_view_test.go index afd11c9..836f6a9 100644 --- a/pkg/consensus/change_view_test.go +++ b/pkg/consensus/change_view_test.go @@ -3,7 +3,7 @@ package consensus import ( "testing" - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/stretchr/testify/require" ) diff --git a/pkg/consensus/commit.go b/pkg/consensus/commit.go index 271988e..0f55602 100644 --- a/pkg/consensus/commit.go +++ b/pkg/consensus/commit.go @@ -1,7 +1,7 @@ package consensus import ( - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/tutus-one/tutus-chain/pkg/io" ) diff --git a/pkg/consensus/consensus.go b/pkg/consensus/consensus.go index c482583..625638c 100644 --- a/pkg/consensus/consensus.go +++ b/pkg/consensus/consensus.go @@ -7,8 +7,8 @@ import ( "sync/atomic" "time" - "github.com/nspcc-dev/dbft" - "github.com/nspcc-dev/dbft/timer" + "github.com/tutus-one/tutus-consensus" + "github.com/tutus-one/tutus-consensus/timer" "github.com/tutus-one/tutus-chain/pkg/config" "github.com/tutus-one/tutus-chain/pkg/config/netmode" coreb "github.com/tutus-one/tutus-chain/pkg/core/block" diff --git a/pkg/consensus/consensus_test.go b/pkg/consensus/consensus_test.go index d9e05f0..7f0872b 100644 --- a/pkg/consensus/consensus_test.go +++ b/pkg/consensus/consensus_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/tutus-one/tutus-chain/internal/random" "github.com/tutus-one/tutus-chain/internal/testchain" "github.com/tutus-one/tutus-chain/pkg/config" diff --git a/pkg/consensus/payload.go b/pkg/consensus/payload.go index 22d9577..2f2398e 100644 --- a/pkg/consensus/payload.go +++ b/pkg/consensus/payload.go @@ -3,7 +3,7 @@ package consensus import ( "fmt" - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/tutus-one/tutus-chain/pkg/config/netmode" "github.com/tutus-one/tutus-chain/pkg/crypto/keys" "github.com/tutus-one/tutus-chain/pkg/io" diff --git a/pkg/consensus/payload_test.go b/pkg/consensus/payload_test.go index ab6e85a..aea6ab9 100644 --- a/pkg/consensus/payload_test.go +++ b/pkg/consensus/payload_test.go @@ -6,7 +6,7 @@ import ( "math/rand/v2" "testing" - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/tutus-one/tutus-chain/internal/random" "github.com/tutus-one/tutus-chain/internal/testserdes" "github.com/tutus-one/tutus-chain/pkg/config/netmode" diff --git a/pkg/consensus/prepare_request.go b/pkg/consensus/prepare_request.go index 3cfe492..a6d3ca7 100644 --- a/pkg/consensus/prepare_request.go +++ b/pkg/consensus/prepare_request.go @@ -1,7 +1,7 @@ package consensus import ( - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/tutus-one/tutus-chain/pkg/core/block" "github.com/tutus-one/tutus-chain/pkg/io" "github.com/tutus-one/tutus-chain/pkg/util" diff --git a/pkg/consensus/prepare_response.go b/pkg/consensus/prepare_response.go index 1ac4fcb..06e81d3 100644 --- a/pkg/consensus/prepare_response.go +++ b/pkg/consensus/prepare_response.go @@ -1,7 +1,7 @@ package consensus import ( - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/tutus-one/tutus-chain/pkg/io" "github.com/tutus-one/tutus-chain/pkg/util" ) diff --git a/pkg/consensus/recovery_message.go b/pkg/consensus/recovery_message.go index 03a0cda..5a8e867 100644 --- a/pkg/consensus/recovery_message.go +++ b/pkg/consensus/recovery_message.go @@ -3,7 +3,7 @@ package consensus import ( "errors" - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/tutus-one/tutus-chain/pkg/crypto/keys" "github.com/tutus-one/tutus-chain/pkg/io" npayload "github.com/tutus-one/tutus-chain/pkg/network/payload" diff --git a/pkg/consensus/recovery_message_test.go b/pkg/consensus/recovery_message_test.go index 2d76edd..06d19f8 100644 --- a/pkg/consensus/recovery_message_test.go +++ b/pkg/consensus/recovery_message_test.go @@ -3,7 +3,7 @@ package consensus import ( "testing" - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/tutus-one/tutus-chain/internal/testchain" "github.com/tutus-one/tutus-chain/pkg/config/netmode" "github.com/tutus-one/tutus-chain/pkg/crypto/keys" diff --git a/pkg/consensus/recovery_request.go b/pkg/consensus/recovery_request.go index dbc9372..1f275ab 100644 --- a/pkg/consensus/recovery_request.go +++ b/pkg/consensus/recovery_request.go @@ -1,7 +1,7 @@ package consensus import ( - "github.com/nspcc-dev/dbft" + "github.com/tutus-one/tutus-consensus" "github.com/tutus-one/tutus-chain/pkg/io" )