From db1e05c37766da5a173584d0e0906d16838cdd19 Mon Sep 17 00:00:00 2001 From: Jitendra Bhurat Date: Thu, 15 Jul 2021 11:33:19 -0400 Subject: [PATCH] Renaming Qbft to QBFT and updated qbftBlock fork block to testQBFTBlock --- cmd/qbft/extra/decoder.go | 4 ++-- cmd/qbft/extra/encoder.go | 2 +- genesis/options.go | 2 +- go.mod | 2 +- go.sum | 3 +++ 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cmd/qbft/extra/decoder.go b/cmd/qbft/extra/decoder.go index 9f39e335..ec7b8376 100644 --- a/cmd/qbft/extra/decoder.go +++ b/cmd/qbft/extra/decoder.go @@ -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 } diff --git a/cmd/qbft/extra/encoder.go b/cmd/qbft/extra/encoder.go index 01e2624c..edebe917 100644 --- a/cmd/qbft/extra/encoder.go +++ b/cmd/qbft/extra/encoder.go @@ -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{}, diff --git a/genesis/options.go b/genesis/options.go index 27eb56c7..97010714 100644 --- a/genesis/options.go +++ b/genesis/options.go @@ -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 } } diff --git a/go.mod b/go.mod index c1a36732..fc51a1f7 100644 --- a/go.mod +++ b/go.mod @@ -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 ) diff --git a/go.sum b/go.sum index 6f5225cf..fe11d2f8 100644 --- a/go.sum +++ b/go.sum @@ -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= @@ -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=