From 886a04fd399db0f4b05f8a320f1eb48021d53977 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Fri, 27 Sep 2024 16:29:08 -0700 Subject: [PATCH 01/20] bump versions --- .github/workflows/perf.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index d4607e5..8a67ab7 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -11,16 +11,16 @@ jobs: strategy: fail-fast: false env: - DFX_VERSION: 0.18.0 - IC_REPL_VERSION: 0.7.0 - MOC_VERSION: 0.11.0 - IC_WASM_VERSION: 0.7.0 - RUSTC_VERSION: 1.76.0 + DFX_VERSION: 0.23.0 + IC_REPL_VERSION: 0.7.5 + MOC_VERSION: 0.13.0 + IC_WASM_VERSION: 0.8.6 + RUSTC_VERSION: 1.79.0 steps: - uses: actions/checkout@v4 - name: Checkout out gh-pages report if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'build_base') - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: gh-pages path: main/_out From 63a3fa408b7004a1c766d7514bc13a5fcb4fd40d Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Fri, 27 Sep 2024 16:31:05 -0700 Subject: [PATCH 02/20] fix --- Cargo.lock | 238 +++++++++++++++++++++++++++++++++-------------------- Cargo.toml | 6 +- 2 files changed, 152 insertions(+), 92 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c98f4fb..ba4f155 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arrayvec" @@ -16,9 +16,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "basic_dao" @@ -98,9 +98,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "candid" -version = "0.10.7" +version = "0.10.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "818394610ed32d9e4c81025f97c8580698b69542527efde18514cf9ad1f8f5f0" +checksum = "6c30ee7f886f296b6422c0ff017e89dd4f831521dfdcc76f3f71aae1ce817222" dependencies = [ "anyhow", "binread", @@ -128,14 +128,17 @@ dependencies = [ "lazy_static", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] name = "cc" -version = "1.0.88" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" +dependencies = [ + "shlex", +] [[package]] name = "certified_map" @@ -158,18 +161,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -186,9 +189,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "digest" @@ -212,9 +215,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "futures" @@ -272,7 +275,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] @@ -376,9 +379,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "ic-cdk" -version = "0.13.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63a6fceb94127bda86bd6d05f859a0e2a67d128a8ffb5ddab17e1f15ac8f555" +checksum = "dd8ecacd682fa05a985253592963306cb9799622d7b1cce4b1edb89c6ec85be1" dependencies = [ "candid", "ic-cdk-macros", @@ -389,23 +392,23 @@ dependencies = [ [[package]] name = "ic-cdk-macros" -version = "0.9.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fde5ca6ef1e69825c68916ff1bf7256b8f7ed69ac5ea3f1756f6e57f1503e27" +checksum = "0d4d857135deef20cc7ea8f3869a30cd9cfeb1392b3a81043790b2cd82adc3e0" dependencies = [ "candid", "proc-macro2", "quote", "serde", "serde_tokenstream", - "syn 1.0.109", + "syn 2.0.79", ] [[package]] name = "ic-cdk-timers" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054727a3a1c486528b96349817d54290ff70df6addf417def456ea708a16f7fb" +checksum = "0c7c528bbb3d4d934b43a364855995d318649217c7510f40f92ad52eba3ff7be" dependencies = [ "futures", "ic-cdk", @@ -428,18 +431,18 @@ dependencies = [ [[package]] name = "ic-stable-structures" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774d7d26420c095f2b5f0f71f7b2ff4a5b58b87e0959dccc78b3d513a7db5112" +checksum = "03f3044466a69802de74e710dc0300b706a05696a0531c942ca856751a13b0db" dependencies = [ "ic_principal", ] [[package]] name = "ic0" -version = "0.21.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a54b5297861c651551676e8c43df805dad175cc33bc97dbd992edbbb85dcbcdf" +checksum = "8de254dd67bbd58073e23dc1c8553ba12fa1dc610a19de94ad2bbcd0460c067f" [[package]] name = "ic_principal" @@ -480,9 +483,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "leb128" @@ -492,23 +495,22 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", "serde", @@ -525,24 +527,24 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -563,18 +565,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "psm" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" dependencies = [ "cc", ] @@ -590,9 +592,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -614,24 +616,24 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] @@ -648,24 +650,25 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] name = "serde_tokenstream" -version = "0.1.7" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "797ba1d80299b264f3aac68ab5d12e5825a561749db4df7cd7c8083900c5d4e9" +checksum = "64060d864397305347a78851c51588fd283767e7e7589829e8121d65512340f1" dependencies = [ "proc-macro2", + "quote", "serde", - "syn 1.0.109", + "syn 2.0.79", ] [[package]] @@ -689,6 +692,12 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "sized-chunks" version = "0.6.5" @@ -719,15 +728,15 @@ dependencies = [ [[package]] name = "stacker" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "winapi", + "windows-sys", ] [[package]] @@ -752,9 +761,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -763,22 +772,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.79", ] [[package]] @@ -804,15 +813,15 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "utils" @@ -843,28 +852,79 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] -name = "winapi" -version = "0.3.9" +name = "windows-sys" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows-targets", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows-targets" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/Cargo.toml b/Cargo.toml index 9c1f2f2..693a535 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,9 +26,9 @@ lto = true opt-level = 2 [workspace.dependencies] -ic-cdk = "0.13.1" -ic-cdk-timers = "0.7" -candid = "0.10.4" +ic-cdk = "0.16.0" +ic-cdk-timers = "0.10" +candid = "0.10" serde = "1" ic-stable-structures = "0.6" From cb7aa92031b2b19d03b38d4f33b696972d3b1d2f Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Fri, 27 Sep 2024 19:43:40 -0700 Subject: [PATCH 03/20] try moc 0.12 --- .github/workflows/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 8a67ab7..560e42d 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -13,7 +13,7 @@ jobs: env: DFX_VERSION: 0.23.0 IC_REPL_VERSION: 0.7.5 - MOC_VERSION: 0.13.0 + MOC_VERSION: 0.12.1 IC_WASM_VERSION: 0.8.6 RUSTC_VERSION: 1.79.0 steps: From 99498584aa39f5d51a91a990e51c3d12ecae29df Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Fri, 27 Sep 2024 21:55:04 -0700 Subject: [PATCH 04/20] try dfx 0.22 --- .github/workflows/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 560e42d..a6a223d 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false env: - DFX_VERSION: 0.23.0 + DFX_VERSION: 0.22.0 IC_REPL_VERSION: 0.7.5 MOC_VERSION: 0.12.1 IC_WASM_VERSION: 0.8.6 From 69d2a5c5f58c54905ed2a996abdb11d8facd73ef Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Sat, 28 Sep 2024 10:14:09 -0700 Subject: [PATCH 05/20] try ic-repl 0.7.0 --- .github/workflows/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index a6a223d..3e77fbe 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false env: DFX_VERSION: 0.22.0 - IC_REPL_VERSION: 0.7.5 + IC_REPL_VERSION: 0.7.0 MOC_VERSION: 0.12.1 IC_WASM_VERSION: 0.8.6 RUSTC_VERSION: 1.79.0 From 5ab4d916fa44632241317d8c7355732cd0d93c28 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Sat, 28 Sep 2024 11:34:37 -0700 Subject: [PATCH 06/20] bump back dfx and moc --- .github/workflows/perf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 3e77fbe..2ce737f 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -11,9 +11,9 @@ jobs: strategy: fail-fast: false env: - DFX_VERSION: 0.22.0 + DFX_VERSION: 0.23.0 IC_REPL_VERSION: 0.7.0 - MOC_VERSION: 0.12.1 + MOC_VERSION: 0.13.0 IC_WASM_VERSION: 0.8.6 RUSTC_VERSION: 1.79.0 steps: From 8aecaaedc7e1ad1ad6c012b33a981a172d73bdc0 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Sat, 28 Sep 2024 13:03:44 -0700 Subject: [PATCH 07/20] ic-agent 0.35, moc 0.12.1 --- .github/workflows/perf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 2ce737f..cd5c358 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -12,8 +12,8 @@ jobs: fail-fast: false env: DFX_VERSION: 0.23.0 - IC_REPL_VERSION: 0.7.0 - MOC_VERSION: 0.13.0 + IC_REPL_VERSION: 0.7.3 + MOC_VERSION: 0.12.1 IC_WASM_VERSION: 0.8.6 RUSTC_VERSION: 1.79.0 steps: From fec42b8de7d3fe57c1373240dbcee654ae5249c5 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Sat, 28 Sep 2024 13:59:17 -0700 Subject: [PATCH 08/20] dfx 22, moc 0.13 --- .github/workflows/perf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index cd5c358..6ec31b6 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -11,9 +11,9 @@ jobs: strategy: fail-fast: false env: - DFX_VERSION: 0.23.0 + DFX_VERSION: 0.22.0 IC_REPL_VERSION: 0.7.3 - MOC_VERSION: 0.12.1 + MOC_VERSION: 0.13.0 IC_WASM_VERSION: 0.8.6 RUSTC_VERSION: 1.79.0 steps: From eb3ec5e7ccdcb99171ae910583295085b78e77d6 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Sat, 28 Sep 2024 15:29:15 -0700 Subject: [PATCH 09/20] dfx 21 --- .github/workflows/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 6ec31b6..1bb002b 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false env: - DFX_VERSION: 0.22.0 + DFX_VERSION: 0.21.0 IC_REPL_VERSION: 0.7.3 MOC_VERSION: 0.13.0 IC_WASM_VERSION: 0.8.6 From e5fc94e8d1a71bb7969a168feae266e809668c71 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Sat, 28 Sep 2024 18:53:24 -0700 Subject: [PATCH 10/20] ic-agent 0.34 --- .github/workflows/perf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 1bb002b..1fdef0c 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -11,8 +11,8 @@ jobs: strategy: fail-fast: false env: - DFX_VERSION: 0.21.0 - IC_REPL_VERSION: 0.7.3 + DFX_VERSION: 0.23.0 + IC_REPL_VERSION: 0.7.2 MOC_VERSION: 0.13.0 IC_WASM_VERSION: 0.8.6 RUSTC_VERSION: 1.79.0 From c65d6b0cf7e59d70e8f65a82663773c4215a17e4 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Sat, 28 Sep 2024 19:04:45 -0700 Subject: [PATCH 11/20] fix --- .github/workflows/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 1fdef0c..c1a6614 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false env: DFX_VERSION: 0.23.0 - IC_REPL_VERSION: 0.7.2 + IC_REPL_VERSION: 0.7.1 MOC_VERSION: 0.13.0 IC_WASM_VERSION: 0.8.6 RUSTC_VERSION: 1.79.0 From 2928cbcfb5d62e86eda2296e0986e7407583fb59 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Sat, 28 Sep 2024 20:38:46 -0700 Subject: [PATCH 12/20] back to ic-repl 0.7.0 --- .github/workflows/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index c1a6614..2ce737f 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false env: DFX_VERSION: 0.23.0 - IC_REPL_VERSION: 0.7.1 + IC_REPL_VERSION: 0.7.0 MOC_VERSION: 0.13.0 IC_WASM_VERSION: 0.8.6 RUSTC_VERSION: 1.79.0 From cb74d748ebc33eaef5bebfc892323ff4321b5474 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Sat, 28 Sep 2024 21:17:04 -0700 Subject: [PATCH 13/20] moc 0.12.1 --- .github/workflows/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 2ce737f..a82943d 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -13,7 +13,7 @@ jobs: env: DFX_VERSION: 0.23.0 IC_REPL_VERSION: 0.7.0 - MOC_VERSION: 0.13.0 + MOC_VERSION: 0.12.1 IC_WASM_VERSION: 0.8.6 RUSTC_VERSION: 1.79.0 steps: From 4bed274c6b2b748239b195dd796227ca9ad862f0 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Thu, 3 Oct 2024 18:00:01 -0700 Subject: [PATCH 14/20] bump --- .github/workflows/perf.yml | 10 +++++----- Cargo.lock | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index a82943d..11eb85a 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -11,11 +11,11 @@ jobs: strategy: fail-fast: false env: - DFX_VERSION: 0.23.0 - IC_REPL_VERSION: 0.7.0 - MOC_VERSION: 0.12.1 - IC_WASM_VERSION: 0.8.6 - RUSTC_VERSION: 1.79.0 + DFX_VERSION: 0.24.0 + IC_REPL_VERSION: 0.7.6 + MOC_VERSION: 0.13.0 + IC_WASM_VERSION: 0.9.0 + RUSTC_VERSION: 1.81.0 steps: - uses: actions/checkout@v4 - name: Checkout out gh-pages report diff --git a/Cargo.lock b/Cargo.lock index ba4f155..62c9810 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.22" +version = "1.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" dependencies = [ "shlex", ] From 46f5ed0395a9ba33fd3cdbdf4b84d5796bf827b0 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Thu, 3 Oct 2024 18:38:33 -0700 Subject: [PATCH 15/20] reduce crypto size again --- crypto/perf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/perf.sh b/crypto/perf.sh index 968ec0b..ff54c27 100644 --- a/crypto/perf.sh +++ b/crypto/perf.sh @@ -74,7 +74,7 @@ let res2 = perf_sha(sha_rs, "Rust"); assert res1 == res2; output(file, "\n## Certified map\n\n| |binary_size|generate 10k|max mem|inc|witness|upgrade|\n|--:|--:|--:|--:|--:|--:|--:|\n"); -let init_size = 10_000; +let init_size = 5_000; let res1 = perf_map(map_mo, "Motoko", init_size); let res2 = perf_map(map_rs, "Rust", init_size); // Cannot check for equality because witness is not unique From 1af4433eb0d557b00590d6181fc2268d73be2cfc Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Thu, 3 Oct 2024 19:27:54 -0700 Subject: [PATCH 16/20] reduce crypto size again --- crypto/perf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/perf.sh b/crypto/perf.sh index ff54c27..dda3aa2 100644 --- a/crypto/perf.sh +++ b/crypto/perf.sh @@ -74,7 +74,7 @@ let res2 = perf_sha(sha_rs, "Rust"); assert res1 == res2; output(file, "\n## Certified map\n\n| |binary_size|generate 10k|max mem|inc|witness|upgrade|\n|--:|--:|--:|--:|--:|--:|--:|\n"); -let init_size = 5_000; +let init_size = 1_000; let res1 = perf_map(map_mo, "Motoko", init_size); let res2 = perf_map(map_rs, "Rust", init_size); // Cannot check for equality because witness is not unique From a32d6b6a434ae922c185cd9ab96a9242741cdcf6 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Thu, 3 Oct 2024 20:07:49 -0700 Subject: [PATCH 17/20] switch to ubuntu --- .github/workflows/perf.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 11eb85a..2d3b915 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -7,7 +7,7 @@ on: jobs: perf: - runs-on: macos-latest + runs-on: ubuntu-latest strategy: fail-fast: false env: @@ -62,16 +62,16 @@ jobs: dfx-version: ${{ env.DFX_VERSION }} - name: Install ic-repl, mops and moc run: | - wget https://github.com/chenyan2002/ic-repl/releases/download/$IC_REPL_VERSION/ic-repl-macos - cp ./ic-repl-macos /usr/local/bin/ic-repl + wget https://github.com/chenyan2002/ic-repl/releases/download/$IC_REPL_VERSION/ic-repl-linux64 + cp ./ic-repl-linux64 /usr/local/bin/ic-repl chmod a+x /usr/local/bin/ic-repl npm i -g ic-mops dfx cache install cd $(dfx cache show) - wget https://github.com/dfinity/motoko/releases/download/$MOC_VERSION/motoko-Darwin-x86_64-$MOC_VERSION.tar.gz - tar zxvf motoko-Darwin-x86_64-$MOC_VERSION.tar.gz - wget https://github.com/dfinity/ic-wasm/releases/download/$IC_WASM_VERSION/ic-wasm-macos - cp ./ic-wasm-macos /usr/local/bin/ic-wasm + wget https://github.com/dfinity/motoko/releases/download/$MOC_VERSION/motoko-Linux-x86_64-$MOC_VERSION.tar.gz + tar zxvf motoko-Linux-x86_64-$MOC_VERSION.tar.gz + wget https://github.com/dfinity/ic-wasm/releases/download/$IC_WASM_VERSION/ic-wasm-linux64 + cp ./ic-wasm-linux64 /usr/local/bin/ic-wasm chmod a+x /usr/local/bin/ic-wasm - name: Setup system subnet and start dfx run: | From a8781bedd7cb517fa08562eed8c130f97d869b5b Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Thu, 3 Oct 2024 20:54:00 -0700 Subject: [PATCH 18/20] try pocketic --- .github/workflows/perf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 2d3b915..700fa48 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -77,14 +77,14 @@ jobs: run: | mkdir -p $HOME/.config/dfx cp networks.json $HOME/.config/dfx/ - dfx start --background + dfx start --background --pocketic - name: Run perf for base branch if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'build_base') run: | cd main make dfx stop - dfx start --clean --background + dfx start --clean --background --pocketic - name: Run perf run: | make From 6b68ac1d9159c360f30b608dec5840239531e1e6 Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Thu, 3 Oct 2024 21:00:54 -0700 Subject: [PATCH 19/20] fix --- utils.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils.mk b/utils.mk index 2f55440..c2688ba 100644 --- a/utils.mk +++ b/utils.mk @@ -35,14 +35,14 @@ endef define perf set -e; \ $(call prepare_perf,$(1)); \ - ic-repl ../../$(1)/$(2); \ + ic-repl -v ../../$(1)/$(2); \ du -h ../../_out endef define perf_two set -e; \ $(call prepare_perf,$(1)); \ - ic-repl ../../$(1)/$(2); \ - ic-repl ../../$(1)/$(3); \ + ic-repl -v ../../$(1)/$(2); \ + ic-repl -v ../../$(1)/$(3); \ du -h ../../_out endef From 542e6704d1fe718135479a6b18e69476a3ea641c Mon Sep 17 00:00:00 2001 From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com> Date: Thu, 3 Oct 2024 21:09:39 -0700 Subject: [PATCH 20/20] back to replica --- .github/workflows/perf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 700fa48..2d3b915 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -77,14 +77,14 @@ jobs: run: | mkdir -p $HOME/.config/dfx cp networks.json $HOME/.config/dfx/ - dfx start --background --pocketic + dfx start --background - name: Run perf for base branch if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'build_base') run: | cd main make dfx stop - dfx start --clean --background --pocketic + dfx start --clean --background - name: Run perf run: | make