diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-11-19 14:36:36 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2018-12-19 20:54:27 +0800 |
| commit | 3314c0573822d5008211e076831258899565ba5d (patch) | |
| tree | 5d5b97b513ef52746b4584b21f4efb636aba5106 /dex | |
| parent | d41f3b1a9834e7911603b3ec3ddf0714d99ceca9 (diff) | |
| download | dexon-3314c0573822d5008211e076831258899565ba5d.tar dexon-3314c0573822d5008211e076831258899565ba5d.tar.gz dexon-3314c0573822d5008211e076831258899565ba5d.tar.bz2 dexon-3314c0573822d5008211e076831258899565ba5d.tar.lz dexon-3314c0573822d5008211e076831258899565ba5d.tar.xz dexon-3314c0573822d5008211e076831258899565ba5d.tar.zst dexon-3314c0573822d5008211e076831258899565ba5d.zip | |
governance: implement delegate/undelegate function and add tests (#33)
Implement delegate/undelegate function to allow others to delegate it's
fund to stake on a node. Also added governance contract tests.
Diffstat (limited to 'dex')
| -rw-r--r-- | dex/app.go | 2 | ||||
| -rw-r--r-- | dex/governance.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dex/app.go b/dex/app.go index e0280dc2c..99514ed83 100644 --- a/dex/app.go +++ b/dex/app.go @@ -245,7 +245,7 @@ func (d *DexconApp) PrepareWitness(consensusHeight uint64) (witness coreTypes.Wi if lastPendingHeight == 0 && consensusHeight == 0 { witnessBlock = d.blockchain.CurrentBlock() } else if lastPendingHeight >= consensusHeight { - witnessBlock = d.blockchain.GetPendingBlock() + witnessBlock = d.blockchain.PendingBlock() } else { log.Error("last pending height too low", "lastPendingHeight", lastPendingHeight, "consensusHeight", consensusHeight) diff --git a/dex/governance.go b/dex/governance.go index f555b3508..db33f7820 100644 --- a/dex/governance.go +++ b/dex/governance.go @@ -100,7 +100,7 @@ func (d *DexconGovernance) Configuration(round uint64) *coreTypes.Config { NumChains: c.NumChains, LambdaBA: time.Duration(c.LambdaBA) * time.Millisecond, LambdaDKG: time.Duration(c.LambdaDKG) * time.Millisecond, - K: c.K, + K: int(c.K), PhiRatio: c.PhiRatio, NotarySetSize: c.NotarySetSize, DKGSetSize: c.DKGSetSize, @@ -172,12 +172,12 @@ func (d *DexconGovernance) ProposeCRS(round uint64, signedCRS []byte) { } } -// NodeSet returns the current notary set. +// NodeSet returns the current node set. func (d *DexconGovernance) NodeSet(round uint64) []coreCrypto.PublicKey { s := d.getGovStateAtRound(round) var pks []coreCrypto.PublicKey - for _, n := range s.Nodes() { + for _, n := range s.QualifiedNodes() { pk, err := coreEcdsa.NewPublicKeyFromByteSlice(n.PublicKey) if err != nil { panic(err) |