OSDN Git Service
(root)
/
bytom
/
vapor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
edit the config (#320)
[bytom/vapor.git]
/
proposal
/
proposal.go
diff --git
a/proposal/proposal.go
b/proposal/proposal.go
index
d2d045e
..
a4c51e4
100644
(file)
--- a/
proposal/proposal.go
+++ b/
proposal/proposal.go
@@
-37,7
+37,7
@@
func createCoinbaseTx(accountManager *account.Manager, blockHeight uint64) (tx *
return nil, err
}
return nil, err
}
- if len(arbitrary) > consensus.CoinbaseArbitrarySizeLimit {
+ if len(arbitrary) > consensus.
ActiveNetParams.
CoinbaseArbitrarySizeLimit {
return nil, validation.ErrCoinbaseArbitraryOversize
}
return nil, validation.ErrCoinbaseArbitraryOversize
}
@@
-99,7
+99,7
@@
func NewBlockTemplate(c *protocol.Chain, txPool *protocol.TxPool, accountManager
PreviousBlockHash: preBlockHash,
Timestamp: timestamp,
BlockCommitment: types.BlockCommitment{},
PreviousBlockHash: preBlockHash,
Timestamp: timestamp,
BlockCommitment: types.BlockCommitment{},
- BlockWitness: types.BlockWitness{Witness: make([][]byte, consensus.NumOfConsensusNode)},
+ BlockWitness: types.BlockWitness{Witness: make([][]byte, consensus.
ActiveNetParams.
NumOfConsensusNode)},
},
}
bcBlock := &bc.Block{BlockHeader: &bc.BlockHeader{Height: nextBlockHeight}}
},
}
bcBlock := &bc.Block{BlockHeader: &bc.BlockHeader{Height: nextBlockHeight}}
@@
-133,7
+133,7
@@
func NewBlockTemplate(c *protocol.Chain, txPool *protocol.TxPool, accountManager
continue
}
continue
}
- if gasUsed+uint64(gasStatus.GasUsed) > consensus.MaxBlockGas {
+ if gasUsed+uint64(gasStatus.GasUsed) > consensus.
ActiveNetParams.
MaxBlockGas {
break
}
break
}
@@
-149,7
+149,7
@@
func NewBlockTemplate(c *protocol.Chain, txPool *protocol.TxPool, accountManager
b.Transactions = append(b.Transactions, txDesc.Tx)
txEntries = append(txEntries, tx)
gasUsed += uint64(gasStatus.GasUsed)
b.Transactions = append(b.Transactions, txDesc.Tx)
txEntries = append(txEntries, tx)
gasUsed += uint64(gasStatus.GasUsed)
- if gasUsed == consensus.MaxBlockGas {
+ if gasUsed == consensus.
ActiveNetParams.
MaxBlockGas {
break
}
break
}