You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

115 lines
3.9 KiB

3 years ago
Redo coordinator structure, connect API to node - API: - Modify the constructor so that hardcoded rollup constants don't need to be passed (introduce a `Config` and use `configAPI` internally) - Common: - Update rollup constants with proper *big.Int when required - Add BidCoordinator and Slot structs used by the HistoryDB and Synchronizer. - Add helper methods to AuctionConstants - AuctionVariables: Add column `DefaultSlotSetBidSlotNum` (in the SQL table: `default_slot_set_bid_slot_num`), which indicates at which slotNum does the `DefaultSlotSetBid` specified starts applying. - Config: - Move coordinator exclusive configuration from the node config to the coordinator config - Coordinator: - Reorganize the code towards having the goroutines started and stopped from the coordinator itself instead of the node. - Remove all stop and stopped channels, and use context.Context and sync.WaitGroup instead. - Remove BatchInfo setters and assing variables directly - In ServerProof and ServerProofPool use context instead stop channel. - Use message passing to notify the coordinator about sync updates and reorgs - Introduce the Pipeline, which can be started and stopped by the Coordinator - Introduce the TxManager, which manages ethereum transactions (the TxManager is also in charge of making the forge call to the rollup smart contract). The TxManager keeps ethereum transactions and: 1. Waits for the transaction to be accepted 2. Waits for the transaction to be confirmed for N blocks - In forge logic, first prepare a batch and then wait for an available server proof to have all work ready once the proof server is ready. - Remove the `isForgeSequence` method which was querying the smart contract, and instead use notifications sent by the Synchronizer to figure out if it's forging time. - Update test (which is a minimal test to manually see if the coordinator starts) - HistoryDB: - Add method to get the number of batches in a slot (used to detect when a slot has passed the bid winner forging deadline) - Add method to get the best bid and associated coordinator of a slot (used to detect the forgerAddress that can forge the slot) - General: - Rename some instances of `currentBlock` to `lastBlock` to be more clear. - Node: - Connect the API to the node and call the methods to update cached state when the sync advances blocks. - Call methods to update Coordinator state when the sync advances blocks and finds reorgs. - Synchronizer: - Add Auction field in the Stats, which contain the current slot with info about highest bidder and other related info required to know who can forge in the current block. - Better organization of cached state: - On Sync, update the internal cached state - On Init or Reorg, load the state from HistoryDB into the internal cached state.
4 years ago
Redo coordinator structure, connect API to node - API: - Modify the constructor so that hardcoded rollup constants don't need to be passed (introduce a `Config` and use `configAPI` internally) - Common: - Update rollup constants with proper *big.Int when required - Add BidCoordinator and Slot structs used by the HistoryDB and Synchronizer. - Add helper methods to AuctionConstants - AuctionVariables: Add column `DefaultSlotSetBidSlotNum` (in the SQL table: `default_slot_set_bid_slot_num`), which indicates at which slotNum does the `DefaultSlotSetBid` specified starts applying. - Config: - Move coordinator exclusive configuration from the node config to the coordinator config - Coordinator: - Reorganize the code towards having the goroutines started and stopped from the coordinator itself instead of the node. - Remove all stop and stopped channels, and use context.Context and sync.WaitGroup instead. - Remove BatchInfo setters and assing variables directly - In ServerProof and ServerProofPool use context instead stop channel. - Use message passing to notify the coordinator about sync updates and reorgs - Introduce the Pipeline, which can be started and stopped by the Coordinator - Introduce the TxManager, which manages ethereum transactions (the TxManager is also in charge of making the forge call to the rollup smart contract). The TxManager keeps ethereum transactions and: 1. Waits for the transaction to be accepted 2. Waits for the transaction to be confirmed for N blocks - In forge logic, first prepare a batch and then wait for an available server proof to have all work ready once the proof server is ready. - Remove the `isForgeSequence` method which was querying the smart contract, and instead use notifications sent by the Synchronizer to figure out if it's forging time. - Update test (which is a minimal test to manually see if the coordinator starts) - HistoryDB: - Add method to get the number of batches in a slot (used to detect when a slot has passed the bid winner forging deadline) - Add method to get the best bid and associated coordinator of a slot (used to detect the forgerAddress that can forge the slot) - General: - Rename some instances of `currentBlock` to `lastBlock` to be more clear. - Node: - Connect the API to the node and call the methods to update cached state when the sync advances blocks. - Call methods to update Coordinator state when the sync advances blocks and finds reorgs. - Synchronizer: - Add Auction field in the Stats, which contain the current slot with info about highest bidder and other related info required to know who can forge in the current block. - Better organization of cached state: - On Sync, update the internal cached state - On Init or Reorg, load the state from HistoryDB into the internal cached state.
4 years ago
  1. package common
  2. import (
  3. "encoding/binary"
  4. "fmt"
  5. "math/big"
  6. ethCommon "github.com/ethereum/go-ethereum/common"
  7. "github.com/hermeznetwork/tracerr"
  8. )
  9. const batchNumBytesLen = 8
  10. // Batch is a struct that represents Hermez network batch
  11. type Batch struct {
  12. BatchNum BatchNum `meddler:"batch_num"`
  13. EthBlockNum int64 `meddler:"eth_block_num"` // Ethereum block in which the batch is forged
  14. ForgerAddr ethCommon.Address `meddler:"forger_addr"`
  15. CollectedFees map[TokenID]*big.Int `meddler:"fees_collected,json"`
  16. FeeIdxsCoordinator []Idx `meddler:"fee_idxs_coordinator,json"`
  17. StateRoot *big.Int `meddler:"state_root,bigint"`
  18. NumAccounts int `meddler:"num_accounts"`
  19. LastIdx int64 `meddler:"last_idx"`
  20. ExitRoot *big.Int `meddler:"exit_root,bigint"`
  21. ForgeL1TxsNum *int64 `meddler:"forge_l1_txs_num"` // optional, Only when the batch forges L1 txs. Identifier that corresponds to the group of L1 txs forged in the current batch.
  22. SlotNum int64 `meddler:"slot_num"` // Slot in which the batch is forged
  23. TotalFeesUSD *float64 `meddler:"total_fees_usd"`
  24. }
  25. // NewEmptyBatch creates a new empty batch
  26. func NewEmptyBatch() *Batch {
  27. return &Batch{
  28. BatchNum: 0,
  29. EthBlockNum: 0,
  30. ForgerAddr: ethCommon.Address{},
  31. CollectedFees: make(map[TokenID]*big.Int),
  32. FeeIdxsCoordinator: make([]Idx, 0),
  33. StateRoot: big.NewInt(0),
  34. NumAccounts: 0,
  35. LastIdx: 0,
  36. ExitRoot: big.NewInt(0),
  37. ForgeL1TxsNum: nil,
  38. SlotNum: 0,
  39. TotalFeesUSD: nil,
  40. }
  41. }
  42. // BatchNum identifies a batch
  43. type BatchNum int64
  44. // Bytes returns a byte array of length 4 representing the BatchNum
  45. func (bn BatchNum) Bytes() []byte {
  46. var batchNumBytes [batchNumBytesLen]byte
  47. binary.BigEndian.PutUint64(batchNumBytes[:], uint64(bn))
  48. return batchNumBytes[:]
  49. }
  50. // BigInt returns a *big.Int representing the BatchNum
  51. func (bn BatchNum) BigInt() *big.Int {
  52. return big.NewInt(int64(bn))
  53. }
  54. // BatchNumFromBytes returns BatchNum from a []byte
  55. func BatchNumFromBytes(b []byte) (BatchNum, error) {
  56. if len(b) != batchNumBytesLen {
  57. return 0, tracerr.Wrap(fmt.Errorf("can not parse BatchNumFromBytes, bytes len %d, expected %d", len(b), batchNumBytesLen))
  58. }
  59. batchNum := binary.BigEndian.Uint64(b[:batchNumBytesLen])
  60. return BatchNum(batchNum), nil
  61. }
  62. // BatchData contains the information of a Batch
  63. type BatchData struct {
  64. L1Batch bool // TODO: Remove once Batch.ForgeL1TxsNum is a pointer
  65. // L1UserTxs that were forged in the batch
  66. L1UserTxs []L1Tx
  67. L1CoordinatorTxs []L1Tx
  68. L2Txs []L2Tx
  69. CreatedAccounts []Account
  70. ExitTree []ExitInfo
  71. Batch Batch
  72. }
  73. // NewBatchData creates an empty BatchData with the slices initialized.
  74. func NewBatchData() *BatchData {
  75. return &BatchData{
  76. L1Batch: false,
  77. // L1UserTxs: make([]common.L1Tx, 0),
  78. L1CoordinatorTxs: make([]L1Tx, 0),
  79. L2Txs: make([]L2Tx, 0),
  80. CreatedAccounts: make([]Account, 0),
  81. ExitTree: make([]ExitInfo, 0),
  82. Batch: Batch{},
  83. }
  84. }
  85. // BatchSync is a subset of Batch that contains fileds needed for the
  86. // synchronizer and coordinator
  87. // type BatchSync struct {
  88. // BatchNum BatchNum `meddler:"batch_num"`
  89. // EthBlockNum int64 `meddler:"eth_block_num"` // Ethereum block in which the batch is forged
  90. // ForgerAddr ethCommon.Address `meddler:"forger_addr"`
  91. // StateRoot *big.Int `meddler:"state_root,bigint"`
  92. // SlotNum int64 `meddler:"slot_num"` // Slot in which the batch is forged
  93. // }
  94. //
  95. // func NewBatchSync() *BatchSync {
  96. // return &BatchSync{
  97. // BatchNum: 0,
  98. // EthBlockNum: 0,
  99. // ForgerAddr: ethCommon.Address,
  100. // StateRoot: big.NewInt(0),
  101. // SlotNum: 0,
  102. // }
  103. // }