chore: update to icx-proxy-dev built along with rest of replica binaries

dfinity · Jul 26, 2023 · 62ebe72 · 62ebe72
1 parent 0d3fd56
commit 62ebe72
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/nix/sources.json b/nix/sources.json
@@ -144,19 +144,17 @@
         "builtin": false,
         "rev": "594b6c81cde6da4e08faee8aa8e5a2e6ae815602",
         "sha256": "09rxh6kjwy7qfsvvsy6xjzyn4r4zlb78k1qipi4k3x0w0ajvp0sp",
-        "tag": "rev-c312760",
         "type": "file",
         "url": "https://github.com/dfinity/icx-proxy/releases/download/rev-c312760/binaries-macos.tar.gz",
-        "url_template": "https://github.com/dfinity/icx-proxy/releases/download/<tag>/binaries-macos.tar.gz"
+        "url_template": "https://download.dfinity.systems/ic/<rev>/openssl-static-binaries/x86_64-darwin/icx-proxy-dev.gz"
     },
     "icx-proxy-x86_64-linux": {
         "builtin": false,
         "rev": "594b6c81cde6da4e08faee8aa8e5a2e6ae815602",
         "sha256": "18czg11v5hiczqrahr962wmjig3gcafplqiprlnx44kmzfhi4mks",
-        "tag": "rev-c312760",
         "type": "file",
         "url": "https://github.com/dfinity/icx-proxy/releases/download/rev-c312760/binaries-linux.tar.gz",
-        "url_template": "https://github.com/dfinity/icx-proxy/releases/download/<tag>/binaries-linux.tar.gz"
+        "url_template": "https://download.dfinity.systems/ic/<rev>/openssl-static-binaries/x86_64-linux/icx-proxy-dev.gz"
     },
     "motoko-base": {
         "builtin": false,

diff --git a/scripts/update-replica.sh b/scripts/update-replica.sh
@@ -20,6 +20,8 @@ niv update ic-nns-init-x86_64-darwin -a rev=$SHA
 niv update ic-nns-init-x86_64-linux -a rev=$SHA
 niv update ic-starter-x86_64-darwin -a rev=$SHA
 niv update ic-starter-x86_64-linux -a rev=$SHA
+niv update icx-proxy-x86_64-darwin -a rev=$SHA
+niv update icx-proxy-x86_64-linux -a rev=$SHA
 niv update replica-x86_64-darwin -a rev=$SHA
 niv update replica-x86_64-linux -a rev=$SHA
 niv update canister_sandbox-x86_64-darwin -a rev=$SHA

diff --git a/src/dfx/assets/prepare_assets.rs b/src/dfx/assets/prepare_assets.rs
@@ -113,7 +113,7 @@ fn write_binary_cache(
         Compression::new(6),
     ));
     for (path, bin) in bins.into_iter().chain(
-        ["icx-proxy", "ic-ref", "moc", "mo-doc", "mo-ide"]
+        ["ic-ref", "moc", "mo-doc", "mo-ide"]
             .map(|bin| (bin.into(), bin_tars.remove(Path::new(bin)).unwrap())),
     ) {
         let mut header = Header::new_gnu();
@@ -182,6 +182,7 @@ async fn download_binaries(
         "ic-btc-adapter",
         "ic-https-outcalls-adapter",
         "ic-nns-init",
+        "icx-proxy",
         "replica",
         "canister_sandbox",
         "sandbox_launcher",
@@ -219,13 +220,13 @@ async fn download_bin_tarballs(
     sources: Arc<HashMap<String, Source>>,
 ) -> HashMap<PathBuf, Bytes> {
     let mut map = HashMap::new();
-    let [motoko, icx_proxy, ic_ref] = ["motoko", "icx-proxy", "ic-ref"].map(|pkg| {
+    let [motoko, ic_ref] = ["motoko", "ic-ref"].map(|pkg| {
         let client = client.clone();
         let source = sources[pkg].clone();
         spawn(download_and_check_sha(client, source))
     });
-    let (motoko, icx_proxy, ic_ref) = tokio::try_join!(motoko, icx_proxy, ic_ref).unwrap();
-    for tar in [motoko, icx_proxy, ic_ref] {
+    let (motoko, ic_ref) = tokio::try_join!(motoko, ic_ref).unwrap();
+    for tar in [motoko, ic_ref] {
         tar_xzf(&tar, |path, content| {
             map.insert(path, content);
         });