Skip to content

Commit

Permalink
Merge branch 'main' into feat-assert-station-id-constraints
Browse files Browse the repository at this point in the history
  • Loading branch information
bajtos authored May 13, 2024
2 parents c8c2be7 + b9653ee commit 3945fd8
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 35 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -159,7 +159,7 @@ jobs:

- uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1
with:
toolchain: stable
toolchain: 1.77
components: rustfmt

- name: Check formatting
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}"
Expand Down
25 changes: 12 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "zinnia"
version = "0.18.3"
version = "0.19.1"
authors.workspace = true
default-run = "zinnia"
edition.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions daemon/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "zinniad"
version = "0.18.3"
version = "0.19.1"
authors.workspace = true
default-run = "zinniad"
edition.workspace = true
Expand All @@ -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 }

Expand Down
6 changes: 3 additions & 3 deletions docs/building-modules.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)`

Expand Down
4 changes: 2 additions & 2 deletions ext/libp2p/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion runtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions runtime/runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion runtime/tests/js/station_apis_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -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", () => {
Expand Down

0 comments on commit 3945fd8

Please sign in to comment.