arnaucube/hermez-node
1
0
Fork 0
mirror of https://github.com/arnaucube/hermez-node.git synced 2026-02-07 03:16:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #262 from hermeznetwork/feature/api-checks

Browse Source 
ItemID to uint64 & check timestamp
This commit is contained in:
Toni Ramírez
2020-11-06 11:45:14 +01:00
committed by GitHub
parent 3591e3c2a2 22f0a45118
commit f662beb2ea
14 changed files with 105 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/account_test.go
View File

@@ -14,7 +14,7 @@ import (
) )
type testAccount struct { type testAccount struct {
ItemID int `json:"itemId"` ItemID uint64 `json:"itemId"`
Idx apitypes.HezIdx `json:"accountIndex"` Idx apitypes.HezIdx `json:"accountIndex"`
BatchNum common.BatchNum `json:"batchNum"` BatchNum common.BatchNum `json:"batchNum"`
PublicKey apitypes.HezBJJ `json:"bjj"` PublicKey apitypes.HezBJJ `json:"bjj"`
@@ -34,7 +34,7 @@ func genTestAccounts(accounts []common.Account, tokens []historydb.TokenWithUSD)
for x, account := range accounts { for x, account := range accounts {
token := getTokenByID(account.TokenID, tokens) token := getTokenByID(account.TokenID, tokens)
tAccount := testAccount{ tAccount := testAccount{
ItemID: x + 1, ItemID: uint64(x + 1),
Idx: apitypes.HezIdx(idxToHez(account.Idx, token.Symbol)), Idx: apitypes.HezIdx(idxToHez(account.Idx, token.Symbol)),
PublicKey: apitypes.NewHezBJJ(account.PublicKey), PublicKey: apitypes.NewHezBJJ(account.PublicKey),
EthAddr: apitypes.NewHezEthAddr(account.EthAddr), EthAddr: apitypes.NewHezEthAddr(account.EthAddr),

4
api/api_test.go
View File

@@ -364,13 +364,13 @@ func doGoodReqPaginated(
if pag.LastReturnedItem == pag.LastItem { // No if pag.LastReturnedItem == pag.LastItem { // No
break break
} else { // Yes } else { // Yes
next = pag.LastReturnedItem + 1 next = int(pag.LastReturnedItem + 1)
} }
} else { } else {
if pag.FirstReturnedItem == pag.FirstItem { // No if pag.FirstReturnedItem == pag.FirstItem { // No
break break
} else { // Yes } else { // Yes
next = pag.FirstReturnedItem - 1 next = int(pag.FirstReturnedItem - 1)
} }
} }
} }

2
api/batch_test.go
View File

@@ -15,7 +15,7 @@ import (
) )
type testBatch struct { type testBatch struct {
ItemID int `json:"itemId"` ItemID uint64 `json:"itemId"`
BatchNum common.BatchNum `json:"batchNum"` BatchNum common.BatchNum `json:"batchNum"`
EthBlockNum int64 `json:"ethereumBlockNum"` EthBlockNum int64 `json:"ethereumBlockNum"`
EthBlockHash ethCommon.Hash `json:"ethereumBlockHash"` EthBlockHash ethCommon.Hash `json:"ethereumBlockHash"`

2
api/bids_test.go
View File

@@ -14,7 +14,7 @@ import (
) )
type testBid struct { type testBid struct {
ItemID int `json:"itemId"` ItemID uint64 `json:"itemId"`
SlotNum int64 `json:"slotNum"` SlotNum int64 `json:"slotNum"`
BidValue string `json:"bidValue"` BidValue string `json:"bidValue"`
EthBlockNum int64 `json:"ethereumBlockNum"` EthBlockNum int64 `json:"ethereumBlockNum"`

2
api/exits_test.go
View File

@@ -24,7 +24,7 @@ type testCVP struct {
} }
type testExit struct { type testExit struct {
ItemID int `json:"itemId"` ItemID uint64 `json:"itemId"`
BatchNum common.BatchNum `json:"batchNum"` BatchNum common.BatchNum `json:"batchNum"`
AccountIdx string `json:"accountIndex"` AccountIdx string `json:"accountIndex"`
MerkleProof testCVP `json:"merkleProof"` MerkleProof testCVP `json:"merkleProof"`

36
api/slots.go
View File

@@ -13,15 +13,15 @@ import (
// SlotAPI is a repesentation of a slot information // SlotAPI is a repesentation of a slot information
type SlotAPI struct { type SlotAPI struct {
ItemID int `json:"itemId"` ItemID uint64 `json:"itemId"`
SlotNum int64 `json:"slotNum"` SlotNum int64 `json:"slotNum"`
FirstBlock int64 `json:"firstBlock"` FirstBlock int64 `json:"firstBlock"`
LastBlock int64 `json:"lastBlock"` LastBlock int64 `json:"lastBlock"`
OpenAuction bool `json:"openAuction"` OpenAuction bool `json:"openAuction"`
WinnerBid *historydb.BidAPI `json:"winnerBid"` WinnerBid *historydb.BidAPI `json:"winnerBid"`
TotalItems int `json:"-"` TotalItems uint64 `json:"-"`
FirstItem int `json:"-"` FirstItem uint64 `json:"-"`
LastItem int `json:"-"` LastItem uint64 `json:"-"`
} }
func getFirstLastBlock(slotNum int64) (int64, int64) { func getFirstLastBlock(slotNum int64) (int64, int64) {
@@ -49,14 +49,14 @@ func isOpenAuction(currentBlock, slotNum int64, auctionVars common.AuctionVariab
return false return false
} }
func getPagination(totalItems int, minSlotNum, maxSlotNum *int64) *db.Pagination { func getPagination(totalItems uint64, minSlotNum, maxSlotNum *int64) *db.Pagination {
// itemID is slotNum // itemID is slotNum
firstItem := *minSlotNum firstItem := *minSlotNum
lastItem := *maxSlotNum lastItem := *maxSlotNum
pagination := &db.Pagination{ pagination := &db.Pagination{
TotalItems: int(totalItems), TotalItems: totalItems,
FirstItem: int(firstItem), FirstItem: uint64(firstItem),
LastItem: int(lastItem), LastItem: uint64(lastItem),
} }
return pagination return pagination
} }
@@ -65,7 +65,7 @@ func newSlotAPI(slotNum, currentBlockNum int64, bid *historydb.BidAPI, auctionVa
firstBlock, lastBlock := getFirstLastBlock(slotNum) firstBlock, lastBlock := getFirstLastBlock(slotNum)
openAuction := isOpenAuction(currentBlockNum, slotNum, *auctionVars) openAuction := isOpenAuction(currentBlockNum, slotNum, *auctionVars)
slot := SlotAPI{ slot := SlotAPI{
ItemID: int(slotNum), ItemID: uint64(slotNum),
SlotNum: slotNum, SlotNum: slotNum,
FirstBlock: firstBlock, FirstBlock: firstBlock,
LastBlock: lastBlock, LastBlock: lastBlock,
@@ -80,11 +80,11 @@ func newSlotsAPIFromWinnerBids(fromItem *uint, order string, bids []historydb.Bi
slotNum := bids[i].SlotNum slotNum := bids[i].SlotNum
slot := newSlotAPI(slotNum, currentBlockNum, &bids[i], auctionVars) slot := newSlotAPI(slotNum, currentBlockNum, &bids[i], auctionVars)
if order == historydb.OrderAsc { if order == historydb.OrderAsc {
if slot.ItemID >= int(*fromItem) { if slot.ItemID >= uint64(*fromItem) {
slots = append(slots, slot) slots = append(slots, slot)
} }
} else { } else {
if slot.ItemID <= int(*fromItem) { if slot.ItemID <= uint64(*fromItem) {
slots = append(slots, slot) slots = append(slots, slot)
} }
} }
@@ -95,11 +95,11 @@ func newSlotsAPIFromWinnerBids(fromItem *uint, order string, bids []historydb.Bi
func addEmptySlot(slots []SlotAPI, slotNum int64, currentBlockNum int64, auctionVars *common.AuctionVariables, fromItem *uint, order string) ([]SlotAPI, error) { func addEmptySlot(slots []SlotAPI, slotNum int64, currentBlockNum int64, auctionVars *common.AuctionVariables, fromItem *uint, order string) ([]SlotAPI, error) {
emptySlot := newSlotAPI(slotNum, currentBlockNum, nil, auctionVars) emptySlot := newSlotAPI(slotNum, currentBlockNum, nil, auctionVars)
if order == historydb.OrderAsc { if order == historydb.OrderAsc {
if emptySlot.ItemID >= int(*fromItem) { if emptySlot.ItemID >= uint64(*fromItem) {
slots = append(slots, emptySlot) slots = append(slots, emptySlot)
} }
} else { } else {
if emptySlot.ItemID <= int(*fromItem) { if emptySlot.ItemID <= uint64(*fromItem) {
slots = append([]SlotAPI{emptySlot}, slots...) slots = append([]SlotAPI{emptySlot}, slots...)
} }
} }
@@ -263,7 +263,7 @@ func getSlots(c *gin.Context) {
var slotMinLim, slotMaxLim int64 var slotMinLim, slotMaxLim int64
var bids []historydb.BidAPI var bids []historydb.BidAPI
var pag *db.Pagination var pag *db.Pagination
totalItems := 0 totalItems := uint64(0)
if wonByEthereumAddress == nil { if wonByEthereumAddress == nil {
slotMinLim, slotMaxLim = getLimits(minSlotNum, maxSlotNum, fromItem, limit, order) slotMinLim, slotMaxLim = getLimits(minSlotNum, maxSlotNum, fromItem, limit, order)
// Get best bids in range maxSlotNum - minSlotNum // Get best bids in range maxSlotNum - minSlotNum
@@ -272,7 +272,7 @@ func getSlots(c *gin.Context) {
retSQLErr(err, c) retSQLErr(err, c)
return return
} }
totalItems = int(*maxSlotNum) - int(*minSlotNum) + 1 totalItems = uint64(*maxSlotNum) - uint64(*minSlotNum) + 1
} else { } else {
slotMinLim, slotMaxLim = getLimitsWithAddr(minSlotNum, maxSlotNum, fromItem, limit, order) slotMinLim, slotMaxLim = getLimitsWithAddr(minSlotNum, maxSlotNum, fromItem, limit, order)
bids, pag, err = h.GetBestBidsAPI(&slotMinLim, &slotMaxLim, wonByEthereumAddress, limit, order) bids, pag, err = h.GetBestBidsAPI(&slotMinLim, &slotMaxLim, wonByEthereumAddress, limit, order)
@@ -281,7 +281,7 @@ func getSlots(c *gin.Context) {
return return
} }
if len(bids) > 0 { if len(bids) > 0 {
totalItems = pag.TotalItems totalItems = uint64(pag.TotalItems)
*maxSlotNum = int64(pag.LastItem) *maxSlotNum = int64(pag.LastItem)
*minSlotNum = int64(pag.FirstItem) *minSlotNum = int64(pag.FirstItem)
} }
@@ -306,11 +306,11 @@ func getSlots(c *gin.Context) {
if slotsBids[j].SlotNum == i { if slotsBids[j].SlotNum == i {
found = true found = true
if order == historydb.OrderAsc { if order == historydb.OrderAsc {
if slotsBids[j].ItemID >= int(*fromItem) { if slotsBids[j].ItemID >= uint64(*fromItem) {
slots = append(slots, slotsBids[j]) slots = append(slots, slotsBids[j])
} }
} else { } else {
if slotsBids[j].ItemID <= int(*fromItem) { if slotsBids[j].ItemID <= uint64(*fromItem) {
slots = append([]SlotAPI{slotsBids[j]}, slots...) slots = append([]SlotAPI{slotsBids[j]}, slots...)
} }
} }

8
api/slots_test.go
View File

@@ -28,11 +28,11 @@ type testSlotsResponse struct {
func (t testSlotsResponse) GetPagination() *db.Pagination { func (t testSlotsResponse) GetPagination() *db.Pagination {
if t.Slots[0].ItemID < t.Slots[len(t.Slots)-1].ItemID { if t.Slots[0].ItemID < t.Slots[len(t.Slots)-1].ItemID {
t.Pagination.FirstReturnedItem = int(t.Slots[0].ItemID) t.Pagination.FirstReturnedItem = uint64(t.Slots[0].ItemID)
t.Pagination.LastReturnedItem = int(t.Slots[len(t.Slots)-1].ItemID) t.Pagination.LastReturnedItem = uint64(t.Slots[len(t.Slots)-1].ItemID)
} else { } else {
t.Pagination.LastReturnedItem = int(t.Slots[0].ItemID) t.Pagination.LastReturnedItem = uint64(t.Slots[0].ItemID)
t.Pagination.FirstReturnedItem = int(t.Slots[len(t.Slots)-1].ItemID) t.Pagination.FirstReturnedItem = uint64(t.Slots[len(t.Slots)-1].ItemID)
} }
return t.Pagination return t.Pagination
} }

8
api/swagger.yml
View File

@@ -2488,11 +2488,11 @@ components:
withdrawalDelay: withdrawalDelay:
allOf: allOf:
- $ref: '#/components/schemas/EthBlockNum' - $ref: '#/components/schemas/EthBlockNum'
- description: The time that anyone needs to wait until a withdrawal of the funds is allowed, in Ethereum blocks. - description: The time that anyone needs to wait until a withdrawal of the funds is allowed, in seconds.
- example: 539573849 - example: 539573849
emergencyModeStartingTime: emergencyModeStartingTime:
type: integer type: integer
description: Ethereum block in which the emergency mode will be activated. description: Second (since unix epoch) in which the emergency mode has been activated.
example: 10 example: 10
emergencyMode: emergencyMode:
type: boolean type: boolean
@@ -2716,11 +2716,11 @@ components:
properties: properties:
maxWithdrawalDelay: maxWithdrawalDelay:
type: integer type: integer
description: Maximum time delay in which the tokens can be locked in the contract. Time is measured in Ethereum blocks. description: Maximum time delay in which the tokens can be locked in the contract. Time is measured in seconds.
example: 200 example: 200
maxEmergencyModeTime: maxEmergencyModeTime:
type: integer type: integer
description: Maximum amount of time in which the contract can be in emergency mode. Time is measured in Ethereum blocks. description: Maximum amount of time in which the contract can be in emergency mode. Time is measured in seconds.
example: 2000 example: 2000
hermezRollup: hermezRollup:
allOf: allOf:

2
api/txshistory_test.go
View File

@@ -34,7 +34,7 @@ type testL2Info struct {
type testTx struct { type testTx struct {
IsL1 string `json:"L1orL2"` IsL1 string `json:"L1orL2"`
TxID common.TxID `json:"id"` TxID common.TxID `json:"id"`
ItemID int `json:"itemId"` ItemID uint64 `json:"itemId"`
Type common.TxType `json:"type"` Type common.TxType `json:"type"`
Position int `json:"position"` Position int `json:"position"`
FromIdx *string `json:"fromAccountIndex"` FromIdx *string `json:"fromAccountIndex"`

29
db/historydb/historydb_test.go
View File

@@ -6,6 +6,7 @@ import (
"math/big" "math/big"
"os" "os"
"testing" "testing"
"time"
ethCommon "github.com/ethereum/go-ethereum/common" ethCommon "github.com/ethereum/go-ethereum/common"
"github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/common"
@@ -55,6 +56,9 @@ func TestBlocks(t *testing.T) {
test.WipeDB(historyDB.DB()) test.WipeDB(historyDB.DB())
// Generate fake blocks // Generate fake blocks
blocks := test.GenBlocks(fromBlock, toBlock) blocks := test.GenBlocks(fromBlock, toBlock)
// Save timestamp of a block with UTC and change it without UTC
timestamp := time.Now().Add(time.Second * 13)
blocks[fromBlock].Timestamp = timestamp
// Insert blocks into DB // Insert blocks into DB
for i := 0; i < len(blocks); i++ { for i := 0; i < len(blocks); i++ {
err := historyDB.AddBlock(&blocks[i]) err := historyDB.AddBlock(&blocks[i])
@@ -68,6 +72,11 @@ func TestBlocks(t *testing.T) {
for i := range fetchedBlocks { for i := range fetchedBlocks {
assertEqualBlock(t, &blocks[i], &fetchedBlocks[i]) assertEqualBlock(t, &blocks[i], &fetchedBlocks[i])
} }
// Compare saved timestamp vs getted
nameZoneUTC, offsetUTC := timestamp.UTC().Zone()
zoneFetchedBlock, offsetFetchedBlock := fetchedBlocks[fromBlock].Timestamp.Zone()
assert.Equal(t, nameZoneUTC, zoneFetchedBlock)
assert.Equal(t, offsetUTC, offsetFetchedBlock)
// Get blocks from the DB one by one // Get blocks from the DB one by one
for i := fromBlock; i < toBlock; i++ { for i := fromBlock; i < toBlock; i++ {
fetchedBlock, err := historyDB.GetBlock(i) fetchedBlock, err := historyDB.GetBlock(i)
@@ -182,7 +191,7 @@ func TestTokens(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
tokens = append([]common.Token{ethToken}, tokens...) tokens = append([]common.Token{ethToken}, tokens...)
limit := uint(10) limit := uint(10)
// Fetch tokens6 // Fetch tokens
fetchedTokens, _, err := historyDB.GetTokens(nil, nil, "", nil, &limit, OrderAsc) fetchedTokens, _, err := historyDB.GetTokens(nil, nil, "", nil, &limit, OrderAsc)
assert.NoError(t, err) assert.NoError(t, err)
// Compare fetched tokens vs generated tokens // Compare fetched tokens vs generated tokens
@@ -196,6 +205,24 @@ func TestTokens(t *testing.T) {
assert.Nil(t, token.USD) assert.Nil(t, token.USD)
assert.Nil(t, token.USDUpdate) assert.Nil(t, token.USDUpdate)
} }
// Update token value
for i, token := range tokens {
value := 1.01 * float64(i)
assert.NoError(t, historyDB.UpdateTokenValue(token.Symbol, value))
}
// Fetch tokens
fetchedTokens, _, err = historyDB.GetTokens(nil, nil, "", nil, &limit, OrderAsc)
assert.NoError(t, err)
// Compare fetched tokens vs generated tokens
// All the tokens should have USDUpdate setted by the DB trigger
for i, token := range fetchedTokens {
value := 1.01 * float64(i)
assert.Equal(t, value, *token.USD)
nameZone, offset := token.USDUpdate.Zone()
assert.Equal(t, "UTC", nameZone)
assert.Equal(t, 0, offset)
}
} }
func TestAccounts(t *testing.T) { func TestAccounts(t *testing.T) {

60
db/historydb/views.go
View File

@@ -18,7 +18,7 @@ type TxAPI struct {
// Generic // Generic
IsL1 bool `meddler:"is_l1"` IsL1 bool `meddler:"is_l1"`
TxID common.TxID `meddler:"id"` TxID common.TxID `meddler:"id"`
ItemID int `meddler:"item_id"` ItemID uint64 `meddler:"item_id"`
Type common.TxType `meddler:"type"` Type common.TxType `meddler:"type"`
Position int `meddler:"position"` Position int `meddler:"position"`
FromIdx *apitypes.HezIdx `meddler:"from_idx"` FromIdx *apitypes.HezIdx `meddler:"from_idx"`
@@ -42,11 +42,11 @@ type TxAPI struct {
Nonce *common.Nonce `meddler:"nonce"` Nonce *common.Nonce `meddler:"nonce"`
// API extras // API extras
Timestamp time.Time `meddler:"timestamp,utctime"` Timestamp time.Time `meddler:"timestamp,utctime"`
TotalItems int `meddler:"total_items"` TotalItems uint64 `meddler:"total_items"`
FirstItem int `meddler:"first_item"` FirstItem uint64 `meddler:"first_item"`
LastItem int `meddler:"last_item"` LastItem uint64 `meddler:"last_item"`
TokenID common.TokenID `meddler:"token_id"` TokenID common.TokenID `meddler:"token_id"`
TokenItemID int `meddler:"token_item_id"` TokenItemID uint64 `meddler:"token_item_id"`
TokenEthBlockNum int64 `meddler:"token_block"` TokenEthBlockNum int64 `meddler:"token_block"`
TokenEthAddr ethCommon.Address `meddler:"eth_addr"` TokenEthAddr ethCommon.Address `meddler:"eth_addr"`
TokenName string `meddler:"name"` TokenName string `meddler:"name"`
@@ -137,7 +137,7 @@ type txWrite struct {
// TokenWithUSD add USD info to common.Token // TokenWithUSD add USD info to common.Token
type TokenWithUSD struct { type TokenWithUSD struct {
ItemID int `json:"itemId" meddler:"item_id"` ItemID uint64 `json:"itemId" meddler:"item_id"`
TokenID common.TokenID `json:"id" meddler:"token_id"` TokenID common.TokenID `json:"id" meddler:"token_id"`
EthBlockNum int64 `json:"ethereumBlockNum" meddler:"eth_block_num"` // Ethereum block number in which this token was registered EthBlockNum int64 `json:"ethereumBlockNum" meddler:"eth_block_num"` // Ethereum block number in which this token was registered
EthAddr ethCommon.Address `json:"ethereumAddress" meddler:"eth_addr"` EthAddr ethCommon.Address `json:"ethereumAddress" meddler:"eth_addr"`
@@ -146,15 +146,15 @@ type TokenWithUSD struct {
Decimals uint64 `json:"decimals" meddler:"decimals"` Decimals uint64 `json:"decimals" meddler:"decimals"`
USD *float64 `json:"USD" meddler:"usd"` USD *float64 `json:"USD" meddler:"usd"`
USDUpdate *time.Time `json:"fiatUpdate" meddler:"usd_update,utctime"` USDUpdate *time.Time `json:"fiatUpdate" meddler:"usd_update,utctime"`
TotalItems int `json:"-" meddler:"total_items"` TotalItems uint64 `json:"-" meddler:"total_items"`
FirstItem int `json:"-" meddler:"first_item"` FirstItem uint64 `json:"-" meddler:"first_item"`
LastItem int `json:"-" meddler:"last_item"` LastItem uint64 `json:"-" meddler:"last_item"`
} }
// ExitAPI is a representation of a exit with additional information // ExitAPI is a representation of a exit with additional information
// required by the API, and extracted by joining token table // required by the API, and extracted by joining token table
type ExitAPI struct { type ExitAPI struct {
ItemID int `meddler:"item_id"` ItemID uint64 `meddler:"item_id"`
BatchNum common.BatchNum `meddler:"batch_num"` BatchNum common.BatchNum `meddler:"batch_num"`
AccountIdx apitypes.HezIdx `meddler:"account_idx"` AccountIdx apitypes.HezIdx `meddler:"account_idx"`
MerkleProof *merkletree.CircomVerifierProof `meddler:"merkle_proof,json"` MerkleProof *merkletree.CircomVerifierProof `meddler:"merkle_proof,json"`
@@ -162,11 +162,11 @@ type ExitAPI struct {
InstantWithdrawn *int64 `meddler:"instant_withdrawn"` InstantWithdrawn *int64 `meddler:"instant_withdrawn"`
DelayedWithdrawRequest *int64 `meddler:"delayed_withdraw_request"` DelayedWithdrawRequest *int64 `meddler:"delayed_withdraw_request"`
DelayedWithdrawn *int64 `meddler:"delayed_withdrawn"` DelayedWithdrawn *int64 `meddler:"delayed_withdrawn"`
TotalItems int `meddler:"total_items"` TotalItems uint64 `meddler:"total_items"`
FirstItem int `meddler:"first_item"` FirstItem uint64 `meddler:"first_item"`
LastItem int `meddler:"last_item"` LastItem uint64 `meddler:"last_item"`
TokenID common.TokenID `meddler:"token_id"` TokenID common.TokenID `meddler:"token_id"`
TokenItemID int `meddler:"token_item_id"` TokenItemID uint64 `meddler:"token_item_id"`
TokenEthBlockNum int64 `meddler:"token_block"` TokenEthBlockNum int64 `meddler:"token_block"`
TokenEthAddr ethCommon.Address `meddler:"eth_addr"` TokenEthAddr ethCommon.Address `meddler:"eth_addr"`
TokenName string `meddler:"name"` TokenName string `meddler:"name"`
@@ -218,29 +218,29 @@ func (e ExitAPI) MarshalJSON() ([]byte, error) {
// CoordinatorAPI is a representation of a coordinator with additional information // CoordinatorAPI is a representation of a coordinator with additional information
// required by the API // required by the API
type CoordinatorAPI struct { type CoordinatorAPI struct {
ItemID int `json:"itemId" meddler:"item_id"` ItemID uint64 `json:"itemId" meddler:"item_id"`
Bidder ethCommon.Address `json:"bidderAddr" meddler:"bidder_addr"` Bidder ethCommon.Address `json:"bidderAddr" meddler:"bidder_addr"`
Forger ethCommon.Address `json:"forgerAddr" meddler:"forger_addr"` Forger ethCommon.Address `json:"forgerAddr" meddler:"forger_addr"`
EthBlockNum int64 `json:"ethereumBlock" meddler:"eth_block_num"` EthBlockNum int64 `json:"ethereumBlock" meddler:"eth_block_num"`
URL string `json:"URL" meddler:"url"` URL string `json:"URL" meddler:"url"`
TotalItems int `json:"-" meddler:"total_items"` TotalItems uint64 `json:"-" meddler:"total_items"`
FirstItem int `json:"-" meddler:"first_item"` FirstItem uint64 `json:"-" meddler:"first_item"`
LastItem int `json:"-" meddler:"last_item"` LastItem uint64 `json:"-" meddler:"last_item"`
} }
// AccountAPI is a representation of a account with additional information // AccountAPI is a representation of a account with additional information
// required by the API // required by the API
type AccountAPI struct { type AccountAPI struct {
ItemID int `meddler:"item_id"` ItemID uint64 `meddler:"item_id"`
Idx apitypes.HezIdx `meddler:"idx"` Idx apitypes.HezIdx `meddler:"idx"`
BatchNum common.BatchNum `meddler:"batch_num"` BatchNum common.BatchNum `meddler:"batch_num"`
PublicKey apitypes.HezBJJ `meddler:"bjj"` PublicKey apitypes.HezBJJ `meddler:"bjj"`
EthAddr apitypes.HezEthAddr `meddler:"eth_addr"` EthAddr apitypes.HezEthAddr `meddler:"eth_addr"`
Nonce common.Nonce `meddler:"-"` // max of 40 bits used Nonce common.Nonce `meddler:"-"` // max of 40 bits used
Balance *apitypes.BigIntStr `meddler:"-"` // max of 192 bits used Balance *apitypes.BigIntStr `meddler:"-"` // max of 192 bits used
TotalItems int `meddler:"total_items"` TotalItems uint64 `meddler:"total_items"`
FirstItem int `meddler:"first_item"` FirstItem uint64 `meddler:"first_item"`
LastItem int `meddler:"last_item"` LastItem uint64 `meddler:"last_item"`
TokenID common.TokenID `meddler:"token_id"` TokenID common.TokenID `meddler:"token_id"`
TokenItemID int `meddler:"token_item_id"` TokenItemID int `meddler:"token_item_id"`
TokenEthBlockNum int64 `meddler:"token_block"` TokenEthBlockNum int64 `meddler:"token_block"`
@@ -280,7 +280,7 @@ func (account AccountAPI) MarshalJSON() ([]byte, error) {
// BatchAPI is a representation of a batch with additional information // BatchAPI is a representation of a batch with additional information
// required by the API, and extracted by joining block table // required by the API, and extracted by joining block table
type BatchAPI struct { type BatchAPI struct {
ItemID int `json:"itemId" meddler:"item_id"` ItemID uint64 `json:"itemId" meddler:"item_id"`
BatchNum common.BatchNum `json:"batchNum" meddler:"batch_num"` BatchNum common.BatchNum `json:"batchNum" meddler:"batch_num"`
EthBlockNum int64 `json:"ethereumBlockNum" meddler:"eth_block_num"` EthBlockNum int64 `json:"ethereumBlockNum" meddler:"eth_block_num"`
EthBlockHash ethCommon.Hash `json:"ethereumBlockHash" meddler:"hash"` EthBlockHash ethCommon.Hash `json:"ethereumBlockHash" meddler:"hash"`
@@ -293,9 +293,9 @@ type BatchAPI struct {
ExitRoot apitypes.BigIntStr `json:"exitRoot" meddler:"exit_root"` ExitRoot apitypes.BigIntStr `json:"exitRoot" meddler:"exit_root"`
ForgeL1TxsNum *int64 `json:"forgeL1TransactionsNum" meddler:"forge_l1_txs_num"` ForgeL1TxsNum *int64 `json:"forgeL1TransactionsNum" meddler:"forge_l1_txs_num"`
SlotNum int64 `json:"slotNum" meddler:"slot_num"` SlotNum int64 `json:"slotNum" meddler:"slot_num"`
TotalItems int `json:"-" meddler:"total_items"` TotalItems uint64 `json:"-" meddler:"total_items"`
FirstItem int `json:"-" meddler:"first_item"` FirstItem uint64 `json:"-" meddler:"first_item"`
LastItem int `json:"-" meddler:"last_item"` LastItem uint64 `json:"-" meddler:"last_item"`
} }
// Network define status of the network // Network define status of the network
@@ -319,7 +319,7 @@ type Metrics struct {
// BidAPI is a representation of a bid with additional information // BidAPI is a representation of a bid with additional information
// required by the API // required by the API
type BidAPI struct { type BidAPI struct {
ItemID int `json:"itemId" meddler:"item_id"` ItemID uint64 `json:"itemId" meddler:"item_id"`
SlotNum int64 `json:"slotNum" meddler:"slot_num"` SlotNum int64 `json:"slotNum" meddler:"slot_num"`
BidValue apitypes.BigIntStr `json:"bidValue" meddler:"bid_value"` BidValue apitypes.BigIntStr `json:"bidValue" meddler:"bid_value"`
EthBlockNum int64 `json:"ethereumBlockNum" meddler:"eth_block_num"` EthBlockNum int64 `json:"ethereumBlockNum" meddler:"eth_block_num"`
@@ -327,7 +327,7 @@ type BidAPI struct {
Forger ethCommon.Address `json:"forgerAddr" meddler:"forger_addr"` Forger ethCommon.Address `json:"forgerAddr" meddler:"forger_addr"`
URL string `json:"URL" meddler:"url"` URL string `json:"URL" meddler:"url"`
Timestamp time.Time `json:"timestamp" meddler:"timestamp,utctime"` Timestamp time.Time `json:"timestamp" meddler:"timestamp,utctime"`
TotalItems int `json:"-" meddler:"total_items"` TotalItems uint64 `json:"-" meddler:"total_items"`
FirstItem int `json:"-" meddler:"first_item"` FirstItem uint64 `json:"-" meddler:"first_item"`
LastItem int `json:"-" meddler:"last_item"` LastItem uint64 `json:"-" meddler:"last_item"`
} }

6
db/l2db/l2db_test.go
View File

@@ -90,6 +90,9 @@ func TestAddTxTest(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
// assertReadTx(t, commonToRead(tx, tokens), fetchedTx) // assertReadTx(t, commonToRead(tx, tokens), fetchedTx)
assertTx(t, tx, fetchedTx) assertTx(t, tx, fetchedTx)
nameZone, offset := fetchedTx.Timestamp.Zone()
assert.Equal(t, "UTC", nameZone)
assert.Equal(t, 0, offset)
} }
} }
@@ -419,5 +422,8 @@ func TestAuth(t *testing.T) {
assert.Equal(t, auths[i].BJJ, auth.BJJ) assert.Equal(t, auths[i].BJJ, auth.BJJ)
assert.Equal(t, auths[i].Signature, auth.Signature) assert.Equal(t, auths[i].Signature, auth.Signature)
assert.Equal(t, auths[i].Timestamp.Unix(), auths[i].Timestamp.Unix()) assert.Equal(t, auths[i].Timestamp.Unix(), auths[i].Timestamp.Unix())
nameZone, offset := auths[i].Timestamp.Zone()
assert.Equal(t, "UTC", nameZone)
assert.Equal(t, 0, offset)
} }
} }

4
db/l2db/views.go
View File

@@ -62,9 +62,9 @@ type PoolTxAPI struct {
// Extra read fileds // Extra read fileds
BatchNum *common.BatchNum `meddler:"batch_num"` BatchNum *common.BatchNum `meddler:"batch_num"`
Timestamp time.Time `meddler:"timestamp,utctime"` Timestamp time.Time `meddler:"timestamp,utctime"`
TotalItems int `meddler:"total_items"` TotalItems uint64 `meddler:"total_items"`
TokenID common.TokenID `meddler:"token_id"` TokenID common.TokenID `meddler:"token_id"`
TokenItemID int `meddler:"token_item_id"` TokenItemID uint64 `meddler:"token_item_id"`
TokenEthBlockNum int64 `meddler:"eth_block_num"` TokenEthBlockNum int64 `meddler:"eth_block_num"`
TokenEthAddr ethCommon.Address `meddler:"eth_addr"` TokenEthAddr ethCommon.Address `meddler:"eth_addr"`
TokenName string `meddler:"name"` TokenName string `meddler:"name"`

10
db/utils.go
View File

@@ -181,11 +181,11 @@ func SlicePtrsToSlice(slice interface{}) interface{} {
// Pagination give information on the items of a query // Pagination give information on the items of a query
type Pagination struct { type Pagination struct {
TotalItems int `json:"totalItems"` TotalItems uint64 `json:"totalItems"`
FirstItem int `json:"firstItem"` FirstItem uint64 `json:"firstItem"`
LastItem int `json:"lastItem"` LastItem uint64 `json:"lastItem"`
FirstReturnedItem int `json:"-"` FirstReturnedItem uint64 `json:"-"`
LastReturnedItem int `json:"-"` LastReturnedItem uint64 `json:"-"`
} }
// Paginationer is an interface that allows getting pagination info on any struct // Paginationer is an interface that allows getting pagination info on any struct