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

Update missing LoadAmount to DepositAmount

Browse Source 
Related to 445f26ec9f
This commit is contained in:
arnaucube
2020-12-09 18:26:54 +01:00
parent d5c753030a
commit 9d0b278d50
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/swagger.yml
View File

@@ -1768,7 +1768,7 @@ components:
example: true example: true
historicDepositAmountUSD: historicDepositAmountUSD:
type: number type: number
description: Load amount in USD, at the moment the transaction was made. description: Deposit amount in USD, at the moment the transaction was made.
example: 3.897 example: 3.897
nullable: true nullable: true
ethereumBlockNum: ethereumBlockNum:
@@ -2974,7 +2974,7 @@ components:
example: 1 example: 1
limitDepositAmount: limitDepositAmount:
type: integer type: integer
description: Maximum load amount (L1 to L2) allowed. description: Maximum deposit amount (L1 to L2) allowed.
example: 321 example: 321
limitL2TransferAmount: limitL2TransferAmount:
type: integer type: integer

4
api/txshistory_test.go
View File

@@ -166,9 +166,9 @@ func genTestTxs(
} }
laf := new(big.Float).SetInt(l1.DepositAmount) laf := new(big.Float).SetInt(l1.DepositAmount)
depositAmountFloat, _ := laf.Float64() depositAmountFloat, _ := laf.Float64()
loadUSD := *token.USD * depositAmountFloat / math.Pow(10, float64(token.Decimals)) depositUSD := *token.USD * depositAmountFloat / math.Pow(10, float64(token.Decimals))
if depositAmountFloat != 0 { if depositAmountFloat != 0 {
tx.L1Info.HistoricDepositAmountUSD = &loadUSD tx.L1Info.HistoricDepositAmountUSD = &depositUSD
} }
} }
txs = append(txs, tx) txs = append(txs, tx)

2
common/ethrollup.go
View File

@@ -87,7 +87,7 @@ const (
) )
var ( var (
// RollupConstLimitDepositAmount Max load amount allowed (depositAmount: L1 --> L2) // RollupConstLimitDepositAmount Max deposit amount allowed (depositAmount: L1 --> L2)
RollupConstLimitDepositAmount, _ = new(big.Int).SetString("340282366920938463463374607431768211456", 10) RollupConstLimitDepositAmount, _ = new(big.Int).SetString("340282366920938463463374607431768211456", 10)
// RollupConstLimitL2TransferAmount Max amount allowed (amount L2 --> L2) // RollupConstLimitL2TransferAmount Max amount allowed (amount L2 --> L2)
RollupConstLimitL2TransferAmount, _ = new(big.Int).SetString("6277101735386680763835789423207666416102355444464034512896", 10) RollupConstLimitL2TransferAmount, _ = new(big.Int).SetString("6277101735386680763835789423207666416102355444464034512896", 10)

2
db/historydb/historydb_test.go
View File

@@ -516,7 +516,7 @@ func TestTxs(t *testing.T) {
assert.Equal(t, true, dbL1Txs[8].UserOrigin) assert.Equal(t, true, dbL1Txs[8].UserOrigin)
assert.Equal(t, true, dbL1Txs[9].UserOrigin) assert.Equal(t, true, dbL1Txs[9].UserOrigin)
// Load Amount // Deposit Amount
assert.Equal(t, big.NewInt(10), dbL1Txs[0].DepositAmount) assert.Equal(t, big.NewInt(10), dbL1Txs[0].DepositAmount)
assert.Equal(t, big.NewInt(10), dbL1Txs[1].DepositAmount) assert.Equal(t, big.NewInt(10), dbL1Txs[1].DepositAmount)
assert.Equal(t, big.NewInt(20), dbL1Txs[2].DepositAmount) assert.Equal(t, big.NewInt(20), dbL1Txs[2].DepositAmount)

2
db/historydb/views.go
View File

@@ -120,7 +120,7 @@ func (tx TxAPI) MarshalJSON() ([]byte, error) {
// txWrite is an representatiion that merges common.L1Tx and common.L2Tx // txWrite is an representatiion that merges common.L1Tx and common.L2Tx
// in order to perform inserts into tx table // in order to perform inserts into tx table
// EffectiveAmount and LoadEffectiveAmount are not set since they have default values in the DB // EffectiveAmount and EffectiveDepositAmount are not set since they have default values in the DB
type txWrite struct { type txWrite struct {
// Generic // Generic
IsL1 bool `meddler:"is_l1"` IsL1 bool `meddler:"is_l1"`

2
db/migrations/0001.sql
View File

@@ -137,7 +137,7 @@ CREATE SEQUENCE tx_item_id;
-- When tx is not forged: amount_success = false, deposit_amount_success = false -- When tx is not forged: amount_success = false, deposit_amount_success = false
-- When tx is forged: -- When tx is forged:
-- amount_success = false if the "effective amount" is 0, else true -- amount_success = false if the "effective amount" is 0, else true
-- deposit_amount_success = false if the "effective load amount" is 0, else true -- deposit_amount_success = false if the "effective deposit amount" is 0, else true
-- --
-- However, in order to reduce the amount of updates, by default amount_success and deposit_amount_success will be set to true (when tx is unforged) -- However, in order to reduce the amount of updates, by default amount_success and deposit_amount_success will be set to true (when tx is unforged)
-- whne they should be false. This can be worked around at a query level by checking if "batch_num IS NULL" (which indicates that the tx is unforged). -- whne they should be false. This can be worked around at a query level by checking if "batch_num IS NULL" (which indicates that the tx is unforged).