Make Powergate CGO free & use testnet/3

.dockerignore

@@ -1,4 +1,3 @@
 **/docker-compose.yaml
 **/docker-compose-embedded.yaml
-**/Dockerfile
-extern
+**/Dockerfile

.github/workflows/test.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - jsign/pg5
   pull_request:
     branches:
       - master
@@ -11,13 +12,6 @@ jobs:
     name: Test
     runs-on: self-hosted
     steps:
-      - name: Set up Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-      - name: Install OpenCL
-        run: sudo apt-get update && sudo apt-get install -y mesa-opencl-icd ocl-icd-opencl-dev jq make
       - name: Check out code
         uses: actions/checkout@v1
       - name: Test

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "extern/filecoin-ffi"]
-	path = extern/filecoin-ffi
-	url = https://github.com/filecoin-project/filecoin-ffi.git

Makefile

@@ -1,32 +1,18 @@
-SUBMODULES=.update-modules
-
-FFI_PATH:=./extern/filecoin-ffi/
-FFI_DEPS:=libfilecoin.a filecoin.pc filecoin.h
-FFI_DEPS:=$(addprefix $(FFI_PATH),$(FFI_DEPS))
-
-$(FFI_DEPS): .filecoin-build ;
+clean:
+	rm -f powd pow
+.PHONY: clean
 
-.filecoin-build: $(FFI_PATH)
-	$(MAKE) -C $(FFI_PATH) $(FFI_DEPS:$(FFI_PATH)%=%)
-	@touch $@
+build-cli:
+	go build -o pow exe/cli/main.go
+.PHONY: build-cli
 
-.update-modules:
-	git submodule update --init --recursive
-	@touch $@
+build-server:
+	go build -o powd exe/server/main.go
+.PHONY: build-server
 
-build: .update-modules .filecoin-build
+build: build-cli build-server
 .PHONY: build
 
-clean:
-	rm -f .filecoin-build
-	rm -f .update-modules
-	git submodule deinit --all -f
-
-PARAMCACHE_PATH:=/var/tmp/powergate/filecoin-proof-parameters
-test: build
-	mkdir -p $(PARAMCACHE_PATH)
-	cat build/proof-params/parameters.json | jq 'keys[]' | xargs touch
-	mv -n v20* $(PARAMCACHE_PATH)
-	rm v20* || true
-	PARAMCACHE_PATH=$(PARAMCACHE_PATH) go test -short -p 1 -count 1  ./... 
+test:
+	go test -short -p 1 ./... 
 .PHONY: test

api/server/server.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/lotus/api/apistruct"
 	"github.com/improbable-eng/grpc-web/go/grpcweb"
 	"github.com/ipfs/go-datastore"
 	badger "github.com/ipfs/go-ds-badger2"
