aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei-Ning Huang <w@dexon.org>2019-03-17 11:08:49 +0800
committerWei-Ning Huang <w@byzantine-lab.io>2019-06-12 17:27:23 +0800
commit5993c56b2835f3ac056707b153ed5c84855228d5 (patch)
tree75481e56967d513e35064470fb1a5d1e1c8da429
parent5f64e1d10d620a8a299ff3a40695f26107f157c5 (diff)
downloadgo-tangerine-5993c56b2835f3ac056707b153ed5c84855228d5.tar
go-tangerine-5993c56b2835f3ac056707b153ed5c84855228d5.tar.gz
go-tangerine-5993c56b2835f3ac056707b153ed5c84855228d5.tar.bz2
go-tangerine-5993c56b2835f3ac056707b153ed5c84855228d5.tar.lz
go-tangerine-5993c56b2835f3ac056707b153ed5c84855228d5.tar.xz
go-tangerine-5993c56b2835f3ac056707b153ed5c84855228d5.tar.zst
go-tangerine-5993c56b2835f3ac056707b153ed5c84855228d5.zip
core: vm: reorder minGasPriceLoc
-rw-r--r--core/vm/oracle_contracts.go2
-rw-r--r--params/config.go8
2 files changed, 5 insertions, 5 deletions
diff --git a/core/vm/oracle_contracts.go b/core/vm/oracle_contracts.go
index d983cdfc8..56e82f7df 100644
--- a/core/vm/oracle_contracts.go
+++ b/core/vm/oracle_contracts.go
@@ -75,6 +75,7 @@ const (
miningVelocityLoc
nextHalvingSupplyLoc
lastHalvedAmountLoc
+ minGasPriceLoc
blockGasLimitLoc
lambdaBALoc
lambdaDKGLoc
@@ -84,7 +85,6 @@ const (
minBlockIntervalLoc
fineValuesLoc
finedRecordsLoc
- minGasPriceLoc // TODO(w): reorder this before mainnet
)
func publicKeyToNodeKeyAddress(pkBytes []byte) (common.Address, error) {
diff --git a/params/config.go b/params/config.go
index a6390c671..8986ba5ab 100644
--- a/params/config.go
+++ b/params/config.go
@@ -26,10 +26,10 @@ import (
// Genesis hashes to enforce below configs on.
var (
- MainnetGenesisHash = common.HexToHash("0xc3320be1e1e83f6e2116ec3f46966502a09655d8939967450c345507350bedc8")
- TestnetGenesisHash = common.HexToHash("0xe338c08039a92fb146c4af646ecbae4a50aac048249894d4eebb2c54ab369e06")
- TaipeiGenesisHash = common.HexToHash("0xc7bef94f43a1350da382b67d0bc7dd32ceb30b7c33820afc74c3716a2189a1e4")
- YilanGenesisHash = common.HexToHash("0xae0aac389776b6e35aff2569a2b9be234f6703a5c923e48cf42edffa7c1a24fc")
+ MainnetGenesisHash = common.HexToHash("0x075918a1da88f5d7bed21362e22b780d6b04739b04c7fd0aa25d33b86f56a87f")
+ TestnetGenesisHash = common.HexToHash("0x4e8e72e73b70f096f31910f0f9b930f65291fcff8b344c93dada282df90bb99f")
+ TaipeiGenesisHash = common.HexToHash("0x8c074f5f0d434e23feda0ba238a8915a2457c6d169a14020afc05e0f7ee812e3")
+ YilanGenesisHash = common.HexToHash("0x6d4bc5a73bc2b665b23a06bed9d16c5239ca9598a2cbb662677d0329a0819a2d")
)
// TrustedCheckpoints associates each known checkpoint with the genesis hash of