Merge branch 'main' into build/bump-replica

cli/scripts/download_did.sh

@@ -19,14 +19,21 @@ function download_candid() {
     local metadata=$2
 
     local commit=($(jq -r ".\"${key}\".commit" ${metadata}))
-    local candid_urls=$(jq -r ".${key}.candid[]" $metadata)
+    local candid_data=$(jq -r ".${key}.candid[]" $metadata)
 
-    for url in $candid_urls; do
-      local download_url=${url/"{commit}"/$commit}
-      local filename=$(basename "$download_url")
+    local count=$(jq -r ".${key}.candid | length" $metadata)
 
-      echo "Downloading $filename from $download_url"
-      curl -L -o "$DIR/$filename" "$download_url"
+    for i in $(seq 0 $(($count - 1))); do
+        local url=$(jq -r ".${key}.candid[$i].url" $metadata)
+        local filename=$(jq -r ".${key}.candid[$i].filename // empty" $metadata)
+
+        local download_url=${url/"{commit}"/$commit}
+        if [ -z "$filename" ]; then
+          filename=$(basename "$download_url")
+        fi
+
+        echo "Downloading $filename from $download_url"
+        curl -L -o "$DIR/$filename" "$download_url"
     done
 }
 

cli/src/modules/icp-index.ts

@@ -1,7 +1,7 @@
 import {IDL} from '@dfinity/candid';
 import {Principal} from '@dfinity/principal';
 import {assertNonNullish} from '@dfinity/utils';
-import {init} from '../declarations/index.idl';
+import {init} from '../declarations/icp_index.idl';
 import {Module} from '../services/modules.services';
 import type {ModuleDescription, ModuleInstallParams} from '../types/module';
 

cli/src/modules/icp-ledger.ts

@@ -1,7 +1,7 @@
 import {IDL} from '@dfinity/candid';
 import {AccountIdentifier} from '@dfinity/ledger-icp';
 import {MAIN_IDENTITY_KEY, MINTER_IDENTITY_KEY} from '../constants/constants';
-import {init} from '../declarations/ledger.idl';
+import {init} from '../declarations/icp_ledger.idl';
 import {Module} from '../services/modules.services';
 import type {ModuleDescription, ModuleInstallParams} from '../types/module';
 

cli/src/services/actor.services.ts

@@ -9,8 +9,8 @@ import type {IDL} from '@dfinity/candid';
 import type {Principal} from '@dfinity/principal';
 import type {_SERVICE as ConsoleActor} from '../declarations/console';
 import {idlFactory as idlFactorConsole} from '../declarations/console.idl';
-import type {_SERVICE as IcpLedgerActor} from '../declarations/ledger';
-import {idlFactory as idlFactorIcpLedger} from '../declarations/ledger.idl';
+import type {_SERVICE as IcpLedgerActor} from '../declarations/icp_ledger';
+import {idlFactory as idlFactorIcpLedger} from '../declarations/icp_ledger.idl';
 
 export const getConsoleActor = async (params: {
   agent: HttpAgent;

modules.json

@@ -4,80 +4,104 @@
     "repo": "https://github.com/dfinity/internet-identity",
     "url": "https://github.com/dfinity/internet-identity/releases/download/release-2024-08-30/internet_identity_dev.wasm.gz",
     "candid": [
-      "https://github.com/dfinity/internet-identity/releases/download/release-2024-08-30/internet_identity.did"
+      {
+        "url": "https://github.com/dfinity/internet-identity/releases/download/release-2024-08-30/internet_identity.did"
+      }
     ]
   },
   "satellite": {
     "commit": "96de091ab2ee9b5e317d1be61f30e2d07b018beb",
     "repo": "https://github.com/junobuild/juno",
     "url": "https://cdn.juno.build/releases/satellite-v0.0.20.wasm.gz",
     "candid": [
-      "https://github.com/junobuild/juno/releases/download/v0.0.34/satellite.did",
-      "https://raw.githubusercontent.com/junobuild/juno/main/src/satellite/satellite_extension.did"
+      {
+        "url": "https://github.com/junobuild/juno/releases/download/v0.0.34/satellite.did"
+      },
+      {
+        "url": "https://raw.githubusercontent.com/junobuild/juno/main/src/satellite/satellite_extension.did"
+      }
     ]
   },
   "mission_control": {
     "commit": "96de091ab2ee9b5e317d1be61f30e2d07b018beb",
     "repo": "https://github.com/junobuild/juno",
     "url": "https://cdn.juno.build/releases/mission_control-v0.0.12.wasm.gz",
     "candid": [
-      "https://github.com/junobuild/juno/releases/download/v0.0.34/mission_control.did"
+      {
+        "url": "https://github.com/junobuild/juno/releases/download/v0.0.34/mission_control.did"
+      }
     ]
   },
   "orbiter": {
     "commit": "96de091ab2ee9b5e317d1be61f30e2d07b018beb",
     "repo": "https://github.com/junobuild/juno",
     "url": "https://cdn.juno.build/releases/orbiter-v0.0.8.wasm.gz",
     "candid": [
-      "https://github.com/junobuild/juno/releases/download/v0.0.34/orbiter.did"
+      {
+        "url": "https://github.com/junobuild/juno/releases/download/v0.0.34/orbiter.did"
+      }
     ]
   },
   "console": {
     "commit": "96de091ab2ee9b5e317d1be61f30e2d07b018beb",
     "repo": "https://github.com/junobuild/juno",
     "url": "https://github.com/junobuild/juno/releases/download/v0.0.34/console-v0.0.12.wasm.gz",
     "candid": [
-      "https://github.com/junobuild/juno/releases/download/v0.0.34/console.did"
+      {
+        "url": "https://github.com/junobuild/juno/releases/download/v0.0.34/console.did"
+      }
     ]
   },
   "observatory": {
     "commit": "96de091ab2ee9b5e317d1be61f30e2d07b018beb",
     "repo": "https://github.com/junobuild/juno",
     "url": "https://github.com/junobuild/juno/releases/download/v0.0.34/observatory-v0.0.6.wasm.gz",
     "candid": [
-      "https://github.com/junobuild/juno/releases/download/v0.0.34/observatory.did"
+      {
+        "url": "https://github.com/junobuild/juno/releases/download/v0.0.34/observatory.did"
+      }
     ]
   },
-  "ledger": {
+  "icp_ledger": {
     "commit": "6dcfafb491092704d374317d9a72a7ad2475d7c9",
     "repo": "https://github.com/dfinity/ic",
     "url": "https://download.dfinity.systems/ic/{commit}/canisters/ledger-canister.wasm.gz",
     "candid": [
-      "https://raw.githubusercontent.com/dfinity/ic/{commit}/rs/ledger_suite/icp/ledger.did"
+      {
+        "url": "https://raw.githubusercontent.com/dfinity/ic/{commit}/rs/ledger_suite/icp/ledger.did",
+        "filename": "icp_ledger.did"
+      }
     ]
   },
-  "index": {
+  "icp_index": {
     "commit": "6dcfafb491092704d374317d9a72a7ad2475d7c9",
     "repo": "https://github.com/dfinity/ic",
     "url": "https://download.dfinity.systems/ic/{commit}/canisters/ic-icp-index-canister.wasm.gz",
     "candid": [
-      "https://raw.githubusercontent.com/dfinity/ic/{commit}/rs/ledger_suite/icp/index/index.did"
+      {
+        "url": "https://raw.githubusercontent.com/dfinity/ic/{commit}/rs/ledger_suite/icp/index/index.did",
+        "filename": "icp_index.did"
+      }
     ]
   },
   "cmc": {
     "commit": "ca8847547d327ce8a3bd81d25a590e01da1a3af5",
     "repo": "https://github.com/dfinity/ic",
     "url": "https://download.dfinity.systems/ic/{commit}/canisters/cycles-minting-canister.wasm.gz",
     "candid": [
-      "https://raw.githubusercontent.com/dfinity/ic/{commit}/rs/nns/cmc/cmc.did"
+      {
+        "url": "https://raw.githubusercontent.com/dfinity/ic/{commit}/rs/nns/cmc/cmc.did"
+      }
     ]
   },
   "governance": {
     "commit": "e790c6636115482db53ca3daa2f1900202ab04cf",
     "repo": "https://github.com/dfinity/ic",
     "url": "https://download.dfinity.systems/ic/{commit}/canisters/governance-canister.wasm.gz",
     "candid": [
-      "https://raw.githubusercontent.com/dfinity/ic/{commit}/rs/nns/governance/canister/governance.did"
+      {
+        "url": "https://raw.githubusercontent.com/dfinity/ic/{commit}/rs/nns/governance/canister/governance.did"
+      }
     ]
   }
 }