@@ -93,6 +92,7 @@ type Config struct {
 	IpfsApiAddr         ma.Multiaddr
 	LotusAddress        ma.Multiaddr
 	LotusAuthToken      string
+	LotusMasterAddr     string
 	Embedded            bool
 	GrpcHostNetwork     string
 	GrpcHostAddress     string
@@ -104,25 +104,21 @@ type Config struct {
 
 // NewServer starts and returns a new server with the given configuration.
 func NewServer(conf Config) (*Server, error) {
-	var c *apistruct.FullNodeStruct
-	var cls func()
 	var err error
 	var masterAddr address.Address
+	c, cls, err := lotus.New(conf.LotusAddress, conf.LotusAuthToken)
+	if err != nil {
+		return nil, fmt.Errorf("connecting to lotus node: %s", err)
+	}
+
 	if conf.Embedded {
-		c, cls, err = lotus.NewEmbedded()
-		if err != nil {
-			return nil, fmt.Errorf("creating the embedded network: %s", err)
-		}
-		masterAddr, err = c.WalletDefaultAddress(context.Background())
-		if err != nil {
-			return nil, fmt.Errorf("getting default address: %s", err)
+		if masterAddr, err = c.WalletDefaultAddress(context.Background()); err != nil {
+			return nil, fmt.Errorf("getting default wallet addr as masteraddr: %s", err)
 		}
-
 	} else {
-		c, cls, err = lotus.New(conf.LotusAddress, conf.LotusAuthToken)
-	}
-	if err != nil {
-		return nil, err
+		if masterAddr, err = address.NewFromString(conf.LotusMasterAddr); err != nil {
+			return nil, fmt.Errorf("parsing masteraddr: %s", err)
+		}
 	}
 
 	fchost, err := fchost.New()
@@ -174,7 +170,7 @@ func NewServer(conf Config) (*Server, error) {
 	lchain := lotuschain.New(c)
 	var ms ffs.MinerSelector
 	if conf.Embedded {
-		ms = fixed.New([]fixed.Miner{{Addr: "t0300", EpochPrice: 4000000}})
+		ms = fixed.New([]fixed.Miner{{Addr: "t01000", EpochPrice: 1000000}})
 	} else {
 		ms = reptop.New(rm, ai)
 	}

api/stub/asks.go

@@ -19,29 +19,29 @@ func (a *Asks) Get(ctx context.Context) (*ask.Index, error) {
 			Miner:        "miner1",
 			Price:        5001,
 			MinPieceSize: 1004,
-			Timestamp:    uint64(time.Now().Unix()),
-			Expiry:       uint64(time.Now().Unix()),
+			Timestamp:    1,
+			Expiry:       100,
 		},
 		"miner2": ask.StorageAsk{
 			Miner:        "miner2",
 			Price:        5002,
 			MinPieceSize: 1004,
-			Timestamp:    uint64(time.Now().Unix()),
-			Expiry:       uint64(time.Now().Unix()),
+			Timestamp:    2,
+			Expiry:       100,
 		},
 		"miner3": ask.StorageAsk{
 			Miner:        "miner3",
 			Price:        5003,
 			MinPieceSize: 1004,
-			Timestamp:    uint64(time.Now().Unix()),
-			Expiry:       uint64(time.Now().Unix()),
+			Timestamp:    3,
+			Expiry:       100,
 		},
 		"miner4": ask.StorageAsk{
 			Miner:        "miner4",
 			Price:        5004,
 			MinPieceSize: 1004,
-			Timestamp:    uint64(time.Now().Unix()),
-			Expiry:       uint64(time.Now().Unix()),
+			Timestamp:    4,
+			Expiry:       100,
 		},
 	}
 	return &ask.Index{
@@ -59,29 +59,29 @@ func (a *Asks) Query(ctx context.Context, query ask.Query) ([]ask.StorageAsk, er
 			Miner:        "miner1",
 			Price:        1245,
 			MinPieceSize: 1024,
-			Timestamp:    uint64(time.Now().Unix()),
-			Expiry:       uint64(time.Now().Unix()),
+			Timestamp:    1,
+			Expiry:       100,
 		},
 		ask.StorageAsk{
 			Miner:        "miner2",
 			Price:        3420,
 			MinPieceSize: 2048,
-			Timestamp:    uint64(time.Now().Unix()),
-			Expiry:       uint64(time.Now().Unix()),
+			Timestamp:    2,
+			Expiry:       200,
 		},
 		ask.StorageAsk{
 			Miner:        "miner3",
 			Price:        1245,
 			MinPieceSize: 1024,
-			Timestamp:    uint64(time.Now().Unix()),
-			Expiry:       uint64(time.Now().Unix()),
+			Timestamp:    3,
+			Expiry:       100,
 		},
 		ask.StorageAsk{
 			Miner:        "miner4",
 			Price:        1245,
 			MinPieceSize: 1024,
-			Timestamp:    uint64(time.Now().Unix()),
-			Expiry:       uint64(time.Now().Unix()),
+			Timestamp:    4,
+			Expiry:       200,
 		},
 	}
 	return asks, nil

chainsync/chainsync.go

@@ -4,23 +4,18 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/textileio/lotus-client/api/apistruct"
+	"github.com/textileio/lotus-client/chain/store"
 )
 
-// API provides an abstraction to a Filecoin full-node
-type API interface {
-	ChainGetPath(context.Context, types.TipSetKey, types.TipSetKey) ([]*store.HeadChange, error)
-	ChainGetGenesis(context.Context) (*types.TipSet, error)
-}
-
 // ChainSync provides methods to resolve chain syncing situations
 type ChainSync struct {
-	api API
+	api *apistruct.FullNodeStruct
 }
 
 // New returns a new ChainSync
-func New(api API) *ChainSync {
+func New(api *apistruct.FullNodeStruct) *ChainSync {
 	return &ChainSync{
 		api: api,
 	}
@@ -42,7 +37,7 @@ func (cs *ChainSync) Precedes(ctx context.Context, from, to types.TipSetKey) (bo
 
 // ResolveBase returns the base TipSetKey that both left and right TipSetKey share,
 // plus a Revert/Apply set of operations to get from last to new.
-func ResolveBase(ctx context.Context, api API, left *types.TipSetKey, right types.TipSetKey) (*types.TipSetKey, []*types.TipSet, error) {
+func ResolveBase(ctx context.Context, api *apistruct.FullNodeStruct, left *types.TipSetKey, right types.TipSetKey) (*types.TipSetKey, []*types.TipSet, error) {
 	var path []*types.TipSet
 	if left == nil {
 		genesis, err := api.ChainGetGenesis(ctx)

chainsync/chainsync_test.go

@@ -16,14 +16,13 @@ func TestMain(m *testing.M) {
 }
 
 func TestPrecede(t *testing.T) {
-	dnet, _, _, close := tests.CreateLocalDevnet(t, 1)
-	defer close()
+	client, _, _ := tests.CreateLocalDevnet(t, 1)
 	ctx := context.Background()
 
-	h, err := dnet.Client.ChainHead(ctx)
+	h, err := client.ChainHead(ctx)
 	checkErr(t, err)
 
-	csync := New(dnet.Client)
+	csync := New(client)
 	head := h.Key()
 	prevhead := types.NewTipSetKey(h.Blocks()[0].Parents...)
 	yes, err := csync.Precedes(ctx, prevhead, head)