diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cb5395ef..a89abf35 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: - uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1 with: - toolchain: stable + toolchain: 1.77 target: ${{ matrix.target }} - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3 @@ -76,7 +76,7 @@ jobs: - uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1 with: - toolchain: stable + toolchain: 1.77 target: ${{ matrix.target }} - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3 @@ -117,7 +117,7 @@ jobs: - uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1 with: - toolchain: stable + toolchain: 1.77 - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3 with: @@ -135,7 +135,7 @@ jobs: - uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1 with: - toolchain: stable + toolchain: 1.77 components: clippy - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3 @@ -159,7 +159,7 @@ jobs: - uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1 with: - toolchain: stable + toolchain: 1.77 components: rustfmt - name: Check formatting diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd422825..c3b96df9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -102,7 +102,7 @@ jobs: - name: Setup | Rust uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1 with: - toolchain: stable + toolchain: 1.77 target: ${{ matrix.target }} - name: Setup | Cross @@ -197,7 +197,7 @@ jobs: - name: Release | Upload artifacts if: startsWith(github.ref, 'refs/tags/') # Don't create releases when debugging - uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 + uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 with: draft: true files: "*-${{ matrix.name }}" diff --git a/Cargo.lock b/Cargo.lock index c15bd923..0d276b7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3583,9 +3583,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.200" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] @@ -3610,9 +3610,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", @@ -3621,9 +3621,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "indexmap", "itoa", @@ -4040,16 +4040,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4854,7 +4853,7 @@ dependencies = [ [[package]] name = "zinnia" -version = "0.18.3" +version = "0.19.1" dependencies = [ "assert_cmd", "assert_fs", @@ -4870,7 +4869,7 @@ dependencies = [ [[package]] name = "zinnia_libp2p" -version = "0.18.3" +version = "0.19.1" dependencies = [ "async-trait", "deno_core", @@ -4886,7 +4885,7 @@ dependencies = [ [[package]] name = "zinnia_runtime" -version = "0.18.3" +version = "0.19.1" dependencies = [ "assert_fs", "chrono", @@ -4913,7 +4912,7 @@ dependencies = [ [[package]] name = "zinniad" -version = "0.18.3" +version = "0.19.1" dependencies = [ "assert_cmd", "assert_fs", diff --git a/Cargo.toml b/Cargo.toml index 64ec68cd..4aae5018 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,13 +22,13 @@ deno_core = "0.232.0" log = "0.4.21" pretty_assertions = "1.4.0" env_logger = "0.10.2" -serde = "1.0.200" +serde = "1.0.201" serde_repr = "0.1.19" tokio = { version = "1.37.0", features = ["fs", "rt", "macros"] } # workspace-local -zinnia_runtime = { version = "0.18.3", path = "./runtime" } -zinnia_libp2p = { version = "0.18.3", path = "./ext/libp2p" } +zinnia_runtime = { version = "0.19.1", path = "./runtime" } +zinnia_libp2p = { version = "0.19.1", path = "./ext/libp2p" } [profile.release] codegen-units = 1 diff --git a/cli/Cargo.toml b/cli/Cargo.toml index c0ed58e3..c21aeac0 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zinnia" -version = "0.18.3" +version = "0.19.1" authors.workspace = true default-run = "zinnia" edition.workspace = true diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index 13e85064..ca050e3d 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zinniad" -version = "0.18.3" +version = "0.19.1" authors.workspace = true default-run = "zinniad" edition.workspace = true @@ -19,7 +19,7 @@ clap = { version = "4.5.4", features = ["derive", "env"] } env_logger.workspace = true log.workspace = true serde.workspace = true -serde_json = "1.0.116" +serde_json = "1.0.117" tokio = { workspace = true } zinnia_runtime = { workspace = true } diff --git a/docs/building-modules.md b/docs/building-modules.md index 660d68b2..82e7c3b6 100644 --- a/docs/building-modules.md +++ b/docs/building-modules.md @@ -310,10 +310,10 @@ The value is hard-coded to 88 `0` characters when running the module via `zinnia #### `Zinnia.walletAddress` The wallet address where to send rewards. When running inside the Station Desktop, this API will -return the address of Station's built-in wallet. +return the address of the Station's built-in wallet. -The value is hard-coded to a testnet address `t1abjxfbp274xpdqcpuaykwkfb43omjotacm2p3za` when -running the module via `zinnia` CLI. +The value is hard-coded to the Ethereum (FEVM) address `0x000000000000000000000000000000000000dEaD` +when running the module via `zinnia` CLI. #### `Zinnia.activity.info(message)` diff --git a/ext/libp2p/Cargo.toml b/ext/libp2p/Cargo.toml index 1487dddf..9f1f15df 100644 --- a/ext/libp2p/Cargo.toml +++ b/ext/libp2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zinnia_libp2p" -version = "0.18.3" +version = "0.19.1" authors.workspace = true edition.workspace = true license.workspace = true @@ -17,7 +17,7 @@ deno_core.workspace = true log.workspace = true smallvec = "1.13.2" tokio = { workspace = true, features = ["rt", "macros", "sync", "time"] } -tokio-util = "0.7.10" +tokio-util = "0.7.11" either = "1.11.0" [dependencies.libp2p] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index f537ae73..25a19601 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zinnia_runtime" -version = "0.18.3" +version = "0.19.1" authors.workspace = true edition.workspace = true license.workspace = true diff --git a/runtime/runtime.rs b/runtime/runtime.rs index 7de57354..dd53f809 100644 --- a/runtime/runtime.rs +++ b/runtime/runtime.rs @@ -65,8 +65,7 @@ impl BootstrapOptions { agent_version, rng_seed: None, module_root, - // See https://lotus.filecoin.io/lotus/manage/manage-fil/#public-key-address - wallet_address: String::from("t1abjxfbp274xpdqcpuaykwkfb43omjotacm2p3za"), + wallet_address: String::from("0x000000000000000000000000000000000000dEaD"), // Station ID must look like a public key - 88 hexadecimal characters. // Let's use all-zeroes value to make it easy to distinguish data reported // from non-production systems (dev, CI). diff --git a/runtime/tests/js/station_apis_tests.js b/runtime/tests/js/station_apis_tests.js index 71460fdd..bdad2d48 100644 --- a/runtime/tests/js/station_apis_tests.js +++ b/runtime/tests/js/station_apis_tests.js @@ -5,7 +5,7 @@ test("Zinnia.walletAddress", () => { // Runtime JS tests are executed with the default configuration // In this test, we assert that we can access the wallet address // and the value is the default testnet one. - assertStrictEquals(Zinnia.walletAddress, "t1abjxfbp274xpdqcpuaykwkfb43omjotacm2p3za"); + assertStrictEquals(Zinnia.walletAddress, "0x000000000000000000000000000000000000dEaD"); }); test("Zinnia.stationId", () => {