mirror of
https://github.com/arnaucube/hermez-node.git
synced 2026-02-07 03:16:45 +01:00
Fix conflicts and update dependencies of ethclient
This commit is contained in:
@@ -9,7 +9,7 @@ import (
|
||||
// Bid is a struct that represents one bid in the PoH
|
||||
type Bid struct {
|
||||
SlotNum SlotNum `meddler:"slot_num"`
|
||||
ForgerAddr ethCommon.Address `meddler:"forger_addr"` // Coordinator reference
|
||||
BidValue *big.Int `meddler:"bid_value,bigint"`
|
||||
EthBlockNum int64 `meddler:"eth_block_num"`
|
||||
Bidder ethCommon.Address `meddler:"bidder_addr"` // Coordinator reference
|
||||
}
|
||||
|
||||
@@ -7,8 +7,8 @@ import (
|
||||
// Coordinator represents a Hermez network coordinator who wins an auction for an specific slot
|
||||
// WARNING: this is strongly based on the previous implementation, once the new spec is done, this may change a lot.
|
||||
type Coordinator struct {
|
||||
Forger ethCommon.Address `meddler:"forger_addr"` // address of the forger
|
||||
EthBlockNum int64 `meddler:"eth_block_num"` // block in which the coordinator was registered
|
||||
WithdrawAddr ethCommon.Address `meddler:"withdraw_addr"` // address of the withdraw
|
||||
URL string `meddler:"url"` // URL of the coordinators API
|
||||
Bidder ethCommon.Address `meddler:"bidder_addr"` // address of the bidder
|
||||
Forger ethCommon.Address `meddler:"forger_addr"` // address of the forger
|
||||
EthBlockNum int64 `meddler:"eth_block_num"` // block in which the coordinator was registered
|
||||
URL string `meddler:"url"` // URL of the coordinators API
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user