chore: update replica rev / SNS version (#164)

* fix: obtain extension version even on branch on a fork workspace_members can contain something like path+file:///Users/ericswanson/fork/anchpop/dfx-extensions/extensions/nns#0.4.7 Instead, get the version directly from the package * chore: Update replica rev --------- Co-authored-by: Eric Swanson <[email protected]> Co-authored-by: anchpop <[email protected]>
dfinity · Jan 10, 2025 · eece457 · eece457
1 parent bd46410
commit eece457
Show file tree

Hide file tree

Showing 12 changed files with 733 additions and 588 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ license = "Apache-2.0"
 repository = "https://github.com/dfinity/dfx-extensions"
 
 [workspace.dependencies]
-dfx-core = "0.1.1"
+dfx-core = "0.1.2"
 dfx-extensions-utils.path = "./extensions-utils"
 
 anyhow = "^1"
@@ -21,8 +21,8 @@ flate2 = { version = "1.0.25", default-features = false, features = [
 ] }
 fn-error-context = "0.2.1"
 futures-util = "0.3.28"
-ic-agent = "=0.38.0"
-ic-utils = "=0.38.0"
+ic-agent = "0.39"
+ic-utils = "0.39"
 pocket-ic = "6.0.0"
 reqwest = { version = "^0.11.22", default-features = false, features = [
     "blocking",
@@ -35,11 +35,11 @@ slog = "^2.7.0"
 tempfile = "3.12.0"
 tokio = { version = "^1.36.0", features = ["rt-multi-thread"] }
 url = "^2.4.1"
-ic-http-utils = { git = "https://github.com/dfinity/ic", rev = "0f96a6f4661f0d87bd9149a88846db9674360291" }
-ic-icp-index = { git = "https://github.com/dfinity/ic", rev = "0f96a6f4661f0d87bd9149a88846db9674360291" }
-ic-icrc1-index-ng = { git = "https://github.com/dfinity/ic", rev = "0f96a6f4661f0d87bd9149a88846db9674360291" }
-ic-icrc1-ledger = { git = "https://github.com/dfinity/ic", rev = "0f96a6f4661f0d87bd9149a88846db9674360291" }
-ic-sns-cli = { git = "https://github.com/dfinity/ic", rev = "0f96a6f4661f0d87bd9149a88846db9674360291" }
+ic-http-utils = { git = "https://github.com/dfinity/ic", rev = "760e1f764b56f4f655a09789c245da487eccc5cb" }
+ic-icp-index = { git = "https://github.com/dfinity/ic", rev = "760e1f764b56f4f655a09789c245da487eccc5cb" }
+ic-icrc1-index-ng = { git = "https://github.com/dfinity/ic", rev = "760e1f764b56f4f655a09789c245da487eccc5cb" }
+ic-icrc1-ledger = { git = "https://github.com/dfinity/ic", rev = "760e1f764b56f4f655a09789c245da487eccc5cb" }
+ic-sns-cli = { git = "https://github.com/dfinity/ic", rev = "760e1f764b56f4f655a09789c245da487eccc5cb" }
 serde_json = "1.0.79"
 
 # Config for 'cargo dist'

diff --git a/extensions-utils/src/manifest.rs b/extensions-utils/src/manifest.rs
@@ -61,7 +61,7 @@ fn generate_args(cmd: &clap::Command) -> BTreeMap<String, ExtensionSubcommandArg
                         if min == 0 && max == usize::MAX {
                             ArgNumberOfValues::Unlimited
                         } else if min == max {
-                            ArgNumberOfValues::Number(min as usize)
+                            ArgNumberOfValues::Number(min)
                         } else {
                             // max is inclusive, but ArgNumberOfValues::Range wants an exclusive range
                             ArgNumberOfValues::Range(min..(max.saturating_add(1)))
@@ -76,7 +76,7 @@ fn generate_args(cmd: &clap::Command) -> BTreeMap<String, ExtensionSubcommandArg
 }
 
 pub fn verify_extension_manifest<Command: clap::CommandFactory>(path: &Path) -> anyhow::Result<()> {
-    // read the mainfest from the path and deserizlize it
+    // read the manifest from the path and deserialize it
     let current_manifest_string = std::fs::read_to_string(path).context(format!(
         "Could not read the extension manifest at {}",
         path.display(),

diff --git a/extensions/nns/build.rs b/extensions/nns/build.rs
@@ -1,7 +1,7 @@
 use std::env;
 use std::path::PathBuf;
 
-const REPLICA_REV: &str = "0f96a6f4661f0d87bd9149a88846db9674360291";
+const REPLICA_REV: &str = "760e1f764b56f4f655a09789c245da487eccc5cb";
 
 const BINARY_DEPENDENCIES: &[(&str, &str)] = &[
     // (downloaded binary name, renamed binary name)

diff --git a/extensions/nns/src/install_nns.rs b/extensions/nns/src/install_nns.rs
@@ -85,7 +85,7 @@ pub async fn install_nns(
     networks_config: &NetworksConfig,
     dfx_cache_path: &Path,
     ledger_accounts: &[String],
-    logger: &Logger,
+    _logger: &Logger,
 ) -> anyhow::Result<()> {
     eprintln!("Checking out the environment...");
     // Retrieve the PocketIC instance topology.

diff --git a/extensions/sns/CHANGELOG.md b/extensions/sns/CHANGELOG.md
@@ -1,9 +1,12 @@
 <!-- next-header -->
 
 ## [Unreleased] - ReleaseDate
-- Fixed a bug where `dfx sns import` would fail if a canister type in dfx.json was defined by an extension.
+- Improved the behavior of SNS Testflight. There is currently an incompatibilty between the `sns-init.yaml` format and SNS Testflight. [Refer to this forum post](https://forum.dfinity.org/t/error-when-deploying-sns-testflight-to-mainnet/38282/6?u=andre-popovitch) for more information and workarounds.
+
+## [0.4.8] - 2024-12-16
 
 ## [0.4.7] - 2024-11-08
+- Fixed a bug where `dfx sns import` would fail if a canister type in dfx.json was defined by an extension.
 - Added support for `dfx start --pocketic`.
 
 ## [0.4.6] - 2024-10-11
@@ -64,6 +67,7 @@
 
 <!-- next-url -->
 [Unreleased]: https://github.com/dfinity/dfx-extensions/compare/{{tag_name}}...HEAD
+[0.4.8]: https://github.com/dfinity/dfx-extensions/compare/{{tag_name}}...{{tag_name}}
 [0.4.7]: https://github.com/dfinity/dfx-extensions/compare/{{tag_name}}...{{tag_name}}
 [0.4.6]: https://github.com/dfinity/dfx-extensions/compare/{{tag_name}}...{{tag_name}}
 [0.4.5]: https://github.com/dfinity/dfx-extensions/compare/{{tag_name}}...{{tag_name}}

diff --git a/extensions/sns/Cargo.toml b/extensions/sns/Cargo.toml
@@ -21,7 +21,7 @@ anyhow.workspace = true
 clap.workspace = true
 fn-error-context.workspace = true
 slog.workspace = true
-ic-agent = "0.37"
+ic-agent.workspace = true
 tokio.workspace = true
 futures-util = "0.3.28"
 candid.workspace = true

diff --git a/extensions/sns/build.rs b/extensions/sns/build.rs
@@ -1,7 +1,7 @@
 use std::env;
 use std::path::PathBuf;
 
-const REPLICA_REV: &str = "0f96a6f4661f0d87bd9149a88846db9674360291";
+const REPLICA_REV: &str = "760e1f764b56f4f655a09789c245da487eccc5cb";
 
 const BINARY_DEPENDENCIES: &[(&str, &str)] = &[
     // (downloaded binary name, renamed binary name)

diff --git a/extensions/sns/dependencies.json b/extensions/sns/dependencies.json
@@ -1,4 +1,9 @@
 {
+  "0.4.8": {
+    "dfx": {
+      "version": ">=0.17.0"
+    }
+  },
   "0.4.7": {
     "dfx": {
       "version": ">=0.17.0"

diff --git a/extensions/sns/src/commands/download.rs b/extensions/sns/src/commands/download.rs
@@ -4,7 +4,6 @@ use dfx_extensions_utils::replica_rev;
 
 use clap::Parser;
 use std::path::{Path, PathBuf};
-use tokio::runtime::Runtime;
 
 /// Downloads the SNS canister WASMs
 #[derive(Parser)]

diff --git a/extensions/sns/src/main.rs b/extensions/sns/src/main.rs
@@ -136,6 +136,7 @@ async fn main() -> anyhow::Result<()> {
 }
 
 #[test]
+#[ignore] // TODO: remove once a dfx-core release containing <https://github.com/dfinity/sdk/pull/4060> is merged and this repo is updated to use that version.
 fn verify_extension_manifest() {
     let project_root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     println!("Project root: {:?}", project_root);

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.76.0"
+channel = "1.83.0"
 components = ["rustfmt", "clippy"]