Merge pull request #122 from Zondax/lotus_1.3.0

Lotus 1.4.0
Zondax · Jan 4, 2021 · 47f039f · 47f039f
2 parents 349ac5b + 23ce308
commit 47f039f
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 32 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,14 +3,14 @@ version: 2.1
 commands:
   ffi_deps:
     steps:
-      - run: apt update && apt install -yy mesa-opencl-icd jq
+      - run: apt update && apt install -yy mesa-opencl-icd jq hwloc libhwloc-dev
       - run: ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1 /usr/lib/libOpenCL.so
       - run: git submodule update --init --recursive
 
 jobs:
   build:
     docker:
-      - image: golang:1.14
+      - image: golang:1.15
     working_directory: /rosetta-filecoin-lib
     steps:
       - checkout
@@ -20,7 +20,7 @@ jobs:
 
   checks:
     docker:
-      - image: golang:1.14
+      - image: golang:1.15
     steps:
       - checkout
       - ffi_deps
@@ -31,7 +31,7 @@ jobs:
 
   integration_testnet:
     docker:
-      - image: golang:1.14
+      - image: golang:1.15
     steps:
       - checkout
       - ffi_deps

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2.3.3
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: '^1.14.3' # The Go version to download (if necessary) and use.
+          go-version: '^1.15.6' # The Go version to download (if necessary) and use.
       - run: git submodule update --init --recursive
       - run: make build_CI
       - run: |

diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ build_ffi:
 	make -C extern/filecoin-ffi
 
 install_lint:
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.31.0
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin
 
 check-modtidy:
 	go mod tidy
@@ -31,7 +31,7 @@ check-modtidy:
 lint:
 	golangci-lint --version
 	golangci-lint run -E gofmt -E gosec -E goconst -E gocritic
-#   golangci-lint run -E stylecheck -E gosec -E goconst -E godox -E gocritic
+#	golangci-lint run -E stylecheck -E gosec -E goconst -E godox -E gocritic
 
 test: build
 	go test -race ./rosetta/services

diff --git a/README.md b/README.md
@@ -2,12 +2,21 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![CircleCI](https://circleci.com/gh/Zondax/rosetta-filecoin-proxy/tree/master.svg?style=shield)](https://circleci.com/gh/Zondax/rosetta-filecoin-proxy/tree/master)
 [![Github-Actions](https://github.com/Zondax/rosetta-filecoin-proxy/workflows/rosetta-cli/badge.svg)](https://github.com/Zondax/rosetta-filecoin-proxy/actions)
-To run a node (this will build the container if you haven't yet):
-```
+
+To build the proxy run:
+```bash
 make
 ```
 
-You can rebuild by using 
-```
-make rebuild
+If you have upgraded and you find FFI issues, try:
+```bash
+make gitclean
+make
 ```
+
+
+If you want to install the linter we use try:
+
+```bash
+make install_lint
+make lint
diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi
diff --git a/go.mod b/go.mod
@@ -1,27 +1,27 @@
 module github.com/zondax/rosetta-filecoin-proxy
 
-go 1.14
+go 1.15
 
 require (
 	github.com/coinbase/rosetta-sdk-go v0.5.10
 	github.com/filecoin-project/go-address v0.0.5-0.20201103152444-f2023ef3f5bb
 	github.com/filecoin-project/go-bitfield v0.2.3-0.20201110211213-fe2c1862e816
-	github.com/filecoin-project/go-data-transfer v1.2.0
-	github.com/filecoin-project/go-fil-markets v1.0.5-0.20201113164554-c5eba40d5335
-	github.com/filecoin-project/go-jsonrpc v0.1.2-0.20201008195726-68c6a2704e49
+	github.com/filecoin-project/go-data-transfer v1.2.3
+	github.com/filecoin-project/go-fil-markets v1.0.10
+	github.com/filecoin-project/go-jsonrpc v0.1.2
 	github.com/filecoin-project/go-multistore v0.0.3
 	github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc
-	github.com/filecoin-project/lotus v1.2.1
+	github.com/filecoin-project/lotus v1.4.0
 	github.com/filecoin-project/specs-actors v0.9.13
-	github.com/filecoin-project/specs-actors/v2 v2.3.2
+	github.com/filecoin-project/specs-actors/v2 v2.3.3
 	github.com/google/uuid v1.1.2
 	github.com/ipfs/go-cid v0.0.7
 	github.com/ipfs/go-log v1.0.4
 	github.com/libp2p/go-libp2p-core v0.7.0
 	github.com/multiformats/go-multihash v0.0.14
 	github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6
 	github.com/stretchr/testify v1.6.1
-	github.com/zondax/rosetta-filecoin-lib v1.201.0
+	github.com/zondax/rosetta-filecoin-lib v1.400.0
 	gotest.tools v2.2.0+incompatible
 )
 

diff --git a/go.sum b/go.sum
diff --git a/rosetta/services/mocks/fullnode_mock.go b/rosetta/services/mocks/fullnode_mock.go
@@ -33,6 +33,22 @@ type FullNodeMock struct {
 	mock.Mock
 }
 
+func (f *FullNodeMock) NetBlockAdd(ctx context.Context, acl api.NetBlockList) error {
+	panic("implement me")
+}
+
+func (f *FullNodeMock) NetBlockRemove(ctx context.Context, acl api.NetBlockList) error {
+	panic("implement me")
+}
+
+func (f *FullNodeMock) NetBlockList(ctx context.Context) (api.NetBlockList, error) {
+	panic("implement me")
+}
+
+func (f *FullNodeMock) MarketWithdraw(ctx context.Context, wallet, addr address.Address, amt filTypes.BigInt) (cid.Cid, error) {
+	panic("implement me")
+}
+
 func (f *FullNodeMock) Session(ctx context.Context) (uuid.UUID, error) {
 	panic("implement me")
 }

diff --git a/rosetta/tests/rosetta_cli_test_PR.sh b/rosetta/tests/rosetta_cli_test_PR.sh
@@ -6,7 +6,7 @@ trap "exit 1" INT
 GRN=$'\e[32;1m'
 OFF=$'\e[0m'
 
-go get github.com/coinbase/rosetta-cli@v0.5.22
+go get github.com/coinbase/rosetta-cli@v0.6.6
 
 rm -rf /tmp/rosetta-cli-test/*
 

diff --git a/rosetta/tests/rosetta_cli_test_push.sh b/rosetta/tests/rosetta_cli_test_push.sh
@@ -6,7 +6,7 @@ trap "exit 1" INT
 GRN=$'\e[32;1m'
 OFF=$'\e[0m'
 
-go get github.com/coinbase/rosetta-cli@v0.5.22
+go get github.com/coinbase/rosetta-cli@v0.6.6
 
 rm -rf /tmp/rosetta-cli-test/*
+94 −22		.circleci/config.yml
+9 −0		SECURITY.md
+11 −12		bls.go
+3 −2		build.sh
+176 −0		distributed.go
+3 −1		filcrypto.yml
+474 −47		generated/cgo_helpers.go
+13 −8		generated/const.go
+0 −54		generated/customallocs.go
+173 −121		generated/generated.go
+10 −0		generated/libs.go
+70 −40		generated/types.go
+4 −4		go.mod
+19 −2		go.sum
+15 −8		install-filcrypto
+79 −19		proofs.go
+671 −537		rust/Cargo.lock
+14 −7		rust/Cargo.toml
+1 −1		rust/rust-toolchain
+681 −110		rust/src/proofs/api.rs
+112 −0		rust/src/proofs/types.rs
+25 −17		rust/src/util/api.rs
+5 −0		types.go
+7 −0		workflows.go