poanetwork
/
istanbul-tools
mirror of https://github.com/poanetwork/istanbul-tools.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Supporting ceil2Nby3Block config in genesis

This commit is contained in:
Jitendra Bhurat 2019-12-13 14:56:57 -05:00
parent 2a19796eca
commit e12d15dd8b
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/ethclient.go
View File

@ -21,6 +21,7 @@ import (
"math/big" "math/big"
"github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
) )
@ -200,5 +201,5 @@ func (c *client) EstimateGas(ctx context.Context, msg ethereum.CallMsg) (*big.In
// If the transaction was a contract creation use the TransactionReceipt method to get the // If the transaction was a contract creation use the TransactionReceipt method to get the
// contract address after the transaction has been mined. // contract address after the transaction has been mined.
func (c *client) SendRawTransaction(ctx context.Context, tx *types.Transaction) error { func (c *client) SendRawTransaction(ctx context.Context, tx *types.Transaction) error {
return c.ethClient.SendTransaction(ctx, tx) return c.ethClient.SendTransaction(ctx, tx, bind.PrivateTxArgs{})
} }

1
genesis/genesis.go
View File

@ -55,6 +55,7 @@ func New(options ...Option) *core.Genesis {
Istanbul: &params.IstanbulConfig{ Istanbul: &params.IstanbulConfig{
ProposerPolicy: uint64(istanbul.DefaultConfig.ProposerPolicy), ProposerPolicy: uint64(istanbul.DefaultConfig.ProposerPolicy),
Epoch: istanbul.DefaultConfig.Epoch, Epoch: istanbul.DefaultConfig.Epoch,
Ceil2Nby3Block: istanbul.DefaultConfig.Ceil2Nby3Block,
}, },
IsQuorum: true, IsQuorum: true,
}, },

4
go.mod
View File

@ -1,6 +1,6 @@
module github.com/jpmorganchase/istanbul-tools module github.com/jpmorganchase/istanbul-tools
replace github.com/ethereum/go-ethereum => github.com/jpmorganchase/quorum v2.2.4+incompatible replace github.com/ethereum/go-ethereum => github.com/jpmorganchase/quorum v2.4.0+incompatible
replace github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.1.1 replace github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.1.1
@ -86,3 +86,5 @@ require (
k8s.io/apimachinery v0.0.0-20170728134514-1fd2e63a9a37 k8s.io/apimachinery v0.0.0-20170728134514-1fd2e63a9a37
k8s.io/client-go v4.0.0+incompatible k8s.io/client-go v4.0.0+incompatible
) )
go 1.13

4
go.sum
View File

@ -91,8 +91,8 @@ github.com/influxdata/influxdb v1.7.7/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOpr
github.com/jackpal/go-nat-pmp v0.0.0-20181021192511-d89d09f6f332 h1:a7NFNcFwp6ML57qUCGcryjr1G5Z5Mh3855uMfUgIIlU= github.com/jackpal/go-nat-pmp v0.0.0-20181021192511-d89d09f6f332 h1:a7NFNcFwp6ML57qUCGcryjr1G5Z5Mh3855uMfUgIIlU=
github.com/jackpal/go-nat-pmp v0.0.0-20181021192511-d89d09f6f332/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jackpal/go-nat-pmp v0.0.0-20181021192511-d89d09f6f332/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jpmorganchase/quorum v2.2.4+incompatible h1:b++tFU1KfHsa3Wplb5F2Xiq13ajSN+iO60eHyDmQMkU= github.com/jpmorganchase/quorum v2.4.0+incompatible h1:ZKLQxG8N3CGUuwCvJhjsIjKQGw4NJxSvs3RD4DawmOs=
github.com/jpmorganchase/quorum v2.2.4+incompatible/go.mod h1:DR/b2dsUf3s/e+ucBn6RhC9w+ouhJQp8qwZehgULebY= github.com/jpmorganchase/quorum v2.4.0+incompatible/go.mod h1:DR/b2dsUf3s/e+ucBn6RhC9w+ouhJQp8qwZehgULebY=
github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
github.com/juju/ratelimit v0.0.0-20170523012141-5b9ff8664717 h1:gfrLWZBU8a+vr2wQZWR9ctEm3syl1A7QIN9O2p7lZ/4= github.com/juju/ratelimit v0.0.0-20170523012141-5b9ff8664717 h1:gfrLWZBU8a+vr2wQZWR9ctEm3syl1A7QIN9O2p7lZ/4=
github.com/juju/ratelimit v0.0.0-20170523012141-5b9ff8664717/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= github.com/juju/ratelimit v0.0.0-20170523012141-5b9ff8664717/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk=