Commit 40f9bd51 authored by Esad Akar's avatar Esad Akar Committed by GitHub

fix: old node overlay migration (#2133)

parent 73654962
...@@ -29,20 +29,29 @@ func InitStateStore(log logging.Logger, dataDir string) (ret storage.StateStorer ...@@ -29,20 +29,29 @@ func InitStateStore(log logging.Logger, dataDir string) (ret storage.StateStorer
} }
const overlayKey = "overlay" const overlayKey = "overlay"
const secureOverlayKey = "non-mineable-overlay"
// CheckOverlayWithStore checks the overlay is the same as stored in the statestore // CheckOverlayWithStore checks the overlay is the same as stored in the statestore
func CheckOverlayWithStore(overlay swarm.Address, storer storage.StateStorer) error { func CheckOverlayWithStore(overlay swarm.Address, storer storage.StateStorer) error {
// migrate overlay key to new key
err := storer.Delete(overlayKey)
if err != nil && !errors.Is(err, storage.ErrNotFound) {
return err
}
var storedOverlay swarm.Address var storedOverlay swarm.Address
err := storer.Get(overlayKey, &storedOverlay) err = storer.Get(secureOverlayKey, &storedOverlay)
if err != nil { if err != nil {
if !errors.Is(err, storage.ErrNotFound) { if !errors.Is(err, storage.ErrNotFound) {
return err return err
} }
return storer.Put(overlayKey, overlay) return storer.Put(secureOverlayKey, overlay)
} }
if !storedOverlay.Equal(overlay) { if !storedOverlay.Equal(overlay) {
return fmt.Errorf("overlay address changed. was %s before but now is %s", storedOverlay, overlay) return fmt.Errorf("overlay address changed. was %s before but now is %s", storedOverlay, overlay)
} }
return nil return nil
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment