diff --git a/packages/ckbtc/candid/minter.did b/packages/ckbtc/candid/minter.did
index e2351249..1dca3538 100644
--- a/packages/ckbtc/candid/minter.did
+++ b/packages/ckbtc/candid/minter.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/bitcoin/ckbtc/minter/ckbtc_minter.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/bitcoin/ckbtc/minter/ckbtc_minter.did' by import-candid
 // Represents an account on the ckBTC ledger.
 type Account = record { owner : principal; subaccount : opt blob };
 
diff --git a/packages/cketh/candid/minter.did b/packages/cketh/candid/minter.did
index fa586d11..5c5698de 100644
--- a/packages/cketh/candid/minter.did
+++ b/packages/cketh/candid/minter.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/ethereum/cketh/minter/cketh_minter.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/ethereum/cketh/minter/cketh_minter.did' by import-candid
 type EthereumNetwork = variant {
     // The public Ethereum mainnet.
     Mainnet;
diff --git a/packages/cketh/candid/orchestrator.did b/packages/cketh/candid/orchestrator.did
index 01a08284..0536da2d 100644
--- a/packages/cketh/candid/orchestrator.did
+++ b/packages/cketh/candid/orchestrator.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/ethereum/ledger-suite-orchestrator/ledger_suite_orchestrator.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/ethereum/ledger-suite-orchestrator/ledger_suite_orchestrator.did' by import-candid
 type OrchestratorArg = variant {
     UpgradeArg : UpgradeArg;
     InitArg : InitArg;
diff --git a/packages/cmc/candid/cmc.certified.idl.js b/packages/cmc/candid/cmc.certified.idl.js
index f3c00f64..b27411a8 100644
--- a/packages/cmc/candid/cmc.certified.idl.js
+++ b/packages/cmc/candid/cmc.certified.idl.js
@@ -23,8 +23,8 @@ export const idlFactory = ({ IDL }) => {
     'public' : IDL.Null,
   });
   const CanisterSettings = IDL.Record({
-    'controller' : IDL.Opt(IDL.Principal),
     'freezing_threshold' : IDL.Opt(IDL.Nat),
+    'wasm_memory_threshold' : IDL.Opt(IDL.Nat),
     'controllers' : IDL.Opt(IDL.Vec(IDL.Principal)),
     'reserved_cycles_limit' : IDL.Opt(IDL.Nat),
     'log_visibility' : IDL.Opt(log_visibility),
diff --git a/packages/cmc/candid/cmc.d.ts b/packages/cmc/candid/cmc.d.ts
index 54ef9778..f37868f1 100644
--- a/packages/cmc/candid/cmc.d.ts
+++ b/packages/cmc/candid/cmc.d.ts
@@ -5,8 +5,8 @@ import type { Principal } from "@dfinity/principal";
 export type AccountIdentifier = string;
 export type BlockIndex = bigint;
 export interface CanisterSettings {
-  controller: [] | [Principal];
   freezing_threshold: [] | [bigint];
+  wasm_memory_threshold: [] | [bigint];
   controllers: [] | [Array<Principal>];
   reserved_cycles_limit: [] | [bigint];
   log_visibility: [] | [log_visibility];
diff --git a/packages/cmc/candid/cmc.did b/packages/cmc/candid/cmc.did
index e0a5409a..f9ed21d6 100644
--- a/packages/cmc/candid/cmc.did
+++ b/packages/cmc/candid/cmc.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/nns/cmc/cmc.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/nns/cmc/cmc.did' by import-candid
 type Cycles = nat;
 type BlockIndex = nat64;
 type log_visibility = variant {
@@ -6,14 +6,14 @@ type log_visibility = variant {
   public;
 };
 type CanisterSettings = record {
-  controller : opt principal;
   controllers : opt vec principal;
   compute_allocation : opt nat;
   memory_allocation : opt nat;
   freezing_threshold : opt nat;
-  reserved_cycles_limit: opt nat;
+  reserved_cycles_limit : opt nat;
   log_visibility : opt log_visibility;
-  wasm_memory_limit: opt nat;
+  wasm_memory_limit : opt nat;
+  wasm_memory_threshold : opt nat;
 };
 type Subaccount = opt blob;
 type Memo = opt blob;
@@ -27,18 +27,17 @@ type NotifyTopUpArg = record {
   canister_id : principal;
 };
 
-
 type SubnetSelection = variant {
-    /// Choose a specific subnet
-    Subnet : record {
-      subnet: principal;
-    };
-    /// Choose a random subnet that fulfills the specified properties
-    Filter : SubnetFilter;
+  /// Choose a specific subnet
+  Subnet : record {
+    subnet : principal;
+  };
+  /// Choose a random subnet that fulfills the specified properties
+  Filter : SubnetFilter;
 };
 
 type SubnetFilter = record {
-  subnet_type: opt text;
+  subnet_type : opt text;
 };
 
 // The argument of the [create_canister] method.
@@ -50,10 +49,10 @@ type CreateCanisterArg = record {
   // An optional subnet type that, if set, determines what type of subnet
   // the new canister will be created on.
   // Deprecated. Use subnet_selection instead.
-  subnet_type: opt text;
+  subnet_type : opt text;
 
   // Optional instructions to select on which subnet the new canister will be created on.
-  subnet_selection: opt SubnetSelection;
+  subnet_selection : opt SubnetSelection;
 };
 
 // The argument of the [notify_create_canister] method.
@@ -67,11 +66,11 @@ type NotifyCreateCanisterArg = record {
   // An optional subnet type that, if set, determines what type of subnet
   // the new canister will be created on.
   // Deprecated. Use subnet_selection instead.
-  subnet_type: opt text;
+  subnet_type : opt text;
 
   // Optional instructions to select on which subnet the new canister will be created on.
   // vec may contain no more than one element.
-  subnet_selection: opt SubnetSelection;
+  subnet_selection : opt SubnetSelection;
 
   // Optional canister settings that, if set, are applied to the newly created canister.
   // If not specified, the caller is the controller of the canister and the other settings are set to default values.
@@ -83,17 +82,17 @@ type NotifyCreateCanisterArg = record {
 type CreateCanisterError = variant {
   Refunded : record {
     // The amount of cycles returned to the calling canister
-    refund_amount: nat;
+    refund_amount : nat;
 
     // The reason why creating a canister failed.
-    create_error: text;
+    create_error : text;
   };
   RefundFailed : record {
     // The reason why creating a canister failed.
-    create_error: text;
+    create_error : text;
 
     // The reason why refunding cycles failed.
-    refund_error: text;
+    refund_error : text;
   };
 };
 
@@ -153,7 +152,6 @@ type IcpXdrConversionRate = record {
   xdr_permyriad_per_icp : nat64;
 };
 
-
 type IcpXdrConversionRateResponse = record {
   // The latest ICP/XDR conversion rate.
   data : IcpXdrConversionRate;
@@ -176,49 +174,49 @@ type IcpXdrConversionRateResponse = record {
 };
 
 type SubnetTypesToSubnetsResponse = record {
-  data: vec record { text; vec principal };
+  data : vec record { text; vec principal };
 };
 
 type PrincipalsAuthorizedToCreateCanistersToSubnetsResponse = record {
-  data: vec record { principal; vec principal };
+  data : vec record { principal; vec principal };
 };
 
 type AccountIdentifier = text;
 
 type ExchangeRateCanister = variant {
-    /// Enables the exchange rate canister with the given canister ID.
-    Set: principal;
-    /// Disable the exchange rate canister.
-    Unset;
+  /// Enables the exchange rate canister with the given canister ID.
+  Set : principal;
+  /// Disable the exchange rate canister.
+  Unset;
 };
 
 type CyclesCanisterInitPayload = record {
-    ledger_canister_id: opt principal;
-    governance_canister_id: opt principal;
-    minting_account_id: opt AccountIdentifier;
-    last_purged_notification: opt nat64;
-    exchange_rate_canister: opt ExchangeRateCanister;
-    cycles_ledger_canister_id: opt principal;
+  ledger_canister_id : opt principal;
+  governance_canister_id : opt principal;
+  minting_account_id : opt AccountIdentifier;
+  last_purged_notification : opt nat64;
+  exchange_rate_canister : opt ExchangeRateCanister;
+  cycles_ledger_canister_id : opt principal;
 };
 
 type NotifyMintCyclesArg = record {
-  block_index: BlockIndex;
-  to_subaccount: Subaccount;
-  deposit_memo: Memo;
+  block_index : BlockIndex;
+  to_subaccount : Subaccount;
+  deposit_memo : Memo;
 };
 
 type NotifyMintCyclesResult = variant {
-  Ok: NotifyMintCyclesSuccess;
-  Err: NotifyError;
+  Ok : NotifyMintCyclesSuccess;
+  Err : NotifyError;
 };
 
 type NotifyMintCyclesSuccess = record {
-    // Cycles ledger block index of deposit
-    block_index: nat;
-    // Amount of cycles that were minted and deposited to the cycles ledger
-    minted: nat;
-    // New balance of the cycles ledger account
-    balance: nat;
+  // Cycles ledger block index of deposit
+  block_index : nat;
+  // Amount of cycles that were minted and deposited to the cycles ledger
+  minted : nat;
+  // New balance of the cycles ledger account
+  balance : nat;
 };
 
 service : (opt CyclesCanisterInitPayload) -> {
@@ -246,4 +244,4 @@ service : (opt CyclesCanisterInitPayload) -> {
   get_principals_authorized_to_create_canisters_to_subnets : () -> (PrincipalsAuthorizedToCreateCanistersToSubnetsResponse) query;
 
   get_build_metadata : () -> (text) query;
-}
+};
diff --git a/packages/cmc/candid/cmc.idl.js b/packages/cmc/candid/cmc.idl.js
index 9f571ced..4d071125 100644
--- a/packages/cmc/candid/cmc.idl.js
+++ b/packages/cmc/candid/cmc.idl.js
@@ -23,8 +23,8 @@ export const idlFactory = ({ IDL }) => {
     'public' : IDL.Null,
   });
   const CanisterSettings = IDL.Record({
-    'controller' : IDL.Opt(IDL.Principal),
     'freezing_threshold' : IDL.Opt(IDL.Nat),
+    'wasm_memory_threshold' : IDL.Opt(IDL.Nat),
     'controllers' : IDL.Opt(IDL.Vec(IDL.Principal)),
     'reserved_cycles_limit' : IDL.Opt(IDL.Nat),
     'log_visibility' : IDL.Opt(log_visibility),
diff --git a/packages/ic-management/candid/ic-management.certified.idl.js b/packages/ic-management/candid/ic-management.certified.idl.js
index 23bc6e05..7ac2af46 100644
--- a/packages/ic-management/candid/ic-management.certified.idl.js
+++ b/packages/ic-management/candid/ic-management.certified.idl.js
@@ -270,6 +270,22 @@ export const idlFactory = ({ IDL }) => {
     'amount' : IDL.Nat,
   });
   const raw_rand_result = IDL.Vec(IDL.Nat8);
+  const schnorr_algorithm = IDL.Variant({
+    'ed25519' : IDL.Null,
+    'bip340secp256k1' : IDL.Null,
+  });
+  const schnorr_public_key_args = IDL.Record({
+    'key_id' : IDL.Record({
+      'algorithm' : schnorr_algorithm,
+      'name' : IDL.Text,
+    }),
+    'canister_id' : IDL.Opt(canister_id),
+    'derivation_path' : IDL.Vec(IDL.Vec(IDL.Nat8)),
+  });
+  const schnorr_public_key_result = IDL.Record({
+    'public_key' : IDL.Vec(IDL.Nat8),
+    'chain_code' : IDL.Vec(IDL.Nat8),
+  });
   const sign_with_ecdsa_args = IDL.Record({
     'key_id' : IDL.Record({ 'name' : IDL.Text, 'curve' : ecdsa_curve }),
     'derivation_path' : IDL.Vec(IDL.Vec(IDL.Nat8)),
@@ -278,6 +294,17 @@ export const idlFactory = ({ IDL }) => {
   const sign_with_ecdsa_result = IDL.Record({
     'signature' : IDL.Vec(IDL.Nat8),
   });
+  const sign_with_schnorr_args = IDL.Record({
+    'key_id' : IDL.Record({
+      'algorithm' : schnorr_algorithm,
+      'name' : IDL.Text,
+    }),
+    'derivation_path' : IDL.Vec(IDL.Vec(IDL.Nat8)),
+    'message' : IDL.Vec(IDL.Nat8),
+  });
+  const sign_with_schnorr_result = IDL.Record({
+    'signature' : IDL.Vec(IDL.Nat8),
+  });
   const start_canister_args = IDL.Record({ 'canister_id' : canister_id });
   const stop_canister_args = IDL.Record({ 'canister_id' : canister_id });
   const stored_chunks_args = IDL.Record({ 'canister_id' : canister_id });
@@ -374,11 +401,21 @@ export const idlFactory = ({ IDL }) => {
         [],
       ),
     'raw_rand' : IDL.Func([], [raw_rand_result], []),
+    'schnorr_public_key' : IDL.Func(
+        [schnorr_public_key_args],
+        [schnorr_public_key_result],
+        [],
+      ),
     'sign_with_ecdsa' : IDL.Func(
         [sign_with_ecdsa_args],
         [sign_with_ecdsa_result],
         [],
       ),
+    'sign_with_schnorr' : IDL.Func(
+        [sign_with_schnorr_args],
+        [sign_with_schnorr_result],
+        [],
+      ),
     'start_canister' : IDL.Func([start_canister_args], [], []),
     'stop_canister' : IDL.Func([stop_canister_args], [], []),
     'stored_chunks' : IDL.Func(
diff --git a/packages/ic-management/candid/ic-management.d.ts b/packages/ic-management/candid/ic-management.d.ts
index 07395763..bc34f19d 100644
--- a/packages/ic-management/candid/ic-management.d.ts
+++ b/packages/ic-management/candid/ic-management.d.ts
@@ -250,6 +250,16 @@ export interface provisional_top_up_canister_args {
 }
 export type raw_rand_result = Uint8Array | number[];
 export type satoshi = bigint;
+export type schnorr_algorithm = { ed25519: null } | { bip340secp256k1: null };
+export interface schnorr_public_key_args {
+  key_id: { algorithm: schnorr_algorithm; name: string };
+  canister_id: [] | [canister_id];
+  derivation_path: Array<Uint8Array | number[]>;
+}
+export interface schnorr_public_key_result {
+  public_key: Uint8Array | number[];
+  chain_code: Uint8Array | number[];
+}
 export interface sign_with_ecdsa_args {
   key_id: { name: string; curve: ecdsa_curve };
   derivation_path: Array<Uint8Array | number[]>;
@@ -258,6 +268,14 @@ export interface sign_with_ecdsa_args {
 export interface sign_with_ecdsa_result {
   signature: Uint8Array | number[];
 }
+export interface sign_with_schnorr_args {
+  key_id: { algorithm: schnorr_algorithm; name: string };
+  derivation_path: Array<Uint8Array | number[]>;
+  message: Uint8Array | number[];
+}
+export interface sign_with_schnorr_result {
+  signature: Uint8Array | number[];
+}
 export interface start_canister_args {
   canister_id: canister_id;
 }
@@ -343,7 +361,15 @@ export interface _SERVICE {
     undefined
   >;
   raw_rand: ActorMethod<[], raw_rand_result>;
+  schnorr_public_key: ActorMethod<
+    [schnorr_public_key_args],
+    schnorr_public_key_result
+  >;
   sign_with_ecdsa: ActorMethod<[sign_with_ecdsa_args], sign_with_ecdsa_result>;
+  sign_with_schnorr: ActorMethod<
+    [sign_with_schnorr_args],
+    sign_with_schnorr_result
+  >;
   start_canister: ActorMethod<[start_canister_args], undefined>;
   stop_canister: ActorMethod<[stop_canister_args], undefined>;
   stored_chunks: ActorMethod<[stored_chunks_args], stored_chunks_result>;
diff --git a/packages/ic-management/candid/ic-management.did b/packages/ic-management/candid/ic-management.did
index bc6a4afb..20a76d9a 100644
--- a/packages/ic-management/candid/ic-management.did
+++ b/packages/ic-management/candid/ic-management.did
@@ -1,4 +1,4 @@
-// Generated from dfinity/interface-spec commit 21d64ed310ea7c835aef353ba651a5c2ccc591ee for file 'spec/_attachments/ic.did'
+// Generated from dfinity/interface-spec commit 99bc27cb00159f4413c320d68c76baec4b230644 for file 'spec/_attachments/ic.did'
 type canister_id = principal;
 type wasm_module = blob;
 
@@ -77,6 +77,11 @@ type ecdsa_curve = variant {
     secp256k1;
 };
 
+type schnorr_algorithm = variant {
+    bip340secp256k1;
+    ed25519;
+};
+
 type satoshi = nat64;
 
 type bitcoin_network = variant {
@@ -304,6 +309,27 @@ type sign_with_ecdsa_result = record {
     signature : blob;
 };
 
+type schnorr_public_key_args = record {
+    canister_id : opt canister_id;
+    derivation_path : vec blob;
+    key_id : record { algorithm : schnorr_algorithm; name : text };
+};
+
+type schnorr_public_key_result = record {
+    public_key : blob;
+    chain_code : blob;
+};
+
+type sign_with_schnorr_args = record {
+    message : blob;
+    derivation_path : vec blob;
+    key_id : record { algorithm : schnorr_algorithm; name : text };
+};
+
+type sign_with_schnorr_result = record {
+    signature : blob;
+};
+
 type node_metrics_history_args = record {
     subnet_id : principal;
     start_at_timestamp_nanos : nat64;
@@ -378,6 +404,10 @@ service ic : {
     ecdsa_public_key : (ecdsa_public_key_args) -> (ecdsa_public_key_result);
     sign_with_ecdsa : (sign_with_ecdsa_args) -> (sign_with_ecdsa_result);
 
+    // Threshold Schnorr signature
+    schnorr_public_key : (schnorr_public_key_args) -> (schnorr_public_key_result);
+    sign_with_schnorr : (sign_with_schnorr_args) -> (sign_with_schnorr_result);
+
     // bitcoin interface
     bitcoin_get_balance : (bitcoin_get_balance_args) -> (bitcoin_get_balance_result);
     bitcoin_get_balance_query : (bitcoin_get_balance_query_args) -> (bitcoin_get_balance_query_result) query;
diff --git a/packages/ic-management/candid/ic-management.idl.js b/packages/ic-management/candid/ic-management.idl.js
index 9e8d59a7..137981b1 100644
--- a/packages/ic-management/candid/ic-management.idl.js
+++ b/packages/ic-management/candid/ic-management.idl.js
@@ -270,6 +270,22 @@ export const idlFactory = ({ IDL }) => {
     'amount' : IDL.Nat,
   });
   const raw_rand_result = IDL.Vec(IDL.Nat8);
+  const schnorr_algorithm = IDL.Variant({
+    'ed25519' : IDL.Null,
+    'bip340secp256k1' : IDL.Null,
+  });
+  const schnorr_public_key_args = IDL.Record({
+    'key_id' : IDL.Record({
+      'algorithm' : schnorr_algorithm,
+      'name' : IDL.Text,
+    }),
+    'canister_id' : IDL.Opt(canister_id),
+    'derivation_path' : IDL.Vec(IDL.Vec(IDL.Nat8)),
+  });
+  const schnorr_public_key_result = IDL.Record({
+    'public_key' : IDL.Vec(IDL.Nat8),
+    'chain_code' : IDL.Vec(IDL.Nat8),
+  });
   const sign_with_ecdsa_args = IDL.Record({
     'key_id' : IDL.Record({ 'name' : IDL.Text, 'curve' : ecdsa_curve }),
     'derivation_path' : IDL.Vec(IDL.Vec(IDL.Nat8)),
@@ -278,6 +294,17 @@ export const idlFactory = ({ IDL }) => {
   const sign_with_ecdsa_result = IDL.Record({
     'signature' : IDL.Vec(IDL.Nat8),
   });
+  const sign_with_schnorr_args = IDL.Record({
+    'key_id' : IDL.Record({
+      'algorithm' : schnorr_algorithm,
+      'name' : IDL.Text,
+    }),
+    'derivation_path' : IDL.Vec(IDL.Vec(IDL.Nat8)),
+    'message' : IDL.Vec(IDL.Nat8),
+  });
+  const sign_with_schnorr_result = IDL.Record({
+    'signature' : IDL.Vec(IDL.Nat8),
+  });
   const start_canister_args = IDL.Record({ 'canister_id' : canister_id });
   const stop_canister_args = IDL.Record({ 'canister_id' : canister_id });
   const stored_chunks_args = IDL.Record({ 'canister_id' : canister_id });
@@ -374,11 +401,21 @@ export const idlFactory = ({ IDL }) => {
         [],
       ),
     'raw_rand' : IDL.Func([], [raw_rand_result], []),
+    'schnorr_public_key' : IDL.Func(
+        [schnorr_public_key_args],
+        [schnorr_public_key_result],
+        [],
+      ),
     'sign_with_ecdsa' : IDL.Func(
         [sign_with_ecdsa_args],
         [sign_with_ecdsa_result],
         [],
       ),
+    'sign_with_schnorr' : IDL.Func(
+        [sign_with_schnorr_args],
+        [sign_with_schnorr_result],
+        [],
+      ),
     'start_canister' : IDL.Func([start_canister_args], [], []),
     'stop_canister' : IDL.Func([stop_canister_args], [], []),
     'stored_chunks' : IDL.Func(
diff --git a/packages/ledger-icp/candid/index.did b/packages/ledger-icp/candid/index.did
index b12e65c3..81ac35c2 100644
--- a/packages/ledger-icp/candid/index.did
+++ b/packages/ledger-icp/candid/index.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/rosetta-api/icp_ledger/index/index.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/rosetta-api/icp_ledger/index/index.did' by import-candid
 type Account = record { owner : principal; subaccount : opt vec nat8 };
 type GetAccountIdentifierTransactionsArgs = record {
   max_results : nat64;
diff --git a/packages/ledger-icp/candid/ledger.did b/packages/ledger-icp/candid/ledger.did
index 7ea22520..d6ee3a84 100644
--- a/packages/ledger-icp/candid/ledger.did
+++ b/packages/ledger-icp/candid/ledger.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/rosetta-api/icp_ledger/ledger.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/rosetta-api/icp_ledger/ledger.did' by import-candid
 // This is the official Ledger interface that is guaranteed to be backward compatible.
 
 // Amount of tokens, measured in 10^-8 of a token.
diff --git a/packages/ledger-icrc/candid/icrc_index-ng.did b/packages/ledger-icrc/candid/icrc_index-ng.did
index ca6926f1..bde19a57 100644
--- a/packages/ledger-icrc/candid/icrc_index-ng.did
+++ b/packages/ledger-icrc/candid/icrc_index-ng.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/rosetta-api/icrc1/index-ng/index-ng.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/rosetta-api/icrc1/index-ng/index-ng.did' by import-candid
 type Tokens = nat;
 
 type InitArg = record {
diff --git a/packages/ledger-icrc/candid/icrc_index.did b/packages/ledger-icrc/candid/icrc_index.did
index bc72bc69..7c0c9d17 100644
--- a/packages/ledger-icrc/candid/icrc_index.did
+++ b/packages/ledger-icrc/candid/icrc_index.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/rosetta-api/icrc1/index/index.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/rosetta-api/icrc1/index/index.did' by import-candid
 type TxId = nat;
 
 type Account = record { owner : principal; subaccount : opt blob };
diff --git a/packages/ledger-icrc/candid/icrc_ledger.did b/packages/ledger-icrc/candid/icrc_ledger.did
index 80e2b0d1..d3b9f1bb 100644
--- a/packages/ledger-icrc/candid/icrc_ledger.did
+++ b/packages/ledger-icrc/candid/icrc_ledger.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/rosetta-api/icrc1/ledger/ledger.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/rosetta-api/icrc1/ledger/ledger.did' by import-candid
 type BlockIndex = nat;
 type Subaccount = blob;
 // Number of nanoseconds since the UNIX epoch in UTC timezone.
diff --git a/packages/nns/candid/genesis_token.did b/packages/nns/candid/genesis_token.did
index e0a7ee37..6be1a978 100644
--- a/packages/nns/candid/genesis_token.did
+++ b/packages/nns/candid/genesis_token.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit 2b109fb9ba (2024-07-25) 'rs/nns/gtc/canister/gtc.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/nns/gtc/canister/gtc.did' by import-candid
 type AccountState = record {
   authenticated_principal_id : opt principal;
   successfully_transferred_neurons : vec TransferredNeuron;
diff --git a/packages/nns/candid/governance.certified.idl.js b/packages/nns/candid/governance.certified.idl.js
index 874d888c..2ef2e9ba 100644
--- a/packages/nns/candid/governance.certified.idl.js
+++ b/packages/nns/candid/governance.certified.idl.js
@@ -425,6 +425,7 @@ export const idlFactory = ({ IDL }) => {
     'not_dissolving_neurons_e8s_buckets_seed' : IDL.Vec(
       IDL.Tuple(IDL.Nat64, IDL.Float64)
     ),
+    'public_neuron_subset_metrics' : IDL.Opt(NeuronSubsetMetrics),
     'timestamp_seconds' : IDL.Nat64,
     'seed_neuron_count' : IDL.Nat64,
   });
@@ -730,6 +731,7 @@ export const idlFactory = ({ IDL }) => {
     'known_neurons' : IDL.Vec(KnownNeuron),
   });
   const ListNeurons = IDL.Record({
+    'include_public_neurons_in_full_neurons' : IDL.Opt(IDL.Bool),
     'neuron_ids' : IDL.Vec(IDL.Nat64),
     'include_empty_neurons_readable_by_caller' : IDL.Opt(IDL.Bool),
     'include_neurons_readable_by_caller' : IDL.Bool,
@@ -1333,6 +1335,7 @@ export const init = ({ IDL }) => {
     'not_dissolving_neurons_e8s_buckets_seed' : IDL.Vec(
       IDL.Tuple(IDL.Nat64, IDL.Float64)
     ),
+    'public_neuron_subset_metrics' : IDL.Opt(NeuronSubsetMetrics),
     'timestamp_seconds' : IDL.Nat64,
     'seed_neuron_count' : IDL.Nat64,
   });
diff --git a/packages/nns/candid/governance.d.ts b/packages/nns/candid/governance.d.ts
index 2ed246e8..eb48d766 100644
--- a/packages/nns/candid/governance.d.ts
+++ b/packages/nns/candid/governance.d.ts
@@ -288,6 +288,7 @@ export interface GovernanceCachedMetrics {
   total_staked_maturity_e8s_equivalent_seed: bigint;
   community_fund_total_staked_e8s: bigint;
   not_dissolving_neurons_e8s_buckets_seed: Array<[bigint, number]>;
+  public_neuron_subset_metrics: [] | [NeuronSubsetMetrics];
   timestamp_seconds: bigint;
   seed_neuron_count: bigint;
 }
@@ -346,6 +347,7 @@ export interface ListKnownNeuronsResponse {
   known_neurons: Array<KnownNeuron>;
 }
 export interface ListNeurons {
+  include_public_neurons_in_full_neurons: [] | [boolean];
   neuron_ids: BigUint64Array | bigint[];
   include_empty_neurons_readable_by_caller: [] | [boolean];
   include_neurons_readable_by_caller: boolean;
diff --git a/packages/nns/candid/governance.did b/packages/nns/candid/governance.did
index 835b0e7e..3bf01d15 100644
--- a/packages/nns/candid/governance.did
+++ b/packages/nns/candid/governance.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit 2b109fb9ba (2024-07-25) 'rs/nns/governance/canister/governance.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/nns/governance/canister/governance.did' by import-candid
 type AccountIdentifier = record { hash : blob };
 type Action = variant {
   RegisterKnownNeuron : KnownNeuron;
@@ -237,6 +237,7 @@ type GovernanceCachedMetrics = record {
   total_staked_maturity_e8s_equivalent_seed : nat64;
   community_fund_total_staked_e8s : nat64;
   not_dissolving_neurons_e8s_buckets_seed : vec record { nat64; float64 };
+  public_neuron_subset_metrics : opt NeuronSubsetMetrics;
   timestamp_seconds : nat64;
   seed_neuron_count : nat64;
 };
@@ -285,6 +286,7 @@ type LedgerParameters = record {
 };
 type ListKnownNeuronsResponse = record { known_neurons : vec KnownNeuron };
 type ListNeurons = record {
+  include_public_neurons_in_full_neurons : opt bool;
   neuron_ids : vec nat64;
   include_empty_neurons_readable_by_caller : opt bool;
   include_neurons_readable_by_caller : bool;
diff --git a/packages/nns/candid/governance.idl.js b/packages/nns/candid/governance.idl.js
index 8a06e3bc..11c3f45f 100644
--- a/packages/nns/candid/governance.idl.js
+++ b/packages/nns/candid/governance.idl.js
@@ -425,6 +425,7 @@ export const idlFactory = ({ IDL }) => {
     'not_dissolving_neurons_e8s_buckets_seed' : IDL.Vec(
       IDL.Tuple(IDL.Nat64, IDL.Float64)
     ),
+    'public_neuron_subset_metrics' : IDL.Opt(NeuronSubsetMetrics),
     'timestamp_seconds' : IDL.Nat64,
     'seed_neuron_count' : IDL.Nat64,
   });
@@ -730,6 +731,7 @@ export const idlFactory = ({ IDL }) => {
     'known_neurons' : IDL.Vec(KnownNeuron),
   });
   const ListNeurons = IDL.Record({
+    'include_public_neurons_in_full_neurons' : IDL.Opt(IDL.Bool),
     'neuron_ids' : IDL.Vec(IDL.Nat64),
     'include_empty_neurons_readable_by_caller' : IDL.Opt(IDL.Bool),
     'include_neurons_readable_by_caller' : IDL.Bool,
@@ -1349,6 +1351,7 @@ export const init = ({ IDL }) => {
     'not_dissolving_neurons_e8s_buckets_seed' : IDL.Vec(
       IDL.Tuple(IDL.Nat64, IDL.Float64)
     ),
+    'public_neuron_subset_metrics' : IDL.Opt(NeuronSubsetMetrics),
     'timestamp_seconds' : IDL.Nat64,
     'seed_neuron_count' : IDL.Nat64,
   });
diff --git a/packages/nns/candid/governance_test.certified.idl.js b/packages/nns/candid/governance_test.certified.idl.js
index e123d40f..1a7bdb20 100644
--- a/packages/nns/candid/governance_test.certified.idl.js
+++ b/packages/nns/candid/governance_test.certified.idl.js
@@ -425,6 +425,7 @@ export const idlFactory = ({ IDL }) => {
     'not_dissolving_neurons_e8s_buckets_seed' : IDL.Vec(
       IDL.Tuple(IDL.Nat64, IDL.Float64)
     ),
+    'public_neuron_subset_metrics' : IDL.Opt(NeuronSubsetMetrics),
     'timestamp_seconds' : IDL.Nat64,
     'seed_neuron_count' : IDL.Nat64,
   });
@@ -730,6 +731,7 @@ export const idlFactory = ({ IDL }) => {
     'known_neurons' : IDL.Vec(KnownNeuron),
   });
   const ListNeurons = IDL.Record({
+    'include_public_neurons_in_full_neurons' : IDL.Opt(IDL.Bool),
     'neuron_ids' : IDL.Vec(IDL.Nat64),
     'include_empty_neurons_readable_by_caller' : IDL.Opt(IDL.Bool),
     'include_neurons_readable_by_caller' : IDL.Bool,
@@ -1334,6 +1336,7 @@ export const init = ({ IDL }) => {
     'not_dissolving_neurons_e8s_buckets_seed' : IDL.Vec(
       IDL.Tuple(IDL.Nat64, IDL.Float64)
     ),
+    'public_neuron_subset_metrics' : IDL.Opt(NeuronSubsetMetrics),
     'timestamp_seconds' : IDL.Nat64,
     'seed_neuron_count' : IDL.Nat64,
   });
diff --git a/packages/nns/candid/governance_test.d.ts b/packages/nns/candid/governance_test.d.ts
index b2419349..6ef18f0d 100644
--- a/packages/nns/candid/governance_test.d.ts
+++ b/packages/nns/candid/governance_test.d.ts
@@ -288,6 +288,7 @@ export interface GovernanceCachedMetrics {
   total_staked_maturity_e8s_equivalent_seed: bigint;
   community_fund_total_staked_e8s: bigint;
   not_dissolving_neurons_e8s_buckets_seed: Array<[bigint, number]>;
+  public_neuron_subset_metrics: [] | [NeuronSubsetMetrics];
   timestamp_seconds: bigint;
   seed_neuron_count: bigint;
 }
@@ -346,6 +347,7 @@ export interface ListKnownNeuronsResponse {
   known_neurons: Array<KnownNeuron>;
 }
 export interface ListNeurons {
+  include_public_neurons_in_full_neurons: [] | [boolean];
   neuron_ids: BigUint64Array | bigint[];
   include_empty_neurons_readable_by_caller: [] | [boolean];
   include_neurons_readable_by_caller: boolean;
diff --git a/packages/nns/candid/governance_test.did b/packages/nns/candid/governance_test.did
index 06d1cfff..7c99bff0 100644
--- a/packages/nns/candid/governance_test.did
+++ b/packages/nns/candid/governance_test.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit 2b109fb9ba (2024-07-25) 'rs/nns/governance/canister/governance_test.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/nns/governance/canister/governance_test.did' by import-candid
 type AccountIdentifier = record { hash : blob };
 type Action = variant {
   RegisterKnownNeuron : KnownNeuron;
@@ -237,6 +237,7 @@ type GovernanceCachedMetrics = record {
   total_staked_maturity_e8s_equivalent_seed : nat64;
   community_fund_total_staked_e8s : nat64;
   not_dissolving_neurons_e8s_buckets_seed : vec record { nat64; float64 };
+  public_neuron_subset_metrics : opt NeuronSubsetMetrics;
   timestamp_seconds : nat64;
   seed_neuron_count : nat64;
 };
@@ -285,6 +286,7 @@ type LedgerParameters = record {
 };
 type ListKnownNeuronsResponse = record { known_neurons : vec KnownNeuron };
 type ListNeurons = record {
+  include_public_neurons_in_full_neurons : opt bool;
   neuron_ids : vec nat64;
   include_empty_neurons_readable_by_caller : opt bool;
   include_neurons_readable_by_caller : bool;
diff --git a/packages/nns/candid/governance_test.idl.js b/packages/nns/candid/governance_test.idl.js
index 52b90d87..818072cd 100644
--- a/packages/nns/candid/governance_test.idl.js
+++ b/packages/nns/candid/governance_test.idl.js
@@ -425,6 +425,7 @@ export const idlFactory = ({ IDL }) => {
     'not_dissolving_neurons_e8s_buckets_seed' : IDL.Vec(
       IDL.Tuple(IDL.Nat64, IDL.Float64)
     ),
+    'public_neuron_subset_metrics' : IDL.Opt(NeuronSubsetMetrics),
     'timestamp_seconds' : IDL.Nat64,
     'seed_neuron_count' : IDL.Nat64,
   });
@@ -730,6 +731,7 @@ export const idlFactory = ({ IDL }) => {
     'known_neurons' : IDL.Vec(KnownNeuron),
   });
   const ListNeurons = IDL.Record({
+    'include_public_neurons_in_full_neurons' : IDL.Opt(IDL.Bool),
     'neuron_ids' : IDL.Vec(IDL.Nat64),
     'include_empty_neurons_readable_by_caller' : IDL.Opt(IDL.Bool),
     'include_neurons_readable_by_caller' : IDL.Bool,
@@ -1350,6 +1352,7 @@ export const init = ({ IDL }) => {
     'not_dissolving_neurons_e8s_buckets_seed' : IDL.Vec(
       IDL.Tuple(IDL.Nat64, IDL.Float64)
     ),
+    'public_neuron_subset_metrics' : IDL.Opt(NeuronSubsetMetrics),
     'timestamp_seconds' : IDL.Nat64,
     'seed_neuron_count' : IDL.Nat64,
   });
diff --git a/packages/nns/candid/sns_wasm.did b/packages/nns/candid/sns_wasm.did
index 2b187e0a..0cdeb05e 100644
--- a/packages/nns/candid/sns_wasm.did
+++ b/packages/nns/candid/sns_wasm.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit 2b109fb9ba (2024-07-25) 'rs/nns/sns-wasm/canister/sns-wasm.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/nns/sns-wasm/canister/sns-wasm.did' by import-candid
 type AddWasmRequest = record { hash : blob; wasm : opt SnsWasm };
 type AddWasmResponse = record { result : opt Result };
 type AirdropDistribution = record { airdrop_neurons : vec NeuronDistribution };
diff --git a/packages/sns/candid/sns_governance.certified.idl.js b/packages/sns/candid/sns_governance.certified.idl.js
index d46a041e..5b726388 100644
--- a/packages/sns/candid/sns_governance.certified.idl.js
+++ b/packages/sns/candid/sns_governance.certified.idl.js
@@ -377,6 +377,28 @@ export const idlFactory = ({ IDL }) => {
     'neurons' : IDL.Vec(IDL.Tuple(IDL.Text, Neuron)),
     'genesis_timestamp_seconds' : IDL.Nat64,
   });
+  const Principals = IDL.Record({ 'principals' : IDL.Vec(IDL.Principal) });
+  const NeuronsFund = IDL.Record({
+    'nns_neuron_hotkeys' : IDL.Opt(Principals),
+    'nns_neuron_controller' : IDL.Opt(IDL.Principal),
+    'nns_neuron_id' : IDL.Opt(IDL.Nat64),
+  });
+  const Participant = IDL.Variant({
+    'NeuronsFund' : NeuronsFund,
+    'Direct' : IDL.Record({}),
+  });
+  const NeuronIds = IDL.Record({ 'neuron_ids' : IDL.Vec(NeuronId) });
+  const NeuronRecipe = IDL.Record({
+    'controller' : IDL.Opt(IDL.Principal),
+    'dissolve_delay_seconds' : IDL.Opt(IDL.Nat64),
+    'participant' : IDL.Opt(Participant),
+    'stake_e8s' : IDL.Opt(IDL.Nat64),
+    'followees' : IDL.Opt(NeuronIds),
+    'neuron_id' : IDL.Opt(NeuronId),
+  });
+  const NeuronRecipes = IDL.Record({
+    'neuron_recipes' : IDL.Vec(NeuronRecipe),
+  });
   const NeuronParameters = IDL.Record({
     'controller' : IDL.Opt(IDL.Principal),
     'dissolve_delay_seconds' : IDL.Opt(IDL.Nat64),
@@ -387,6 +409,7 @@ export const idlFactory = ({ IDL }) => {
     'neuron_id' : IDL.Opt(NeuronId),
   });
   const ClaimSwapNeuronsRequest = IDL.Record({
+    'neuron_recipes' : IDL.Opt(NeuronRecipes),
     'neuron_parameters' : IDL.Vec(NeuronParameters),
   });
   const SwapNeuron = IDL.Record({
diff --git a/packages/sns/candid/sns_governance.d.ts b/packages/sns/candid/sns_governance.d.ts
index 5955e0af..e473f236 100644
--- a/packages/sns/candid/sns_governance.d.ts
+++ b/packages/sns/candid/sns_governance.d.ts
@@ -66,6 +66,7 @@ export interface ClaimOrRefreshResponse {
   refreshed_neuron_id: [] | [NeuronId];
 }
 export interface ClaimSwapNeuronsRequest {
+  neuron_recipes: [] | [NeuronRecipes];
   neuron_parameters: Array<NeuronParameters>;
 }
 export interface ClaimSwapNeuronsResponse {
@@ -386,6 +387,9 @@ export interface Neuron {
 export interface NeuronId {
   id: Uint8Array | number[];
 }
+export interface NeuronIds {
+  neuron_ids: Array<NeuronId>;
+}
 export interface NeuronInFlightCommand {
   command: [] | [Command_2];
   timestamp: bigint;
@@ -406,6 +410,22 @@ export interface NeuronPermission {
 export interface NeuronPermissionList {
   permissions: Int32Array | number[];
 }
+export interface NeuronRecipe {
+  controller: [] | [Principal];
+  dissolve_delay_seconds: [] | [bigint];
+  participant: [] | [Participant];
+  stake_e8s: [] | [bigint];
+  followees: [] | [NeuronIds];
+  neuron_id: [] | [NeuronId];
+}
+export interface NeuronRecipes {
+  neuron_recipes: Array<NeuronRecipe>;
+}
+export interface NeuronsFund {
+  nns_neuron_hotkeys: [] | [Principals];
+  nns_neuron_controller: [] | [Principal];
+  nns_neuron_id: [] | [bigint];
+}
 export type Operation =
   | {
       ChangeAutoStakeMaturity: ChangeAutoStakeMaturity;
@@ -414,9 +434,13 @@ export type Operation =
   | { StartDissolving: {} }
   | { IncreaseDissolveDelay: IncreaseDissolveDelay }
   | { SetDissolveTimestamp: SetDissolveTimestamp };
+export type Participant = { NeuronsFund: NeuronsFund } | { Direct: {} };
 export interface Percentage {
   basis_points: [] | [bigint];
 }
+export interface Principals {
+  principals: Array<Principal>;
+}
 export interface Proposal {
   url: string;
   title: string;
diff --git a/packages/sns/candid/sns_governance.did b/packages/sns/candid/sns_governance.did
index b0477188..98c6276d 100644
--- a/packages/sns/candid/sns_governance.did
+++ b/packages/sns/candid/sns_governance.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/sns/governance/canister/governance.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/sns/governance/canister/governance.did' by import-candid
 type Account = record { owner : opt principal; subaccount : opt Subaccount };
 type Action = variant {
   ManageNervousSystemParameters : NervousSystemParameters;
@@ -50,6 +50,7 @@ type ChangeAutoStakeMaturity = record {
 type ClaimOrRefresh = record { by : opt By };
 type ClaimOrRefreshResponse = record { refreshed_neuron_id : opt NeuronId };
 type ClaimSwapNeuronsRequest = record {
+  neuron_recipes : opt NeuronRecipes;
   neuron_parameters : vec NeuronParameters;
 };
 type ClaimSwapNeuronsResponse = record {
@@ -324,6 +325,7 @@ type Neuron = record {
   neuron_fees_e8s : nat64;
 };
 type NeuronId = record { id : blob };
+type NeuronIds = record { neuron_ids : vec NeuronId };
 type NeuronInFlightCommand = record {
   command : opt Command_2;
   timestamp : nat64;
@@ -342,6 +344,20 @@ type NeuronPermission = record {
   permission_type : vec int32;
 };
 type NeuronPermissionList = record { permissions : vec int32 };
+type NeuronRecipe = record {
+  controller : opt principal;
+  dissolve_delay_seconds : opt nat64;
+  participant : opt Participant;
+  stake_e8s : opt nat64;
+  followees : opt NeuronIds;
+  neuron_id : opt NeuronId;
+};
+type NeuronRecipes = record { neuron_recipes : vec NeuronRecipe };
+type NeuronsFund = record {
+  nns_neuron_hotkeys : opt Principals;
+  nns_neuron_controller : opt principal;
+  nns_neuron_id : opt nat64;
+};
 type Operation = variant {
   ChangeAutoStakeMaturity : ChangeAutoStakeMaturity;
   StopDissolving : record {};
@@ -349,7 +365,9 @@ type Operation = variant {
   IncreaseDissolveDelay : IncreaseDissolveDelay;
   SetDissolveTimestamp : SetDissolveTimestamp;
 };
+type Participant = variant { NeuronsFund : NeuronsFund; Direct : record {} };
 type Percentage = record { basis_points : opt nat64 };
+type Principals = record { principals : vec principal };
 type Proposal = record {
   url : text;
   title : text;
diff --git a/packages/sns/candid/sns_governance.idl.js b/packages/sns/candid/sns_governance.idl.js
index 2fe8635a..b498fa94 100644
--- a/packages/sns/candid/sns_governance.idl.js
+++ b/packages/sns/candid/sns_governance.idl.js
@@ -377,6 +377,28 @@ export const idlFactory = ({ IDL }) => {
     'neurons' : IDL.Vec(IDL.Tuple(IDL.Text, Neuron)),
     'genesis_timestamp_seconds' : IDL.Nat64,
   });
+  const Principals = IDL.Record({ 'principals' : IDL.Vec(IDL.Principal) });
+  const NeuronsFund = IDL.Record({
+    'nns_neuron_hotkeys' : IDL.Opt(Principals),
+    'nns_neuron_controller' : IDL.Opt(IDL.Principal),
+    'nns_neuron_id' : IDL.Opt(IDL.Nat64),
+  });
+  const Participant = IDL.Variant({
+    'NeuronsFund' : NeuronsFund,
+    'Direct' : IDL.Record({}),
+  });
+  const NeuronIds = IDL.Record({ 'neuron_ids' : IDL.Vec(NeuronId) });
+  const NeuronRecipe = IDL.Record({
+    'controller' : IDL.Opt(IDL.Principal),
+    'dissolve_delay_seconds' : IDL.Opt(IDL.Nat64),
+    'participant' : IDL.Opt(Participant),
+    'stake_e8s' : IDL.Opt(IDL.Nat64),
+    'followees' : IDL.Opt(NeuronIds),
+    'neuron_id' : IDL.Opt(NeuronId),
+  });
+  const NeuronRecipes = IDL.Record({
+    'neuron_recipes' : IDL.Vec(NeuronRecipe),
+  });
   const NeuronParameters = IDL.Record({
     'controller' : IDL.Opt(IDL.Principal),
     'dissolve_delay_seconds' : IDL.Opt(IDL.Nat64),
@@ -387,6 +409,7 @@ export const idlFactory = ({ IDL }) => {
     'neuron_id' : IDL.Opt(NeuronId),
   });
   const ClaimSwapNeuronsRequest = IDL.Record({
+    'neuron_recipes' : IDL.Opt(NeuronRecipes),
     'neuron_parameters' : IDL.Vec(NeuronParameters),
   });
   const SwapNeuron = IDL.Record({
diff --git a/packages/sns/candid/sns_governance_test.certified.idl.js b/packages/sns/candid/sns_governance_test.certified.idl.js
index e918dfc5..eb2a94fe 100644
--- a/packages/sns/candid/sns_governance_test.certified.idl.js
+++ b/packages/sns/candid/sns_governance_test.certified.idl.js
@@ -384,6 +384,28 @@ export const idlFactory = ({ IDL }) => {
   const AddMaturityResponse = IDL.Record({
     'new_maturity_e8s' : IDL.Opt(IDL.Nat64),
   });
+  const Principals = IDL.Record({ 'principals' : IDL.Vec(IDL.Principal) });
+  const NeuronsFund = IDL.Record({
+    'nns_neuron_hotkeys' : IDL.Opt(Principals),
+    'nns_neuron_controller' : IDL.Opt(IDL.Principal),
+    'nns_neuron_id' : IDL.Opt(IDL.Nat64),
+  });
+  const Participant = IDL.Variant({
+    'NeuronsFund' : NeuronsFund,
+    'Direct' : IDL.Record({}),
+  });
+  const NeuronIds = IDL.Record({ 'neuron_ids' : IDL.Vec(NeuronId) });
+  const NeuronRecipe = IDL.Record({
+    'controller' : IDL.Opt(IDL.Principal),
+    'dissolve_delay_seconds' : IDL.Opt(IDL.Nat64),
+    'participant' : IDL.Opt(Participant),
+    'stake_e8s' : IDL.Opt(IDL.Nat64),
+    'followees' : IDL.Opt(NeuronIds),
+    'neuron_id' : IDL.Opt(NeuronId),
+  });
+  const NeuronRecipes = IDL.Record({
+    'neuron_recipes' : IDL.Vec(NeuronRecipe),
+  });
   const NeuronParameters = IDL.Record({
     'controller' : IDL.Opt(IDL.Principal),
     'dissolve_delay_seconds' : IDL.Opt(IDL.Nat64),
@@ -394,6 +416,7 @@ export const idlFactory = ({ IDL }) => {
     'neuron_id' : IDL.Opt(NeuronId),
   });
   const ClaimSwapNeuronsRequest = IDL.Record({
+    'neuron_recipes' : IDL.Opt(NeuronRecipes),
     'neuron_parameters' : IDL.Vec(NeuronParameters),
   });
   const SwapNeuron = IDL.Record({
diff --git a/packages/sns/candid/sns_governance_test.d.ts b/packages/sns/candid/sns_governance_test.d.ts
index 365801da..f459e817 100644
--- a/packages/sns/candid/sns_governance_test.d.ts
+++ b/packages/sns/candid/sns_governance_test.d.ts
@@ -73,6 +73,7 @@ export interface ClaimOrRefreshResponse {
   refreshed_neuron_id: [] | [NeuronId];
 }
 export interface ClaimSwapNeuronsRequest {
+  neuron_recipes: [] | [NeuronRecipes];
   neuron_parameters: Array<NeuronParameters>;
 }
 export interface ClaimSwapNeuronsResponse {
@@ -397,6 +398,9 @@ export interface Neuron {
 export interface NeuronId {
   id: Uint8Array | number[];
 }
+export interface NeuronIds {
+  neuron_ids: Array<NeuronId>;
+}
 export interface NeuronInFlightCommand {
   command: [] | [Command_2];
   timestamp: bigint;
@@ -417,6 +421,22 @@ export interface NeuronPermission {
 export interface NeuronPermissionList {
   permissions: Int32Array | number[];
 }
+export interface NeuronRecipe {
+  controller: [] | [Principal];
+  dissolve_delay_seconds: [] | [bigint];
+  participant: [] | [Participant];
+  stake_e8s: [] | [bigint];
+  followees: [] | [NeuronIds];
+  neuron_id: [] | [NeuronId];
+}
+export interface NeuronRecipes {
+  neuron_recipes: Array<NeuronRecipe>;
+}
+export interface NeuronsFund {
+  nns_neuron_hotkeys: [] | [Principals];
+  nns_neuron_controller: [] | [Principal];
+  nns_neuron_id: [] | [bigint];
+}
 export type Operation =
   | {
       ChangeAutoStakeMaturity: ChangeAutoStakeMaturity;
@@ -425,9 +445,13 @@ export type Operation =
   | { StartDissolving: {} }
   | { IncreaseDissolveDelay: IncreaseDissolveDelay }
   | { SetDissolveTimestamp: SetDissolveTimestamp };
+export type Participant = { NeuronsFund: NeuronsFund } | { Direct: {} };
 export interface Percentage {
   basis_points: [] | [bigint];
 }
+export interface Principals {
+  principals: Array<Principal>;
+}
 export interface Proposal {
   url: string;
   title: string;
diff --git a/packages/sns/candid/sns_governance_test.did b/packages/sns/candid/sns_governance_test.did
index d219ae82..19e40d40 100644
--- a/packages/sns/candid/sns_governance_test.did
+++ b/packages/sns/candid/sns_governance_test.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/sns/governance/canister/governance_test.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/sns/governance/canister/governance_test.did' by import-candid
 type Account = record { owner : opt principal; subaccount : opt Subaccount };
 type Action = variant {
   ManageNervousSystemParameters : NervousSystemParameters;
@@ -52,6 +52,7 @@ type ChangeAutoStakeMaturity = record {
 type ClaimOrRefresh = record { by : opt By };
 type ClaimOrRefreshResponse = record { refreshed_neuron_id : opt NeuronId };
 type ClaimSwapNeuronsRequest = record {
+  neuron_recipes : opt NeuronRecipes;
   neuron_parameters : vec NeuronParameters;
 };
 type ClaimSwapNeuronsResponse = record {
@@ -330,6 +331,7 @@ type Neuron = record {
   neuron_fees_e8s : nat64;
 };
 type NeuronId = record { id : blob };
+type NeuronIds = record { neuron_ids : vec NeuronId };
 type NeuronInFlightCommand = record {
   command : opt Command_2;
   timestamp : nat64;
@@ -348,6 +350,20 @@ type NeuronPermission = record {
   permission_type : vec int32;
 };
 type NeuronPermissionList = record { permissions : vec int32 };
+type NeuronRecipe = record {
+  controller : opt principal;
+  dissolve_delay_seconds : opt nat64;
+  participant : opt Participant;
+  stake_e8s : opt nat64;
+  followees : opt NeuronIds;
+  neuron_id : opt NeuronId;
+};
+type NeuronRecipes = record { neuron_recipes : vec NeuronRecipe };
+type NeuronsFund = record {
+  nns_neuron_hotkeys : opt Principals;
+  nns_neuron_controller : opt principal;
+  nns_neuron_id : opt nat64;
+};
 type Operation = variant {
   ChangeAutoStakeMaturity : ChangeAutoStakeMaturity;
   StopDissolving : record {};
@@ -355,7 +371,9 @@ type Operation = variant {
   IncreaseDissolveDelay : IncreaseDissolveDelay;
   SetDissolveTimestamp : SetDissolveTimestamp;
 };
+type Participant = variant { NeuronsFund : NeuronsFund; Direct : record {} };
 type Percentage = record { basis_points : opt nat64 };
+type Principals = record { principals : vec principal };
 type Proposal = record {
   url : text;
   title : text;
diff --git a/packages/sns/candid/sns_governance_test.idl.js b/packages/sns/candid/sns_governance_test.idl.js
index 0a7804f4..2ff3e9e3 100644
--- a/packages/sns/candid/sns_governance_test.idl.js
+++ b/packages/sns/candid/sns_governance_test.idl.js
@@ -384,6 +384,28 @@ export const idlFactory = ({ IDL }) => {
   const AddMaturityResponse = IDL.Record({
     'new_maturity_e8s' : IDL.Opt(IDL.Nat64),
   });
+  const Principals = IDL.Record({ 'principals' : IDL.Vec(IDL.Principal) });
+  const NeuronsFund = IDL.Record({
+    'nns_neuron_hotkeys' : IDL.Opt(Principals),
+    'nns_neuron_controller' : IDL.Opt(IDL.Principal),
+    'nns_neuron_id' : IDL.Opt(IDL.Nat64),
+  });
+  const Participant = IDL.Variant({
+    'NeuronsFund' : NeuronsFund,
+    'Direct' : IDL.Record({}),
+  });
+  const NeuronIds = IDL.Record({ 'neuron_ids' : IDL.Vec(NeuronId) });
+  const NeuronRecipe = IDL.Record({
+    'controller' : IDL.Opt(IDL.Principal),
+    'dissolve_delay_seconds' : IDL.Opt(IDL.Nat64),
+    'participant' : IDL.Opt(Participant),
+    'stake_e8s' : IDL.Opt(IDL.Nat64),
+    'followees' : IDL.Opt(NeuronIds),
+    'neuron_id' : IDL.Opt(NeuronId),
+  });
+  const NeuronRecipes = IDL.Record({
+    'neuron_recipes' : IDL.Vec(NeuronRecipe),
+  });
   const NeuronParameters = IDL.Record({
     'controller' : IDL.Opt(IDL.Principal),
     'dissolve_delay_seconds' : IDL.Opt(IDL.Nat64),
@@ -394,6 +416,7 @@ export const idlFactory = ({ IDL }) => {
     'neuron_id' : IDL.Opt(NeuronId),
   });
   const ClaimSwapNeuronsRequest = IDL.Record({
+    'neuron_recipes' : IDL.Opt(NeuronRecipes),
     'neuron_parameters' : IDL.Vec(NeuronParameters),
   });
   const SwapNeuron = IDL.Record({
diff --git a/packages/sns/candid/sns_root.did b/packages/sns/candid/sns_root.did
index 486cd626..ac580a3a 100644
--- a/packages/sns/candid/sns_root.did
+++ b/packages/sns/candid/sns_root.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/sns/root/canister/root.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/sns/root/canister/root.did' by import-candid
 type CanisterCallError = record { code : opt int32; description : text };
 type CanisterIdRecord = record { canister_id : principal };
 type CanisterInstallMode = variant { reinstall; upgrade; install };
diff --git a/packages/sns/candid/sns_swap.certified.idl.js b/packages/sns/candid/sns_swap.certified.idl.js
index 919f30a0..d7af7497 100644
--- a/packages/sns/candid/sns_swap.certified.idl.js
+++ b/packages/sns/candid/sns_swap.certified.idl.js
@@ -22,12 +22,15 @@ export const idlFactory = ({ IDL }) => {
       IdealMatchedParticipationFunction
     ),
   });
+  const Principals = IDL.Record({ 'principals' : IDL.Vec(IDL.Principal) });
   const CfNeuron = IDL.Record({
     'has_created_neuron_recipes' : IDL.Opt(IDL.Bool),
+    'hotkeys' : IDL.Opt(Principals),
     'nns_neuron_id' : IDL.Nat64,
     'amount_icp_e8s' : IDL.Nat64,
   });
   const CfParticipant = IDL.Record({
+    'controller' : IDL.Opt(IDL.Principal),
     'hotkey_principal' : IDL.Text,
     'cf_neurons' : IDL.Vec(CfNeuron),
   });
@@ -241,7 +244,9 @@ export const idlFactory = ({ IDL }) => {
     'followees' : IDL.Vec(NeuronId),
   });
   const CfInvestment = IDL.Record({
+    'controller' : IDL.Opt(IDL.Principal),
     'hotkey_principal' : IDL.Text,
+    'hotkeys' : IDL.Opt(Principals),
     'nns_neuron_id' : IDL.Nat64,
   });
   const DirectInvestment = IDL.Record({ 'buyer_principal' : IDL.Text });
@@ -326,11 +331,6 @@ export const idlFactory = ({ IDL }) => {
   });
   const Result_2 = IDL.Variant({ 'Ok' : Ok_2, 'Err' : Err_2 });
   const NewSaleTicketResponse = IDL.Record({ 'result' : IDL.Opt(Result_2) });
-  const OpenRequest = IDL.Record({
-    'cf_participants' : IDL.Vec(CfParticipant),
-    'params' : IDL.Opt(Params),
-    'open_sns_token_swap_proposal_id' : IDL.Opt(IDL.Nat64),
-  });
   const RefreshBuyerTokensRequest = IDL.Record({
     'confirmation_text' : IDL.Opt(IDL.Text),
     'buyer' : IDL.Text,
@@ -401,7 +401,6 @@ export const idlFactory = ({ IDL }) => {
         [],
       ),
     'notify_payment_failure' : IDL.Func([IDL.Record({})], [Ok_2], []),
-    'open' : IDL.Func([OpenRequest], [IDL.Record({})], []),
     'refresh_buyer_tokens' : IDL.Func(
         [RefreshBuyerTokensRequest],
         [RefreshBuyerTokensResponse],
@@ -432,12 +431,15 @@ export const init = ({ IDL }) => {
       IdealMatchedParticipationFunction
     ),
   });
+  const Principals = IDL.Record({ 'principals' : IDL.Vec(IDL.Principal) });
   const CfNeuron = IDL.Record({
     'has_created_neuron_recipes' : IDL.Opt(IDL.Bool),
+    'hotkeys' : IDL.Opt(Principals),
     'nns_neuron_id' : IDL.Nat64,
     'amount_icp_e8s' : IDL.Nat64,
   });
   const CfParticipant = IDL.Record({
+    'controller' : IDL.Opt(IDL.Principal),
     'hotkey_principal' : IDL.Text,
     'cf_neurons' : IDL.Vec(CfNeuron),
   });
diff --git a/packages/sns/candid/sns_swap.d.ts b/packages/sns/candid/sns_swap.d.ts
index 24160bc5..6059831a 100644
--- a/packages/sns/candid/sns_swap.d.ts
+++ b/packages/sns/candid/sns_swap.d.ts
@@ -23,15 +23,19 @@ export type CanisterStatusType =
   | { stopping: null }
   | { running: null };
 export interface CfInvestment {
+  controller: [] | [Principal];
   hotkey_principal: string;
+  hotkeys: [] | [Principals];
   nns_neuron_id: bigint;
 }
 export interface CfNeuron {
   has_created_neuron_recipes: [] | [boolean];
+  hotkeys: [] | [Principals];
   nns_neuron_id: bigint;
   amount_icp_e8s: bigint;
 }
 export interface CfParticipant {
+  controller: [] | [Principal];
   hotkey_principal: string;
   cf_neurons: Array<CfNeuron>;
 }
@@ -252,11 +256,6 @@ export interface Ok_1 {
 export interface Ok_2 {
   ticket: [] | [Ticket];
 }
-export interface OpenRequest {
-  cf_participants: Array<CfParticipant>;
-  params: [] | [Params];
-  open_sns_token_swap_proposal_id: [] | [bigint];
-}
 export interface Params {
   min_participant_icp_e8s: bigint;
   neuron_basket_construction_parameters:
@@ -282,6 +281,9 @@ export type Possibility =
 export type Possibility_1 = { Ok: Response } | { Err: CanisterCallError };
 export type Possibility_2 = { Ok: Ok_1 } | { Err: Error };
 export type Possibility_3 = { Ok: {} } | { Err: CanisterCallError };
+export interface Principals {
+  principals: Array<Principal>;
+}
 export interface RefreshBuyerTokensRequest {
   confirmation_text: [] | [string];
   buyer: string;
@@ -389,7 +391,6 @@ export interface _SERVICE {
   >;
   new_sale_ticket: ActorMethod<[NewSaleTicketRequest], NewSaleTicketResponse>;
   notify_payment_failure: ActorMethod<[{}], Ok_2>;
-  open: ActorMethod<[OpenRequest], {}>;
   refresh_buyer_tokens: ActorMethod<
     [RefreshBuyerTokensRequest],
     RefreshBuyerTokensResponse
diff --git a/packages/sns/candid/sns_swap.did b/packages/sns/candid/sns_swap.did
index 867f231e..46f4c325 100644
--- a/packages/sns/candid/sns_swap.did
+++ b/packages/sns/candid/sns_swap.did
@@ -1,4 +1,4 @@
-// Generated from IC repo commit de29a1a (2024-07-18 tags: release-2024-07-18_01-30--github-base) 'rs/sns/swap/canister/swap.did' by import-candid
+// Generated from IC repo commit 3d0b3f1 (2024-08-02 tags: release-2024-08-02_01-30-base) 'rs/sns/swap/canister/swap.did' by import-candid
 type BuyerState = record {
   icp : opt TransferableAmount;
   has_created_neuron_recipes : opt bool;
@@ -13,13 +13,20 @@ type CanisterStatusResultV2 = record {
   module_hash : opt blob;
 };
 type CanisterStatusType = variant { stopped; stopping; running };
-type CfInvestment = record { hotkey_principal : text; nns_neuron_id : nat64 };
+type CfInvestment = record {
+  controller : opt principal;
+  hotkey_principal : text;
+  hotkeys : opt Principals;
+  nns_neuron_id : nat64;
+};
 type CfNeuron = record {
   has_created_neuron_recipes : opt bool;
+  hotkeys : opt Principals;
   nns_neuron_id : nat64;
   amount_icp_e8s : nat64;
 };
 type CfParticipant = record {
+  controller : opt principal;
   hotkey_principal : text;
   cf_neurons : vec CfNeuron;
 };
@@ -183,11 +190,6 @@ type Ok_1 = record {
   neurons_fund_neurons_count : opt nat64;
 };
 type Ok_2 = record { ticket : opt Ticket };
-type OpenRequest = record {
-  cf_participants : vec CfParticipant;
-  params : opt Params;
-  open_sns_token_swap_proposal_id : opt nat64;
-};
 type Params = record {
   min_participant_icp_e8s : nat64;
   neuron_basket_construction_parameters : opt NeuronBasketConstructionParameters;
@@ -212,6 +214,7 @@ type Possibility = variant {
 type Possibility_1 = variant { Ok : Response; Err : CanisterCallError };
 type Possibility_2 = variant { Ok : Ok_1; Err : Error };
 type Possibility_3 = variant { Ok : record {}; Err : CanisterCallError };
+type Principals = record { principals : vec principal };
 type RefreshBuyerTokensRequest = record {
   confirmation_text : opt text;
   buyer : text;
@@ -304,7 +307,6 @@ service : (Init) -> {
     ) query;
   new_sale_ticket : (NewSaleTicketRequest) -> (NewSaleTicketResponse);
   notify_payment_failure : (record {}) -> (Ok_2);
-  open : (OpenRequest) -> (record {});
   refresh_buyer_tokens : (RefreshBuyerTokensRequest) -> (
       RefreshBuyerTokensResponse,
     );
diff --git a/packages/sns/candid/sns_swap.idl.js b/packages/sns/candid/sns_swap.idl.js
index 58300810..4f4eed26 100644
--- a/packages/sns/candid/sns_swap.idl.js
+++ b/packages/sns/candid/sns_swap.idl.js
@@ -22,12 +22,15 @@ export const idlFactory = ({ IDL }) => {
       IdealMatchedParticipationFunction
     ),
   });
+  const Principals = IDL.Record({ 'principals' : IDL.Vec(IDL.Principal) });
   const CfNeuron = IDL.Record({
     'has_created_neuron_recipes' : IDL.Opt(IDL.Bool),
+    'hotkeys' : IDL.Opt(Principals),
     'nns_neuron_id' : IDL.Nat64,
     'amount_icp_e8s' : IDL.Nat64,
   });
   const CfParticipant = IDL.Record({
+    'controller' : IDL.Opt(IDL.Principal),
     'hotkey_principal' : IDL.Text,
     'cf_neurons' : IDL.Vec(CfNeuron),
   });
@@ -241,7 +244,9 @@ export const idlFactory = ({ IDL }) => {
     'followees' : IDL.Vec(NeuronId),
   });
   const CfInvestment = IDL.Record({
+    'controller' : IDL.Opt(IDL.Principal),
     'hotkey_principal' : IDL.Text,
+    'hotkeys' : IDL.Opt(Principals),
     'nns_neuron_id' : IDL.Nat64,
   });
   const DirectInvestment = IDL.Record({ 'buyer_principal' : IDL.Text });
@@ -326,11 +331,6 @@ export const idlFactory = ({ IDL }) => {
   });
   const Result_2 = IDL.Variant({ 'Ok' : Ok_2, 'Err' : Err_2 });
   const NewSaleTicketResponse = IDL.Record({ 'result' : IDL.Opt(Result_2) });
-  const OpenRequest = IDL.Record({
-    'cf_participants' : IDL.Vec(CfParticipant),
-    'params' : IDL.Opt(Params),
-    'open_sns_token_swap_proposal_id' : IDL.Opt(IDL.Nat64),
-  });
   const RefreshBuyerTokensRequest = IDL.Record({
     'confirmation_text' : IDL.Opt(IDL.Text),
     'buyer' : IDL.Text,
@@ -409,7 +409,6 @@ export const idlFactory = ({ IDL }) => {
         [],
       ),
     'notify_payment_failure' : IDL.Func([IDL.Record({})], [Ok_2], []),
-    'open' : IDL.Func([OpenRequest], [IDL.Record({})], []),
     'refresh_buyer_tokens' : IDL.Func(
         [RefreshBuyerTokensRequest],
         [RefreshBuyerTokensResponse],
@@ -440,12 +439,15 @@ export const init = ({ IDL }) => {
       IdealMatchedParticipationFunction
     ),
   });
+  const Principals = IDL.Record({ 'principals' : IDL.Vec(IDL.Principal) });
   const CfNeuron = IDL.Record({
     'has_created_neuron_recipes' : IDL.Opt(IDL.Bool),
+    'hotkeys' : IDL.Opt(Principals),
     'nns_neuron_id' : IDL.Nat64,
     'amount_icp_e8s' : IDL.Nat64,
   });
   const CfParticipant = IDL.Record({
+    'controller' : IDL.Opt(IDL.Principal),
     'hotkey_principal' : IDL.Text,
     'cf_neurons' : IDL.Vec(CfNeuron),
   });