add support for butterflynet and calibrationnet parameters; push bundles for all networks (#205)

* add support for butterflynet and calibrationnet parameters.

* ci: extract cargo run out of ci workflow (#210)

* ci: produce bundles for all networks.

Bundles are uploaded as GitHub assets, and to Estuary as well.

Co-authored-by: Piotr Galar <[email protected]>

Author: raulk

.github/actions/rust-cargo-run/action.yml

@@ -0,0 +1,43 @@
+name: rust cargo run
+description: Rust Cargo Run
+
+inputs:
+  command:
+    description: The cargo command to execute
+    required: true
+  args:
+    description: The arguments to provide for the cargo command
+    required: false
+  components:
+    description: The components to include when installing Rust
+    required: false
+  save_cache:
+    description: Whether to save the SSCACHE
+    required: false
+
+runs:
+  using: composite
+  steps:
+  - name: Installing Rust
+    uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
+    with:
+      profile: minimal
+      target: wasm32-unknown-unknown
+      override: true
+      components: ${{ inputs.components }}
+  - name: Setting up cache
+    uses: pl-strflt/rust-sccache-action@v1
+    env:
+      SCCACHE_CACHE_SIZE: 2G
+      SCCACHE_DIR: ${{ github.workspace }}/.cache/sccache
+      CACHE_SKIP_SAVE: ${{ inputs.save_cache == '' || inputs.save_cache == 'false' }}
+    with:
+      version: v0.2.15
+      shared-key: v1  # change this to invalidate sccache for this job
+  - name: Running ${{ inputs.command }}
+    uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1.0.3
+    env:
+      CARGO_INCREMENTAL: '0'
+    with:
+      command: ${{ inputs.command }}
+      args: ${{ inputs.args }}

.github/actions/rust-sccache/action.yml

@@ -10,82 +10,82 @@ jobs:
   rustfmt:
     runs-on: ubuntu-latest
     steps:
-    - name: Checking out fvm
+    - name: Checking out
       uses: actions/checkout@v2
-    - name: Installing Rust
-      uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
-      with:
-        profile: minimal
-        override: true
-        components: rustfmt
-    - name: Running fmt
-      uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1.0.3
+    - name: Running rustfmt
+      uses: ./.github/actions/rust-cargo-run
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         command: fmt
         args: -- --check
-  cargo:
+        components: rustfmt
+
+  check-clippy:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checking out
+      uses: actions/checkout@v2
+    - name: Running clippy
+      uses: ./.github/actions/rust-cargo-run
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        command: clippy
+        args: --all --all-targets
+        components: clippy
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checking out
+      uses: actions/checkout@v2
+    - name: Running tests
+      uses: ./.github/actions/rust-cargo-run
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        command: test
+        args: --all
+
+  build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - name: check-clippy
-            command: clippy
-            args: --all --all-targets
-            components: clippy
-          - name: test
-            command: test
-            args: --all
-          - name: build
-            command: build
-            push: true
     env:
-      SCCACHE_CACHE_SIZE: 2G
-      SCCACHE_DIR: ${{ github.workspace }}/.cache/sccache
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       CARGO_INCREMENTAL: 0
       CACHE_SKIP_SAVE: ${{ matrix.push == '' || matrix.push == 'false' }}
-    name: ${{ matrix.name }}
+    strategy:
+      matrix:
+        network: [ 'mainnet', 'caterpillarnet', 'butterflynet', 'calibrationnet', 'devnet' ]
     steps:
-    - name: Checking out builtin-actors
+    - name: Checking out
       uses: actions/checkout@v2
+    - name: Install Rust toolchain
+      uses: ./.github/actions/rust-cargo-run
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        submodules: ${{ matrix.submodules }}
-    - name: Installing Rust
-      uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
-      with:
-        profile: minimal
-        target: wasm32-unknown-unknown
-        override: true
-        components: ${{ matrix.components }}
-    # we don't check the lockfile in; this is needed for cache restoration/saving
-    - name: Generating Cargo.lock
-      uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1.0.3
-      with:
-        command: generate-lockfile
-    - name: Setting up cache
-      uses: ./.github/actions/rust-sccache
-      with:
-        version: v0.2.15
-        # change this to invalidate sccache for this job
-        shared-key: v1
-    - name: Running ${{ matrix.command }}
-      uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1.0.3
-      with:
-        command: ${{ matrix.command }}
-        args: ${{ matrix.args }}
-    - name: make bundle
-      if: ${{ matrix.command == 'build' }}
+        command: version
+    - name: Making bundle
+      env:
+        BUILD_FIL_NETWORK: ${{ matrix.network }}
       run: ./build-bundle.sh
-    - name: upload bundle
-      if: ${{ matrix.command == 'build' }}
+    - name: Uploading bundle to Estuary
       env:
         ESTUARY_TOKEN: ${{ secrets.ESTUARY_TOKEN }}
-      run: ./upload-bundle.sh
-    - name: Publishing build artifacts to github
-      if: ${{ matrix.command == 'build' }}
+      run: |
+        BUNDLE_PATH="output/builtin-actors.car"
+        UPLOAD_AS="builtin-actors-${{ matrix.network }}.car"
+        curl -k -X POST -F "data=@${BUNDLE_PATH};type=application/octet-stream;filename=\"${UPLOAD_AS}\"" \
+          -H "Authorization: Bearer $ESTUARY_TOKEN" \
+          -H "Content-Type: multipart/form-data" \
+          https://shuttle-4.estuary.tech/content/add > output/upload.json
+        cat output/upload.json
+        shasum -a 256 "$BUNDLE_PATH" > "$BUNDLE_PATH".sha256sum
+    - name: Publishing build artifacts to GitHub
       uses: actions/upload-artifact@v2
       with:
-        name: bundle
+        name: bundle-${{ matrix.network }}
         path: |
          output/builtin-actors.car
          output/builtin-actors.car.sha256sum

.github/workflows/ci.yml

@@ -27,10 +27,12 @@ fil_actors_runtime = { version = "8.0.0-alpha.1", path = "./actors/runtime", fea
 fil_actor_bundler = "3.0.0"
 cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
 
-
 [features]
-default = []
+default = [] ## translates to mainnet
+mainnet = []
 caterpillarnet = []
+butterflynet = []
+calibrationnet = []
 devnet = []
 
 [workspace]

Cargo.toml

@@ -417,6 +417,8 @@ pub fn consensus_miner_min_power(p: RegisteredPoStProof) -> anyhow::Result<Stora
                 2 << 10
             } else if cfg!(feature = "min-power-2g") {
                 2 << 30
+            } else if cfg!(feature = "min-power-32g") {
+                32 << 30
             } else {
                 10 << 40
             };

actors/power/src/state.rs

@@ -1,5 +1,5 @@
 static NETWORKS: &[(&str, &[&str])] = &[
-    ("default", &["sector-32g", "sector-64g"]),
+    ("mainnet", &["sector-32g", "sector-64g"]),
     (
         "caterpillarnet",
         &[
@@ -11,6 +11,8 @@ static NETWORKS: &[(&str, &[&str])] = &[
             "min-power-2g",
         ],
     ),
+    ("butterflynet", &["sector-512m", "sector-32g", "sector-64g", "min-power-2g"]),
+    ("calibrationnet", &["sector-32g", "sector-64g", "min-power-32g"]),
     ("devnet", &["sector-2k", "sector-8m", "small-deals", "short-precommit", "min-power-2k"]),
 ];
 const NETWORK_ENV: &str = "BUILD_FIL_NETWORK";
@@ -19,7 +21,7 @@ fn main() {
     let network = std::env::var(NETWORK_ENV).ok();
     println!("cargo:rerun-if-env-changed={}", NETWORK_ENV);
 
-    let network = network.as_deref().unwrap_or("default");
+    let network = network.as_deref().unwrap_or("mainnet");
     let features = NETWORKS.iter().find(|(k, _)| k == &network).expect("unknown network").1;
     for feature in features {
         println!("cargo:rustc-cfg=feature=\"{}\"", feature);

actors/runtime/build.rs

@@ -3,4 +3,4 @@
 set -e
 
 bundle=$(cargo build 2>&1 | grep "warning: bundle=" | cut -d = -f 2)
-cp -v $bundle output/builtin-actors.car
+cp -v "$bundle" output/builtin-actors.car

build-bundle.sh

@@ -33,24 +33,30 @@ const NETWORK_ENV: &str = "BUILD_FIL_NETWORK";
 fn network_name() -> String {
     let env_network = std::env::var_os(NETWORK_ENV);
 
-    let cfg_network = if cfg!(feature = "caterpillarnet") {
+    let feat_network = if cfg!(feature = "mainnet") {
+        Some("mainnet")
+    } else if cfg!(feature = "caterpillarnet") {
         Some("caterpillarnet")
+    } else if cfg!(feature = "butterflynet") {
+        Some("butterflynet")
+    } else if cfg!(feature = "calibrationnet") {
+        Some("calibrationnet")
     } else if cfg!(feature = "devnet") {
         Some("devnet")
     } else {
         None
     };
 
-    // Make sure they match if they're both set. Otherwise, pick the one that's set, or fallback on
-    // "default".
-    match (cfg_network, &env_network) {
+    // Make sure they match if they're both set. Otherwise, pick the one
+    // that's set, or fallback on "mainnet".
+    match (feat_network, &env_network) {
         (Some(from_feature), Some(from_env)) => {
             assert_eq!(from_feature, from_env, "different target network configured via the features than via the {} environment variable", NETWORK_ENV);
             from_feature
         }
         (Some(net), None) => net,
         (None, Some(net)) => net.to_str().expect("network name not utf8"),
-        (None, None) => "default",
+        (None, None) => "mainnet",
     }.to_owned()
 }