aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei-Ning Huang <w@dexon.org>2019-03-19 15:02:06 +0800
committerWei-Ning Huang <w@dexon.org>2019-04-09 21:32:58 +0800
commitfff05d83302f6c168409e9e614cd9da7d43bc94a (patch)
tree0acb4bd090edd475ffe75bfcd2c7e95dd7ed7fa7
parentfa793b8d7eeb3601c9b028544f2033228aa95b33 (diff)
downloaddexon-fff05d83302f6c168409e9e614cd9da7d43bc94a.tar.gz
dexon-fff05d83302f6c168409e9e614cd9da7d43bc94a.tar.zst
dexon-fff05d83302f6c168409e9e614cd9da7d43bc94a.zip
core: vm: add extra checks to prevent DKG spamming (#272)
Add two maps to check the uniqueness of DKGMasterPublicKey and DKGComplaints to prevent malicious actors from spamming it.
-rw-r--r--core/governance.go8
-rw-r--r--core/vm/oracle_contract_abi.go38
-rw-r--r--core/vm/oracle_contracts.go176
-rw-r--r--core/vm/oracle_contracts_test.go17
-rw-r--r--dex/governance.go7
-rw-r--r--params/config.go8
6 files changed, 187 insertions, 67 deletions
diff --git a/core/governance.go b/core/governance.go
index 73fb0c923..db0e60b6c 100644
--- a/core/governance.go
+++ b/core/governance.go
@@ -93,10 +93,6 @@ func (g *Governance) GetStateAtRound(round uint64) *vm.GovernanceState {
return &vm.GovernanceState{StateDB: s}
}
-func (g *Governance) GetRoundHeight(round uint64) uint64 {
- return g.GetHeadState().RoundHeight(big.NewInt(int64(round))).Uint64()
-}
-
func (g *Governance) Configuration(round uint64) *coreTypes.Config {
configHelper := g.GetStateForConfigAtRound(round)
c := configHelper.Configuration()
@@ -110,6 +106,10 @@ func (g *Governance) Configuration(round uint64) *coreTypes.Config {
}
}
+func (g *Governance) GetRoundHeight(round uint64) uint64 {
+ return g.GetHeadState().RoundHeight(big.NewInt(int64(round))).Uint64()
+}
+
func (g *Governance) GetStateForDKGAtRound(round uint64) *vm.GovernanceState {
dkgRound := g.GetHeadState().DKGRound().Uint64()
if round > dkgRound {
diff --git a/core/vm/oracle_contract_abi.go b/core/vm/oracle_contract_abi.go
index cd45e2754..369c9ec17 100644
--- a/core/vm/oracle_contract_abi.go
+++ b/core/vm/oracle_contract_abi.go
@@ -38,6 +38,25 @@ const GovernanceABIJSON = `
},
{
"constant": true,
+ "inputs": [
+ {
+ "name": "",
+ "type": "bytes32"
+ }
+ ],
+ "name": "dkgMasterPublicKeyProposed",
+ "outputs": [
+ {
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "payable": false,
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "constant": true,
"inputs": [],
"name": "dkgSetSize",
"outputs": [
@@ -514,6 +533,25 @@ const GovernanceABIJSON = `
"inputs": [
{
"name": "",
+ "type": "bytes32"
+ }
+ ],
+ "name": "dkgComplaintsProposed",
+ "outputs": [
+ {
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "payable": false,
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "constant": true,
+ "inputs": [
+ {
+ "name": "",
"type": "address"
}
],
diff --git a/core/vm/oracle_contracts.go b/core/vm/oracle_contracts.go
index a1ac8ed7b..b8eb4fedc 100644
--- a/core/vm/oracle_contracts.go
+++ b/core/vm/oracle_contracts.go
@@ -51,6 +51,8 @@ const (
ReportTypeForkBlock
)
+const GovernanceActionGasCost = 200000
+
// Storage position enums.
const (
roundHeightLoc = iota
@@ -64,7 +66,9 @@ const (
dkgRoundLoc
dkgResetCountLoc
dkgMasterPublicKeysLoc
+ dkgMasterPublicKeyProposedLoc
dkgComplaintsLoc
+ dkgComplaintsProposedLoc
dkgReadyLoc
dkgReadysCountLoc
dkgFinalizedLoc
@@ -95,6 +99,17 @@ func publicKeyToNodeKeyAddress(pkBytes []byte) (common.Address, error) {
return crypto.PubkeyToAddress(*pk), nil
}
+func getDKGMasterPublicKeyID(mpk *dkgTypes.MasterPublicKey) Bytes32 {
+ return Bytes32(mpk.ProposerID.Hash)
+}
+
+func getDKGComplaintID(comp *dkgTypes.Complaint) Bytes32 {
+ return Bytes32(crypto.Keccak256Hash(
+ comp.ProposerID.Hash[:],
+ comp.PrivateShare.ProposerID.Hash[:],
+ []byte(fmt.Sprintf("%v", comp.IsNack()))))
+}
+
func IdToAddress(id coreTypes.NodeID) common.Address {
return common.BytesToAddress(id.Hash[12:])
}
@@ -604,6 +619,29 @@ func (s *GovernanceState) ClearDKGMasterPublicKeys() {
s.erase1DByteArray(big.NewInt(dkgMasterPublicKeysLoc))
}
+// mapping(bytes32 => bool) public dkgMasterPublicKeyProposed;
+func (s *GovernanceState) DKGMasterPublicKeyProposed(id Bytes32) bool {
+ loc := s.getMapLoc(big.NewInt(dkgMasterPublicKeyProposedLoc), id[:])
+ return s.getStateBigInt(loc).Cmp(big.NewInt(0)) > 0
+}
+func (s *GovernanceState) PutDKGMasterPublicKeyProposed(id Bytes32, status bool) {
+ loc := s.getMapLoc(big.NewInt(dkgMasterPublicKeyProposedLoc), id[:])
+ val := big.NewInt(0)
+ if status {
+ val = big.NewInt(1)
+ }
+ s.setStateBigInt(loc, val)
+}
+func (s *GovernanceState) ClearDKGMasterPublicKeyProposed() {
+ for _, mpk := range s.DKGMasterPublicKeys() {
+ x := new(dkgTypes.MasterPublicKey)
+ if err := rlp.DecodeBytes(mpk, x); err != nil {
+ panic(err)
+ }
+ s.PutDKGMasterPublicKeyProposed(getDKGMasterPublicKeyID(x), false)
+ }
+}
+
// bytes[] public dkgComplaints;
func (s *GovernanceState) DKGComplaints() [][]byte {
return s.read1DByteArray(big.NewInt(dkgComplaintsLoc))
@@ -615,6 +653,29 @@ func (s *GovernanceState) ClearDKGComplaints() {
s.erase1DByteArray(big.NewInt(dkgComplaintsLoc))
}
+// mapping(bytes32 => bool) public dkgComplaintsProposed;
+func (s *GovernanceState) DKGComplaintProposed(id Bytes32) bool {
+ loc := s.getMapLoc(big.NewInt(dkgComplaintsProposedLoc), id[:])
+ return s.getStateBigInt(loc).Cmp(big.NewInt(0)) > 0
+}
+func (s *GovernanceState) PutDKGComplaintProposed(id Bytes32, status bool) {
+ loc := s.getMapLoc(big.NewInt(dkgComplaintsProposedLoc), id[:])
+ val := big.NewInt(0)
+ if status {
+ val = big.NewInt(1)
+ }
+ s.setStateBigInt(loc, val)
+}
+func (s *GovernanceState) ClearDKGComplaintProposed() {
+ for _, comp := range s.DKGComplaints() {
+ x := new(dkgTypes.Complaint)
+ if err := rlp.DecodeBytes(comp, x); err != nil {
+ panic(err)
+ }
+ s.PutDKGComplaintProposed(getDKGComplaintID(x), false)
+ }
+}
+
// mapping(address => bool) public dkgMPKReadys;
func (s *GovernanceState) DKGMPKReady(addr common.Address) bool {
mapLoc := s.getMapLoc(big.NewInt(dkgReadyLoc), addr.Bytes())
@@ -722,7 +783,6 @@ func (s *GovernanceState) HalfLastHalvedAmount() {
s.setStateBigInt(big.NewInt(lastHalvedAmountLoc),
new(big.Int).Div(s.LastHalvedAmount(), big.NewInt(2)))
}
-
func (s *GovernanceState) MiningHalved() {
s.HalfMiningVelocity()
s.HalfLastHalvedAmount()
@@ -1138,11 +1198,6 @@ func (g *GovernanceContract) useGas(gas uint64) ([]byte, error) {
return nil, nil
}
-func (g *GovernanceContract) penalize() ([]byte, error) {
- g.useGas(g.contract.Gas)
- return nil, errExecutionReverted
-}
-
func (g *GovernanceContract) configDKGSetSize(round *big.Int) *big.Int {
s, err := getConfigState(g.evm, round)
if err != nil {
@@ -1201,7 +1256,9 @@ func (g *GovernanceContract) inDKGSet(round *big.Int, nodeID coreTypes.NodeID) b
func (g *GovernanceContract) clearDKG() {
dkgSet := g.getDKGSet(g.evm.Round)
+ g.state.ClearDKGMasterPublicKeyProposed()
g.state.ClearDKGMasterPublicKeys()
+ g.state.ClearDKGComplaintProposed()
g.state.ClearDKGComplaints()
g.state.ClearDKGMPKReadys(dkgSet)
g.state.ResetDKGMPKReadysCount()
@@ -1224,7 +1281,7 @@ func (g *GovernanceContract) addDKGComplaint(round *big.Int, comp []byte) ([]byt
// Finalized caller is not allowed to propose complaint.
if g.state.DKGFinalized(caller) {
- return g.penalize()
+ return nil, errExecutionReverted
}
// Calculate 2f
@@ -1239,54 +1296,58 @@ func (g *GovernanceContract) addDKGComplaint(round *big.Int, comp []byte) ([]byt
var dkgComplaint dkgTypes.Complaint
if err := rlp.DecodeBytes(comp, &dkgComplaint); err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
+ }
+
+ if g.state.DKGComplaintProposed(getDKGComplaintID(&dkgComplaint)) {
+ return nil, errExecutionReverted
}
if dkgComplaint.Reset != g.state.DKGResetCount(round).Uint64() {
- return g.penalize()
+ return nil, errExecutionReverted
}
// DKGComplaint must belongs to someone in DKG set.
if !g.inDKGSet(round, dkgComplaint.ProposerID) {
- return g.penalize()
+ return nil, errExecutionReverted
}
verified, _ := coreUtils.VerifyDKGComplaintSignature(&dkgComplaint)
if !verified {
- return g.penalize()
+ return nil, errExecutionReverted
}
mpk, err := g.state.GetDKGMasterPublicKeyByProposerID(dkgComplaint.PrivateShare.ProposerID)
if err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
// Verify DKG complaint is correct.
ok, err := coreUtils.VerifyDKGComplaint(&dkgComplaint, mpk)
if !ok || err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
// Fine the attacker.
need, err := coreUtils.NeedPenaltyDKGPrivateShare(&dkgComplaint, mpk)
if err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
if need {
node, err := g.state.GetNodeByID(dkgComplaint.PrivateShare.ProposerID)
if err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
fineValue := g.state.FineValue(big.NewInt(ReportTypeInvalidDKG))
if err := g.fine(node.Owner, fineValue, comp, nil); err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
}
g.state.PushDKGComplaint(comp)
+ g.state.PutDKGComplaintProposed(getDKGComplaintID(&dkgComplaint), true)
- // Set this to relatively high to prevent spamming
- return g.useGas(5000000)
+ return g.useGas(GovernanceActionGasCost)
}
func (g *GovernanceContract) addDKGMasterPublicKey(round *big.Int, mpk []byte) ([]byte, error) {
@@ -1310,7 +1371,7 @@ func (g *GovernanceContract) addDKGMasterPublicKey(round *big.Int, mpk []byte) (
// MPKReady caller is not allowed to propose mpk.
if g.state.DKGMPKReady(caller) {
- return g.penalize()
+ return nil, errExecutionReverted
}
// Calculate 2f
@@ -1325,25 +1386,30 @@ func (g *GovernanceContract) addDKGMasterPublicKey(round *big.Int, mpk []byte) (
var dkgMasterPK dkgTypes.MasterPublicKey
if err := rlp.DecodeBytes(mpk, &dkgMasterPK); err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
+ }
+
+ if g.state.DKGMasterPublicKeyProposed(getDKGMasterPublicKeyID(&dkgMasterPK)) {
+ return nil, errExecutionReverted
}
if dkgMasterPK.Reset != g.state.DKGResetCount(round).Uint64() {
- return g.penalize()
+ return nil, errExecutionReverted
}
// DKGMasterPublicKey must belongs to someone in DKG set.
if !g.inDKGSet(round, dkgMasterPK.ProposerID) {
- return g.penalize()
+ return nil, errExecutionReverted
}
verified, _ := coreUtils.VerifyDKGMasterPublicKeySignature(&dkgMasterPK)
if !verified {
- return g.penalize()
+ return nil, errExecutionReverted
}
g.state.PushDKGMasterPublicKey(mpk)
- return g.useGas(100000)
+ g.state.PutDKGMasterPublicKeyProposed(getDKGMasterPublicKeyID(&dkgMasterPK), true)
+ return g.useGas(GovernanceActionGasCost)
}
func (g *GovernanceContract) addDKGMPKReady(round *big.Int, ready []byte) ([]byte, error) {
@@ -1355,21 +1421,21 @@ func (g *GovernanceContract) addDKGMPKReady(round *big.Int, ready []byte) ([]byt
var dkgReady dkgTypes.MPKReady
if err := rlp.DecodeBytes(ready, &dkgReady); err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
if dkgReady.Reset != g.state.DKGResetCount(round).Uint64() {
- return g.penalize()
+ return nil, errExecutionReverted
}
// DKGFInalize must belongs to someone in DKG set.
if !g.inDKGSet(round, dkgReady.ProposerID) {
- return g.penalize()
+ return nil, errExecutionReverted
}
verified, _ := coreUtils.VerifyDKGMPKReadySignature(&dkgReady)
if !verified {
- return g.penalize()
+ return nil, errExecutionReverted
}
if !g.state.DKGMPKReady(caller) {
@@ -1377,7 +1443,7 @@ func (g *GovernanceContract) addDKGMPKReady(round *big.Int, ready []byte) ([]byt
g.state.IncDKGMPKReadysCount()
}
- return g.useGas(100000)
+ return g.useGas(GovernanceActionGasCost)
}
func (g *GovernanceContract) addDKGFinalize(round *big.Int, finalize []byte) ([]byte, error) {
@@ -1389,21 +1455,21 @@ func (g *GovernanceContract) addDKGFinalize(round *big.Int, finalize []byte) ([]
var dkgFinalize dkgTypes.Finalize
if err := rlp.DecodeBytes(finalize, &dkgFinalize); err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
if dkgFinalize.Reset != g.state.DKGResetCount(round).Uint64() {
- return g.penalize()
+ return nil, errExecutionReverted
}
// DKGFInalize must belongs to someone in DKG set.
if !g.inDKGSet(round, dkgFinalize.ProposerID) {
- return g.penalize()
+ return nil, errExecutionReverted
}
verified, _ := coreUtils.VerifyDKGFinalizeSignature(&dkgFinalize)
if !verified {
- return g.penalize()
+ return nil, errExecutionReverted
}
if !g.state.DKGFinalized(caller) {
@@ -1411,7 +1477,7 @@ func (g *GovernanceContract) addDKGFinalize(round *big.Int, finalize []byte) ([]
g.state.IncDKGFinalizedsCount()
}
- return g.useGas(100000)
+ return g.useGas(GovernanceActionGasCost)
}
func (g *GovernanceContract) updateConfiguration(cfg *rawConfigStruct) ([]byte, error) {
@@ -1430,7 +1496,7 @@ func (g *GovernanceContract) register(
// Reject invalid inputs.
if len(name) >= 32 || len(email) >= 32 || len(location) >= 32 || len(url) >= 128 {
- return g.penalize()
+ return nil, errExecutionReverted
}
caller := g.contract.Caller()
@@ -1457,7 +1523,7 @@ func (g *GovernanceContract) register(
}
g.state.PushNode(node)
if err := g.state.PutNodeOffsets(node, offset); err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
g.state.emitNodeAdded(caller)
@@ -1465,7 +1531,7 @@ func (g *GovernanceContract) register(
g.state.IncTotalStaked(value)
g.state.emitStaked(caller, value)
}
- return g.useGas(100000)
+ return g.useGas(GovernanceActionGasCost)
}
func (g *GovernanceContract) stake() ([]byte, error) {
@@ -1491,7 +1557,7 @@ func (g *GovernanceContract) stake() ([]byte, error) {
g.state.IncTotalStaked(value)
g.state.emitStaked(caller, value)
- return g.useGas(100000)
+ return g.useGas(GovernanceActionGasCost)
}
func (g *GovernanceContract) unstake(amount *big.Int) ([]byte, error) {
@@ -1525,7 +1591,7 @@ func (g *GovernanceContract) unstake(amount *big.Int) ([]byte, error) {
g.state.DecTotalStaked(amount)
g.state.emitUnstaked(caller, amount)
- return g.useGas(100000)
+ return g.useGas(GovernanceActionGasCost)
}
func (g *GovernanceContract) withdraw() ([]byte, error) {
@@ -1550,7 +1616,7 @@ func (g *GovernanceContract) withdraw() ([]byte, error) {
unlockTime := new(big.Int).Add(node.UnstakedAt, g.state.LockupPeriod())
if g.evm.Time.Cmp(unlockTime) <= 0 {
- return g.penalize()
+ return nil, errExecutionReverted
}
amount := node.Unstaked
@@ -1581,7 +1647,7 @@ func (g *GovernanceContract) withdraw() ([]byte, error) {
}
g.state.emitWithdrawn(caller, amount)
- return g.useGas(100000)
+ return g.useGas(GovernanceActionGasCost)
}
func (g *GovernanceContract) payFine(nodeAddr common.Address) ([]byte, error) {
@@ -1602,7 +1668,7 @@ func (g *GovernanceContract) payFine(nodeAddr common.Address) ([]byte, error) {
g.state.emitFinePaid(nodeAddr, g.contract.Value())
- return g.useGas(100000)
+ return g.useGas(GovernanceActionGasCost)
}
func (g *GovernanceContract) proposeCRS(nextRound *big.Int, signedCRS []byte) ([]byte, error) {
@@ -1630,7 +1696,7 @@ func (g *GovernanceContract) proposeCRS(nextRound *big.Int, signedCRS []byte) ([
Signature: signedCRS,
}
if !dkgGPK.VerifySignature(coreCommon.Hash(prevCRS), signature) {
- return g.penalize()
+ return nil, errExecutionReverted
}
// Save new CRS into state and increase round.
@@ -1640,9 +1706,7 @@ func (g *GovernanceContract) proposeCRS(nextRound *big.Int, signedCRS []byte) ([
g.state.SetCRSRound(nextRound)
g.state.emitCRSProposed(nextRound, crs)
- // To encourage DKG set to propose the correct value, correctly submitting
- // this should cause nothing.
- return g.useGas(0)
+ return g.useGas(GovernanceActionGasCost)
}
type sortBytes [][]byte
@@ -1691,38 +1755,38 @@ func (g *GovernanceContract) report(reportType *big.Int, arg1, arg2 []byte) ([]b
case ReportTypeForkVote:
vote1 := new(coreTypes.Vote)
if err := rlp.DecodeBytes(arg1, vote1); err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
vote2 := new(coreTypes.Vote)
if err := rlp.DecodeBytes(arg2, vote2); err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
need, err := coreUtils.NeedPenaltyForkVote(vote1, vote2)
if !need || err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
reportedNodeID = vote1.ProposerID
case ReportTypeForkBlock:
block1 := new(coreTypes.Block)
if err := rlp.DecodeBytes(arg1, block1); err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
block2 := new(coreTypes.Block)
if err := rlp.DecodeBytes(arg2, block2); err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
need, err := coreUtils.NeedPenaltyForkBlock(block1, block2)
if !need || err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
reportedNodeID = block1.ProposerID
default:
- return g.penalize()
+ return nil, errExecutionReverted
}
node, err := g.state.GetNodeByID(reportedNodeID)
if err != nil {
- return g.penalize()
+ return nil, errExecutionReverted
}
g.state.emitForkReported(node.Owner, reportType, arg1, arg2)
@@ -1809,7 +1873,7 @@ func (g *GovernanceContract) resetDKG(newSignedCRS []byte) ([]byte, error) {
Signature: newSignedCRS,
}
if !dkgGPK.VerifySignature(coreCommon.Hash(prevCRS), signature) {
- return g.penalize()
+ return nil, errExecutionReverted
}
newRound := new(big.Int).Add(g.evm.Round, big.NewInt(1))
@@ -2249,7 +2313,7 @@ func (g *GovernanceContract) transferNodeOwnership(newOwner common.Address) ([]b
offset := g.state.NodesOffsetByAddress(caller)
if offset.Cmp(big.NewInt(0)) < 0 {
- return g.penalize()
+ return nil, errExecutionReverted
}
node := g.state.Node(offset)
diff --git a/core/vm/oracle_contracts_test.go b/core/vm/oracle_contracts_test.go
index 16d8e8a92..868ea533c 100644
--- a/core/vm/oracle_contracts_test.go
+++ b/core/vm/oracle_contracts_test.go
@@ -31,6 +31,7 @@ import (
coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto"
coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
coreUtils "github.com/dexon-foundation/dexon-consensus/core/utils"
"github.com/dexon-foundation/dexon/common"
@@ -908,7 +909,9 @@ func (g *OracleContractsTestSuite) TestResetDKG() {
// Clear DKG states for next round.
dkgSet := dkgSets[round-1]
+ g.s.ClearDKGMasterPublicKeyProposed()
g.s.ClearDKGMasterPublicKeys()
+ g.s.ClearDKGComplaintProposed()
g.s.ClearDKGComplaints()
g.s.ClearDKGMPKReadys(dkgSet)
g.s.ResetDKGMPKReadysCount()
@@ -939,9 +942,19 @@ func (g *OracleContractsTestSuite) TestResetDKG() {
}
node := g.s.Node(offset)
// Prepare MPK.
- g.s.PushDKGMasterPublicKey(randomBytes(32, 64))
+ x := dkgTypes.MasterPublicKey{}
+ b, err := rlp.EncodeToBytes(&x)
+ if err != nil {
+ panic(err)
+ }
+ g.s.PushDKGMasterPublicKey(b)
// Prepare Complaint.
- g.s.PushDKGComplaint(randomBytes(32, 64))
+ y := dkgTypes.Complaint{}
+ b, err = rlp.EncodeToBytes(&y)
+ if err != nil {
+ panic(err)
+ }
+ g.s.PushDKGComplaint(b)
addr := node.Owner
addrs[round] = append(addrs[round], addr)
// Prepare MPK Ready.
diff --git a/dex/governance.go b/dex/governance.go
index 35c5b4174..c2f2918b1 100644
--- a/dex/governance.go
+++ b/dex/governance.go
@@ -85,11 +85,16 @@ func (d *DexconGovernance) sendGovTx(ctx context.Context, data []byte) error {
// be included in time.
gasPrice = new(big.Int).Mul(gasPrice, big.NewInt(10))
+ gasLimit, err := core.IntrinsicGas(data, false, false)
+ if err != nil {
+ return err
+ }
+
tx := types.NewTransaction(
nonce,
vm.GovernanceContractAddress,
big.NewInt(0),
- uint64(10000000),
+ gasLimit+vm.GovernanceActionGasCost,
gasPrice,
data)
diff --git a/params/config.go b/params/config.go
index 97a46e3be..76ca84cf5 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("0x075918a1da88f5d7bed21362e22b780d6b04739b04c7fd0aa25d33b86f56a87f")
- TestnetGenesisHash = common.HexToHash("0x4e8e72e73b70f096f31910f0f9b930f65291fcff8b344c93dada282df90bb99f")
- TaipeiGenesisHash = common.HexToHash("0x8c074f5f0d434e23feda0ba238a8915a2457c6d169a14020afc05e0f7ee812e3")
- YilanGenesisHash = common.HexToHash("0x6d4bc5a73bc2b665b23a06bed9d16c5239ca9598a2cbb662677d0329a0819a2d")
+ MainnetGenesisHash = common.HexToHash("0xcde2f22a8ccad92a6839880e445bccf3949aae712056a9d139a318f9f4b18fe8")
+ TestnetGenesisHash = common.HexToHash("0x7463c980be61ae7e32e8a7611c9532989dfc4463c264b9ef3d31bfe490780425")
+ TaipeiGenesisHash = common.HexToHash("0x953540c8dc6155c506b85be9944b97c636948e2cb47b698e4bdf7d58563a6e01")
+ YilanGenesisHash = common.HexToHash("0x70654e2b863f01f00f843e6c4b0ecf2af39f7e27493f577ca4526b40eb1773c7")
)
var (