diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go index daf6d27022..d8bb199a50 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -122,8 +122,8 @@ func (w *wizard) makeGenesis() { genesis.Config.XDPoS.Period = uint64(w.readDefaultInt(2)) fmt.Println() - fmt.Println("How many XDC should be rewarded to masternode? (default = 100)") - genesis.Config.XDPoS.Reward = uint64(w.readDefaultInt(100)) + fmt.Println("How many XDC should be rewarded to masternode? (default = 350)") + genesis.Config.XDPoS.Reward = uint64(w.readDefaultInt(350)) fmt.Println() fmt.Println("Who own the first masternodes? (mandatory)") @@ -231,8 +231,8 @@ func (w *wizard) makeGenesis() { code, _ = contractBackend.CodeAt(ctx, multiSignWalletAddr, nil) storage = make(map[common.Hash]common.Hash) contractBackend.ForEachStorageAt(ctx, multiSignWalletAddr, nil, f) - fBalance := big.NewInt(0) // 16m - fBalance.Add(fBalance, big.NewInt(16*1000*1000)) + fBalance := big.NewInt(0) // 3 billion + fBalance.Add(fBalance, big.NewInt(3*1000*1000*1000)) fBalance.Mul(fBalance, big.NewInt(1000000000000000000)) genesis.Alloc[common.HexToAddress(common.FoudationAddr)] = core.GenesisAccount{ Balance: fBalance, @@ -298,24 +298,24 @@ func (w *wizard) makeGenesis() { storage = make(map[common.Hash]common.Hash) contractBackend.ForEachStorageAt(ctx, multiSignWalletTeamAddr, nil, f) // Team balance. - balance := big.NewInt(0) // 12m - balance.Add(balance, big.NewInt(12*1000*1000)) - balance.Mul(balance, big.NewInt(1000000000000000000)) - subBalance := big.NewInt(0) // i * 50k - subBalance.Add(subBalance, big.NewInt(int64(len(signers))*50*1000)) - subBalance.Mul(subBalance, big.NewInt(1000000000000000000)) - balance.Sub(balance, subBalance) // 12m - i * 50k - genesis.Alloc[common.HexToAddress(common.TeamAddr)] = core.GenesisAccount{ + balance := big.NewInt(0) // 20 billion + balance.Add(balance, big.NewInt(20*1000*1000*1000)) + balance.Mul(balance, big.NewInt(1000000000000000000)) + subBalance := big.NewInt(0) // i * 50k + subBalance.Add(subBalance, big.NewInt(int64(len(signers))*50*1000)) + subBalance.Mul(subBalance, big.NewInt(1000000000000000000)) + balance.Sub(balance, subBalance) // 12m - i * 50k + genesis.Alloc[common.HexToAddress(common.TeamAddr)] = core.GenesisAccount{ Balance: balance, Code: code, Storage: storage, } fmt.Println() - fmt.Println("What is swap wallet address for fund 55m XDC?") + fmt.Println("What is swap wallet address for fund 14.5Billion XDC?") swapAddr := *w.readAddress() - baseBalance := big.NewInt(0) // 55m - baseBalance.Add(baseBalance, big.NewInt(55*1000*1000)) + baseBalance := big.NewInt(0) // 14.5Billion + baseBalance.Add(baseBalance, big.NewInt(145*1000*1000*100)) baseBalance.Mul(baseBalance, big.NewInt(1000000000000000000)) genesis.Alloc[swapAddr] = core.GenesisAccount{ Balance: baseBalance, diff --git a/common/constants.go b/common/constants.go index 51ff9f0ee5..1bf32aa9f8 100644 --- a/common/constants.go +++ b/common/constants.go @@ -22,7 +22,7 @@ const ( MinimunMinerBlockPerEpoch = 1 ) -var TIP2019Block = big.NewInt(1050000) +var TIP2019Block = big.NewInt(1) var TIPSigning = big.NewInt(3000000) var TIPRandomize = big.NewInt(3464000) var IsTestnet bool = false diff --git a/core/tx_pool.go b/core/tx_pool.go index 3d7be4c11d..2a66d9c2a1 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -630,10 +630,10 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error { } } - minGasDeploySMC := new(big.Int).Mul(new(big.Int).SetUint64(10), new(big.Int).SetUint64(params.Ether)) - if tx.To() == nil && (tx.Cost().Cmp(minGasDeploySMC) < 0 || tx.GasPrice().Cmp(new(big.Int).SetUint64(10000*params.Shannon)) < 0) { - return ErrMinDeploySMC - } + // minGasDeploySMC := new(big.Int).Mul(new(big.Int).SetUint64(10), new(big.Int).SetUint64(params.Ether)) + // if tx.To() == nil && (tx.Cost().Cmp(minGasDeploySMC) < 0 || tx.GasPrice().Cmp(new(big.Int).SetUint64(10000*params.Shannon)) < 0) { + // return ErrMinDeploySMC + // } return nil }