Merge branch 'main' into severin/cmc-knows-about-cycles-ledger

dfinity · Feb 6, 2024 · e523796 · e523796
2 parents 3856233 + 1eec50b
commit e523796
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 56 deletions.
diff --git a/compatibility.json b/compatibility.json
@@ -1,4 +1,12 @@
 {
+  "0.16.1": {
+      "nns": {
+          "versions": ["0.2.1"]
+      },
+      "sns": {
+          "versions": ["0.2.1"]
+      }
+  },
   "0.16.0": {
       "nns": {
           "versions": ["0.2.1"]

diff --git a/extensions-utils/src/dependencies/download_ic_binaries.rs b/extensions-utils/src/dependencies/download_ic_binaries.rs
@@ -20,7 +20,7 @@ pub fn download_ic_binary(replica_rev: &str, binary_name: &str, destination_path
     };
 
     let url = format!(
-        "https://download.dfinity.systems/ic/{replica_rev}/openssl-static-binaries/{arch}-{os}/{binary_name}.gz",
+        "https://download.dfinity.systems/ic/{replica_rev}/binaries/{arch}-{os}/{binary_name}.gz",
         arch = arch,
         os = os,
         binary_name = binary_name,

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 = "f99495f3772d5a85d25ef5008179b49a5f12c5c2";
+const REPLICA_REV: &str = "044cfd5147fc97d7e5a214966941b6580c325d72";
 
 const BINARY_DEPENDENCIES: &[(&str, &str)] = &[
     // (downloaded binary name, renamed binary name)

diff --git a/extensions/nns/e2e/tests/nns.bash b/extensions/nns/e2e/tests/nns.bash
@@ -25,7 +25,8 @@ teardown() {
     # it panics, but still shows help
     run "$(dfx cache show)/extensions/nns/ic-nns-init" --help
     assert_failure
-    assert_output --partial "thread 'main' panicked at 'Illegal arguments:"
+    assert_output --partial "thread 'main' panicked"
+    assert_output --partial "Illegal arguments:"
     assert_output --partial "ic-nns-init [OPTIONS]"
     assert_output --regexp "-h, --help.*Print help information"
     assert_output --regexp '--version.*Print version information'

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 = "f99495f3772d5a85d25ef5008179b49a5f12c5c2";
+const REPLICA_REV: &str = "044cfd5147fc97d7e5a214966941b6580c325d72";
 
 const BINARY_DEPENDENCIES: &[(&str, &str)] = &[
     // (downloaded binary name, renamed binary name)

diff --git a/extensions/sns/e2e/assets/sns/valid/sns_v2.yml b/extensions/sns/e2e/assets/sns/valid/sns_v2.yml
@@ -1,64 +1,106 @@
 name: Daniel
 description: >
-  The best software engineer you ever did saw.
+    The best software engineer you ever did saw.
 logo: logo.png
-url: https://forum.dfinity.org/
+url: https://some-link-to-a-project.org
+
 NnsProposal:
-  title: "Proposal to Create an SNS named Daniel"
-  url: "https://forum.dfinity.org/"
-  summary: "This is just a short summary, but I think it's pretty good."
-Principals: []
+    title: "Proposal to Create an SNS named Daniel"
+    url: "https://forum.dfinity.org/thread-where-this-sns-is-discussed"
+    summary: "This is just a short summary, but I think it's pretty good."
+
+
+Principals:
+    - id: 5zxxw-63ouu-faaaa-aaaap-4ai
+      name: Bruce Wayne
+      email: batman@superherosinc.com
+    - id: uqf5l-jukmu-fqaaa-aaaap-4ai
+      name: Alfred Pennyworth
+    - id: c2n4r-wni5m-dqaaa-aaaap-4ai
+      name: employees (canister)
+    - id: ucm27-3lxwy-faaaa-aaaap-4ai
+      name: departments (canister)
+
 fallback_controller_principals:
-  - hpikg-6exdt-jn33w-ndty3-fc7jc-tl2lr-buih3-cs3y7-tftkp-sfp62-gqe
+    - 5zxxw-63ouu-faaaa-aaaap-4ai # TODO: Bruce Wayne
+
 dapp_canisters: []
+
 Token:
-  name: Batman
-  symbol: BTM
-  transaction_fee: 10_000 e8s
-  logo: logo.png
+    name: Batman
+    symbol: BTM
+    transaction_fee: 10_000 e8s
+    logo: logo.png
+
 Proposals:
-  rejection_fee: 1 token
-  initial_voting_period: 4d
-  maximum_wait_for_quiet_deadline_extension: 1 day
+    rejection_fee: 1 token
+    initial_voting_period: 4d
+    maximum_wait_for_quiet_deadline_extension: 1 day
+
 Neurons:
-  minimum_creation_stake: 61800 e8s
+    minimum_creation_stake: 61800 e8s
+
 Voting:
-  minimum_dissolve_delay: 26 weeks
-  MaximumVotingPowerBonuses:
-    DissolveDelay:
-      duration: 8 years
-      bonus: 100%
-    Age:
-      duration: 4 years
-      bonus: 25%
-  RewardRate:
-    initial: 10%
-    final: 2.25%
-    transition_duration: 12 years
+    minimum_dissolve_delay: 26 weeks
+
+    MaximumVotingPowerBonuses:
+        DissolveDelay:
+            duration: 8 years
+            bonus: 100%
+
+        Age:
+            duration: 4 years
+            bonus: 25%
+
+    RewardRate:
+        initial: 10%
+        final: 2.25%
+        transition_duration: 12 years
+
 Distribution:
-  Neurons:
-    - principal: dktcs-d43lz-rosn2-wnwsj-kef34-6kl3i-ux7qb-ka6xr-biref-ykeaj-sqe
-      stake: 15 tokens
-      memo: 0
-      dissolve_delay: 1 years
-      vesting_period: 1 year 1 second
-  InitialBalances:
-    governance: 60 tokens
-    swap: 40 tokens
-  total: 115 tokens # 60 + 40 + 15
+
+    Neurons:
+
+        - principal: 5zxxw-63ouu-faaaa-aaaap-4ai # TODO: Bruce Wayne
+          stake: 15 tokens
+          memo: 42
+          # TODO: Add support for non-integer numbers in duration strings?
+          dissolve_delay: 1 years
+          vesting_period: 1 year 1 second
+
+        - principal: uqf5l-jukmu-fqaaa-aaaap-4ai # TODO: Alfred Pennyworth
+          stake: 14.9 tokens
+          dissolve_delay: 52 weeks
+          vesting_period: 53 weeks
+
+    InitialBalances:
+        governance: 60 tokens
+        swap: 40 tokens
+
+    # Optional, but highly recommended. This is a literal
+    # checksum.
+    total: 129.9 tokens # 60 + 40 + 15 + 14.9
+
 Swap:
-  minimum_participants: 50
-  minimum_icp: 123 tokens
-  maximum_icp: 65000 tokens
-  minimum_participant_icp: 650 tokens
-  maximum_participant_icp: 6500 tokens
-  confirmation_text: Hello, world?
-  restricted_countries:
-    - US
-    - CH
-  VestingSchedule:
-    events: 83
-    interval: 17 days
-  start_time: 12:00 UTC
-  duration: 7 days
-  neurons_fund_investment_icp: 1_000 tokens
+    minimum_participants: 50
+
+    minimum_direct_participation_icp: 113 tokens
+    maximum_direct_participation_icp: 64990 tokens
+
+    minimum_participant_icp: 650 tokens
+    maximum_participant_icp: 6500 tokens
+
+    confirmation_text: Hello, world?
+
+    restricted_countries:
+        - US
+        - CH
+
+    VestingSchedule:
+        events: 83
+        interval: 17 days
+
+    start_time: 12:00 UTC
+    duration: 7 days
+
+    neurons_fund_participation: true