feat: B2 pikachu: integration of KVS and Bitcoin testnet and some refactoring

.circleci/config.yml

@@ -805,6 +805,11 @@ workflows:
           suite: itest-deals_padding
           target: "./itests/deals_padding_test.go"
 
+      - test:
+          name: test-itest-deals_partial_retrieval_dm-level
+          suite: itest-deals_partial_retrieval_dm-level
+          target: "./itests/deals_partial_retrieval_dm-level_test.go"
+
       - test:
           name: test-itest-deals_partial_retrieval
           suite: itest-deals_partial_retrieval
@@ -825,6 +830,11 @@ workflows:
           suite: itest-deals_publish
           target: "./itests/deals_publish_test.go"
 
+      - test:
+          name: test-itest-deals_retry_deal_no_funds
+          suite: itest-deals_retry_deal_no_funds
+          target: "./itests/deals_retry_deal_no_funds_test.go"
+
       - test:
           name: test-itest-deals
           suite: itest-deals
@@ -885,6 +895,11 @@ workflows:
           suite: itest-sector_terminate
           target: "./itests/sector_terminate_test.go"
 
+      - test:
+          name: test-itest-self_sent_txn
+          suite: itest-self_sent_txn
+          target: "./itests/self_sent_txn_test.go"
+
       - test:
           name: test-itest-tape
           suite: itest-tape
@@ -935,7 +950,7 @@ workflows:
           codecov-upload: false
           suite: conformance-bleeding-edge
           target: "./conformance"
-          vectors-branch: master
+          vectors-branch: specs-actors-v7
       - trigger-testplans:
           filters:
             branches:
@@ -966,19 +981,10 @@ workflows:
             tags:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
-      - build-appimage:
-          filters:
-            branches:
-              ignore:
-                - /.*/
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
       - publish:
           requires:
             - build-all
             - build-macos
-            - build-appimage
           filters:
             branches:
               ignore:

.circleci/template.yml

@@ -785,7 +785,7 @@ workflows:
           codecov-upload: false
           suite: conformance-bleeding-edge
           target: "./conformance"
-          vectors-branch: master
+          vectors-branch: specs-actors-v7
       - trigger-testplans:
           filters:
             branches:
@@ -816,19 +816,10 @@ workflows:
             tags:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
-      - build-appimage:
-          filters:
-            branches:
-              ignore:
-                - /.*/
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
       - publish:
           requires:
             - build-all
             - build-macos
-            - build-appimage
           filters:
             branches:
               ignore:

.github/pull_request_template.md

@@ -0,0 +1,21 @@
+## Related Issues
+<!-- link all issues that this PR might resolve/fix. If an issue doesn't exist, include a brief motivation for the change being made.-->
+
+## Proposed Changes
+<!-- provide a clear list of the changes being made-->
+
+
+## Additional Info
+<!-- callouts, links to documentation, and etc-->
+
+## Checklist
+
+Before you mark the PR ready for review, please make sure that:
+- [ ] All commits have a clear commit message.
+- [ ] The PR title is in the form of of `<PR type>: <area>: <change being made>`
+    - example: ` fix: mempool: Introduce a cache for valid signatures`
+    - `PR type`: _fix_, _feat_, _INTERFACE BREAKING CHANGE_, _CONSENSUS BREAKING_, _build_, _chore_, _ci_, _docs_,_perf_, _refactor_, _revert_, _style_, _test_
+    - `area`: _api_, _chain_, _state_, _vm_, _data transfer_, _market_, _mempool_, _message_, _block production_, _multisig_, _networking_, _paychan_, _proving_, _sealing_, _wallet_, _deps_
+- [ ] This PR has tests for new functionality or change in behaviour
+- [ ] If new user-facing features are introduced, clear usage guidelines and / or documentation updates should be included in https://lotus.filecoin.io or [Discussion Tutorials.](https://github.com/filecoin-project/lotus/discussions/categories/tutorials)
+- [ ] CI is green

.gitignore

@@ -51,6 +51,7 @@ scratchpad
 
 gen.gen
 *.key
+data/*
 data/*/*
 !data/*/keystore/
 !data/*/config.toml

Dockerfile.lotus

@@ -36,7 +36,7 @@ WORKDIR /opt/filecoin
 ARG RUSTFLAGS=""
 ARG GOFLAGS=""
 
