Skip to content

chore: update icx-proxy #3166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

chore: update icx-proxy #3166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
376a997
test: update canister_http test for transform with context
ericswanson-dfinity Jun 8, 2023
723feba
Get icx-proxy binaries from the same place as all of the others
ericswanson-dfinity Jun 8, 2023
a0eaa50
fix prepare assets
ericswanson-dfinity Jun 8, 2023
0104b9f
Merge branch 'master' into transform-context
ericswanson-dfinity Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,21 +142,19 @@
},
"icx-proxy-x86_64-darwin": {
"builtin": false,
"rev": "594b6c81cde6da4e08faee8aa8e5a2e6ae815602",
"sha256": "09rxh6kjwy7qfsvvsy6xjzyn4r4zlb78k1qipi4k3x0w0ajvp0sp",
"tag": "rev-c312760",
"rev": "794fc5b9341fa8f6a0e8f219201c35f0b5727ab9",
"sha256": "0k5h2xanhd7hqvgkdr05wqw7nswgwqc1xgk3n9abwk076n658n8g",
"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": "https://download.dfinity.systems/ic/794fc5b9341fa8f6a0e8f219201c35f0b5727ab9/openssl-static-binaries/x86_64-darwin/icx-proxy.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/openssl-static-binaries/x86_64-darwin/icx-proxy.gz"
},
"icx-proxy-x86_64-linux": {
"builtin": false,
"rev": "594b6c81cde6da4e08faee8aa8e5a2e6ae815602",
"sha256": "18czg11v5hiczqrahr962wmjig3gcafplqiprlnx44kmzfhi4mks",
"tag": "rev-c312760",
"rev": "794fc5b9341fa8f6a0e8f219201c35f0b5727ab9",
"sha256": "1fym7b8vnd32jz4pvf28vydhka8zzk6b1l4gm85y2v5lsvj17w49",
"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": "https://download.dfinity.systems/ic/794fc5b9341fa8f6a0e8f219201c35f0b5727ab9/openssl-static-binaries/x86_64-linux/icx-proxy.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/openssl-static-binaries/x86_64-linux/icx-proxy.gz"
},
"motoko-base": {
"builtin": false,
Expand Down
2 changes: 2 additions & 0 deletions scripts/update-replica.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/dfx/assets/dfx-asset-sources.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ url = 'https://download.dfinity.systems/ic-ref/ic-ref-0.0.1-a9f73dba-x86_64-darw
sha256 = 'e1c1694579f46d544aa87f6387d7e5a4b096fe65015b1609a459efcbaf15890f'

[x86_64-darwin.icx-proxy]
url = 'https://github.com/dfinity/icx-proxy/releases/download/rev-c312760/binaries-macos.tar.gz'
sha256 = '5783bba5021cf43149bc118789cea29f6462fd97dd78bdb776f8782ea7813d27'
url = 'https://download.dfinity.systems/ic/794fc5b9341fa8f6a0e8f219201c35f0b5727ab9/openssl-static-binaries/x86_64-darwin/icx-proxy.gz'
sha256 = '0f59548c35074cbe54b263be1e18e68f6b7b38e605e436dfc6f034685517b04c'

[x86_64-darwin.ic-admin]
url = 'https://download.dfinity.systems/ic/794fc5b9341fa8f6a0e8f219201c35f0b5727ab9/openssl-static-binaries/x86_64-darwin/ic-admin.gz'
Expand Down Expand Up @@ -64,8 +64,8 @@ url = 'https://download.dfinity.systems/ic-ref/ic-ref-0.0.1-a9f73dba-x86_64-linu
sha256 = '5c4967764e87d1b2945b1db027422633b48f08cd01d96ba2f622753fcb62c2a4'

[x86_64-linux.icx-proxy]
url = 'https://github.com/dfinity/icx-proxy/releases/download/rev-c312760/binaries-linux.tar.gz'
sha256 = '7a5612a1fb7512d22dcd37627a9d626fbc282b172665a832fe2cc2b243789fa1'
url = 'https://download.dfinity.systems/ic/794fc5b9341fa8f6a0e8f219201c35f0b5727ab9/openssl-static-binaries/x86_64-linux/icx-proxy.gz'
sha256 = '89f013e4d6b46ce10baa8fd0b0ccfc1fa9099bdf48b87dc9976234bbd13ad5bb'

[x86_64-linux.ic-admin]
url = 'https://download.dfinity.systems/ic/794fc5b9341fa8f6a0e8f219201c35f0b5727ab9/openssl-static-binaries/x86_64-linux/ic-admin.gz'
Expand Down
9 changes: 5 additions & 4 deletions src/dfx/assets/prepare_assets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -167,6 +167,7 @@ async fn download_binaries(
"ic-btc-adapter",
"ic-https-outcalls-adapter",
"ic-nns-init",
"icx-proxy",
"replica",
"canister_sandbox",
"sandbox_launcher",
Expand Down Expand Up @@ -204,13 +205,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);
});
Expand Down