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.

101 lines
2.5 KiB

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.
3 years ago
Update coordinator, call all api update functions - Common: - Rename Block.EthBlockNum to Block.Num to avoid unneeded repetition - API: - Add UpdateNetworkInfoBlock to update just block information, to be used when the node is not yet synchronized - Node: - Call API.UpdateMetrics and UpdateRecommendedFee in a loop, with configurable time intervals - Synchronizer: - When mapping events by TxHash, use an array to support the possibility of multiple calls of the same function happening in the same transaction (for example, a smart contract in a single transaction could call withdraw with delay twice, which would generate 2 withdraw events, and 2 deposit events). - In Stats, keep entire LastBlock instead of just the blockNum - In Stats, add lastL1BatchBlock - Test Stats and SCVars - Coordinator: - Enable writing the BatchInfo in every step of the pipeline to disk (with JSON text files) for debugging purposes. - Move the Pipeline functionality from the Coordinator to its own struct (Pipeline) - Implement shouldL1lL2Batch - In TxManager, implement logic to perform several attempts when doing ethereum node RPC calls before considering the error. (Both for calls to forgeBatch and transaction receipt) - In TxManager, reorganize the flow and note the specific points in which actions are made when err != nil - HistoryDB: - Implement GetLastL1BatchBlockNum: returns the blockNum of the latest forged l1Batch, to help the coordinator decide when to forge an L1Batch. - EthereumClient and test.Client: - Update EthBlockByNumber to return the last block when the passed number is -1.
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.
3 years ago
  1. [API]
  2. Address = "localhost:8086"
  3. Explorer = true
  4. UpdateMetricsInterval = "10s"
  5. UpdateRecommendedFeeInterval = "10s"
  6. MaxSQLConnections = 100
  7. SQLConnectionTimeout = "2s"
  8. [PriceUpdater]
  9. Interval = "10s"
  10. URL = "https://api-pub.bitfinex.com/v2/"
  11. Type = "bitfinexV2"
  12. [Debug]
  13. APIAddress = "localhost:12345"
  14. MeddlerLogs = true
  15. [StateDB]
  16. Path = "/tmp/iden3-test/hermez/statedb"
  17. Keep = 256
  18. [PostgreSQL]
  19. Port = 5432
  20. Host = "localhost"
  21. User = "hermez"
  22. Password = "yourpasswordhere"
  23. Name = "hermez"
  24. [Web3]
  25. URL = "http://localhost:8545"
  26. [Synchronizer]
  27. SyncLoopInterval = "1s"
  28. StatsRefreshPeriod = "1s"
  29. [SmartContracts]
  30. Rollup = "0x8EEaea23686c319133a7cC110b840d1591d9AeE0"
  31. Auction = "0x317113D2593e3efF1FfAE0ba2fF7A61861Df7ae5"
  32. WDelayer = "0x5E0816F0f8bC560cB2B9e9C87187BeCac8c2021F"
  33. TokenHEZ = "0x5D94e3e7aeC542aB0F9129B9a7BAdeb5B3Ca0f77"
  34. TokenHEZName = "Hermez Network Token"
  35. [Coordinator]
  36. # ForgerAddress = "0x05c23b938a85ab26A36E6314a0D02080E9ca6BeD" # Non-Boot Coordinator
  37. # ForgerAddressPrivateKey = "0x30f5fddb34cd4166adb2c6003fa6b18f380fd2341376be42cf1c7937004ac7a3"
  38. ForgerAddress = "0xb4124ceb3451635dacedd11767f004d8a28c6ee7" # Boot Coordinator
  39. # ForgerAddressPrivateKey = "0xa8a54b2d8197bc0b19bb8a084031be71835580a01e70a45a13babd16c9bc1563"
  40. ConfirmBlocks = 10
  41. L1BatchTimeoutPerc = 0.999
  42. ProofServerPollInterval = "1s"
  43. ForgeRetryInterval = "500ms"
  44. SyncRetryInterval = "1s"
  45. [Coordinator.FeeAccount]
  46. Address = "0x56232B1c5B10038125Bc7345664B4AFD745bcF8E"
  47. # PrivateKey = "0x3a9270c020e169097808da4b02e8d9100be0f8a38cfad3dcfc0b398076381fdd"
  48. BJJ = "0x1b176232f78ba0d388ecc5f4896eca2d3b3d4f272092469f559247297f5c0c13"
  49. # BJJPrivateKey = "0xb556862fb60e7cf4c0a8a7f44baf2ab06a4c90ac39decc4eef363b6142d07a34"
  50. [Coordinator.L2DB]
  51. SafetyPeriod = 10
  52. MaxTxs = 512
  53. TTL = "24h"
  54. PurgeBatchDelay = 10
  55. InvalidateBatchDelay = 20
  56. PurgeBlockDelay = 10
  57. InvalidateBlockDelay = 20
  58. [Coordinator.TxSelector]
  59. Path = "/tmp/iden3-test/hermez/txselector"
  60. [Coordinator.BatchBuilder]
  61. Path = "/tmp/iden3-test/hermez/batchbuilder"
  62. [[Coordinator.ServerProofs]]
  63. URL = "http://localhost:3000/api"
  64. [Coordinator.Circuit]
  65. MaxTx = 512
  66. NLevels = 32
  67. [Coordinator.EthClient]
  68. ReceiptTimeout = "60s"
  69. ReceiptLoopInterval = "500ms"
  70. CheckLoopInterval = "500ms"
  71. Attempts = 4
  72. AttemptsDelay = "500ms"
  73. CallGasLimit = 300000
  74. GasPriceDiv = 100
  75. [Coordinator.EthClient.Keystore]
  76. Path = "/tmp/iden3-test/hermez/ethkeystore"
  77. Password = "yourpasswordhere"
  78. [Coordinator.API]
  79. Coordinator = true
  80. [Coordinator.Debug]
  81. BatchPath = "/tmp/iden3-test/hermez/batchesdebug"
  82. LightScrypt = true
  83. # RollupVerifierIndex = 0