Skip to content

Commit

Permalink
Update smartbft library (#4750)
Browse files Browse the repository at this point in the history 
* update smartbft library

Signed-off-by: Hagar Meir <hagar.meir@ibm.com>

* change name

Signed-off-by: Hagar Meir <hagar.meir@ibm.com>

* update fabric-lib-go

Signed-off-by: Hagar Meir <hagar.meir@ibm.com>

* also update in tools

Signed-off-by: Hagar Meir <hagar.meir@ibm.com>

---------

Signed-off-by: Hagar Meir <hagar.meir@ibm.com>
  • Loading branch information
@HagarMeir
HagarMeir authored Mar 14, 2024
1 parent 9a48251 commit 0007c39
Show file tree
Hide file tree
Showing 64 changed files with 119 additions and 124 deletions.
2 changes: 1 addition & 1 deletion docs/source/orderer/ordering_service.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ implementation the node will be used in), check out [our documentation on deploy
A Byzantine Fault Tolerant (BFT) ordering service, as its name implies,
can withstand not only crash failures, but also a subset of nodes behaving maliciously.
It is now possible to run a BFT ordering service
with the [SmartBFT](https://arxiv.org/abs/2107.06922) [library](https://github.com/SmartBFT-Go/consensus)
with the [SmartBFT](https://arxiv.org/abs/2107.06922) [library](https://github.com/hyperledger-labs/SmartBFT)
as its underlying consensus protocol. Consider using the BFT orderer if true decentralization is required, where
up to and not including a third of the parties running the orderers may not be trusted due to malicious intent or being compromised.

Expand Down
2 changes: 1 addition & 1 deletion docs/source/whatsnew.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Byzantine Fault Tolerant (BFT) ordering service
Hyperledger Fabric has utilized a Raft crash fault tolerant (CFT) ordering service since version v1.4.
A Byzantine Fault Tolerant (BFT) ordering service can withstand not only crash failures, but also a subset of nodes behaving maliciously.
Fabric v3.0 is the first release to provide a BFT ordering service based on the
`SmartBFT <https://arxiv.org/abs/2107.06922>`_ `consensus library <https://github.com/SmartBFT-Go/consensus>`_.
`SmartBFT <https://arxiv.org/abs/2107.06922>`_ `consensus library <https://github.com/hyperledger-labs/SmartBFT>`_.
Consider using the BFT orderer if true decentralization is required,
where up to and not including a third of the parties running the orderers may not be trusted due to malicious intent or being compromised.

Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ require (
code.cloudfoundry.org/clock v1.0.0
github.com/IBM/idemix v0.0.2-0.20231011101252-a4feda90f3f7
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible
github.com/SmartBFT-Go/consensus v0.0.0-20240215044737-fd3c35e3c876
github.com/VictoriaMetrics/fastcache v1.9.0
github.com/bits-and-blooms/bitset v1.13.0
github.com/cheggaaa/pb v1.0.29
Expand All @@ -17,9 +16,10 @@ require (
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/hyperledger-labs/SmartBFT v0.0.0-20240314083322-beb702253a8c
github.com/hyperledger/fabric-chaincode-go v0.0.0-20220713164125-8f0791c989d7
github.com/hyperledger/fabric-config v0.2.1
github.com/hyperledger/fabric-lib-go v1.1.0
github.com/hyperledger/fabric-lib-go v1.1.1
github.com/hyperledger/fabric-protos-go v0.3.2
github.com/kr/pretty v0.3.1
github.com/miekg/pkcs11 v1.1.1
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYx
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
github.com/SmartBFT-Go/consensus v0.0.0-20240215044737-fd3c35e3c876 h1:E7XUbc3IePMgCJmdbgwzRucmrBCvCBBnrsWR1I0EMkQ=
github.com/SmartBFT-Go/consensus v0.0.0-20240215044737-fd3c35e3c876/go.mod h1:aeRINA5oFotrrfV/mDlTkN/UePrSIIPziuAjEqETRN0=
github.com/VictoriaMetrics/fastcache v1.9.0 h1:oMwsS6c8abz98B7ytAewQ7M1ZN/Im/iwKoE1euaFvhs=
github.com/VictoriaMetrics/fastcache v1.9.0/go.mod h1:otoTS3xu+6IzF/qByjqzjp3rTuzM3Qf0ScU1UTj97iU=
github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
Expand Down Expand Up @@ -318,14 +316,16 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
github.com/hyperledger-labs/SmartBFT v0.0.0-20240314083322-beb702253a8c h1:WI3KhtKZ4g0A+p0vWVaqoejTwtKrL96x4pO+zXcCfA8=
github.com/hyperledger-labs/SmartBFT v0.0.0-20240314083322-beb702253a8c/go.mod h1:vP2WuYRHnbOZfik/btUpKGXI9ZrRz2hIIzjrGLvDXr8=
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M=
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE=
github.com/hyperledger/fabric-chaincode-go v0.0.0-20220713164125-8f0791c989d7 h1:w0VDGxvAmu8WZEfAhLn9M4SJg5xWMFIxUokfflx1MaU=
github.com/hyperledger/fabric-chaincode-go v0.0.0-20220713164125-8f0791c989d7/go.mod h1:9HhzkKkb8qteXBbHEQ3J/FHBVJRDJAgYIPtKPIl3Dt8=
github.com/hyperledger/fabric-config v0.2.1 h1:CsReuxvi5c5NUyKKQOIVbHux32o+XtmDNceYLYjycxo=
github.com/hyperledger/fabric-config v0.2.1/go.mod h1:1ZfjDrsuMoM4IPKezQgTByy2vXUj8bgTXaOXaGXK5O4=
github.com/hyperledger/fabric-lib-go v1.1.0 h1:iVjRr0oxqNn2P0SH2UCiOdLak56kqn/YJ6A/wnxNNaU=
github.com/hyperledger/fabric-lib-go v1.1.0/go.mod h1:SHNCq8AB0VpHAmvJEtdbzabv6NNV1F48JdmDihasBjc=
github.com/hyperledger/fabric-lib-go v1.1.1 h1:GA4+1k5NgeCJRlMovivzYlW7lUAA+hfS3O3c9bLWOBA=
github.com/hyperledger/fabric-lib-go v1.1.1/go.mod h1:SHNCq8AB0VpHAmvJEtdbzabv6NNV1F48JdmDihasBjc=
github.com/hyperledger/fabric-protos-go v0.0.0-20220516090339-9685156fada6/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
github.com/hyperledger/fabric-protos-go v0.3.2 h1:mQmbHw3lyDV2+W5b0FitV/SjM4LLDjMTQJWW9taitDM=
github.com/hyperledger/fabric-protos-go v0.3.2/go.mod h1:WWnyWP40P2roPmmvxsUXSvVI/CF6vwY1K1UFidnKBys=
Expand Down
7 changes: 3 additions & 4 deletions integration/raft/migration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@ import (
"syscall"
"time"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/hyperledger/fabric-protos-go/orderer/smartbft"
"github.com/hyperledger/fabric/common/policies"

docker "github.com/fsouza/go-dockerclient"
"github.com/golang/protobuf/proto"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger/fabric-protos-go/common"
protosorderer "github.com/hyperledger/fabric-protos-go/orderer"
"github.com/hyperledger/fabric-protos-go/orderer/smartbft"
"github.com/hyperledger/fabric/common/policies"
"github.com/hyperledger/fabric/integration/channelparticipation"
"github.com/hyperledger/fabric/integration/nwo"
"github.com/hyperledger/fabric/integration/nwo/commands"
Expand Down
2 changes: 1 addition & 1 deletion integration/smartbft/smartbft_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"syscall"
"time"

protos "github.com/SmartBFT-Go/consensus/smartbftprotos"
docker "github.com/fsouza/go-dockerclient"
"github.com/golang/protobuf/proto"
protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos"
"github.com/hyperledger/fabric-config/configtx"
"github.com/hyperledger/fabric-config/configtx/orderer"
"github.com/hyperledger/fabric-protos-go/common"
Expand Down
2 changes: 1 addition & 1 deletion internal/configtxgen/genesisconfig/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"sync"
"time"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger/fabric-lib-go/common/flogging"
"github.com/hyperledger/fabric-protos-go/orderer/etcdraft"
"github.com/hyperledger/fabric-protos-go/orderer/smartbft"
Expand Down
10 changes: 4 additions & 6 deletions orderer/common/msgprocessor/maintenancefilter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,16 @@ import (
"path"
"testing"

"github.com/hyperledger/fabric-protos-go/orderer/etcdraft"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-protos-go/orderer/smartbft"
"github.com/hyperledger/fabric/common/crypto/tlsgen"

"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger/fabric-lib-go/bccsp/sw"
"github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric-protos-go/orderer"
"github.com/hyperledger/fabric-protos-go/orderer/etcdraft"
"github.com/hyperledger/fabric-protos-go/orderer/smartbft"
"github.com/hyperledger/fabric/common/capabilities"
"github.com/hyperledger/fabric/common/channelconfig"
"github.com/hyperledger/fabric/common/crypto/tlsgen"
"github.com/hyperledger/fabric/core/config/configtest"
"github.com/hyperledger/fabric/internal/configtxgen/encoder"
"github.com/hyperledger/fabric/internal/configtxgen/genesisconfig"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/assembler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"encoding/asn1"
"sync/atomic"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger/fabric-lib-go/common/flogging"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric/orderer/common/cluster"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/assembler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"sync/atomic"
"testing"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger/fabric-lib-go/common/flogging"
"github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric/orderer/consensus/smartbft"
Expand Down
10 changes: 5 additions & 5 deletions orderer/consensus/smartbft/chain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import (
"sync/atomic"
"time"

"github.com/SmartBFT-Go/consensus/pkg/api"
smartbft "github.com/SmartBFT-Go/consensus/pkg/consensus"
"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/SmartBFT-Go/consensus/pkg/wal"
"github.com/SmartBFT-Go/consensus/smartbftprotos"
"github.com/golang/protobuf/proto"
"github.com/hyperledger-labs/SmartBFT/pkg/api"
smartbft "github.com/hyperledger-labs/SmartBFT/pkg/consensus"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger-labs/SmartBFT/pkg/wal"
"github.com/hyperledger-labs/SmartBFT/smartbftprotos"
"github.com/hyperledger/fabric-lib-go/bccsp"
"github.com/hyperledger/fabric-lib-go/common/flogging"
cb "github.com/hyperledger/fabric-protos-go/common"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/consenter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"sync/atomic"
"time"

"github.com/SmartBFT-Go/consensus/pkg/api"
"github.com/SmartBFT-Go/consensus/pkg/wal"
"github.com/golang/protobuf/proto"
"github.com/hyperledger-labs/SmartBFT/pkg/api"
"github.com/hyperledger-labs/SmartBFT/pkg/wal"
"github.com/hyperledger/fabric-lib-go/bccsp"
"github.com/hyperledger/fabric-lib-go/common/flogging"
"github.com/hyperledger/fabric-lib-go/common/metrics"
Expand Down
7 changes: 3 additions & 4 deletions orderer/consensus/smartbft/egress.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ package smartbft
import (
"sync/atomic"

"github.com/SmartBFT-Go/consensus/pkg/api"
"github.com/hyperledger/fabric/orderer/common/cluster"

protos "github.com/SmartBFT-Go/consensus/smartbftprotos"
"github.com/golang/protobuf/proto"
"github.com/hyperledger-labs/SmartBFT/pkg/api"
protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos"
cb "github.com/hyperledger/fabric-protos-go/common"
ab "github.com/hyperledger/fabric-protos-go/orderer"
"github.com/hyperledger/fabric/orderer/common/cluster"
"github.com/hyperledger/fabric/protoutil"
)

Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/egress_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package smartbft_test
import (
"testing"

protos "github.com/SmartBFT-Go/consensus/smartbftprotos"
protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos"
"github.com/hyperledger/fabric-lib-go/common/flogging"
cb "github.com/hyperledger/fabric-protos-go/common"
ab "github.com/hyperledger/fabric-protos-go/orderer"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/ingress.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ SPDX-License-Identifier: Apache-2.0
package smartbft

import (
protos "github.com/SmartBFT-Go/consensus/smartbftprotos"
"github.com/golang/protobuf/proto"
protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos"
ab "github.com/hyperledger/fabric-protos-go/orderer"
"github.com/hyperledger/fabric/protoutil"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/ingress_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ package smartbft_test
import (
"testing"

protos "github.com/SmartBFT-Go/consensus/smartbftprotos"
"github.com/golang/protobuf/proto"
protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos"
"github.com/hyperledger/fabric-lib-go/common/flogging"
cb "github.com/hyperledger/fabric-protos-go/common"
ab "github.com/hyperledger/fabric-protos-go/orderer"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/metrics_provider_converter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
package smartbft

import (
api "github.com/SmartBFT-Go/consensus/pkg/metrics"
api "github.com/hyperledger-labs/SmartBFT/pkg/metrics"
"github.com/hyperledger/fabric-lib-go/common/metrics"
)

Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/mocks/egress_comm.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/mocks/message_receiver.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/signature.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"encoding/asn1"
"math/big"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/golang/protobuf/proto"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric/common/util"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/signer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
package smartbft

import (
"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric/common/crypto"
"github.com/hyperledger/fabric/internal/pkg/identity"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/signer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"sync/atomic"
"testing"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/golang/protobuf/proto"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger/fabric-lib-go/common/flogging"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric/orderer/consensus/smartbft"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/synchronizer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ package smartbft
import (
"sort"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/SmartBFT-Go/consensus/smartbftprotos"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger-labs/SmartBFT/smartbftprotos"
"github.com/hyperledger/fabric-lib-go/bccsp"
"github.com/hyperledger/fabric-lib-go/common/flogging"
cb "github.com/hyperledger/fabric-protos-go/common"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/synchronizer_bft.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"sync"
"time"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger/fabric-lib-go/bccsp"
"github.com/hyperledger/fabric-lib-go/common/flogging"
"github.com/hyperledger/fabric-protos-go/common"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/synchronizer_bft_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"sync"
"testing"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/SmartBFT-Go/consensus/smartbftprotos"
"github.com/golang/protobuf/proto"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger-labs/SmartBFT/smartbftprotos"
"github.com/hyperledger/fabric-lib-go/common/flogging"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric-protos-go/orderer"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/synchronizer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"os"
"testing"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/SmartBFT-Go/consensus/smartbftprotos"
"github.com/golang/protobuf/proto"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger-labs/SmartBFT/smartbftprotos"
"github.com/hyperledger/fabric-lib-go/common/flogging"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric/internal/pkg/comm"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"sort"
"time"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/SmartBFT-Go/consensus/smartbftprotos"
"github.com/golang/protobuf/proto"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger-labs/SmartBFT/smartbftprotos"
"github.com/hyperledger/fabric-lib-go/bccsp"
"github.com/hyperledger/fabric-lib-go/common/flogging"
cb "github.com/hyperledger/fabric-protos-go/common"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/util/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package util
import (
"time"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger/fabric-protos-go/orderer/smartbft"
"github.com/pkg/errors"
)
Expand Down
11 changes: 5 additions & 6 deletions orderer/consensus/smartbft/util_network_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@ import (
"testing"
"time"

"github.com/hyperledger/fabric/orderer/common/cluster"

"github.com/SmartBFT-Go/consensus/pkg/api"
"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/SmartBFT-Go/consensus/pkg/wal"
"github.com/SmartBFT-Go/consensus/smartbftprotos"
"github.com/hyperledger-labs/SmartBFT/pkg/api"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger-labs/SmartBFT/pkg/wal"
"github.com/hyperledger-labs/SmartBFT/smartbftprotos"
"github.com/hyperledger/fabric-lib-go/bccsp/sw"
"github.com/hyperledger/fabric-lib-go/common/metrics/disabled"
cb "github.com/hyperledger/fabric-protos-go/common"
Expand All @@ -31,6 +29,7 @@ import (
"github.com/hyperledger/fabric/core/config/configtest"
"github.com/hyperledger/fabric/internal/configtxgen/encoder"
"github.com/hyperledger/fabric/internal/configtxgen/genesisconfig"
"github.com/hyperledger/fabric/orderer/common/cluster"
"github.com/hyperledger/fabric/orderer/common/localconfig"
"github.com/hyperledger/fabric/orderer/consensus/smartbft"
smartBFTMocks "github.com/hyperledger/fabric/orderer/consensus/smartbft/mocks"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/verifier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"sync"
"sync/atomic"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/SmartBFT-Go/consensus/smartbftprotos"
"github.com/golang/protobuf/proto"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger-labs/SmartBFT/smartbftprotos"
"github.com/hyperledger/fabric-lib-go/common/flogging"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric-protos-go/msp"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/verifier_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"sync/atomic"
"testing"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/SmartBFT-Go/consensus/smartbftprotos"
"github.com/golang/protobuf/proto"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger-labs/SmartBFT/smartbftprotos"
"github.com/hyperledger/fabric-lib-go/common/flogging"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric-protos-go/msp"
Expand Down
2 changes: 1 addition & 1 deletion release_notes/v3.0.0-preview.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ New features

Hyperledger Fabric has utilized a Raft crash fault tolerant (CFT) ordering service since version v1.4.1.
A Byzantine Fault Tolerant (BFT) ordering service can withstand not only crash failures, but also a subset of nodes behaving maliciously.
Fabric v3.0.0-preview is the first release to provide a BFT ordering service based on the [SmartBFT](https://arxiv.org/abs/2107.06922) [consensus library](https://github.com/SmartBFT-Go/consensus).
Fabric v3.0.0-preview is the first release to provide a BFT ordering service based on the [SmartBFT](https://arxiv.org/abs/2107.06922) [consensus library](https://github.com/hyperledger-labs/SmartBFT).
Consider using the BFT orderer if true decentralization is required, where up to and not including a third of the parties running the orderers may not be trusted due to malicious intent or being compromised.
For more details of the BFT ordering service and other recent features, see the [What's New documentation](https://hyperledger-fabric.readthedocs.io/en/latest/whatsnew.html).

Expand Down
Loading

0 comments on commit 0007c39

Please sign in to comment.