diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 356540de..ac23a34a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,8 +9,8 @@ on: env: GO_VER: 1.26.3 - PROTOC_VER: "33.1" - PROTOC_GEN_GO_VER: v1.36.10 + PROTOC_VER: "36.2" + PROTOC_GEN_GO_VER: v1.36.12 jobs: validate: @@ -28,7 +28,7 @@ jobs: run: | curl -fL --retry 3 -o /tmp/protoc.zip "https://github.com/protocolbuffers/protobuf/releases/download/v${{ env.PROTOC_VER }}/protoc-${{ env.PROTOC_VER }}-linux-x86_64.zip" # update this hash whenever PROTOC_VER is bumped - echo "f3340e28a83d1c637d8bafdeed92b9f7db6a384c26bca880a6e5217b40a4328b /tmp/protoc.zip" | sha256sum -c - + echo "121f6c7afe1d4d0e3ea6aab9432038599250134cbf4474cb1167d2c7decd4278 /tmp/protoc.zip" | sha256sum -c - unzip -o /tmp/protoc.zip -d "$HOME/protoc" 'bin/*' 'include/*' echo "$HOME/protoc/bin" >> "$GITHUB_PATH" diff --git a/README.md b/README.md index 547bc222..002987b8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This is a Byzantine fault-tolerant (BFT) state machine replication (SMR) library. It is an open source library written in Go. The implementation is inspired by the [BFT-SMaRt project](https://github.com/bft-smart/library). -For more information on this library see our [wiki page](https://github.com/hyperledger-labs/SmartBFT/wiki). +For more information on this library see our [wiki page](https://github.com/hyperledger/SmartBFT/wiki). ## License diff --git a/examples/naive_chain/chain.go b/examples/naive_chain/chain.go index 112c2611..7b58118f 100644 --- a/examples/naive_chain/chain.go +++ b/examples/naive_chain/chain.go @@ -8,8 +8,8 @@ package naive import ( "encoding/asn1" - smart "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/wal" + smart "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/wal" ) type Block struct { diff --git a/examples/naive_chain/chain_test.go b/examples/naive_chain/chain_test.go index 49900181..a4522c34 100644 --- a/examples/naive_chain/chain_test.go +++ b/examples/naive_chain/chain_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - smart "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" - "github.com/hyperledger-labs/SmartBFT/pkg/wal" + smart "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger/SmartBFT/pkg/wal" "github.com/stretchr/testify/assert" "go.uber.org/zap" "google.golang.org/protobuf/proto" diff --git a/examples/naive_chain/node.go b/examples/naive_chain/node.go index f301cc46..c680157b 100644 --- a/examples/naive_chain/node.go +++ b/examples/naive_chain/node.go @@ -13,11 +13,11 @@ import ( "sync" "time" - smart "github.com/hyperledger-labs/SmartBFT/pkg/api" - smartbft "github.com/hyperledger-labs/SmartBFT/pkg/consensus" - bft "github.com/hyperledger-labs/SmartBFT/pkg/types" - "github.com/hyperledger-labs/SmartBFT/pkg/wal" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + smart "github.com/hyperledger/SmartBFT/pkg/api" + smartbft "github.com/hyperledger/SmartBFT/pkg/consensus" + bft "github.com/hyperledger/SmartBFT/pkg/types" + "github.com/hyperledger/SmartBFT/pkg/wal" + "github.com/hyperledger/SmartBFT/smartbftprotos" "google.golang.org/protobuf/proto" ) diff --git a/examples/naive_chain/test_message.pb.go b/examples/naive_chain/test_message.pb.go index c916d678..0f233659 100644 --- a/examples/naive_chain/test_message.pb.go +++ b/examples/naive_chain/test_message.pb.go @@ -5,8 +5,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.10 -// protoc v6.33.1 +// protoc-gen-go v1.36.12 +// protoc v7.36.2 // source: examples/naive_chain/test_message.proto package naive @@ -86,7 +86,7 @@ const file_examples_naive_chain_test_message_proto_rawDesc = "" + "\n" + "FwdMessage\x12\x16\n" + "\x06sender\x18\x01 \x01(\x04R\x06sender\x12\x18\n" + - "\apayload\x18\x02 \x01(\fR\apayloadB,Z*github.com/hyperledger-labs/SmartBFT/naiveb\x06proto3" + "\apayload\x18\x02 \x01(\fR\apayloadB'Z%github.com/hyperledger/SmartBFT/naiveb\x06proto3" var ( file_examples_naive_chain_test_message_proto_rawDescOnce sync.Once diff --git a/examples/naive_chain/test_message.proto b/examples/naive_chain/test_message.proto index e4bba145..b5a334bf 100644 --- a/examples/naive_chain/test_message.proto +++ b/examples/naive_chain/test_message.proto @@ -5,7 +5,7 @@ syntax = "proto3"; -option go_package = "github.com/hyperledger-labs/SmartBFT/naive"; +option go_package = "github.com/hyperledger/SmartBFT/naive"; package naive; diff --git a/go.mod b/go.mod index b93c9175..dcb08018 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/hyperledger-labs/SmartBFT +module github.com/hyperledger/SmartBFT go 1.26.3 diff --git a/internal/bft/batcher_test.go b/internal/bft/batcher_test.go index a30e1cad..11d47dab 100644 --- a/internal/bft/batcher_test.go +++ b/internal/bft/batcher_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/hyperledger-labs/SmartBFT/internal/bft" - "github.com/hyperledger-labs/SmartBFT/internal/bft/mocks" - "github.com/hyperledger-labs/SmartBFT/pkg/types" + "github.com/hyperledger/SmartBFT/internal/bft" + "github.com/hyperledger/SmartBFT/internal/bft/mocks" + "github.com/hyperledger/SmartBFT/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.uber.org/zap" diff --git a/internal/bft/controller.go b/internal/bft/controller.go index 8a192518..4a9eac58 100644 --- a/internal/bft/controller.go +++ b/internal/bft/controller.go @@ -10,9 +10,9 @@ import ( "sync/atomic" "time" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "google.golang.org/protobuf/proto" ) diff --git a/internal/bft/controller_sync_test.go b/internal/bft/controller_sync_test.go index 94725b5c..b0d0baad 100644 --- a/internal/bft/controller_sync_test.go +++ b/internal/bft/controller_sync_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/internal/bft/controller_test.go b/internal/bft/controller_test.go index bc018ce9..430edc69 100644 --- a/internal/bft/controller_test.go +++ b/internal/bft/controller_test.go @@ -13,13 +13,13 @@ import ( "testing" "time" - "github.com/hyperledger-labs/SmartBFT/internal/bft" - "github.com/hyperledger-labs/SmartBFT/internal/bft/mocks" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - "github.com/hyperledger-labs/SmartBFT/pkg/wal" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/internal/bft" + "github.com/hyperledger/SmartBFT/internal/bft/mocks" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger/SmartBFT/pkg/types" + "github.com/hyperledger/SmartBFT/pkg/wal" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.uber.org/zap" @@ -1194,7 +1194,6 @@ func TestRotateFromFollowerToLeader(t *testing.T) { } func TestDeliverTwiceOnceFromSyncAndOnceFromViewData(t *testing.T) { - // In this scenario a decision is delivered twice. // Once by the synchronizer and a second time by the view data received during a view change. // In the beginning there is a view change timeout and there is a view still running concurrently. diff --git a/internal/bft/hbm_test.go b/internal/bft/hbm_test.go index 8ca5bd89..54604ed9 100644 --- a/internal/bft/hbm_test.go +++ b/internal/bft/hbm_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/internal/bft/heartbeatmonitor.go b/internal/bft/heartbeatmonitor.go index 40e27ca0..5881a01b 100644 --- a/internal/bft/heartbeatmonitor.go +++ b/internal/bft/heartbeatmonitor.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "time" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/smartbftprotos" ) // A node could either be a leader or a follower diff --git a/internal/bft/heartbeatmonitor_test.go b/internal/bft/heartbeatmonitor_test.go index 562102d4..a008503c 100644 --- a/internal/bft/heartbeatmonitor_test.go +++ b/internal/bft/heartbeatmonitor_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "github.com/hyperledger-labs/SmartBFT/internal/bft" - "github.com/hyperledger-labs/SmartBFT/internal/bft/mocks" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/internal/bft" + "github.com/hyperledger/SmartBFT/internal/bft/mocks" + "github.com/hyperledger/SmartBFT/pkg/types" + "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.uber.org/zap" diff --git a/internal/bft/mocks/application_mock.go b/internal/bft/mocks/application_mock.go index e16506dd..4f4b13fd 100644 --- a/internal/bft/mocks/application_mock.go +++ b/internal/bft/mocks/application_mock.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/hyperledger-labs/SmartBFT/pkg/types" + types "github.com/hyperledger/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/assembler_mock.go b/internal/bft/mocks/assembler_mock.go index e08824bb..93386b66 100644 --- a/internal/bft/mocks/assembler_mock.go +++ b/internal/bft/mocks/assembler_mock.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/hyperledger-labs/SmartBFT/pkg/types" + types "github.com/hyperledger/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/comm_mock.go b/internal/bft/mocks/comm_mock.go index cfbc98ef..ab1e502d 100644 --- a/internal/bft/mocks/comm_mock.go +++ b/internal/bft/mocks/comm_mock.go @@ -3,7 +3,7 @@ package mocks import ( - smartbftprotos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + smartbftprotos "github.com/hyperledger/SmartBFT/smartbftprotos" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/decider.go b/internal/bft/mocks/decider.go index eaa054fd..5d2f73e1 100644 --- a/internal/bft/mocks/decider.go +++ b/internal/bft/mocks/decider.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/hyperledger-labs/SmartBFT/pkg/types" + types "github.com/hyperledger/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/leader_monitor.go b/internal/bft/mocks/leader_monitor.go index e3e791eb..43defa5b 100644 --- a/internal/bft/mocks/leader_monitor.go +++ b/internal/bft/mocks/leader_monitor.go @@ -3,10 +3,10 @@ package mocks import ( - bft "github.com/hyperledger-labs/SmartBFT/internal/bft" + bft "github.com/hyperledger/SmartBFT/internal/bft" mock "github.com/stretchr/testify/mock" - smartbftprotos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + smartbftprotos "github.com/hyperledger/SmartBFT/smartbftprotos" ) // LeaderMonitor is an autogenerated mock type for the LeaderMonitor type diff --git a/internal/bft/mocks/proposer_builder.go b/internal/bft/mocks/proposer_builder.go index f84a6492..36150942 100644 --- a/internal/bft/mocks/proposer_builder.go +++ b/internal/bft/mocks/proposer_builder.go @@ -3,7 +3,7 @@ package mocks import ( - bft "github.com/hyperledger-labs/SmartBFT/internal/bft" + bft "github.com/hyperledger/SmartBFT/internal/bft" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/request_pool.go b/internal/bft/mocks/request_pool.go index 392208cf..c4d7819f 100644 --- a/internal/bft/mocks/request_pool.go +++ b/internal/bft/mocks/request_pool.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/hyperledger-labs/SmartBFT/pkg/types" + types "github.com/hyperledger/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/request_timeout_handler.go b/internal/bft/mocks/request_timeout_handler.go index 09e06fd2..c95fd00e 100644 --- a/internal/bft/mocks/request_timeout_handler.go +++ b/internal/bft/mocks/request_timeout_handler.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/hyperledger-labs/SmartBFT/pkg/types" + types "github.com/hyperledger/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/requests_timer.go b/internal/bft/mocks/requests_timer.go index e3265578..dc90a7db 100644 --- a/internal/bft/mocks/requests_timer.go +++ b/internal/bft/mocks/requests_timer.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/hyperledger-labs/SmartBFT/pkg/types" + types "github.com/hyperledger/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/signer_mock.go b/internal/bft/mocks/signer_mock.go index 89ec830b..5b9e7669 100644 --- a/internal/bft/mocks/signer_mock.go +++ b/internal/bft/mocks/signer_mock.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/hyperledger-labs/SmartBFT/pkg/types" + types "github.com/hyperledger/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/state.go b/internal/bft/mocks/state.go index b17b40a5..d77a12e5 100644 --- a/internal/bft/mocks/state.go +++ b/internal/bft/mocks/state.go @@ -3,10 +3,10 @@ package mocks import ( - bft "github.com/hyperledger-labs/SmartBFT/internal/bft" + bft "github.com/hyperledger/SmartBFT/internal/bft" mock "github.com/stretchr/testify/mock" - smartbftprotos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + smartbftprotos "github.com/hyperledger/SmartBFT/smartbftprotos" ) // State is an autogenerated mock type for the State type diff --git a/internal/bft/mocks/synchronizer_mock.go b/internal/bft/mocks/synchronizer_mock.go index 5ce25521..ee5b4931 100644 --- a/internal/bft/mocks/synchronizer_mock.go +++ b/internal/bft/mocks/synchronizer_mock.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/hyperledger-labs/SmartBFT/pkg/types" + types "github.com/hyperledger/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/verifier_mock.go b/internal/bft/mocks/verifier_mock.go index 44d1318a..476d8b8d 100644 --- a/internal/bft/mocks/verifier_mock.go +++ b/internal/bft/mocks/verifier_mock.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/hyperledger-labs/SmartBFT/pkg/types" + types "github.com/hyperledger/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/requestpool.go b/internal/bft/requestpool.go index 7f98d47a..490678ca 100644 --- a/internal/bft/requestpool.go +++ b/internal/bft/requestpool.go @@ -13,9 +13,9 @@ import ( "sync" "time" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" - "github.com/hyperledger-labs/SmartBFT/pkg/types" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger/SmartBFT/pkg/types" "golang.org/x/sync/semaphore" ) diff --git a/internal/bft/requestpool_test.go b/internal/bft/requestpool_test.go index acaf7ce7..cb89fbfa 100644 --- a/internal/bft/requestpool_test.go +++ b/internal/bft/requestpool_test.go @@ -15,9 +15,9 @@ import ( "testing" "time" - "github.com/hyperledger-labs/SmartBFT/internal/bft" - "github.com/hyperledger-labs/SmartBFT/internal/bft/mocks" - "github.com/hyperledger-labs/SmartBFT/pkg/types" + "github.com/hyperledger/SmartBFT/internal/bft" + "github.com/hyperledger/SmartBFT/internal/bft/mocks" + "github.com/hyperledger/SmartBFT/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.uber.org/zap" diff --git a/internal/bft/sched_test.go b/internal/bft/sched_test.go index 9ba0f659..251a9098 100644 --- a/internal/bft/sched_test.go +++ b/internal/bft/sched_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/hyperledger-labs/SmartBFT/internal/bft" + "github.com/hyperledger/SmartBFT/internal/bft" "github.com/stretchr/testify/assert" ) diff --git a/internal/bft/state.go b/internal/bft/state.go index 8b8659a3..ffe9ab21 100644 --- a/internal/bft/state.go +++ b/internal/bft/state.go @@ -9,9 +9,9 @@ import ( "errors" "fmt" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "google.golang.org/protobuf/proto" ) diff --git a/internal/bft/state_test.go b/internal/bft/state_test.go index 7e69548a..64a6f6f0 100644 --- a/internal/bft/state_test.go +++ b/internal/bft/state_test.go @@ -8,11 +8,11 @@ package bft_test import ( "testing" - "github.com/hyperledger-labs/SmartBFT/internal/bft" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/internal/bft" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/internal/bft/statecollector.go b/internal/bft/statecollector.go index 649a6581..a64ae306 100644 --- a/internal/bft/statecollector.go +++ b/internal/bft/statecollector.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" ) // StateCollector collects the current state from other nodes diff --git a/internal/bft/statecollector_test.go b/internal/bft/statecollector_test.go index 2b8f0540..7074be99 100644 --- a/internal/bft/statecollector_test.go +++ b/internal/bft/statecollector_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/hyperledger-labs/SmartBFT/internal/bft" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/internal/bft" + "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/internal/bft/support.go b/internal/bft/support.go index 7b19ffb7..df1830d8 100644 --- a/internal/bft/support.go +++ b/internal/bft/support.go @@ -6,8 +6,8 @@ package bft import ( - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/smartbftprotos" ) // Generate mocks for a collection of interfaces that are defined in api/dependencies.go diff --git a/internal/bft/util.go b/internal/bft/util.go index 179f2ec4..4306b00a 100644 --- a/internal/bft/util.go +++ b/internal/bft/util.go @@ -16,9 +16,9 @@ import ( "sync" "sync/atomic" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "google.golang.org/protobuf/proto" ) diff --git a/internal/bft/util_test.go b/internal/bft/util_test.go index 7db1989b..1bb6780b 100644 --- a/internal/bft/util_test.go +++ b/internal/bft/util_test.go @@ -9,10 +9,10 @@ import ( "fmt" "testing" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/internal/bft/view.go b/internal/bft/view.go index 0566eb49..85d741e5 100644 --- a/internal/bft/view.go +++ b/internal/bft/view.go @@ -14,9 +14,9 @@ import ( "sync/atomic" "time" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "google.golang.org/protobuf/proto" ) diff --git a/internal/bft/view_test.go b/internal/bft/view_test.go index a2b5054f..bd03d69d 100644 --- a/internal/bft/view_test.go +++ b/internal/bft/view_test.go @@ -14,13 +14,13 @@ import ( "sync/atomic" "testing" - "github.com/hyperledger-labs/SmartBFT/internal/bft" - "github.com/hyperledger-labs/SmartBFT/internal/bft/mocks" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - "github.com/hyperledger-labs/SmartBFT/pkg/wal" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/internal/bft" + "github.com/hyperledger/SmartBFT/internal/bft/mocks" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger/SmartBFT/pkg/types" + "github.com/hyperledger/SmartBFT/pkg/wal" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.uber.org/zap" diff --git a/internal/bft/viewchanger.go b/internal/bft/viewchanger.go index 9a98a8b2..0a0a1263 100644 --- a/internal/bft/viewchanger.go +++ b/internal/bft/viewchanger.go @@ -12,10 +12,10 @@ import ( "sync/atomic" "time" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "google.golang.org/protobuf/proto" ) diff --git a/internal/bft/viewchanger_test.go b/internal/bft/viewchanger_test.go index 893c6bfe..84344be2 100644 --- a/internal/bft/viewchanger_test.go +++ b/internal/bft/viewchanger_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" - "github.com/hyperledger-labs/SmartBFT/internal/bft" - "github.com/hyperledger-labs/SmartBFT/internal/bft/mocks" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/internal/bft" + "github.com/hyperledger/SmartBFT/internal/bft/mocks" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.uber.org/zap" diff --git a/pkg/api/dependencies.go b/pkg/api/dependencies.go index 8d69fa87..6bbd0af2 100644 --- a/pkg/api/dependencies.go +++ b/pkg/api/dependencies.go @@ -6,8 +6,8 @@ package api import ( - bft "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + bft "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" ) // Application delivers the consented proposal and corresponding signatures. diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go index 1e0eb99c..4338693d 100644 --- a/pkg/api/metrics.go +++ b/pkg/api/metrics.go @@ -5,7 +5,7 @@ import ( "sort" "strconv" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics" + "github.com/hyperledger/SmartBFT/pkg/metrics" ) const ( diff --git a/pkg/api/metrics_test.go b/pkg/api/metrics_test.go index 216ad52d..0464e84a 100644 --- a/pkg/api/metrics_test.go +++ b/pkg/api/metrics_test.go @@ -3,8 +3,8 @@ package api_test import ( "testing" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/metrics" "github.com/stretchr/testify/assert" ) diff --git a/pkg/consensus/consensus.go b/pkg/consensus/consensus.go index 211f60ee..7321378e 100644 --- a/pkg/consensus/consensus.go +++ b/pkg/consensus/consensus.go @@ -14,11 +14,11 @@ import ( "sync/atomic" "time" - algorithm "github.com/hyperledger-labs/SmartBFT/internal/bft" - bft "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + algorithm "github.com/hyperledger/SmartBFT/internal/bft" + bft "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger/SmartBFT/pkg/types" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "google.golang.org/protobuf/proto" ) diff --git a/pkg/metrics/disabled/provider.go b/pkg/metrics/disabled/provider.go index b9fe1a62..78253ee4 100644 --- a/pkg/metrics/disabled/provider.go +++ b/pkg/metrics/disabled/provider.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0 package disabled import ( - bft "github.com/hyperledger-labs/SmartBFT/pkg/metrics" + bft "github.com/hyperledger/SmartBFT/pkg/metrics" ) type Provider struct{} diff --git a/pkg/types/types.go b/pkg/types/types.go index 5c65bcc3..f923fe01 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -12,7 +12,7 @@ import ( "fmt" "sync" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/smartbftprotos" ) type Proposal struct { diff --git a/pkg/wal/metrics.go b/pkg/wal/metrics.go index 3aedea71..ec3a0f2c 100644 --- a/pkg/wal/metrics.go +++ b/pkg/wal/metrics.go @@ -1,8 +1,8 @@ package wal import ( - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/metrics" ) var countOfFilesOpts = metrics.GaugeOpts{ diff --git a/pkg/wal/reader.go b/pkg/wal/reader.go index 185cda76..186c8ced 100644 --- a/pkg/wal/reader.go +++ b/pkg/wal/reader.go @@ -13,8 +13,8 @@ import ( "io" "os" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "google.golang.org/protobuf/proto" ) diff --git a/pkg/wal/reader_test.go b/pkg/wal/reader_test.go index d87ac5fa..b5cb1fcb 100644 --- a/pkg/wal/reader_test.go +++ b/pkg/wal/reader_test.go @@ -12,7 +12,7 @@ import ( "path/filepath" "testing" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" "google.golang.org/protobuf/proto" diff --git a/pkg/wal/util.go b/pkg/wal/util.go index eaadd1b5..31d694a9 100644 --- a/pkg/wal/util.go +++ b/pkg/wal/util.go @@ -15,7 +15,7 @@ import ( "sort" "strings" - "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/api" ) var padTable [][]byte diff --git a/pkg/wal/util_test.go b/pkg/wal/util_test.go index 74f177d5..86f07b11 100644 --- a/pkg/wal/util_test.go +++ b/pkg/wal/util_test.go @@ -12,8 +12,8 @@ import ( "path/filepath" "testing" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/pkg/wal/writeaheadlog.go b/pkg/wal/writeaheadlog.go index 2aafdda9..fdb3f344 100644 --- a/pkg/wal/writeaheadlog.go +++ b/pkg/wal/writeaheadlog.go @@ -16,9 +16,9 @@ import ( "strings" "sync" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" - protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/metrics/disabled" + protos "github.com/hyperledger/SmartBFT/smartbftprotos" "google.golang.org/protobuf/proto" ) diff --git a/pkg/wal/writeaheadlog_test.go b/pkg/wal/writeaheadlog_test.go index e8d7280a..c3aaa5ab 100644 --- a/pkg/wal/writeaheadlog_test.go +++ b/pkg/wal/writeaheadlog_test.go @@ -13,8 +13,8 @@ import ( "path/filepath" "testing" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/smartbftprotos/logrecord.pb.go b/smartbftprotos/logrecord.pb.go index 3c80bc3c..baaf6fb7 100644 --- a/smartbftprotos/logrecord.pb.go +++ b/smartbftprotos/logrecord.pb.go @@ -5,8 +5,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.10 -// protoc v6.33.1 +// protoc-gen-go v1.36.12 +// protoc v7.36.2 // source: smartbftprotos/logrecord.proto package smartbftprotos @@ -149,7 +149,7 @@ const file_smartbftprotos_logrecord_proto_rawDesc = "" + "\x05ENTRY\x10\x00\x12\v\n" + "\aCONTROL\x10\x01\x12\x0e\n" + "\n" + - "CRC_ANCHOR\x10\x02B5Z3github.com/hyperledger-labs/SmartBFT/smartbftprotosb\x06proto3" + "CRC_ANCHOR\x10\x02B0Z.github.com/hyperledger/SmartBFT/smartbftprotosb\x06proto3" var ( file_smartbftprotos_logrecord_proto_rawDescOnce sync.Once diff --git a/smartbftprotos/logrecord.proto b/smartbftprotos/logrecord.proto index cde62529..f733d4ad 100644 --- a/smartbftprotos/logrecord.proto +++ b/smartbftprotos/logrecord.proto @@ -5,7 +5,7 @@ syntax = "proto3"; -option go_package = "github.com/hyperledger-labs/SmartBFT/smartbftprotos"; +option go_package = "github.com/hyperledger/SmartBFT/smartbftprotos"; package smartbftprotos; diff --git a/smartbftprotos/messages.pb.go b/smartbftprotos/messages.pb.go index a2c2a4ef..48cee321 100644 --- a/smartbftprotos/messages.pb.go +++ b/smartbftprotos/messages.pb.go @@ -5,8 +5,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.10 -// protoc v6.33.1 +// protoc-gen-go v1.36.12 +// protoc v7.36.2 // source: smartbftprotos/messages.proto package smartbftprotos @@ -1369,7 +1369,7 @@ const file_smartbftprotos_messages_proto_rawDesc = "" + "\x14StateTransferRequest\"N\n" + "\x15StateTransferResponse\x12\x19\n" + "\bview_num\x18\x01 \x01(\x04R\aviewNum\x12\x1a\n" + - "\bsequence\x18\x02 \x01(\x04R\bsequenceB5Z3github.com/hyperledger-labs/SmartBFT/smartbftprotosb\x06proto3" + "\bsequence\x18\x02 \x01(\x04R\bsequenceB0Z.github.com/hyperledger/SmartBFT/smartbftprotosb\x06proto3" var ( file_smartbftprotos_messages_proto_rawDescOnce sync.Once diff --git a/smartbftprotos/messages.proto b/smartbftprotos/messages.proto index 70da3558..751b39b9 100644 --- a/smartbftprotos/messages.proto +++ b/smartbftprotos/messages.proto @@ -6,7 +6,7 @@ syntax = "proto3"; -option go_package = "github.com/hyperledger-labs/SmartBFT/smartbftprotos"; +option go_package = "github.com/hyperledger/SmartBFT/smartbftprotos"; package smartbftprotos; diff --git a/test/basic_test.go b/test/basic_test.go index 814cf91f..453ee00d 100644 --- a/test/basic_test.go +++ b/test/basic_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/hyperledger-labs/SmartBFT/internal/bft" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/internal/bft" + "github.com/hyperledger/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -1145,7 +1145,6 @@ func TestSyncSameHeightPreservesDecisionsInView(t *testing.T) { } } } - } func TestFollowerStateTransfer(t *testing.T) { diff --git a/test/network.go b/test/network.go index 42ff37f0..b16f56a2 100644 --- a/test/network.go +++ b/test/network.go @@ -11,7 +11,7 @@ import ( "slices" "sync" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/smartbftprotos" "google.golang.org/protobuf/proto" ) diff --git a/test/network_test.go b/test/network_test.go index ffc62dff..a8b59336 100644 --- a/test/network_test.go +++ b/test/network_test.go @@ -8,7 +8,7 @@ package test import ( "testing" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/smartbftprotos" ) func TestNetwork(*testing.T) { diff --git a/test/reconfig.go b/test/reconfig.go index aea7ee74..676fb618 100644 --- a/test/reconfig.go +++ b/test/reconfig.go @@ -3,7 +3,7 @@ package test import ( "time" - "github.com/hyperledger-labs/SmartBFT/pkg/types" + "github.com/hyperledger/SmartBFT/pkg/types" ) type Configuration struct { diff --git a/test/reconfig_test.go b/test/reconfig_test.go index 7e39a0bd..8dd61aba 100644 --- a/test/reconfig_test.go +++ b/test/reconfig_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hyperledger-labs/SmartBFT/pkg/types" + "github.com/hyperledger/SmartBFT/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/test/test_app.go b/test/test_app.go index 764509d0..e36df67c 100644 --- a/test/test_app.go +++ b/test/test_app.go @@ -13,13 +13,13 @@ import ( "sync/atomic" "time" - "github.com/hyperledger-labs/SmartBFT/pkg/api" - "github.com/hyperledger-labs/SmartBFT/pkg/consensus" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics" - "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" - "github.com/hyperledger-labs/SmartBFT/pkg/types" - "github.com/hyperledger-labs/SmartBFT/pkg/wal" - "github.com/hyperledger-labs/SmartBFT/smartbftprotos" + "github.com/hyperledger/SmartBFT/pkg/api" + "github.com/hyperledger/SmartBFT/pkg/consensus" + "github.com/hyperledger/SmartBFT/pkg/metrics" + "github.com/hyperledger/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger/SmartBFT/pkg/types" + "github.com/hyperledger/SmartBFT/pkg/wal" + "github.com/hyperledger/SmartBFT/smartbftprotos" "go.uber.org/zap" "go.uber.org/zap/zapcore" "google.golang.org/protobuf/proto" diff --git a/test/test_messages.pb.go b/test/test_messages.pb.go index c6a914d2..4d0e729d 100644 --- a/test/test_messages.pb.go +++ b/test/test_messages.pb.go @@ -5,8 +5,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.10 -// protoc v6.33.1 +// protoc-gen-go v1.36.12 +// protoc v7.36.2 // source: test/test_messages.proto package test @@ -86,7 +86,7 @@ const file_test_test_messages_proto_rawDesc = "" + "\n" + "fwdMessage\x12\x16\n" + "\x06sender\x18\x01 \x01(\x04R\x06sender\x12\x18\n" + - "\apayload\x18\x02 \x01(\fR\apayloadB+Z)github.com/hyperledger-labs/SmartBFT/testb\x06proto3" + "\apayload\x18\x02 \x01(\fR\apayloadB&Z$github.com/hyperledger/SmartBFT/testb\x06proto3" var ( file_test_test_messages_proto_rawDescOnce sync.Once diff --git a/test/test_messages.proto b/test/test_messages.proto index 989a13f9..9fad1b72 100644 --- a/test/test_messages.proto +++ b/test/test_messages.proto @@ -5,7 +5,7 @@ syntax = "proto3"; -option go_package = "github.com/hyperledger-labs/SmartBFT/test"; +option go_package = "github.com/hyperledger/SmartBFT/test"; package test;