Skip to content

Commit 64111bc

Browse files
committed
The actual code changes for blockchain and stake.
1 parent 6784604 commit 64111bc

21 files changed

Lines changed: 49 additions & 112 deletions

File tree

‎api/insight/converter.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package insight
66

77
import (
8-
"github.com/decred/dcrd/blockchain"
8+
"github.com/decred/dcrd/blockchain/standalone"
99
"github.com/decred/dcrd/dcrutil/v2"
1010
chainjson "github.com/decred/dcrd/rpc/jsonrpc/types"
1111
apitypes "github.com/decred/dcrdata/api/types/v4"
@@ -146,12 +146,11 @@ func (iapi *InsightApi) DcrToInsightTxns(txs []*chainjson.TxRawResult, noAsm, no
146146

147147
// DcrToInsightBlock converts a chainjson.GetBlockVerboseResult to Insight block.
148148
func (iapi *InsightApi) DcrToInsightBlock(inBlocks []*chainjson.GetBlockVerboseResult) ([]*apitypes.InsightBlockResult, error) {
149-
params := txhelpers.ParamsV2ToV1(iapi.params)
150149
RewardAtBlock := func(blocknum int64, voters uint16) float64 {
151-
subsidyCache := blockchain.NewSubsidyCache(0, params)
152-
work := blockchain.CalcBlockWorkSubsidy(subsidyCache, blocknum, voters, params)
153-
stake := blockchain.CalcStakeVoteSubsidy(subsidyCache, blocknum, params) * int64(voters)
154-
tax := blockchain.CalcBlockTaxSubsidy(subsidyCache, blocknum, voters, params)
150+
subsidyCache := standalone.NewSubsidyCache(iapi.params)
151+
work := subsidyCache.CalcWorkSubsidy(blocknum, voters)
152+
stake := subsidyCache.CalcStakeVoteSubsidy(blocknum) * int64(voters)
153+
tax := subsidyCache.CalcTreasurySubsidy(blocknum, voters)
155154
return dcrutil.Amount(work + stake + tax).ToCoin()
156155
}
157156

‎blockdata/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.11
44

55
require (
66
github.com/decred/dcrd/chaincfg/chainhash v1.0.2
7-
github.com/decred/dcrd/chaincfg/v2 v2.1.0
7+
github.com/decred/dcrd/chaincfg/v2 v2.2.0
88
github.com/decred/dcrd/dcrutil/v2 v2.0.0
99
github.com/decred/dcrd/rpc/jsonrpc/types v1.0.0
1010
github.com/decred/dcrd/rpcclient/v4 v4.0.0

‎cmd/scanblocks/scanblocks.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99
"strconv"
1010

11-
"github.com/decred/dcrd/blockchain"
11+
"github.com/decred/dcrd/blockchain/standalone"
1212
"github.com/decred/dcrd/chaincfg/v2"
1313
"github.com/decred/dcrd/dcrutil/v2"
1414
"github.com/decred/dcrd/rpcclient/v4"
@@ -165,8 +165,8 @@ func getDifficultyRatio(bits uint32) float64 {
165165
// converted back to a number. Note this is not the same as the proof of
166166
// work limit directly because the block difficulty is encoded in a block
167167
// with the compact form which loses precision.
168-
max := blockchain.CompactToBig(activeNetParams.PowLimitBits)
169-
target := blockchain.CompactToBig(bits)
168+
max := standalone.CompactToBig(activeNetParams.PowLimitBits)
169+
target := standalone.CompactToBig(bits)
170170

171171
difficulty := new(big.Rat).SetFrac(max, target)
172172
outString := difficulty.FloatString(8)

‎db/cache/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.11
44

55
require (
66
github.com/decred/dcrd/chaincfg/chainhash v1.0.2
7-
github.com/decred/dcrd/chaincfg/v2 v2.1.0
7+
github.com/decred/dcrd/chaincfg/v2 v2.2.0
88
github.com/decred/dcrdata/db/dbtypes/v2 v2.1.3
99
github.com/decred/dcrdata/semver v1.0.0
1010
github.com/decred/dcrdata/txhelpers/v3 v3.0.3

‎db/dbtypes/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.11
55
require (
66
github.com/decred/dcrd/blockchain/stake/v2 v2.0.1
77
github.com/decred/dcrd/chaincfg/chainhash v1.0.2
8-
github.com/decred/dcrd/chaincfg/v2 v2.1.0
8+
github.com/decred/dcrd/chaincfg/v2 v2.2.0
99
github.com/decred/dcrd/dcrutil/v2 v2.0.0
1010
github.com/decred/dcrd/txscript/v2 v2.0.0
1111
github.com/decred/dcrd/wire v1.2.0

‎db/dcrpg/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/davecgh/go-spew v1.1.1
88
github.com/decred/dcrd/blockchain/stake/v2 v2.0.1
99
github.com/decred/dcrd/chaincfg/chainhash v1.0.2
10-
github.com/decred/dcrd/chaincfg/v2 v2.1.0
10+
github.com/decred/dcrd/chaincfg/v2 v2.2.0
1111
github.com/decred/dcrd/dcrutil/v2 v2.0.0
1212
github.com/decred/dcrd/rpc/jsonrpc/types v1.0.0
1313
github.com/decred/dcrd/rpcclient/v4 v4.0.0

‎db/dcrsqlite/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.11
55
require (
66
github.com/decred/dcrd/blockchain/stake/v2 v2.0.1
77
github.com/decred/dcrd/chaincfg/chainhash v1.0.2
8-
github.com/decred/dcrd/chaincfg/v2 v2.1.0
8+
github.com/decred/dcrd/chaincfg/v2 v2.2.0
99
github.com/decred/dcrd/dcrutil/v2 v2.0.0
1010
github.com/decred/dcrd/rpc/jsonrpc/types v1.0.0
1111
github.com/decred/dcrd/rpcclient/v4 v4.0.0

‎explorer/types/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/decred/dcrdata/explorer/types/v2
33
go 1.11
44

55
require (
6-
github.com/decred/dcrd/chaincfg/v2 v2.1.0
6+
github.com/decred/dcrd/chaincfg/v2 v2.2.0
77
github.com/decred/dcrd/dcrutil/v2 v2.0.0
88
github.com/decred/dcrd/rpc/jsonrpc/types v1.0.0
99
github.com/decred/dcrd/wire v1.2.0

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/decred/dcrdata/v5
33
require (
44
github.com/caarlos0/env v3.5.0+incompatible
55
github.com/chappjc/logrus-prefix v0.0.0-20180227015900-3a1d64819adb
6-
github.com/decred/dcrd/blockchain v1.2.0
6+
github.com/decred/dcrd/blockchain/standalone v1.0.0
77
github.com/decred/dcrd/chaincfg/chainhash v1.0.2
8-
github.com/decred/dcrd/chaincfg/v2 v2.1.0
8+
github.com/decred/dcrd/chaincfg/v2 v2.2.0
99
github.com/decred/dcrd/dcrec v1.0.0
1010
github.com/decred/dcrd/dcrutil/v2 v2.0.0
1111
github.com/decred/dcrd/rpc/jsonrpc/types v1.0.0

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ github.com/decred/dcrd/chaincfg/v2 v2.0.2 h1:VeGY52lHuYT01tIGbvYj+OO0GaGxGaJmnh+
9999
github.com/decred/dcrd/chaincfg/v2 v2.0.2/go.mod h1:hpKvhLCDAD/xDZ3V1Pqpv9fIKVYYi11DyxETguazyvg=
100100
github.com/decred/dcrd/chaincfg/v2 v2.1.0 h1:2S7TL9YWnKDDiH5bTpp3xcBo+1gl1IXFi5KU4QwSIDk=
101101
github.com/decred/dcrd/chaincfg/v2 v2.1.0/go.mod h1:hpKvhLCDAD/xDZ3V1Pqpv9fIKVYYi11DyxETguazyvg=
102+
github.com/decred/dcrd/chaincfg/v2 v2.2.0 h1:SBkoqeM9+CkMA1V3i3Ffc4gAC4TqN2EoSRw5kjGkvx4=
103+
github.com/decred/dcrd/chaincfg/v2 v2.2.0/go.mod h1:hpKvhLCDAD/xDZ3V1Pqpv9fIKVYYi11DyxETguazyvg=
102104
github.com/decred/dcrd/connmgr v1.0.2/go.mod h1:jBNfQLh+454n3crgNCPrhMgZ9mVvYcMbWSCEAHsJQus=
103105
github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0=
104106
github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=

0 commit comments

Comments
 (0)
⌂ 换网址