Merge pull request #17 from filecoin-project/feat/mining-1

Implement basic mining logic

node/api.go

@@ -6,8 +6,9 @@ import (
 	"github.com/filecoin-project/go-lotus/api"
 	"github.com/filecoin-project/go-lotus/build"
 	"github.com/filecoin-project/go-lotus/chain"
+	"github.com/filecoin-project/go-lotus/chain/address"
+	"github.com/filecoin-project/go-lotus/miner"
 
-	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/peer"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
@@ -18,9 +19,14 @@ type API struct {
 	Host   host.Host
 	Chain  *chain.ChainStore
 	PubSub *pubsub.PubSub
+	Mpool  *chain.MessagePool
 }
 
 func (a *API) ChainSubmitBlock(ctx context.Context, blk *chain.BlockMsg) error {
+	if err := a.Chain.AddBlock(blk.Header); err != nil {
+		return err
+	}
+
 	b, err := blk.Serialize()
 	if err != nil {
 		return err
@@ -30,8 +36,13 @@ func (a *API) ChainSubmitBlock(ctx context.Context, blk *chain.BlockMsg) error {
 	return a.PubSub.Publish("/fil/blocks", b)
 }
 
-func (a *API) ChainHead(context.Context) ([]cid.Cid, error) {
-	return a.Chain.GetHeaviestTipSet().Cids(), nil
+func (a *API) ChainHead(context.Context) (*chain.TipSet, error) {
+	return a.Chain.GetHeaviestTipSet(), nil
+}
+
+func (a *API) ChainGetRandomness(ctx context.Context, pts *chain.TipSet) ([]byte, error) {
+	// TODO: this needs to look back in the chain for the right random beacon value
+	return []byte("foo bar random"), nil
 }
 
 func (a *API) ID(context.Context) (peer.ID, error) {
@@ -44,6 +55,36 @@ func (a *API) Version(context.Context) (api.Version, error) {
 	}, nil
 }
 
+func (a *API) MpoolPending(ctx context.Context, ts *chain.TipSet) ([]*chain.SignedMessage, error) {
+	// TODO: need to make sure we don't return messages that were already included in the referenced chain
+	// also need to accept ts == nil just fine, assume nil == chain.Head()
+	return a.Mpool.Pending(), nil
+}
+
+func (a *API) MinerStart(ctx context.Context, addr address.Address) error {
+	// hrm...
+	m := miner.NewMiner(a, addr)
+
+	go m.Mine(context.TODO())
+
+	return nil
+}
+
+func (a *API) MinerCreateBlock(ctx context.Context, addr address.Address, parents *chain.TipSet, tickets []chain.Ticket, proof chain.ElectionProof, msgs []*chain.SignedMessage) (*chain.BlockMsg, error) {
+	fblk, err := chain.MinerCreateBlock(a.Chain, addr, parents, tickets, proof, msgs)
+	if err != nil {
+		return nil, err
+	}
+
+	var out chain.BlockMsg
+	out.Header = fblk.Header
+	for _, msg := range fblk.Messages {
+		out.Messages = append(out.Messages, msg.Cid())
+	}
+
+	return &out, nil
+}
+
 func (a *API) NetPeers(context.Context) ([]peer.AddrInfo, error) {
 	conns := a.Host.Network().Conns()
 	out := make([]peer.AddrInfo, len(conns))

node/builder.go

@@ -58,7 +58,7 @@ const (
 	StartListeningKey
 
 	// filecoin
-	SetGenisisKey
+	SetGenesisKey
 
 	RunHelloKey
 	RunBlockSyncKey
@@ -174,7 +174,7 @@ func Online() Option {
 		Override(new(*chain.MessagePool), chain.NewMessagePool),
 
 		Override(new(modules.Genesis), testing.MakeGenesis),
-		Override(SetGenisisKey, modules.SetGenesis),
+		Override(SetGenesisKey, modules.SetGenesis),
 
 		Override(new(*hello.Service), hello.NewHelloService),
 		Override(new(*chain.BlockSyncService), chain.NewBlockSyncService),