Startpost rpc

activation/activation.go

@@ -6,6 +6,7 @@ import (
 	"github.com/spacemeshos/go-spacemesh/common"
 	"github.com/spacemeshos/go-spacemesh/log"
 	"github.com/spacemeshos/go-spacemesh/types"
+	"sync"
 	"sync/atomic"
 )
 
@@ -36,7 +37,7 @@ func (provider *PoETNumberOfTickProvider) NumOfTicks() uint64 {
 type NipstBuilder interface {
 	BuildNIPST(challenge *common.Hash) (*types.NIPST, error)
 	IsPostInitialized() bool
-	InitializePost() (*types.PostProof, error)
+	InitializePost(logicalDrive string, commitmentSize uint64) (*types.PostProof, error)
 }
 
 type IdStore interface {
@@ -60,6 +61,12 @@ type BytesStore interface {
 	Get(key []byte) ([]byte, error)
 }
 
+const (
+	Idle       = 1
+	InProgress = 2
+	Done       = 3
+)
+
 type Builder struct {
 	nodeId          types.NodeId
 	coinbaseAccount address.Address
@@ -80,6 +87,9 @@ type Builder struct {
 	started         uint32
 	store           BytesStore
 	isSynced        func() bool
+	accountLock     sync.RWMutex
+	postInitLock    sync.RWMutex
+	initStatus      int
 	log             log.Log
 }
 
@@ -99,6 +109,7 @@ func NewBuilder(nodeId types.NodeId, coinbaseAccount address.Address, db ATXDBPr
 		finished:        make(chan struct{}),
 		isSynced:        isSyncedFunc,
 		store:           store,
+		initStatus:      Idle,
 		log:             log,
 	}
 }
@@ -119,14 +130,6 @@ func (b *Builder) Stop() {
 
 // loop is the main loop that tries to create an atx per tick received from the global clock
 func (b *Builder) loop() {
-	// post is initialized here, consider moving it to another location.
-	if !b.nipstBuilder.IsPostInitialized() {
-		_, err := b.nipstBuilder.InitializePost() // TODO: add proof to first ATX
-		if err != nil {
-			b.log.Error("PoST initialization failed: %v", err)
-			return
-		}
-	}
 	err := b.loadChallenge()
 	if err != nil {
 		log.Info("challenge not loaded: %s", err)
@@ -140,6 +143,13 @@ func (b *Builder) loop() {
 				b.log.Info("cannot create atx : not synced")
 				break
 			}
+			b.postInitLock.RLock()
+			initStat := b.initStatus
+			b.postInitLock.RUnlock()
+			if initStat != Done || !b.nipstBuilder.IsPostInitialized() {
+				b.log.Info("nipst is not initialized yet, not building nipst")
+				break
+			}
 			if b.working {
 				break
 			}
@@ -222,6 +232,44 @@ func (b *Builder) buildNipstChallenge(epoch types.EpochId) error {
 	return nil
 }
 
+func (b *Builder) StartPost(rewardAddress address.Address, logicalDrive string, commitmentSize uint64) error {
+	b.SetCoinbaseAccount(rewardAddress)
+
+	if !b.nipstBuilder.IsPostInitialized() {
+		b.postInitLock.Lock()
+		if b.initStatus != Idle {
+			b.postInitLock.Unlock()
+			return fmt.Errorf("attempted to start post when post already inited")
+		}
+		b.initStatus = InProgress
+		go func() {
+			_, err := b.nipstBuilder.InitializePost(logicalDrive, commitmentSize) // TODO: add proof to first ATX
+			b.postInitLock.Lock()
+			b.initStatus = Done
+			b.postInitLock.Unlock()
+			if err != nil {
+				b.log.Error("PoST initialization failed: %v", err)
+				return
+			}
+		}()
+		b.postInitLock.Unlock()
+	}
+	return nil
+}
+
+func (b *Builder) SetCoinbaseAccount(rewardAddress address.Address) {
+	b.accountLock.Lock()
+	b.coinbaseAccount = rewardAddress
+	b.accountLock.Unlock()
+}
+
+func (b *Builder) getCoinbaseAccount() address.Address {
+	b.accountLock.RLock()
+	acc := b.coinbaseAccount
+	b.accountLock.RUnlock()
+	return acc
+}
+
 func (b Builder) getNipstKey() []byte {
 	return []byte("nipst")
 }
@@ -326,7 +374,7 @@ func (b *Builder) PublishActivationTx(epoch types.EpochId) error {
 			pubEpoch, len(view), view)
 	}
 
-	atx := types.NewActivationTxWithChallenge(*b.challenge, b.coinbaseAccount, activeSetSize, view, b.nipst)
+	atx := types.NewActivationTxWithChallenge(*b.challenge, b.getCoinbaseAccount(), activeSetSize, view, b.nipst)
 
 	b.log.With().Info("active ids seen for epoch", log.Uint64("pos_atx_epoch", uint64(posEpoch)),
 		log.Uint32("view_cnt", activeSetSize))

activation/activation_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"sort"
 	"testing"
+	"time"
 )
 
 // ========== Vars / Consts ==========
@@ -71,15 +72,20 @@ func (n *NetMock) Broadcast(id string, d []byte) error {
 }
 
 type NipstBuilderMock struct {
-	poetRef        []byte
-	buildNipstFunc func(challenge *common.Hash) (*types.NIPST, error)
+	poetRef         []byte
+	buildNipstFunc  func(challenge *common.Hash) (*types.NIPST, error)
+	SleepTime       int
+	PostInitialized bool
 }
 
 func (np *NipstBuilderMock) IsPostInitialized() bool {
-	return true
+	return np.PostInitialized
 }
 
-func (np *NipstBuilderMock) InitializePost() (*types.PostProof, error) {
+func (np *NipstBuilderMock) InitializePost(logicalDrive string, commitmentSize uint64) (*types.PostProof, error) {
+	if np.SleepTime != 0 {
+		time.Sleep(time.Duration(np.SleepTime) * time.Millisecond)
+	}
 	return nil, nil
 }
 
@@ -97,7 +103,7 @@ func (np *NipstErrBuilderMock) IsPostInitialized() bool {
 	return true
 }
 
-func (np *NipstErrBuilderMock) InitializePost() (*types.PostProof, error) {
+func (np *NipstErrBuilderMock) InitializePost(logicalDrive string, commitmentSize uint64) (*types.PostProof, error) {
 	return nil, nil
 }
 
@@ -432,7 +438,7 @@ func TestBuilder_NipstPublishRecovery(t *testing.T) {
 	coinbase := address.HexToAddress("0xaaa")
 	net := &NetMock{}
 	layers := &MeshProviderMock{}
-	nipstBuilder := &NipstBuilderMock{}
+	nipstBuilder := &NipstBuilderMock{PostInitialized: true}
 	layersPerEpoch := uint16(10)
 	lg := log.NewDefault(id.Key[:5])
 	db := NewMockDB()
@@ -492,3 +498,28 @@ func TestBuilder_NipstPublishRecovery(t *testing.T) {
 	err = b.PublishActivationTx(3)
 	assert.True(t, db.hadNone)
 }
+
+func TestStartPost(t *testing.T) {
+	id := types.NodeId{"aaaaaa", []byte("bbbbb")}
+	coinbase := address.HexToAddress("0xaaa")
+	//net := &NetMock{}
+	layers := &MeshProviderMock{}
+	nipstBuilder := &NipstBuilderMock{PostInitialized: false}
+	layersPerEpoch := uint16(10)
+	lg := log.NewDefault(id.Key[:5])
+
+	drive := "/tmp/anton"
+	coinbase2 := address.HexToAddress("0xabb")
+	db := NewMockDB()
+	activationDb := NewActivationDb(database.NewMemDatabase(), &MockIdStore{}, mesh.NewMemMeshDB(lg.WithName("meshDB")), layersPerEpoch, &ValidatorMock{}, lg.WithName("atxDB1"))
+	b := NewBuilder(id, coinbase, activationDb, &FaultyNetMock{}, layers, layersPerEpoch, nipstBuilder, nil, func() bool { return true }, db, lg.WithName("atxBuilder"))
+
+	nipstBuilder.SleepTime = 10000
+	err := b.StartPost(coinbase2, drive, 1000)
+	assert.NoError(t, err)
+
+	// negative test to run
+	err = b.StartPost(coinbase2, drive, 1000)
+	assert.Error(t, err)
+
+}

address/address.go

@@ -30,6 +30,14 @@ func BigToAddress(b *big.Int) Address { return BytesToAddress(b.Bytes()) }
 // If s is larger than len(h), s will be cropped from the left.
 func HexToAddress(s string) Address { return BytesToAddress(common.FromHex(s)) }
 
+func StringToAddress(s string) (Address, error) {
+	bt, err := hex.DecodeString(s)
+	if err != nil {
+		return Address{}, err
+	}
+	return BytesToAddress(bt), nil
+}
+
 // Bytes gets the string representation of the underlying address.
 func (a Address) Bytes() []byte { return a[:] }