-RUN make lotus lotus-miner lotus-worker lotus-shed lotus-wallet lotus-gateway
+RUN make lotus lotus-miner lotus-worker lotus-shed lotus-wallet lotus-gateway lotus-stats
 
 
 FROM ubuntu:20.04 AS base
@@ -66,8 +66,6 @@ COPY scripts/docker-lotus-entrypoint.sh /
 
 ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
 ENV LOTUS_PATH /var/lib/lotus
-ENV LOTUS_JAEGER_AGENT_HOST 127.0.0.1
-ENV LOTUS_JAEGER_AGENT_PORT 6831
 ENV DOCKER_LOTUS_IMPORT_SNAPSHOT https://fil-chain-snapshots-fallback.s3.amazonaws.com/mainnet/minimal_finality_stateroots_latest.car
 ENV DOCKER_LOTUS_IMPORT_WALLET ""
 
@@ -92,8 +90,6 @@ MAINTAINER Lotus Development Team
 COPY --from=builder /opt/filecoin/lotus-wallet /usr/local/bin/
 
 ENV WALLET_PATH /var/lib/lotus-wallet
-ENV LOTUS_JAEGER_AGENT_HOST 127.0.0.1
-ENV LOTUS_JAEGER_AGENT_PORT 6831
 
 RUN mkdir /var/lib/lotus-wallet
 RUN chown fc: /var/lib/lotus-wallet
@@ -114,10 +110,6 @@ MAINTAINER Lotus Development Team
 
 COPY --from=builder /opt/filecoin/lotus-gateway /usr/local/bin/
 
-ENV LOTUS_JAEGER_AGENT_HOST 127.0.0.1
-ENV LOTUS_JAEGER_AGENT_PORT 6831
-ENV FULLNODE_API_INFO /ip4/127.0.0.1/tcp/1234/http
-
 USER fc
 
 EXPOSE 1234
@@ -135,11 +127,7 @@ COPY --from=builder /opt/filecoin/lotus-miner /usr/local/bin/
 COPY scripts/docker-lotus-miner-entrypoint.sh /
 
 ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
-ENV FULLNODE_API_INFO /ip4/127.0.0.1/tcp/1234/http
 ENV LOTUS_MINER_PATH /var/lib/lotus-miner
-ENV LOTUS_JAEGER_AGENT_HOST 127.0.0.1
-ENV LOTUS_JAEGER_AGENT_PORT 6831
-ENV DOCKER_LOTUS_MINER_INIT true
 
 RUN mkdir /var/lib/lotus-miner /var/tmp/filecoin-proof-parameters
 RUN chown fc: /var/lib/lotus-miner /var/tmp/filecoin-proof-parameters
@@ -163,10 +151,7 @@ MAINTAINER Lotus Development Team
 COPY --from=builder /opt/filecoin/lotus-worker /usr/local/bin/
 
 ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
-ENV MINER_API_INFO /ip4/127.0.0.1/tcp/2345/http
 ENV LOTUS_WORKER_PATH /var/lib/lotus-worker
-ENV LOTUS_JAEGER_AGENT_HOST 127.0.0.1
-ENV LOTUS_JAEGER_AGENT_PORT 6831
 
 RUN mkdir /var/lib/lotus-worker
 RUN chown fc: /var/lib/lotus-worker
@@ -186,23 +171,19 @@ CMD ["-help"]
 from base as lotus-all-in-one
 
 ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
-ENV FULLNODE_API_INFO /ip4/127.0.0.1/tcp/1234/http
-ENV LOTUS_JAEGER_AGENT_HOST 127.0.0.1
-ENV LOTUS_JAEGER_AGENT_PORT 6831
 ENV LOTUS_MINER_PATH /var/lib/lotus-miner
 ENV LOTUS_PATH /var/lib/lotus
 ENV LOTUS_WORKER_PATH /var/lib/lotus-worker
-ENV MINER_API_INFO /ip4/127.0.0.1/tcp/2345/http
 ENV WALLET_PATH /var/lib/lotus-wallet
 ENV DOCKER_LOTUS_IMPORT_SNAPSHOT https://fil-chain-snapshots-fallback.s3.amazonaws.com/mainnet/minimal_finality_stateroots_latest.car
-ENV DOCKER_LOTUS_MINER_INIT true
 
 COPY --from=builder /opt/filecoin/lotus      /usr/local/bin/
 COPY --from=builder /opt/filecoin/lotus-shed /usr/local/bin/
 COPY --from=builder /opt/filecoin/lotus-wallet /usr/local/bin/
 COPY --from=builder /opt/filecoin/lotus-gateway /usr/local/bin/
 COPY --from=builder /opt/filecoin/lotus-miner /usr/local/bin/
 COPY --from=builder /opt/filecoin/lotus-worker /usr/local/bin/
