From b1e7ba9e2f392cc447c3bc522194119e254e1f54 Mon Sep 17 00:00:00 2001 From: Zizou <111426680+zizou0x@users.noreply.github.com> Date: Mon, 17 Feb 2025 09:29:07 +0100 Subject: [PATCH] refactor(substreams): add `rust-toolchain` to the templates and modules. (#155) * refactor(substreams): add `rust-toolchain` to the templates and modules. This freezes the wasm output for each module, allowing us to have full control over each packages and when we break the modules hashes. * fix(testing): allow no `initialized_accounts` in tests --------- Co-authored-by: zizou <111426680+flopell@users.noreply.github.com> --- substreams/ethereum-ambient/rust-toolchain.toml | 4 ++++ substreams/ethereum-balancer-v2/rust-toolchain.toml | 4 ++++ substreams/ethereum-curve/rust-toolchain.toml | 4 +++- substreams/ethereum-template-factory/rust-toolchain.toml | 4 ++++ substreams/ethereum-template-singleton/rust-toolchain.toml | 4 ++++ substreams/ethereum-uniswap-v2/rust-toolchain.toml | 4 ++++ substreams/ethereum-uniswap-v3-logs-only/rust-toolchain.toml | 4 ++++ substreams/ethereum-uniswap-v3/rust-toolchain.toml | 4 ++++ substreams/ethereum-uniswap-v4/rust-toolchain.toml | 4 ++++ testing/src/runner/runner.py | 4 ++-- 10 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 substreams/ethereum-ambient/rust-toolchain.toml create mode 100644 substreams/ethereum-balancer-v2/rust-toolchain.toml create mode 100644 substreams/ethereum-template-factory/rust-toolchain.toml create mode 100644 substreams/ethereum-template-singleton/rust-toolchain.toml create mode 100644 substreams/ethereum-uniswap-v2/rust-toolchain.toml create mode 100644 substreams/ethereum-uniswap-v3-logs-only/rust-toolchain.toml create mode 100644 substreams/ethereum-uniswap-v3/rust-toolchain.toml create mode 100644 substreams/ethereum-uniswap-v4/rust-toolchain.toml diff --git a/substreams/ethereum-ambient/rust-toolchain.toml b/substreams/ethereum-ambient/rust-toolchain.toml new file mode 100644 index 0000000..15b4897 --- /dev/null +++ b/substreams/ethereum-ambient/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.83.0" +components = [ "rustfmt" ] +targets = [ "wasm32-unknown-unknown" ] diff --git a/substreams/ethereum-balancer-v2/rust-toolchain.toml b/substreams/ethereum-balancer-v2/rust-toolchain.toml new file mode 100644 index 0000000..15b4897 --- /dev/null +++ b/substreams/ethereum-balancer-v2/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.83.0" +components = [ "rustfmt" ] +targets = [ "wasm32-unknown-unknown" ] diff --git a/substreams/ethereum-curve/rust-toolchain.toml b/substreams/ethereum-curve/rust-toolchain.toml index 5d56faf..15b4897 100644 --- a/substreams/ethereum-curve/rust-toolchain.toml +++ b/substreams/ethereum-curve/rust-toolchain.toml @@ -1,2 +1,4 @@ [toolchain] -channel = "nightly" +channel = "1.83.0" +components = [ "rustfmt" ] +targets = [ "wasm32-unknown-unknown" ] diff --git a/substreams/ethereum-template-factory/rust-toolchain.toml b/substreams/ethereum-template-factory/rust-toolchain.toml new file mode 100644 index 0000000..15b4897 --- /dev/null +++ b/substreams/ethereum-template-factory/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.83.0" +components = [ "rustfmt" ] +targets = [ "wasm32-unknown-unknown" ] diff --git a/substreams/ethereum-template-singleton/rust-toolchain.toml b/substreams/ethereum-template-singleton/rust-toolchain.toml new file mode 100644 index 0000000..15b4897 --- /dev/null +++ b/substreams/ethereum-template-singleton/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.83.0" +components = [ "rustfmt" ] +targets = [ "wasm32-unknown-unknown" ] diff --git a/substreams/ethereum-uniswap-v2/rust-toolchain.toml b/substreams/ethereum-uniswap-v2/rust-toolchain.toml new file mode 100644 index 0000000..15b4897 --- /dev/null +++ b/substreams/ethereum-uniswap-v2/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.83.0" +components = [ "rustfmt" ] +targets = [ "wasm32-unknown-unknown" ] diff --git a/substreams/ethereum-uniswap-v3-logs-only/rust-toolchain.toml b/substreams/ethereum-uniswap-v3-logs-only/rust-toolchain.toml new file mode 100644 index 0000000..15b4897 --- /dev/null +++ b/substreams/ethereum-uniswap-v3-logs-only/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.83.0" +components = [ "rustfmt" ] +targets = [ "wasm32-unknown-unknown" ] diff --git a/substreams/ethereum-uniswap-v3/rust-toolchain.toml b/substreams/ethereum-uniswap-v3/rust-toolchain.toml new file mode 100644 index 0000000..15b4897 --- /dev/null +++ b/substreams/ethereum-uniswap-v3/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.83.0" +components = [ "rustfmt" ] +targets = [ "wasm32-unknown-unknown" ] diff --git a/substreams/ethereum-uniswap-v4/rust-toolchain.toml b/substreams/ethereum-uniswap-v4/rust-toolchain.toml new file mode 100644 index 0000000..15b4897 --- /dev/null +++ b/substreams/ethereum-uniswap-v4/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.83.0" +components = [ "rustfmt" ] +targets = [ "wasm32-unknown-unknown" ] diff --git a/testing/src/runner/runner.py b/testing/src/runner/runner.py index 9c8218a..f7c06ea 100644 --- a/testing/src/runner/runner.py +++ b/testing/src/runner/runner.py @@ -210,9 +210,9 @@ class TestRunner: ] related_contracts = set() - for account in self.config.initialized_accounts: + for account in self.config.initialized_accounts or []: related_contracts.add(HexBytes(account)) - for account in initialized_accounts: + for account in initialized_accounts or []: related_contracts.add(HexBytes(account)) # Filter out components that are not set to be used for the simulation