aboutsummaryrefslogtreecommitdiffstats
path: root/dex
diff options
context:
space:
mode:
authorWei-Ning Huang <w@dexon.org>2018-11-26 10:00:31 +0800
committerWei-Ning Huang <w@byzantine-lab.io>2019-06-12 17:27:18 +0800
commitafc6a417210dc43a5a38ece5302de6801785316f (patch)
treebdf34181a628038f935e161433fe1b612a5b3bae /dex
parent82d138debeac23029d3640ee7bc31c4ed093ff28 (diff)
downloadgo-tangerine-afc6a417210dc43a5a38ece5302de6801785316f.tar
go-tangerine-afc6a417210dc43a5a38ece5302de6801785316f.tar.gz
go-tangerine-afc6a417210dc43a5a38ece5302de6801785316f.tar.bz2
go-tangerine-afc6a417210dc43a5a38ece5302de6801785316f.tar.lz
go-tangerine-afc6a417210dc43a5a38ece5302de6801785316f.tar.xz
go-tangerine-afc6a417210dc43a5a38ece5302de6801785316f.tar.zst
go-tangerine-afc6a417210dc43a5a38ece5302de6801785316f.zip
core: various changes on tps tuning (#46)
Diffstat (limited to 'dex')
-rw-r--r--dex/app.go9
-rw-r--r--dex/handler.go2
2 files changed, 4 insertions, 7 deletions
diff --git a/dex/app.go b/dex/app.go
index 623bb8dff..0e3f34f70 100644
--- a/dex/app.go
+++ b/dex/app.go
@@ -174,10 +174,9 @@ func (d *DexconApp) PreparePayload(position coreTypes.Position) (payload []byte,
chainID := new(big.Int).SetUint64(uint64(position.ChainID))
chainNums := new(big.Int).SetUint64(uint64(d.gov.GetNumChains(position.Round)))
- blockGasLimit := new(big.Int).SetUint64(core.CalcGasLimit(d.blockchain.CurrentBlock(),
- d.config.GasFloor, d.config.GasCeil))
+ blockGasLimit := new(big.Int).SetUint64(d.blockchain.CurrentBlock().GasLimit())
blockGasUsed := new(big.Int)
- var allTxs types.Transactions
+ allTxs := make([]*types.Transaction, 0, 3000)
addressMap:
for address, txs := range txsMap {
@@ -374,8 +373,7 @@ func (d *DexconApp) VerifyBlock(block *coreTypes.Block) coreTypes.BlockVerifySta
}
// Validate if balance is enough for TXs in this block.
- blockGasLimit := new(big.Int).SetUint64(core.CalcGasLimit(
- d.blockchain.CurrentBlock(), d.config.GasFloor, d.config.GasCeil))
+ blockGasLimit := new(big.Int).SetUint64(d.blockchain.CurrentBlock().GasLimit())
blockGasUsed := new(big.Int)
for _, tx := range transactions {
@@ -451,7 +449,6 @@ func (d *DexconApp) BlockDelivered(
}
d.chainLatestRoot.Store(block.Position.ChainID, root)
- log.Info("Insert pending block success", "height", result.Height)
d.blockchain.RemoveConfirmedBlock(chainID, blockHash)
}
diff --git a/dex/handler.go b/dex/handler.go
index b4499ae5a..60a5ede17 100644
--- a/dex/handler.go
+++ b/dex/handler.go
@@ -1112,7 +1112,7 @@ func (pm *ProtocolManager) txBroadcastLoop() {
txs := make(types.Transactions, 0)
for {
select {
- case <-time.After(500 * time.Millisecond):
+ case <-time.After(100 * time.Millisecond):
pm.BroadcastTxs(txs)
txs = txs[:0]
currentSize = 0