mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-20 02:42:27 +00:00
concurrent process txs
This commit is contained in:
parent
65ff031f16
commit
b19694afe3
1 changed files with 49 additions and 42 deletions
|
|
@ -18,9 +18,7 @@ package posv
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
// "strings"
|
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
// "encoding/hex"
|
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
|
|
@ -32,7 +30,6 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/accounts"
|
"github.com/ethereum/go-ethereum/accounts"
|
||||||
// "github.com/ethereum/go-ethereum/accounts/abi"
|
|
||||||
"github.com/ethereum/go-ethereum/common"
|
"github.com/ethereum/go-ethereum/common"
|
||||||
"github.com/ethereum/go-ethereum/common/hexutil"
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
||||||
"github.com/ethereum/go-ethereum/consensus"
|
"github.com/ethereum/go-ethereum/consensus"
|
||||||
|
|
@ -862,45 +859,9 @@ func (c *Posv) Finalize(chain consensus.ChainReader, header *types.Header, state
|
||||||
number := header.Number.Uint64()
|
number := header.Number.Uint64()
|
||||||
rCheckpoint := chain.Config().Posv.RewardCheckpoint
|
rCheckpoint := chain.Config().Posv.RewardCheckpoint
|
||||||
|
|
||||||
for _, tx := range txs {
|
start := time.Now()
|
||||||
if tx.IsSigningTransaction() {
|
_ = c.cacheData(txs, receipts)
|
||||||
blkHash := common.BytesToHash(tx.Data()[len(tx.Data())-32:])
|
fmt.Println("Time processed txs", len(txs), "time", common.PrettyDuration(time.Since(start)))
|
||||||
from := *tx.From()
|
|
||||||
|
|
||||||
var b uint
|
|
||||||
for _, r := range receipts {
|
|
||||||
if r.TxHash == tx.Hash() {
|
|
||||||
b = r.Status
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if b == types.ReceiptStatusFailed {
|
|
||||||
fmt.Println("Tx receipt status false", tx.Hash().Hex())
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
var lAddr []common.Address
|
|
||||||
if cached, ok := c.BlockSigners.Get(blkHash); ok {
|
|
||||||
lAddr = cached.([]common.Address)
|
|
||||||
lAddr = append(lAddr, from)
|
|
||||||
} else {
|
|
||||||
lAddr = []common.Address{from}
|
|
||||||
}
|
|
||||||
c.BlockSigners.Add(blkHash, lAddr)
|
|
||||||
} else {
|
|
||||||
|
|
||||||
b, addr := tx.IsVotingTransaction()
|
|
||||||
if b && addr != nil {
|
|
||||||
var vote common.Vote
|
|
||||||
vote.Masternode = *addr
|
|
||||||
vote.Voter = *tx.From()
|
|
||||||
|
|
||||||
fmt.Println("Remove from Votes cache", vote.Masternode.String(), vote.Voter.String())
|
|
||||||
c.Votes.Remove(vote)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if c.HookReward != nil && number%rCheckpoint == 0 {
|
if c.HookReward != nil && number%rCheckpoint == 0 {
|
||||||
if !c.EnableCache && uint64(c.BlockSigners.Len()) >= (rCheckpoint*3) {
|
if !c.EnableCache && uint64(c.BlockSigners.Len()) >= (rCheckpoint*3) {
|
||||||
|
|
@ -1078,6 +1039,52 @@ func (c *Posv) GetMasternodesFromCheckpointHeader(preCheckpointHeader *types.Hea
|
||||||
return masternodes
|
return masternodes
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Posv) cacheData(txs []*types.Transaction, receipts []*types.Receipt) error {
|
||||||
|
for _, tx := range txs {
|
||||||
|
go func(tx *types.Transaction) error {
|
||||||
|
if tx.IsSigningTransaction() {
|
||||||
|
blkHash := common.BytesToHash(tx.Data()[len(tx.Data())-32:])
|
||||||
|
from := *tx.From()
|
||||||
|
|
||||||
|
var b uint
|
||||||
|
for _, r := range receipts {
|
||||||
|
if r.TxHash == tx.Hash() {
|
||||||
|
b = r.Status
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if b == types.ReceiptStatusFailed {
|
||||||
|
fmt.Println("Tx receipt status false", tx.Hash().Hex())
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var lAddr []common.Address
|
||||||
|
if cached, ok := c.BlockSigners.Get(blkHash); ok {
|
||||||
|
lAddr = cached.([]common.Address)
|
||||||
|
lAddr = append(lAddr, from)
|
||||||
|
} else {
|
||||||
|
lAddr = []common.Address{from}
|
||||||
|
}
|
||||||
|
c.BlockSigners.Add(blkHash, lAddr)
|
||||||
|
} else {
|
||||||
|
|
||||||
|
b, addr := tx.IsVotingTransaction()
|
||||||
|
if b && addr != nil {
|
||||||
|
var vote common.Vote
|
||||||
|
vote.Masternode = *addr
|
||||||
|
vote.Voter = *tx.From()
|
||||||
|
|
||||||
|
fmt.Println("Remove from Votes cache", vote.Masternode.String(), vote.Voter.String())
|
||||||
|
c.Votes.Remove(vote)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}(tx)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// Extract validators from byte array.
|
// Extract validators from byte array.
|
||||||
func RemovePenaltiesFromBlock(chain consensus.ChainReader, masternodes []common.Address, epochNumber uint64) []common.Address {
|
func RemovePenaltiesFromBlock(chain consensus.ChainReader, masternodes []common.Address, epochNumber uint64) []common.Address {
|
||||||
if epochNumber <= 0 {
|
if epochNumber <= 0 {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue