ethash: fix initialization flaw

ethereum · Oct 5, 2020 · 3fc6dd8 · 3fc6dd8
1 parent 523f284
commit 3fc6dd8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go
@@ -546,6 +546,9 @@ func NewShared(progpowNumber *big.Int) *Ethash {
  if progpowNumber == nil {
  progpowNumber = new(big.Int).SetUint64(uint64(math.MaxUint64))
  }
+ if sharedEngines == nil {
+ sharedEngines = make(map[uint64]*Ethash)
+ }
  sharedEngine, exist := sharedEngines[progpowNumber.Uint64()]
  if !exist {
  sharedEngine = New(Config{"", 3, 0, false, "", 1, 0, false, ModeNormal, progpowNumber, nil}, nil, false)

diff --git a/consensus/ethash/progpow.go b/consensus/ethash/progpow.go
@@ -19,9 +19,9 @@ package ethash
 
 import (
  "encoding/binary"
+ "math/bits"
 
  "golang.org/x/crypto/sha3"
- "math/bits"
 )
 
 const (
@@ -310,15 +310,14 @@ func progpowLoop(seed uint64, loop uint32, mix *[progpowLanes][progpowRegs]uint3
  gOffset := mix[loop%progpowLanes][0] % (64 * datasetSize / (progpowLanes * progpowDagLoads))
 
  var (
- srcCounter = uint32(0)
- dstCounter = uint32(0)
+ srcCounter uint32
+ dstCounter uint32
  randState kiss99State
  srcSeq [32]uint32
  dstSeq [32]uint32
  rnd = kiss99
- //iMax = uint32(0)
- index = uint32(0)
- data_g []uint32 = make([]uint32, progpowDagLoads)
+ index uint32
+ data_g []uint32 = make([]uint32, progpowDagLoads)
  )
  // 256 bytes of dag data
  dag_item := make([]byte, 256)

diff --git a/consensus/ethash/progpow_test.go b/consensus/ethash/progpow_test.go
@@ -20,13 +20,13 @@ import (
  "bytes"
  "encoding/json"
  "fmt"
- "golang.org/x/crypto/sha3"
  "io/ioutil"
  "path/filepath"
  "strconv"
  "testing"
 
  "github.com/ethereum/go-ethereum/common"
+ "golang.org/x/crypto/sha3"
 )
 
 func TestRandomMerge(t *testing.T) {