forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-15 17:30:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'apothem' into new_EVM_Upgrade

Browse source
This commit is contained in:
olumuyiwadad 2021-09-23 17:05:46 +05:30 committed by GitHub
commit 7d08fa95ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
common/constants.go
View file

@ -36,14 +36,14 @@ var TIPSigning = big.NewInt(3000000)
var TIPRandomize = big.NewInt(3464000) var TIPRandomize = big.NewInt(3464000)
var TIPIncreaseMasternodes = big.NewInt(5000000) // Upgrade MN Count at Block. var TIPIncreaseMasternodes = big.NewInt(5000000) // Upgrade MN Count at Block.
var TIPNoHalvingMNReward = big.NewInt(40000000) // hardfork no halving masternodes reward var TIPNoHalvingMNReward = big.NewInt(23779191) // hardfork no halving masternodes reward
var BlackListHFNumber = uint64(40000000) var BlackListHFNumber = uint64(23779191)
var TIPXDCX = big.NewInt(40000000) var TIPXDCX = big.NewInt(23779191)
var TIPXDCXLending = big.NewInt(40000000) var TIPXDCXLending = big.NewInt(23779191)
var TIPXDCXCancellationFee = big.NewInt(40000000) var TIPXDCXCancellationFee = big.NewInt(23779191)
var TIPXDCXCancellationFeeTestnet = big.NewInt(23777777) var TIPXDCXCancellationFeeTestnet = big.NewInt(23779191)
var TIPXDCXTestnet = big.NewInt(23777777) var TIPXDCXTestnet = big.NewInt(23779191)
var IsTestnet bool = false var IsTestnet bool = false
var StoreRewardFolder string var StoreRewardFolder string
var RollbackHash Hash var RollbackHash Hash
@ -71,8 +71,8 @@ var TRC21GasPrice = big.NewInt(250000000)
var RateTopUp = big.NewInt(90) // 90% var RateTopUp = big.NewInt(90) // 90%
var BaseTopUp = big.NewInt(100) var BaseTopUp = big.NewInt(100)
var BaseRecall = big.NewInt(100) var BaseRecall = big.NewInt(100)
var TIPTRC21Fee = big.NewInt(40000000) var TIPTRC21Fee = big.NewInt(23779191)
var TIPTRC21FeeTestnet = big.NewInt(23777777) var TIPTRC21FeeTestnet = big.NewInt(23779191)
var LimitTimeFinality = uint64(30) // limit in 30 block var LimitTimeFinality = uint64(30) // limit in 30 block
var Blacklist = map[Address]bool{ var Blacklist = map[Address]bool{
HexToAddress("0x5248bfb72fd4f234e062d3e9bb76f08643004fcd"): true, HexToAddress("0x5248bfb72fd4f234e062d3e9bb76f08643004fcd"): true,

1
core/state/trc21_reader.go
View file

@ -6,6 +6,7 @@ import (
"github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/common"
lru "github.com/hashicorp/golang-lru" lru "github.com/hashicorp/golang-lru"
) )
var ( var (