Improve deal making efficiency & Lotus v1.1.3 update & fixes (#705)

* update things Signed-off-by: Ignacio Hagopian <[email protected]> * add missing deal Signed-off-by: Ignacio Hagopian <[email protected]> * fix changed error message Signed-off-by: Ignacio Hagopian <[email protected]> * update devnet Signed-off-by: Ignacio Hagopian <[email protected]> * update devnet Signed-off-by: Ignacio Hagopian <[email protected]> * revert change Signed-off-by: Ignacio Hagopian <[email protected]> * remove sector list from miner index Signed-off-by: Ignacio Hagopian <[email protected]> * avoid port collisions Signed-off-by: Ignacio Hagopian <[email protected]> * configurable index raw json output bind addr Signed-off-by: Ignacio Hagopian <[email protected]> * use random free port Signed-off-by: Ignacio Hagopian <[email protected]> * fix Signed-off-by: Ignacio Hagopian <[email protected]> * lints Signed-off-by: Ignacio Hagopian <[email protected]> * update devnet to 1.1.3 unnamed Signed-off-by: Ignacio Hagopian <[email protected]> * update tags Signed-off-by: Ignacio Hagopian <[email protected]> * update to definitive tag Signed-off-by: Ignacio Hagopian <[email protected]> * fmt nit Signed-off-by: Ignacio Hagopian <[email protected]>
textileio · Nov 13, 2020 · fd1029c · fd1029c
1 parent 54752ac
commit fd1029c
Show file tree

Hide file tree

Showing 23 changed files with 171 additions and 127 deletions.
diff --git a/api/client/admin_test.go b/api/client/admin_test.go
@@ -68,7 +68,7 @@ func setupAdmin(t *testing.T, adminAuthToken string) (*admin.Admin, func()) {
 		defConfig.FFSAdminToken = adminAuthToken
 	}
 	serverDone := setupServer(t, defConfig)
-	conn, done := setupConnection(t)
+	conn, done := setupConnection(t, defConfig.GrpcHostAddress)
 	return admin.NewAdmin(adminPb.NewAdminServiceClient(conn)), func() {
 		done()
 		serverDone()

diff --git a/api/client/utils_test.go b/api/client/utils_test.go
@@ -1,27 +1,30 @@
 package client
 
 import (
+	"fmt"
 	"io/ioutil"
 	"math/big"
 	"testing"
 	"time"
 
 	"github.com/multiformats/go-multiaddr"
+	"github.com/phayes/freeport"
 	"github.com/stretchr/testify/require"
 	"github.com/textileio/powergate/api/server"
 	"github.com/textileio/powergate/tests"
 	"github.com/textileio/powergate/util"
 	"google.golang.org/grpc"
 )
 
-var (
-	grpcHostNetwork     = "tcp"
-	grpcHostAddress     = "/ip4/127.0.0.1/tcp/5002"
-	grpcWebProxyAddress = "127.0.0.1:6002"
-	gatewayHostAddr     = "0.0.0.0:7000"
-)
+var ()
 
 func defaultServerConfig(t *testing.T) server.Config {
+	grpcHostNetwork := "tcp"
+	grpcHostAddress := fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", freePort(t))
+	grpcWebProxyAddress := fmt.Sprintf("127.0.0.1:%d", freePort(t))
+	gatewayHostAddr := fmt.Sprintf("0.0.0.0:%d", freePort(t))
+	indexRawJSONHostAddr := fmt.Sprintf("0.0.0.0:%d", freePort(t))
+
 	repoPath, err := ioutil.TempDir("/tmp/powergate", ".powergate-*")
 	require.NoError(t, err)
 
@@ -48,6 +51,7 @@ func defaultServerConfig(t *testing.T) server.Config {
 		GrpcWebProxyAddress:         grpcWebProxyAddress,
 		RepoPath:                    repoPath,
 		GatewayHostAddr:             gatewayHostAddr,
+		IndexRawJSONHostAddr:        indexRawJSONHostAddr,
 		MaxMindDBFolder:             "../../iplocation/maxmind",
 		MinerSelector:               "reputation",
 		FFSDealFinalityTimeout:      time.Minute * 30,
@@ -71,11 +75,15 @@ func setupServer(t *testing.T, conf server.Config) func() {
 	}
 }
 
-func setupConnection(t *testing.T) (*grpc.ClientConn, func()) {
-	auth := TokenAuth{}
-	ma, err := multiaddr.NewMultiaddr(grpcHostAddress)
+func freePort(t *testing.T) int {
+	fp, err := freeport.GetFreePort()
 	require.NoError(t, err)
-	addr, err := util.TCPAddrFromMultiAddr(ma)
+	return fp
+}
+
+func setupConnection(t *testing.T, grpcHostAddress multiaddr.Multiaddr) (*grpc.ClientConn, func()) {
+	auth := TokenAuth{}
+	addr, err := util.TCPAddrFromMultiAddr(grpcHostAddress)
 	require.NoError(t, err)
 	conn, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithPerRPCCredentials(auth))
 	require.NoError(t, err)

diff --git a/api/server/server.go b/api/server/server.go
@@ -110,8 +110,9 @@ type Config struct {
 	GrpcServerOpts      []grpc.ServerOption
 	GrpcWebProxyAddress string
 
-	GatewayBasePath string
-	GatewayHostAddr string
+	GatewayBasePath      string
+	GatewayHostAddr      string
+	IndexRawJSONHostAddr string
 
 	MongoURI string
 	MongoDB  string
@@ -309,7 +310,7 @@ func NewServer(conf Config) (*Server, error) {
 		return nil, fmt.Errorf("starting GRPC services: %s", err)
 	}
 
-	s.indexServer = startIndexHTTPServer(s)
+	s.indexServer = startIndexHTTPServer(s, conf.IndexRawJSONHostAddr)
 
 	log.Info("Starting finished, serving requests")
 
@@ -412,13 +413,13 @@ func startGRPCServices(server *grpc.Server, webProxy *http.Server, s *Server, ho
 
 	go func() {
 		if err := webProxy.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-			log.Errorf("error starting proxy: %v", err)
+			log.Errorf("starting proxy: %v", err)
 		}
 	}()
 	return nil
 }
 
-func startIndexHTTPServer(s *Server) *http.Server {
+func startIndexHTTPServer(s *Server, addr string) *http.Server {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/index/ask", func(w http.ResponseWriter, r *http.Request) {
 		index := s.ai.Get()
@@ -454,7 +455,7 @@ func startIndexHTTPServer(s *Server) *http.Server {
 		}
 	})
 
-	srv := &http.Server{Addr: ":8889", Handler: mux}
+	srv := &http.Server{Addr: addr, Handler: mux}
 	go func() {
 		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			log.Fatalf("serving index http: %v", err)

diff --git a/chainsync/chainsync.go b/chainsync/chainsync.go
@@ -12,8 +12,8 @@ import (
 const (
 	hcApply = "apply"
 	// For completeness:
-	// hcRevert = "revert"
-	// hcCurrent = "current"
+	// hcRevert = "revert".
+	// hcCurrent = "current".
 )
 
 // ChainSync provides methods to resolve chain syncing situations.

diff --git a/cmd/powd/main.go b/cmd/powd/main.go
@@ -119,6 +119,7 @@ func configFromFlags() (server.Config, error) {
 	grpcWebProxyAddr := config.GetString("grpcwebproxyaddr")
 	gatewayHostAddr := config.GetString("gatewayhostaddr")
 	gatewayBasePath := config.GetString("gatewaybasepath")
+	indexRawJSONHostAddr := config.GetString("indexrawjsonhostaddr")
 	maxminddbfolder := config.GetString("maxminddbfolder")
 	mongoURI := config.GetString("mongouri")
 	mongoDB := config.GetString("mongodb")
@@ -154,8 +155,9 @@ func configFromFlags() (server.Config, error) {
 		GrpcHostAddress:     grpcHostMaddr,
 		GrpcWebProxyAddress: grpcWebProxyAddr,
 
-		GatewayHostAddr: gatewayHostAddr,
-		GatewayBasePath: gatewayBasePath,
+		GatewayHostAddr:      gatewayHostAddr,
+		GatewayBasePath:      gatewayBasePath,
+		IndexRawJSONHostAddr: indexRawJSONHostAddr,
 
 		MongoURI: mongoURI,
 		MongoDB:  mongoDB,
@@ -208,7 +210,7 @@ func setupInstrumentation() (func(), error) {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 		defer cancel()
 		if err := srv.Shutdown(ctx); err != nil {
-			log.Error("shutting down prometheus server: %s", err)
+			log.Errorf("shutting down prometheus server: %s", err)
 		}
 	}
 
@@ -334,6 +336,7 @@ func setupFlags() error {
 
 	pflag.String("grpchostaddr", "/ip4/0.0.0.0/tcp/5002", "gRPC host listening address.")
 	pflag.String("grpcwebproxyaddr", "0.0.0.0:6002", "gRPC webproxy listening address.")
+	pflag.String("indexrawjsonhostaddr", "0.0.0.0:8889", "Indexes raw json output listening address")
 
 	pflag.String("lotushost", "/ip4/127.0.0.1/tcp/1234", "Lotus client API endpoint multiaddress.")
 	pflag.String("lotustoken", "", "Lotus API authorization token. This flag or --lotustoken file are mandatory.")

diff --git a/deals/module/deals.go b/deals/module/deals.go
@@ -111,7 +111,7 @@ func (m *Module) Import(ctx context.Context, data io.Reader, isCAR bool) (cid.Ci
 // is automatically calculated considering each miner epoch price and piece size.
 // The data of dataCid should be already imported to the Filecoin Client or should be
 // accessible to it. (e.g: is integrated with an IPFS node).
-func (m *Module) Store(ctx context.Context, waddr string, dataCid cid.Cid, pieceSize uint64, dcfgs []deals.StorageDealConfig, minDuration uint64) ([]deals.StoreResult, error) {
+func (m *Module) Store(ctx context.Context, waddr string, dataCid cid.Cid, pieceSize abi.PaddedPieceSize, pieceCid cid.Cid, dcfgs []deals.StorageDealConfig, minDuration uint64) ([]deals.StoreResult, error) {
 	if minDuration < util.MinDealDuration {
 		return nil, fmt.Errorf("duration %d should be greater or equal to %d", minDuration, util.MinDealDuration)
 	}
@@ -146,9 +146,11 @@ func (m *Module) Store(ctx context.Context, waddr string, dataCid cid.Cid, piece
 			Data: &storagemarket.DataRef{
 				TransferType: storagemarket.TTGraphsync,
 				Root:         dataCid,
+				PieceCid:     &pieceCid,
+				PieceSize:    pieceSize.Unpadded(),
 			},
 			MinBlocksDuration: minDuration,
-			EpochPrice:        big.Div(big.Mul(big.NewIntUnsigned(c.EpochPrice), big.NewIntUnsigned(pieceSize)), abi.NewTokenAmount(1<<30)),
+			EpochPrice:        big.Div(big.Mul(big.NewIntUnsigned(c.EpochPrice), big.NewIntUnsigned(uint64(pieceSize))), abi.NewTokenAmount(1<<30)),
 			Miner:             maddr,
 			Wallet:            addr,
 			FastRetrieval:     c.FastRetrieval,
@@ -173,18 +175,17 @@ func (m *Module) Store(ctx context.Context, waddr string, dataCid cid.Cid, piece
 	return res, nil
 }
 
-// CalculatePieceSize calculates the data and piece size of a Cid accesible
-// by the underlying Lotus node.
-func (m *Module) CalculatePieceSize(ctx context.Context, c cid.Cid) (api.DataSize, error) {
+// CalculateDealPiece calculates the size and CommP for a data cid.
+func (m *Module) CalculateDealPiece(ctx context.Context, c cid.Cid) (api.DataCIDSize, error) {
 	lapi, cls, err := m.clientBuilder(ctx)
 	if err != nil {
-		return api.DataSize{}, fmt.Errorf("creating lotus client: %s", err)
+		return api.DataCIDSize{}, fmt.Errorf("creating lotus client: %s", err)
 	}
 	defer cls()
 
-	dsz, err := lapi.ClientDealSize(ctx, c)
+	dsz, err := lapi.ClientDealPieceCID(ctx, c)
 	if err != nil {
-		return api.DataSize{}, fmt.Errorf("calculating data size: %s", err)
+		return api.DataCIDSize{}, fmt.Errorf("calculating data size: %s", err)
 	}
 	return dsz, nil
 }

diff --git a/deals/module/deals_test.go b/deals/module/deals_test.go
@@ -148,14 +148,18 @@ func storeMultiMiner(m *Module, client *apistruct.FullNodeStruct, numMiners int,
 			EpochPrice: 500000000,
 		}
 	}
-	dataCid, size, err := m.Import(ctx, bytes.NewReader(data), false)
+	dataCid, _, err := m.Import(ctx, bytes.NewReader(data), false)
 	if err != nil {
 		return cid.Undef, nil, err
 	}
 	if !dataCid.Defined() {
 		return cid.Undef, nil, fmt.Errorf("data cid is undefined")
 	}
-	srs, err := m.Store(ctx, addr.String(), dataCid, 2*uint64(size), cfgs, util.MinDealDuration)
+	piece, err := m.CalculateDealPiece(ctx, dataCid)
+	if err != nil {
+		return cid.Undef, nil, err
+	}
+	srs, err := m.Store(ctx, addr.String(), dataCid, piece.PieceSize, piece.PieceCID, cfgs, util.MinDealDuration)
 	if err != nil {
 		return cid.Undef, nil, fmt.Errorf("calling Store(): %s", err)
 	}
@@ -199,8 +203,8 @@ func waitForDealComplete(client *apistruct.FullNodeStruct, deals []cid.Cid) erro
 				storagemarket.StorageDealStaged,
 				storagemarket.StorageDealValidating,
 				storagemarket.StorageDealTransferring,
-				storagemarket.StorageDealFundsEnsured,
 				storagemarket.StorageDealCheckForAcceptance,
+				storagemarket.StorageDealReserveClientFunds,
 				storagemarket.StorageDealClientFunding,
 				storagemarket.StorageDealPublish,
 				storagemarket.StorageDealPublishing,

diff --git a/docker/Makefile b/docker/Makefile
@@ -16,7 +16,7 @@ localnet:
 
 
 up: down
-	LOTUS_IMAGE_TAG=v1.1.2 \
+	LOTUS_IMAGE_TAG=v1.1.3 \
 	docker-compose \
 		-p mainnet \
 		-f docker-compose.yaml \
@@ -26,7 +26,7 @@ up: down
 .PHONY: up
 
 down:
-	LOTUS_IMAGE_TAG=v1.1.2 \
+	LOTUS_IMAGE_TAG=v1.1.3 \
 	docker-compose \
 		-p mainnet \
 		-f docker-compose.yaml \

diff --git a/docker/docker-compose-localnet.yaml b/docker/docker-compose-localnet.yaml
@@ -23,7 +23,7 @@ services:
       - 5001:5001
 
   lotus:
-    image: textile/lotus-devnet:sha-d57ac07
+    image: textile/lotus-devnet:v1.1.3
     ports:
       - 7777:7777
     environment: