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

Jump to bottom

Renaming Qbft to QBFT and updated qbftBlock fork block to testQBFTBlock #26

Merged
merged 1 commit into from
Jul 16, 2021
Merged

Renaming Qbft to QBFT and updated qbftBlock fork block to testQBFTBlock #26

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
4 changes: 2 additions & 2 deletions cmd/qbft/extra/decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import (
"github.com/ethereum/go-ethereum/core/types"
)

func Decode(extraData string) (*types.QbftExtra, error) {
func Decode(extraData string) (*types.QBFTExtra, error) {
extra, err := hexutil.Decode(extraData)
if err != nil {
return nil, err
}

qbftExtra, err := types.ExtractQbftExtra(&types.Header{Extra: extra})
qbftExtra, err := types.ExtractQBFTExtra(&types.Header{Extra: extra})
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/qbft/extra/encoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func Encode(vanity string, validators []common.Address) (string, error) {
}
newVanity = newVanity[:atypes.IstanbulExtraVanity]

ist := &atypes.QbftExtra{
ist := &atypes.QBFTExtra{
VanityData: newVanity,
Validators: validators,
CommittedSeal: [][]byte{},
Expand Down
2 changes: 1 addition & 1 deletion genesis/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ func Alloc(addrs []common.Address, balance *big.Int) Option {

func AddQbftBlock() Option {
return func(genesis *core.Genesis) {
genesis.Config.Istanbul.QbftBlock = common.Big0
genesis.Config.Istanbul.TestQBFTBlock = common.Big0
}
}
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module github.com/jpmorganchase/istanbul-tools

replace (
github.com/ethereum/go-ethereum => github.com/jbhurat/quorum v1.2.2-0.20210616172307-f1d83881c796
github.com/ethereum/go-ethereum => github.com/jbhurat/quorum v1.2.2-0.20210715145259-9eca71c721df
github.com/ethereum/go-ethereum/crypto/secp256k1 => github.com/ConsenSys/quorum/crypto/secp256k1 v0.0.0-20210518093622-1d7926a19a1e
)

Expand Down
3 changes: 3 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
Expand Down Expand Up @@ -209,6 +210,8 @@ github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 h1:6OvNmYgJye
github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
github.com/jbhurat/quorum v1.2.2-0.20210616172307-f1d83881c796 h1:JB7eVF1iy4/dh+d0mw1bDSTZqkzxq1JChjtIgMUCkYo=
github.com/jbhurat/quorum v1.2.2-0.20210616172307-f1d83881c796/go.mod h1:ZSayeOFvLOfRGa4kOaveDnug6GFQj5H8s2Zakh37FgY=
github.com/jbhurat/quorum v1.2.2-0.20210715145259-9eca71c721df h1:X/3jMd+xduZ27lYn8vXQrBBN2bZhihMxwZf8EICLAJM=
github.com/jbhurat/quorum v1.2.2-0.20210715145259-9eca71c721df/go.mod h1:swaO68pteenUPbZswhvRen+jSSliyKuxCNggvZWtPvg=
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
Expand Down