Skip to content

chore: update icx-proxy to rev-c312760 #2211

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

Merged
mergify merged 1 commit into from
May 17, 2022
Merged

chore: update icx-proxy to rev-c312760 #2211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions CHANGELOG.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@

= UNRELEASED

== BUILD PROCESS

The build process temporarily obtains the icx-proxy binary from the dfx 0.10.0 release binary.
Once icx-proxy releases are once again available on github, we will revert this change.
Do not release dfx until this is reverted.

== DFX

=== fix: Webpack config no longer uses CopyPlugin
Expand Down Expand Up @@ -93,6 +87,15 @@ This incorporates the following executed proposals:
* https://dashboard.internetcomputer.org/proposal/57843[57843]
* https://dashboard.internetcomputer.org/proposal/57395[57395]

== icx-proxy

Updated icx-proxy to commit c312760a62b20931431ba45e5b0168ee79ea5cda

* Added gzip and deflate body decoding before certification validation.
* Fixed unzip and streaming bugs
* Added Prometheus metrics endpoint
* Added root and invalid ssl and dns mapping

= 0.10.0

== DFX
Expand Down
16 changes: 8 additions & 8 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,20 +124,20 @@
"icx-proxy-x86_64-darwin": {
"builtin": false,
"rev": "594b6c81cde6da4e08faee8aa8e5a2e6ae815602",
"sha256": "0xccz7b2bpy4i17kli4p6ngscmb4z0qlby98cj44hkwpwd22bgz2",
"shortrev": "594b6c8",
"sha256": "09rxh6kjwy7qfsvvsy6xjzyn4r4zlb78k1qipi4k3x0w0ajvp0sp",
"tag": "rev-c312760",
"type": "file",
"url": "https://github.com/dfinity/icx-proxy/releases/download/594b6c8/binaries-macos.tar.gz",
"url_template": "https://github.com/dfinity/icx-proxy/releases/download/<shortrev>/binaries-macos.tar.gz"
"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"
},
"icx-proxy-x86_64-linux": {
"builtin": false,
"rev": "594b6c81cde6da4e08faee8aa8e5a2e6ae815602",
"sha256": "0bvm0pplfdqv1x39pza1ljhkba9fd7mg81xa6rc5p0i17hk7faxz",
"shortrev": "594b6c8",
"sha256": "18czg11v5hiczqrahr962wmjig3gcafplqiprlnx44kmzfhi4mks",
"tag": "rev-c312760",
"type": "file",
"url": "https://github.com/dfinity/icx-proxy/releases/download/594b6c8/binaries-linux.tar.gz",
"url_template": "https://github.com/dfinity/icx-proxy/releases/download/<shortrev>/binaries-linux.tar.gz"
"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"
},
"motoko-base": {
"branch": "next-moc",
Expand Down
8 changes: 4 additions & 4 deletions scripts/dfx-asset-sources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ IC_REF_X86_64_DARWIN_SHA256="407ac5a195315290c0659f9d3d8206c443c2c1014ad04bc6e07
IC_REF_X86_64_DARWIN_URL="https://download.dfinity.systems/ic-ref/ic-ref-0.0.1-ab8e3f5a-x86_64-darwin.tar.gz"
IC_REF_X86_64_LINUX_SHA256="72c8e85be096ec071d236e3024134b62866b2d73ac1c2e56757b09a7d158a064"
IC_REF_X86_64_LINUX_URL="https://download.dfinity.systems/ic-ref/ic-ref-0.0.1-ab8e3f5a-x86_64-linux.tar.gz"
ICX_PROXY_X86_64_DARWIN_SHA256="e2bf2544e3974f48886428f94531f86455a69f3597443a4f88c4df25d6f98c75"
ICX_PROXY_X86_64_DARWIN_URL="https://github.com/dfinity/icx-proxy/releases/download/594b6c8/binaries-macos.tar.gz"
ICX_PROXY_X86_64_LINUX_SHA256="bf2b77263c21825b5836aa07f4ea692ea935a1a441fd9b460f1b3747ef05752f"
ICX_PROXY_X86_64_LINUX_URL="https://github.com/dfinity/icx-proxy/releases/download/594b6c8/binaries-linux.tar.gz"
ICX_PROXY_X86_64_DARWIN_SHA256="5783bba5021cf43149bc118789cea29f6462fd97dd78bdb776f8782ea7813d27"
ICX_PROXY_X86_64_DARWIN_URL="https://github.com/dfinity/icx-proxy/releases/download/rev-c312760/binaries-macos.tar.gz"
ICX_PROXY_X86_64_LINUX_SHA256="7a5612a1fb7512d22dcd37627a9d626fbc282b172665a832fe2cc2b243789fa1"
ICX_PROXY_X86_64_LINUX_URL="https://github.com/dfinity/icx-proxy/releases/download/rev-c312760/binaries-linux.tar.gz"
IC_BTC_ADAPTER_X86_64_DARWIN_SHA256="116259a74d3708559b4382bd8377d034d452059e5918b32c4821d0f612dae0d5"
IC_BTC_ADAPTER_X86_64_DARWIN_URL="https://download.dfinity.systems/blessed/ic/dcb2d23dfcd9de200f235110e618713cc884cb19/sdk-release/x86_64-darwin/ic-btc-adapter.gz"
IC_BTC_ADAPTER_X86_64_LINUX_SHA256="312968b414f1375ad8a65554e0600c04f09096ad58236fb8b144d2e1f26b57d8"
Expand Down
23 changes: 1 addition & 22 deletions scripts/prepare-dfx-assets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,29 +92,8 @@ download_ic_ref() {
chmod 0500 "$BINARY_CACHE_TEMP_DIR/ic-ref"
}

# This is a temporary hack while icx-proxy releases are not available from github releases.
# To be reverted: https://dfinity.atlassian.net/browse/SDK-498
get_icx_proxy_from_dfx_release() {
case "$OSTYPE" in
darwin*)
URL="https://github.com/dfinity/sdk/releases/download/0.10.0/dfx-0.10.0-x86_64-darwin.tar.gz"
SHA256="7a4d49eeb004e9c5c2ac20891b95564cbe728f0ee7a9fa8579dc4e0022339d79"
;;
linux*)
URL="https://github.com/dfinity/sdk/releases/download/0.10.0/dfx-0.10.0-x86_64-linux.tar.gz"
SHA256="f6ae43098b676da87503e627cc6f8820d0a0ff9f9beac0da2cc884598216b996"
;;
*) echo "Unsupported OS type: $OSTYPE" ; exit 1;;
esac
download_url_and_check_sha "$URL" "$SHA256" "$DOWNLOAD_TEMP_DIR/dfx.tar.gz"
tar -xkvf "$DOWNLOAD_TEMP_DIR/dfx.tar.gz" -C "$DOWNLOAD_TEMP_DIR"
DFX_CACHE_ROOT="$DOWNLOAD_TEMP_DIR/dfx-cache" "$DOWNLOAD_TEMP_DIR/dfx" cache install
cp "$DOWNLOAD_TEMP_DIR/dfx-cache/.cache/dfinity/versions/0.10.0/icx-proxy" "$BINARY_CACHE_TEMP_DIR"
}

download_icx_proxy() {
# download_tarball "icx-proxy"
get_icx_proxy_from_dfx_release
download_tarball "icx-proxy"

chmod 0500 "$BINARY_CACHE_TEMP_DIR/icx-proxy"
}
Expand Down