Modify gas cost params and bootnodes. Relaunch testnet.

This commit is contained in:
Yohan Graterol 2017-12-26 01:07:53 -05:00
parent 11f7a9603e
commit ef128e9b0e
5 changed files with 15 additions and 17 deletions

View file

@ -325,7 +325,7 @@ func DefaultCallistoMainnetGenesisBlock() *Genesis {
return &Genesis{ return &Genesis{
Config: params.CallistoMainnetChainConfig, Config: params.CallistoMainnetChainConfig,
ExtraData: hexutil.MustDecode("0x0000000000000000000000000000000000000000000000000000000000000000"), ExtraData: hexutil.MustDecode("0x0000000000000000000000000000000000000000000000000000000000000000"),
GasLimit: 8000000, GasLimit: 470000000,
Difficulty: big.NewInt(4000000), Difficulty: big.NewInt(4000000),
Alloc: decodePrealloc(callistoMainnetAllocData), Alloc: decodePrealloc(callistoMainnetAllocData),
} }
@ -348,7 +348,7 @@ func DefaultCallistoTestnetGenesisBlock() *Genesis {
return &Genesis{ return &Genesis{
Config: params.CallistoTestnetChainConfig, Config: params.CallistoTestnetChainConfig,
ExtraData: hexutil.MustDecode("0x00000000000000000000000000000000000000000000000000000000000000004fd2dead40490e7efb256899289896c844280e3dceb6e1affb81eae90695efd61e9d2c214f72b8cf0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"), ExtraData: hexutil.MustDecode("0x00000000000000000000000000000000000000000000000000000000000000004fd2dead40490e7efb256899289896c844280e3dceb6e1affb81eae90695efd61e9d2c214f72b8cf0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"),
GasLimit: 4700000, GasLimit: 470000000,
Difficulty: big.NewInt(1), Difficulty: big.NewInt(1),
Alloc: decodePrealloc(callistoTestnetAllocData), Alloc: decodePrealloc(callistoTestnetAllocData),
} }

View file

@ -60,6 +60,6 @@ var DiscoveryV5Bootnodes = []string{
// CallistoTestnetBootnodes are the enode URLs of the P2P bootstrap nodes for the // CallistoTestnetBootnodes are the enode URLs of the P2P bootstrap nodes for the
// Callisto tes network. // Callisto tes network.
var CallistoTestnetBootnodes = []string{ var CallistoTestnetBootnodes = []string{
"enode://588489cbfcfa3766965845d2d376f257d078fd0bb320be886d79d919a595aa32374ec1aff1162f53cf692655c9138e35e5d39c5d9f1fd255e125959dfc9cc50f@138.197.90.157:30303", "enode://6b857ecbb4ea5e4469cb132eb07a5885a346d34c34588ce3e40f27a9cd134db6da44eb76f6b0bb856361daa5045ad2333e1273e781209f2ec2a6be617554432e@138.197.90.157:30303",
"enode://e62eb26790e6d4e93df0503aa56735df92c279ebec4013d79f934a4f22566eade20c0b6c29249a3f1e56f99c042acd63569642db1abfcf973e8dfd64ddec61a0@104.131.103.14:30303", "enode://c19ce20fa8d079c488ec27e6defd4b0b7e17a4df667e9f9436ff54841f637db051cd43aecb7350c6ddcd2056597878a420d9083dec4076ab68e93c619bdbe77c@104.131.103.14:30303",
} }

View file

@ -239,7 +239,7 @@ func (c *ChainConfig) IsCallisto(num *big.Int) bool {
// Callisto has a 10x more cost in gas // Callisto has a 10x more cost in gas
func (c *ChainConfig) GasTable(num *big.Int) GasTable { func (c *ChainConfig) GasTable(num *big.Int) GasTable {
if num == nil { if num == nil {
return GasTableHomestead return GasTableCallisto
} }
switch { switch {
case c.IsCallisto(num): case c.IsCallisto(num):
@ -248,8 +248,6 @@ func (c *ChainConfig) GasTable(num *big.Int) GasTable {
return GasTableEIP158 return GasTableEIP158
case c.IsEIP150(num): case c.IsEIP150(num):
return GasTableEIP150 return GasTableEIP150
case c.IsCallisto(num):
return GasTableCallisto
default: default:
return GasTableHomestead return GasTableHomestead
} }

View file

@ -74,15 +74,15 @@ var (
} }
GasTableCallisto = GasTable{ GasTableCallisto = GasTable{
ExtcodeSize: 7000, ExtcodeSize: 70000,
ExtcodeCopy: 7000, ExtcodeCopy: 70000,
Balance: 4000, Balance: 40000,
SLoad: 2000, SLoad: 20000,
Calls: 7000, Calls: 70000,
Suicide: 50000, Suicide: 500000,
ExpByte: 100, ExpByte: 5000,
CreateBySuicide: 250000, CreateBySuicide: 2500000,
} }
) )

View file

@ -24,8 +24,8 @@ const (
SloadGas uint64 = 50 // Multiplied by the number of 32-byte words that are copied (round up) for any *COPY operation and added. SloadGas uint64 = 50 // Multiplied by the number of 32-byte words that are copied (round up) for any *COPY operation and added.
CallValueTransferGas uint64 = 9000 // Paid for CALL when the value transfer is non-zero. CallValueTransferGas uint64 = 9000 // Paid for CALL when the value transfer is non-zero.
CallNewAccountGas uint64 = 25000 // Paid for CALL when the destination address didn't exist prior. CallNewAccountGas uint64 = 25000 // Paid for CALL when the destination address didn't exist prior.
TxGas uint64 = 21000 // Per transaction not creating a contract. NOTE: Not payable on data of calls between transactions. TxGas uint64 = 2100000 // Per transaction not creating a contract. NOTE: Not payable on data of calls between transactions.
TxGasContractCreation uint64 = 53000 // Per transaction that creates a contract. NOTE: Not payable on data of calls between transactions. TxGasContractCreation uint64 = 5300000 // Per transaction that creates a contract. NOTE: Not payable on data of calls between transactions.
TxDataZeroGas uint64 = 4 // Per byte of data attached to a transaction that equals zero. NOTE: Not payable on data of calls between transactions. TxDataZeroGas uint64 = 4 // Per byte of data attached to a transaction that equals zero. NOTE: Not payable on data of calls between transactions.
QuadCoeffDiv uint64 = 512 // Divisor for the quadratic particle of the memory cost equation. QuadCoeffDiv uint64 = 512 // Divisor for the quadratic particle of the memory cost equation.
SstoreSetGas uint64 = 20000 // Once per SLOAD operation. SstoreSetGas uint64 = 20000 // Once per SLOAD operation.