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.
4 years ago |
|
package api
import ( "math/big" "testing"
"github.com/hermeznetwork/hermez-node/apitypes" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/db/historydb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" )
type testStatus struct { Network testNetwork `json:"network"` Metrics historydb.Metrics `json:"metrics"` Rollup historydb.RollupVariablesAPI `json:"rollup"` Auction historydb.AuctionVariablesAPI `json:"auction"` WithdrawalDelayer common.WDelayerVariables `json:"withdrawalDelayer"` RecommendedFee common.RecommendedFee `json:"recommendedFee"` }
type testNetwork struct { LastEthBlock int64 `json:"lastEthereumBlock"` LastSyncBlock int64 `json:"lastSynchedBlock"` LastBatch testBatch `json:"lastBatch"` CurrentSlot int64 `json:"currentSlot"` NextForgers []historydb.NextForger `json:"nextForgers"` }
func TestSetRollupVariables(t *testing.T) { api.h.SetRollupVariables(&tc.rollupVars) ni, err := api.h.GetNodeInfoAPI() assert.NoError(t, err) assertEqualRollupVariables(t, tc.rollupVars, ni.APIState.Rollup, true) }
func assertEqualRollupVariables(t *testing.T, rollupVariables common.RollupVariables, apiVariables historydb.RollupVariablesAPI, checkBuckets bool) { assert.Equal(t, apitypes.NewBigIntStr(rollupVariables.FeeAddToken), apiVariables.FeeAddToken) assert.Equal(t, rollupVariables.ForgeL1L2BatchTimeout, apiVariables.ForgeL1L2BatchTimeout) assert.Equal(t, rollupVariables.WithdrawalDelay, apiVariables.WithdrawalDelay) assert.Equal(t, rollupVariables.SafeMode, apiVariables.SafeMode) if checkBuckets { for i, bucket := range rollupVariables.Buckets { assert.Equal(t, apitypes.NewBigIntStr(bucket.BlockWithdrawalRate), apiVariables.Buckets[i].BlockWithdrawalRate) assert.Equal(t, apitypes.NewBigIntStr(bucket.CeilUSD), apiVariables.Buckets[i].CeilUSD) assert.Equal(t, apitypes.NewBigIntStr(bucket.MaxWithdrawals), apiVariables.Buckets[i].MaxWithdrawals) assert.Equal(t, apitypes.NewBigIntStr(bucket.Withdrawals), apiVariables.Buckets[i].Withdrawals) } } }
func TestSetWDelayerVariables(t *testing.T) { api.h.SetWDelayerVariables(&tc.wdelayerVars) ni, err := api.h.GetNodeInfoAPI() assert.NoError(t, err) assert.Equal(t, tc.wdelayerVars, ni.APIState.WithdrawalDelayer) }
func TestSetAuctionVariables(t *testing.T) { api.h.SetAuctionVariables(&tc.auctionVars) ni, err := api.h.GetNodeInfoAPI() assert.NoError(t, err) assertEqualAuctionVariables(t, tc.auctionVars, ni.APIState.Auction) }
func assertEqualAuctionVariables(t *testing.T, auctionVariables common.AuctionVariables, apiVariables historydb.AuctionVariablesAPI) { assert.Equal(t, auctionVariables.EthBlockNum, apiVariables.EthBlockNum) assert.Equal(t, auctionVariables.DonationAddress, apiVariables.DonationAddress) assert.Equal(t, auctionVariables.BootCoordinator, apiVariables.BootCoordinator) assert.Equal(t, auctionVariables.BootCoordinatorURL, apiVariables.BootCoordinatorURL) assert.Equal(t, auctionVariables.DefaultSlotSetBidSlotNum, apiVariables.DefaultSlotSetBidSlotNum) assert.Equal(t, auctionVariables.ClosedAuctionSlots, apiVariables.ClosedAuctionSlots) assert.Equal(t, auctionVariables.OpenAuctionSlots, apiVariables.OpenAuctionSlots) assert.Equal(t, auctionVariables.Outbidding, apiVariables.Outbidding) assert.Equal(t, auctionVariables.SlotDeadline, apiVariables.SlotDeadline)
for i, slot := range auctionVariables.DefaultSlotSetBid { assert.Equal(t, apitypes.NewBigIntStr(slot), apiVariables.DefaultSlotSetBid[i]) }
for i, ratio := range auctionVariables.AllocationRatio { assert.Equal(t, ratio, apiVariables.AllocationRatio[i]) } }
func TestUpdateNetworkInfo(t *testing.T) { lastBlock := tc.blocks[3] lastBatchNum := common.BatchNum(3) currentSlotNum := int64(1)
// Generate some bucket_update data
bucketUpdates := []common.BucketUpdate{ { EthBlockNum: 4, NumBucket: 0, BlockStamp: 4, Withdrawals: big.NewInt(123), }, { EthBlockNum: 5, NumBucket: 2, BlockStamp: 5, Withdrawals: big.NewInt(42), }, { EthBlockNum: 5, NumBucket: 2, // Repeated bucket
BlockStamp: 5, Withdrawals: big.NewInt(43), }, } err := api.h.AddBucketUpdatesTest(api.h.DB(), bucketUpdates) require.NoError(t, err)
err = api.h.UpdateNetworkInfo(lastBlock, lastBlock, lastBatchNum, currentSlotNum) assert.NoError(t, err) ni, err := api.h.GetNodeInfoAPI() assert.NoError(t, err) assert.Equal(t, lastBlock.Num, ni.APIState.Network.LastSyncBlock) assert.Equal(t, lastBatchNum, ni.APIState.Network.LastBatch.BatchNum) assert.Equal(t, currentSlotNum, ni.APIState.Network.CurrentSlot) assert.Equal(t, int(ni.APIState.Auction.ClosedAuctionSlots)+1, len(ni.APIState.Network.NextForgers)) assert.Equal(t, ni.APIState.Rollup.Buckets[0].Withdrawals, apitypes.NewBigIntStr(big.NewInt(123))) assert.Equal(t, ni.APIState.Rollup.Buckets[2].Withdrawals, apitypes.NewBigIntStr(big.NewInt(43))) }
func TestUpdateMetrics(t *testing.T) { // Update Metrics needs api.status.Network.LastBatch.BatchNum to be updated
lastBlock := tc.blocks[3] lastBatchNum := common.BatchNum(12) currentSlotNum := int64(1) err := api.h.UpdateNetworkInfo(lastBlock, lastBlock, lastBatchNum, currentSlotNum) assert.NoError(t, err)
err = api.h.UpdateMetrics() assert.NoError(t, err) ni, err := api.h.GetNodeInfoAPI() assert.NoError(t, err) assert.Greater(t, ni.APIState.Metrics.TransactionsPerBatch, float64(0)) assert.Greater(t, ni.APIState.Metrics.BatchFrequency, float64(0)) assert.Greater(t, ni.APIState.Metrics.TransactionsPerSecond, float64(0)) assert.Greater(t, ni.APIState.Metrics.TotalAccounts, int64(0)) assert.Greater(t, ni.APIState.Metrics.TotalBJJs, int64(0)) assert.Greater(t, ni.APIState.Metrics.AvgTransactionFee, float64(0)) }
func TestUpdateRecommendedFee(t *testing.T) { err := api.h.UpdateRecommendedFee() assert.NoError(t, err) var minFeeUSD float64 if api.l2 != nil { minFeeUSD = api.l2.MinFeeUSD() } ni, err := api.h.GetNodeInfoAPI() assert.NoError(t, err) assert.Greater(t, ni.APIState.RecommendedFee.ExistingAccount, minFeeUSD) // assert.Equal(t, ni.StateAPI.RecommendedFee.CreatesAccount,
// ni.StateAPI.RecommendedFee.ExistingAccount*createAccountExtraFeePercentage)
// assert.Equal(t, ni.StateAPI.RecommendedFee.CreatesAccountAndRegister,
// ni.StateAPI.RecommendedFee.ExistingAccount*createAccountInternalExtraFeePercentage)
}
func TestGetState(t *testing.T) { lastBlock := tc.blocks[3] lastBatchNum := common.BatchNum(12) currentSlotNum := int64(1) api.h.SetRollupVariables(&tc.rollupVars) api.h.SetWDelayerVariables(&tc.wdelayerVars) api.h.SetAuctionVariables(&tc.auctionVars) err := api.h.UpdateNetworkInfo(lastBlock, lastBlock, lastBatchNum, currentSlotNum) assert.NoError(t, err) err = api.h.UpdateMetrics() assert.NoError(t, err) err = api.h.UpdateRecommendedFee() assert.NoError(t, err)
endpoint := apiURL + "state" var status testStatus
assert.NoError(t, doGoodReq("GET", endpoint, nil, &status))
// SC vars
// UpdateNetworkInfo will overwrite buckets withdrawal values
// So they won't be checked here, they are checked at
// TestUpdateNetworkInfo
assertEqualRollupVariables(t, tc.rollupVars, status.Rollup, false) assertEqualAuctionVariables(t, tc.auctionVars, status.Auction) assert.Equal(t, tc.wdelayerVars, status.WithdrawalDelayer) // Network
assert.Equal(t, lastBlock.Num, status.Network.LastEthBlock) assert.Equal(t, lastBlock.Num, status.Network.LastSyncBlock) // TODO: assert all the batch, not just the batch num
assert.Equal(t, lastBatchNum, status.Network.LastBatch.BatchNum) assert.Equal(t, currentSlotNum, status.Network.CurrentSlot) assertNextForgers(t, tc.nextForgers, status.Network.NextForgers) // Metrics
// TODO: perform real asserts (not just greater than 0)
assert.Greater(t, status.Metrics.TransactionsPerBatch, float64(0)) assert.Greater(t, status.Metrics.BatchFrequency, float64(0)) assert.Greater(t, status.Metrics.TransactionsPerSecond, float64(0)) assert.Greater(t, status.Metrics.TotalAccounts, int64(0)) assert.Greater(t, status.Metrics.TotalBJJs, int64(0)) assert.Greater(t, status.Metrics.AvgTransactionFee, float64(0)) // Recommended fee
// TODO: perform real asserts (not just greater than 0)
assert.Greater(t, status.RecommendedFee.ExistingAccount, float64(0)) // assert.Equal(t, status.RecommendedFee.CreatesAccount,
// status.RecommendedFee.ExistingAccount*createAccountExtraFeePercentage)
// assert.Equal(t, status.RecommendedFee.CreatesAccountAndRegister,
// status.RecommendedFee.ExistingAccount*createAccountInternalExtraFeePercentage)
}
func assertNextForgers(t *testing.T, expected, actual []historydb.NextForger) { assert.Equal(t, len(expected), len(actual)) for i := range expected { // ignore timestamps and other metadata
actual[i].Period.FromTimestamp = expected[i].Period.FromTimestamp actual[i].Period.ToTimestamp = expected[i].Period.ToTimestamp actual[i].Coordinator.ItemID = expected[i].Coordinator.ItemID actual[i].Coordinator.EthBlockNum = expected[i].Coordinator.EthBlockNum assert.Equal(t, expected[i], actual[i]) } }
|