diff --git a/core/gen_genesis.go b/core/gen_genesis.go new file mode 100644 index 000000000..f10c683d9 --- /dev/null +++ b/core/gen_genesis.go @@ -0,0 +1,124 @@ +// Code generated by github.com/fjl/gencodec. DO NOT EDIT. + +package core + +import ( + "encoding/json" + "errors" + "math/big" + + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethereum/go-ethereum/common/math" + "github.com/ethereum/go-ethereum/params" +) + +var _ = (*genesisSpecMarshaling)(nil) + +// MarshalJSON marshals as JSON. +func (g Genesis) MarshalJSON() ([]byte, error) { + type Genesis struct { + Config *params.ChainConfig `json:"config"` + Nonce math.HexOrDecimal64 `json:"nonce"` + ShardID uint32 `json:"shardID"` + Timestamp math.HexOrDecimal64 `json:"timestamp"` + ExtraData hexutil.Bytes `json:"extraData"` + GasLimit math.HexOrDecimal64 `json:"gasLimit" gencodec:"required"` + Difficulty *math.HexOrDecimal256 `json:"difficulty" gencodec:"required"` + Mixhash common.Hash `json:"mixHash"` + Coinbase common.Address `json:"coinbase"` + Alloc map[common.UnprefixedAddress]GenesisAccount `json:"alloc" gencodec:"required"` + Number math.HexOrDecimal64 `json:"number"` + GasUsed math.HexOrDecimal64 `json:"gasUsed"` + ParentHash common.Hash `json:"parentHash"` + } + var enc Genesis + enc.Config = g.Config + enc.Nonce = math.HexOrDecimal64(g.Nonce) + enc.ShardID = g.ShardID + enc.Timestamp = math.HexOrDecimal64(g.Timestamp) + enc.ExtraData = g.ExtraData + enc.GasLimit = math.HexOrDecimal64(g.GasLimit) + enc.Difficulty = (*math.HexOrDecimal256)(g.Difficulty) + enc.Mixhash = g.Mixhash + enc.Coinbase = g.Coinbase + if g.Alloc != nil { + enc.Alloc = make(map[common.UnprefixedAddress]GenesisAccount, len(g.Alloc)) + for k, v := range g.Alloc { + enc.Alloc[common.UnprefixedAddress(k)] = v + } + } + enc.Number = math.HexOrDecimal64(g.Number) + enc.GasUsed = math.HexOrDecimal64(g.GasUsed) + enc.ParentHash = g.ParentHash + return json.Marshal(&enc) +} + +// UnmarshalJSON unmarshals from JSON. +func (g *Genesis) UnmarshalJSON(input []byte) error { + type Genesis struct { + Config *params.ChainConfig `json:"config"` + Nonce *math.HexOrDecimal64 `json:"nonce"` + ShardID *uint32 `json:"shardID"` + Timestamp *math.HexOrDecimal64 `json:"timestamp"` + ExtraData *hexutil.Bytes `json:"extraData"` + GasLimit *math.HexOrDecimal64 `json:"gasLimit" gencodec:"required"` + Difficulty *math.HexOrDecimal256 `json:"difficulty" gencodec:"required"` + Mixhash *common.Hash `json:"mixHash"` + Coinbase *common.Address `json:"coinbase"` + Alloc map[common.UnprefixedAddress]GenesisAccount `json:"alloc" gencodec:"required"` + Number *math.HexOrDecimal64 `json:"number"` + GasUsed *math.HexOrDecimal64 `json:"gasUsed"` + ParentHash *common.Hash `json:"parentHash"` + } + var dec Genesis + if err := json.Unmarshal(input, &dec); err != nil { + return err + } + if dec.Config != nil { + g.Config = dec.Config + } + if dec.Nonce != nil { + g.Nonce = uint64(*dec.Nonce) + } + if dec.ShardID != nil { + g.ShardID = *dec.ShardID + } + if dec.Timestamp != nil { + g.Timestamp = uint64(*dec.Timestamp) + } + if dec.ExtraData != nil { + g.ExtraData = *dec.ExtraData + } + if dec.GasLimit == nil { + return errors.New("missing required field 'gasLimit' for Genesis") + } + g.GasLimit = uint64(*dec.GasLimit) + if dec.Difficulty == nil { + return errors.New("missing required field 'difficulty' for Genesis") + } + g.Difficulty = (*big.Int)(dec.Difficulty) + if dec.Mixhash != nil { + g.Mixhash = *dec.Mixhash + } + if dec.Coinbase != nil { + g.Coinbase = *dec.Coinbase + } + if dec.Alloc == nil { + return errors.New("missing required field 'alloc' for Genesis") + } + g.Alloc = make(GenesisAlloc, len(dec.Alloc)) + for k, v := range dec.Alloc { + g.Alloc[common.Address(k)] = v + } + if dec.Number != nil { + g.Number = uint64(*dec.Number) + } + if dec.GasUsed != nil { + g.GasUsed = uint64(*dec.GasUsed) + } + if dec.ParentHash != nil { + g.ParentHash = *dec.ParentHash + } + return nil +} diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go new file mode 100644 index 000000000..a9d47e6ba --- /dev/null +++ b/core/gen_genesis_account.go @@ -0,0 +1,73 @@ +// Code generated by github.com/fjl/gencodec. DO NOT EDIT. + +package core + +import ( + "encoding/json" + "errors" + "math/big" + + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethereum/go-ethereum/common/math" +) + +var _ = (*genesisAccountMarshaling)(nil) + +// MarshalJSON marshals as JSON. +func (g GenesisAccount) MarshalJSON() ([]byte, error) { + type GenesisAccount struct { + Code hexutil.Bytes `json:"code,omitempty"` + Storage map[storageJSON]storageJSON `json:"storage,omitempty"` + Balance *math.HexOrDecimal256 `json:"balance" gencodec:"required"` + Nonce math.HexOrDecimal64 `json:"nonce,omitempty"` + PrivateKey hexutil.Bytes `json:"secretKey,omitempty"` + } + var enc GenesisAccount + enc.Code = g.Code + if g.Storage != nil { + enc.Storage = make(map[storageJSON]storageJSON, len(g.Storage)) + for k, v := range g.Storage { + enc.Storage[storageJSON(k)] = storageJSON(v) + } + } + enc.Balance = (*math.HexOrDecimal256)(g.Balance) + enc.Nonce = math.HexOrDecimal64(g.Nonce) + enc.PrivateKey = g.PrivateKey + return json.Marshal(&enc) +} + +// UnmarshalJSON unmarshals from JSON. +func (g *GenesisAccount) UnmarshalJSON(input []byte) error { + type GenesisAccount struct { + Code *hexutil.Bytes `json:"code,omitempty"` + Storage map[storageJSON]storageJSON `json:"storage,omitempty"` + Balance *math.HexOrDecimal256 `json:"balance" gencodec:"required"` + Nonce *math.HexOrDecimal64 `json:"nonce,omitempty"` + PrivateKey *hexutil.Bytes `json:"secretKey,omitempty"` + } + var dec GenesisAccount + if err := json.Unmarshal(input, &dec); err != nil { + return err + } + if dec.Code != nil { + g.Code = *dec.Code + } + if dec.Storage != nil { + g.Storage = make(map[common.Hash]common.Hash, len(dec.Storage)) + for k, v := range dec.Storage { + g.Storage[common.Hash(k)] = common.Hash(v) + } + } + if dec.Balance == nil { + return errors.New("missing required field 'balance' for GenesisAccount") + } + g.Balance = (*big.Int)(dec.Balance) + if dec.Nonce != nil { + g.Nonce = uint64(*dec.Nonce) + } + if dec.PrivateKey != nil { + g.PrivateKey = *dec.PrivateKey + } + return nil +} diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 1b5ae3c65..6e9433947 100644 --- a/core/types/gen_log_json.go +++ b/core/types/gen_log_json.go @@ -12,6 +12,7 @@ import ( var _ = (*logMarshaling)(nil) +// MarshalJSON marshals as JSON. func (l Log) MarshalJSON() ([]byte, error) { type Log struct { Address common.Address `json:"address" gencodec:"required"` @@ -37,6 +38,7 @@ func (l Log) MarshalJSON() ([]byte, error) { return json.Marshal(&enc) } +// UnmarshalJSON unmarshals from JSON. func (l *Log) UnmarshalJSON(input []byte) error { type Log struct { Address *common.Address `json:"address" gencodec:"required"` diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index c27da6709..c5744571a 100644 --- a/core/types/gen_tx_json.go +++ b/core/types/gen_tx_json.go @@ -13,9 +13,11 @@ import ( var _ = (*txdataMarshaling)(nil) +// MarshalJSON marshals as JSON. func (t txdata) MarshalJSON() ([]byte, error) { type txdata struct { AccountNonce hexutil.Uint64 `json:"nonce" gencodec:"required"` + ShardID uint32 `json:"shardID" gencodec:"required"` Price *hexutil.Big `json:"gasPrice" gencodec:"required"` GasLimit hexutil.Uint64 `json:"gas" gencodec:"required"` Recipient *common.Address `json:"to" rlp:"nil"` @@ -28,6 +30,7 @@ func (t txdata) MarshalJSON() ([]byte, error) { } var enc txdata enc.AccountNonce = hexutil.Uint64(t.AccountNonce) + enc.ShardID = t.ShardID enc.Price = (*hexutil.Big)(t.Price) enc.GasLimit = hexutil.Uint64(t.GasLimit) enc.Recipient = t.Recipient @@ -40,9 +43,11 @@ func (t txdata) MarshalJSON() ([]byte, error) { return json.Marshal(&enc) } +// UnmarshalJSON unmarshals from JSON. func (t *txdata) UnmarshalJSON(input []byte) error { type txdata struct { AccountNonce *hexutil.Uint64 `json:"nonce" gencodec:"required"` + ShardID *uint32 `json:"shardID" gencodec:"required"` Price *hexutil.Big `json:"gasPrice" gencodec:"required"` GasLimit *hexutil.Uint64 `json:"gas" gencodec:"required"` Recipient *common.Address `json:"to" rlp:"nil"` @@ -61,6 +66,10 @@ func (t *txdata) UnmarshalJSON(input []byte) error { return errors.New("missing required field 'nonce' for txdata") } t.AccountNonce = uint64(*dec.AccountNonce) + if dec.ShardID == nil { + return errors.New("missing required field 'shardID' for txdata") + } + t.ShardID = *dec.ShardID if dec.Price == nil { return errors.New("missing required field 'gasPrice' for txdata") } diff --git a/p2p/host/mock/host_mock.go b/p2p/host/mock/host_mock.go index 1d00a3df3..27c1fef32 100644 --- a/p2p/host/mock/host_mock.go +++ b/p2p/host/mock/host_mock.go @@ -5,12 +5,11 @@ package mock_p2p import ( - reflect "reflect" - gomock "github.com/golang/mock/gomock" p2p "github.com/harmony-one/harmony/p2p" go_libp2p_host "github.com/libp2p/go-libp2p-host" go_libp2p_peer "github.com/libp2p/go-libp2p-peer" + reflect "reflect" ) // MockHost is a mock of Host interface @@ -118,6 +117,16 @@ func (mr *MockHostMockRecorder) GetP2PHost() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetP2PHost", reflect.TypeOf((*MockHost)(nil).GetP2PHost)) } +// ConnectHostPeer mocks base method +func (m *MockHost) ConnectHostPeer(arg0 p2p.Peer) { + m.ctrl.Call(m, "ConnectHostPeer", arg0) +} + +// ConnectHostPeer indicates an expected call of ConnectHostPeer +func (mr *MockHostMockRecorder) ConnectHostPeer(arg0 interface{}) *gomock.Call { + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ConnectHostPeer", reflect.TypeOf((*MockHost)(nil).ConnectHostPeer), arg0) +} + // SendMessageToGroups mocks base method func (m *MockHost) SendMessageToGroups(groups []p2p.GroupID, msg []byte) error { ret := m.ctrl.Call(m, "SendMessageToGroups", groups, msg) @@ -142,33 +151,3 @@ func (m *MockHost) GroupReceiver(arg0 p2p.GroupID) (p2p.GroupReceiver, error) { func (mr *MockHostMockRecorder) GroupReceiver(arg0 interface{}) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GroupReceiver", reflect.TypeOf((*MockHost)(nil).GroupReceiver), arg0) } - -// AddIncomingPeer mocks base method -func (m *MockHost) AddIncomingPeer(peer p2p.Peer) { - m.ctrl.Call(m, "AddIncomingPeer", peer) -} - -// AddIncomingPeer indicates an expected call of AddIncomingPeer -func (mr *MockHostMockRecorder) AddIncomingPeer(groups, msg interface{}) *gomock.Call { - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddIncomingPeer", reflect.TypeOf((*MockHost)(nil).AddIncomingPeer), groups, msg) -} - -// AddOutgoingPeer mocks base method -func (m *MockHost) AddOutgoingPeer(peer p2p.Peer) { - m.ctrl.Call(m, "AddOutgoingPeer", peer) -} - -// AddOutgoingPeer indicates an expected call of AddOutgoingPeer -func (mr *MockHostMockRecorder) AddOutgoingPeer(groups, msg interface{}) *gomock.Call { - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddOutgoingPeer", reflect.TypeOf((*MockHost)(nil).AddOutgoingPeer), groups, msg) -} - -// ConnectHostPeer mocks base method -func (m *MockHost) ConnectHostPeer(peer p2p.Peer) { - m.ctrl.Call(m, "ConnectHostPeer", peer) -} - -// ConnectHostPeer indicates an expected call of ConnectHostPeer -func (mr *MockHostMockRecorder) ConnectHostPeer(groups, msg interface{}) *gomock.Call { - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ConnectHostPeer", reflect.TypeOf((*MockHost)(nil).ConnectHostPeer), groups, msg) -} diff --git a/p2p/mock_stream.go b/p2p/mock_stream.go index 27ce7fac5..b4446aa3a 100644 --- a/p2p/mock_stream.go +++ b/p2p/mock_stream.go @@ -1,14 +1,13 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: ./p2p/stream.go +// Source: stream.go // Package p2p is a generated GoMock package. package p2p import ( + gomock "github.com/golang/mock/gomock" reflect "reflect" time "time" - - gomock "github.com/golang/mock/gomock" ) // MockStream is a mock of Stream interface