+COPY --from=builder /opt/filecoin/lotus-stats /usr/local/bin/
 
 RUN mkdir /var/tmp/filecoin-proof-parameters
 RUN mkdir /var/lib/lotus

FAQ.md

@@ -0,0 +1,75 @@
+# Eudico FAQ
+_Note: The aim of these FAQs is to get you started fast with Eudico so you can spawn a test network and start contributing to the code in no time. For more in depth documentation or further information about how to perform other actions go to the [Lotus documentation](https://lotus.filecoin.io/docs/set-up/about/), or refer to the base code. Eudico is a fork of Lotus, which means that "almost" everything that works in Lotus should work in Eudico out-of-the-box._
+
+## Q: How to import a wallet?
+
+**A:** Generate a key:
+```
+./lotus-keygen -t secp256k1
+```
+Import it (as default if needed):
+```
+./eudico wallet import –-as-default –-format=json-lotus $file
+```
+
+## Q: How to generate the cbor files when creating a new actor?
+
+**A:** The Cbor library is used to help with marshalling and unmarshalling.
+In the same folder where your `$actorName_actor.go` and `$actorName_state.go` files are defined, create a `gen` folder with a `gen.go` file that looks like [this](https://github.com/filecoin-project/eudico/blob/eudico/chain/consensus/hierarchical/actors/sca/gen/gen.go
+). Add all the correspondings states and parameters, update the import url and add the package using `go get`. 
+Pre-populate the functions of the interface in a `cbor_gen.go` file as follows:
+```
+func (t *$YourStruct) MarshalCBOR(w io.Writer) error { return nil }
+
+func (t *$YourStruct) MarshalCBOR(w io.Writer) error { return nil }
+```
+Run  `go run gen.go`. 
+
+
+## Q: How do you send a transaction directly from the code?
+**A:** By using the `api-MpoolPushMessage.` See how to use it [here](https://github.com/filecoin-project/eudico/blob/113829e7fc115daac08ea0217170baddcb7788ba/chain/consensus/hierarchical/subnet/manager/manager.go#L375-L391).
+
+## Q: How can a built-in actor be initialize?
+**A:** You can see an example of how is done for the SCA in [this piece of code](https://github.com/filecoin-project/eudico/blob/113829e7fc115daac08ea0217170baddcb7788ba/chain/consensus/hierarchical/actors/subnet/genesis.go#L131).
+
+## Q: How can I run an eudico network with a specific consensus protocol?
+**A:** Use the following commands:
+
+Run a network:
+ ```
+ ./eudico delegated genesis $ADDR gen.gen
+ ./eudico delegated daemon --genesis=gen.gen
+ ```
+ Run a miner:
+ ```
+ ./eudico wallet import --format=json-lotus $ADDR
+ ./eudico delegated miner
+ ```
+
+## Q: How can I run two eudico peers on the same host?
+**A:** Use a different `EUDICO_PATH` variable and `api` argument for each path.
+
+Terminal 1:
+```
+export EUDICO_PATH="~/.eudico1/"
+./eudico delegated daemon --genesis=gen.gen --api=1234
+```
+
+Terminal 2:
+```
+export EUDICO_PATH="~/.eudico2/"
+./eudico delegated daemon --genesis=gen.gen --api=1235
+```
+
+## Q: How can two two eudico clients be connected with each other?
+**A:** Suppose you have two eudico clients A and B. Run the following commands:
+
+On client A run the command below to output the target's libp2p address, `ADDR_A` 
+```
+./eudico net listen
+```
+
+Run on client B:
+```
+./eudico net connect ADDR_A
+```

Makefile

@@ -299,6 +299,7 @@ method-gen: api-gen
 	(cd ./lotuspond/front/src/chain && $(GOCC) run ./methodgen.go)
 
 actors-gen:
+	$(GOCC) run ./gen/inline-gen . gen/inlinegen-data.json
 	$(GOCC) run ./chain/actors/agen
 	$(GOCC) fmt ./...
 
@@ -367,4 +368,4 @@ print-%:
 	@echo $*=$($*)
 
 circleci:
-	go generate -x ./.circleci
+	go generate -x ./.circleci

README.md

@@ -71,7 +71,7 @@ See the [official Golang installation instructions](https://golang.org/doc/insta
 
 ### Build and install Eudico
 
-Once all the dependencies are installed, you can build and install the Eudico suite (`eudico`, `eudico-miner`, and `eudico-worker`).
+Once all the dependencies are installed, you can build and install Eudico.
 
 1. Clone the repository:
 
@@ -82,39 +82,60 @@ Once all the dependencies are installed, you can build and install the Eudico su
 
 Note: The default branch `eudico` is the dev branch where the latest new features, bug fixes and improvement are in. 
 
-2. To join mainnet -- don't!
-
-   If you are changing networks from a previous installation or there has been a network reset, read the [Switch networks guide](https://docs.filecoin.io/get-started/lotus/switch-networks/) before proceeding.
-
-   For networks other than mainnet, look up the current branch or tag/commit for the network you want to join in the [Filecoin networks dashboard](https://network.filecoin.io), then build Eudico for your specific network below.
+2. Build Eudico:
 
    ```sh
-   git checkout <tag_or_branch>
-   # For example:
-   git checkout <vX.X.X> # tag for a release
+   make eudico
    ```
+   This will create the `eudico` executable in the current directory.
 
-   Currently, the latest code on the _master_ branch corresponds to mainnet.
+### Run a local test network.
 
-3. If you are in China, see "[Lotus: tips when running in China](https://docs.filecoin.io/get-started/lotus/tips-running-in-china/)".
-4. This build instruction uses the prebuilt proofs binaries. If you want to build the proof binaries from source check the [complete instructions](https://docs.filecoin.io/get-started/lotus/installation/#build-and-install-lotus). Note, if you are building the proof binaries from source, [installing rustup](https://docs.filecoin.io/get-started/lotus/installation/#rustup) is also needed.
+**Note**: `eudico` uses the `$HOME/.eudico` folder by default for storage (configuration, chain data, wallets, etc). See [advanced options](https://docs.filecoin.io/get-started/lotus/configuration-and-advanced-usage/) for information on how to customize the folder.
+If you want to run more than one Eudico node the same host, you need to tell the nodes to use different folders (see [FAQ](FAQ.md#q-how-can-i-run-two-eudico-peers-on-the-same-host))
+Make sure that this directory does not exist when you are starting a new network.
 
-5. Build and install Eudico:
+First, a key needs to be generated. 
+In order to do that, compile the Lotus key generator:
 
-   ```sh
-   make clean all #mainnet
+   ```bash
+   make lotus-keygen
+   ```
+
+Then, generate a key:
+
+   ```bash
+   ./lotus-keygen -t secp256k1
+   ```
+This creates a key file, with the name `f1[...].key` (e.g. `f16dv4rlp3b33d5deasf3lxkrbfwhi4q4a5uw5scy.key`) in the local directory.
+The file name, without the `.key` extension, is the corresponding Filecoin address.
+If this is the only key you generated so far, you can obtain the address, for example, by running
+
+   ```bash
+   ADDR=$(echo f1* | tr '.' ' ' | awk '{print $1}')
+   ```
 
-   # Or to join a testnet or devnet:
-   make clean calibnet # Calibration with min 32GiB sectors
+Use this address to create a genesis block for the system and start the Eudico daemon.
+The following command uses the `delegated` consensus.
 
-   sudo make eudico
+   ```bash
+   ./eudico delegated genesis $ADDR gen.gen
+   ./eudico delegated daemon --genesis=gen.gen
    ```
 
-   This will put `eudico`, `eudico-miner` and `eudico-worker` in `/usr/local/bin`.
+The daemon will continue running until you stop it.
+To start a miner, first import a wallet, using the generated key
+(replacing `f1*.key` by the generated key file if more than one key is present in the directory).
 
-   `eudico` will use the `$HOME/.eudico` folder by default for storage (configuration, chain data, wallets, etc). See [advanced options](https://docs.filecoin.io/get-started/lotus/configuration-and-advanced-usage/) for information on how to customize the folder.
+   ```bash
+   ./eudico wallet import --format=json-lotus f1*.key
+   ```
+
+Then, start the miner.
 
-6. You should now have Eudico installed. You can now [start the Eudico daemon and sync the chain](https://docs.filecoin.io/get-started/lotus/installation/#start-the-lotus-daemon-and-sync-the-chain).
+   ```bash
+   ./eudico delegated miner
+   ```
 
 ## License