interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1611 from obscuren/expdiff-olympic-fix 

cmd/utils, core: disable exp diff for olympic net
This commit is contained in:
Jeffrey Wilcke 2015-08-09 05:15:13 -07:00
parent 1cbd53add8 74f6d90153
commit 07cb8092e7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/utils/cmd.go
View File

@ -21,6 +21,7 @@ import (
"bufio" "bufio"
"fmt" "fmt"
"io" "io"
"math"
"math/big" "math/big"
"os" "os"
"os/signal" "os/signal"
@ -152,6 +153,7 @@ func InitOlympic() {
params.MaximumExtraDataSize = big.NewInt(1024) params.MaximumExtraDataSize = big.NewInt(1024)
NetworkIdFlag.Value = 0 NetworkIdFlag.Value = 0
core.BlockReward = big.NewInt(1.5e+18) core.BlockReward = big.NewInt(1.5e+18)
core.ExpDiffPeriod = big.NewInt(math.MaxInt64)
} }
func FormatTransactionData(data string) []byte { func FormatTransactionData(data string) []byte {

4
core/chain_util.go
View File

@ -32,7 +32,7 @@ import (
var ( var (
blockHashPre = []byte("block-hash-") blockHashPre = []byte("block-hash-")
blockNumPre = []byte("block-num-") blockNumPre = []byte("block-num-")
expDiffPeriod = big.NewInt(100000) ExpDiffPeriod = big.NewInt(100000)
) )
// CalcDifficulty is the difficulty adjustment algorithm. It returns // CalcDifficulty is the difficulty adjustment algorithm. It returns
@ -57,7 +57,7 @@ func CalcDifficulty(time, parentTime uint64, parentNumber, parentDiff *big.Int)
} }
periodCount := new(big.Int).Add(parentNumber, common.Big1) periodCount := new(big.Int).Add(parentNumber, common.Big1)
periodCount.Div(periodCount, expDiffPeriod) periodCount.Div(periodCount, ExpDiffPeriod)
if periodCount.Cmp(common.Big1) > 0 { if periodCount.Cmp(common.Big1) > 0 {
// diff = diff + 2^(periodCount - 2) // diff = diff + 2^(periodCount - 2)
expDiff := periodCount.Sub(periodCount, common.Big2) expDiff := periodCount.Sub(periodCount, common.Big2)