Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update smart bft #19

Merged
merged 1 commit into from
Mar 14, 2024
Merged

update smart bft #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ require (
github.com/IBM/idemix v0.0.2-0.20231011101252-a4feda90f3f7
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible
github.com/Shopify/sarama v1.20.1
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 @@ -19,6 +18,8 @@ require (
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/hashicorp/go-version v1.4.0
github.com/hyperledger-labs/SmartBFT v0.0.0-20240314102917-584daefbad5b
github.com/hyperledger/fabric-chaincode-go v0.0.0-20220920210243-7bc6fa0dd58b
github.com/hyperledger/fabric-config v0.1.0
github.com/hyperledger/fabric-lib-go v1.0.0
github.com/hyperledger/fabric-protos-go v0.2.0
Expand All @@ -40,20 +41,16 @@ require (
go.etcd.io/etcd/client/pkg/v3 v3.5.9
go.etcd.io/etcd/raft/v3 v3.5.9
go.etcd.io/etcd/server/v3 v3.5.9
go.uber.org/atomic v1.7.0
go.uber.org/zap v1.26.0
golang.org/x/crypto v0.19.0
golang.org/x/tools v0.14.0
google.golang.org/grpc v1.61.0
google.golang.org/protobuf v1.33.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/hyperledger/fabric-chaincode-go v0.0.0-20220920210243-7bc6fa0dd58b
go.uber.org/atomic v1.7.0
google.golang.org/protobuf v1.33.0
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/DataDog/zstd v1.4.5 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ github.com/Shopify/sarama v1.20.1 h1:Bb0h3I++r4eX333Y0uZV2vwUXepJbt6ig05TUU1qt9I
github.com/Shopify/sarama v1.20.1/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
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 @@ -319,6 +317,8 @@ 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-20240314102917-584daefbad5b h1:3jnnacriUAWk7BRqt6bJRCXXHe3axPcaTOACgtWIrPU=
github.com/hyperledger-labs/SmartBFT v0.0.0-20240314102917-584daefbad5b/go.mod h1:ygWtLPsiYrl58bikv1ybIQJBwRuPw9KV3Y93drGr4zU=
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-20220920210243-7bc6fa0dd58b h1:MGT5rdajc4zbsbU7yMzkLJmsiRwJk5gBX5OdpU117Bg=
Expand Down
2 changes: 1 addition & 1 deletion internal/configtxgen/genesisconfig/config.go
View file
Open in desktop
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-protos-go/orderer/etcdraft"
"github.com/hyperledger/fabric-protos-go/orderer/smartbft"
"github.com/hyperledger/fabric/common/flogging"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/assembler.go
View file
Open in desktop
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"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric/common/flogging"
"github.com/hyperledger/fabric/orderer/common/cluster"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/assembler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"sync/atomic"
"testing"

"github.com/SmartBFT-Go/consensus/pkg/types"
"github.com/hyperledger-labs/SmartBFT/pkg/types"
"github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric/common/flogging"
"github.com/hyperledger/fabric/orderer/consensus/smartbft"
Expand Down
10 changes: 5 additions & 5 deletions orderer/consensus/smartbft/chain.go
View file
Open in desktop
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"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric-protos-go/msp"
"github.com/hyperledger/fabric/bccsp"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/consenter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"path"
"reflect"

"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"
cb "github.com/hyperledger/fabric-protos-go/common"
ab "github.com/hyperledger/fabric-protos-go/orderer"
"github.com/hyperledger/fabric-protos-go/orderer/smartbft"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/egress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ package smartbft
import (
"sync/atomic"

protos "github.com/SmartBFT-Go/consensus/smartbftprotos"
"github.com/golang/protobuf/proto"
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/protoutil"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/egress_test.go
View file
Open in desktop
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"
cb "github.com/hyperledger/fabric-protos-go/common"
ab "github.com/hyperledger/fabric-protos-go/orderer"
"github.com/hyperledger/fabric/common/flogging"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/ingress.go
View file
Open in desktop
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
Open in desktop
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"
cb "github.com/hyperledger/fabric-protos-go/common"
ab "github.com/hyperledger/fabric-protos-go/orderer"
"github.com/hyperledger/fabric/common/flogging"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/metrics_provider_converter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package smartbft

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

Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/mocks/message_receiver.go
View file
Open in desktop

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
Open in desktop
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
Open in desktop
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/protoutil"
Expand Down
2 changes: 1 addition & 1 deletion orderer/consensus/smartbft/signer_test.go
View file
Open in desktop
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"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric/common/flogging"
"github.com/hyperledger/fabric/orderer/consensus/smartbft"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/synchronizer.go
View file
Open in desktop
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"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric/common/flogging"
"github.com/hyperledger/fabric/orderer/consensus"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/synchronizer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"io/ioutil"
"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"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric/common/flogging"
mocks2 "github.com/hyperledger/fabric/orderer/consensus/mocks"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,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"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric-protos-go/msp"
"github.com/hyperledger/fabric-protos-go/orderer/smartbft"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/verifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,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"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric-protos-go/msp"
"github.com/hyperledger/fabric/common/flogging"
Expand Down
4 changes: 2 additions & 2 deletions orderer/consensus/smartbft/verifier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,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"
cb "github.com/hyperledger/fabric-protos-go/common"
"github.com/hyperledger/fabric-protos-go/msp"
"github.com/hyperledger/fabric/common/flogging"
Expand Down
0 .../github.com/SmartBFT-Go/consensus/LICENSE → ...hub.com/hyperledger-labs/SmartBFT/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...tBFT-Go/consensus/internal/bft/batcher.go → ...ger-labs/SmartBFT/internal/bft/batcher.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...T-Go/consensus/internal/bft/controller.go → ...-labs/SmartBFT/internal/bft/controller.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions ...onsensus/internal/bft/heartbeatmonitor.go → ...SmartBFT/internal/bft/heartbeatmonitor.go
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions ...-Go/consensus/internal/bft/requestpool.go → ...labs/SmartBFT/internal/bft/requestpool.go
View file
Open in desktop

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

0 ...artBFT-Go/consensus/internal/bft/sched.go → ...edger-labs/SmartBFT/internal/bft/sched.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...artBFT-Go/consensus/internal/bft/state.go → ...edger-labs/SmartBFT/internal/bft/state.go
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions .../consensus/internal/bft/statecollector.go → ...s/SmartBFT/internal/bft/statecollector.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions ...tBFT-Go/consensus/internal/bft/support.go → ...ger-labs/SmartBFT/internal/bft/support.go
View file
Open in desktop

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

8 changes: 5 additions & 3 deletions ...martBFT-Go/consensus/internal/bft/util.go → ...ledger-labs/SmartBFT/internal/bft/util.go
View file
Open in desktop

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

Loading