debugging: compile sha2 with sanity checks and rtti

.github/workflows/perf.yml

@@ -11,13 +11,14 @@ jobs:
     strategy:
       fail-fast: false
     env:
-      DFX_VERSION: 0.16.1
+      DFX_VERSION: 0.18.0-beta.3
       IC_REPL_VERSION: 0.6.2
-      MOC_VERSION: 0.10.4
+      MOC_VERSION: 0.11.0
       IC_WASM_VERSION: 0.7.0
-      RUSTC_VERSION: 1.75.0
+      RUSTC_VERSION: 1.76.0
+      MOC_ARTIFACT: 1305781756
     steps:
-      - uses: actions/checkout@v3
+      - 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
@@ -26,7 +27,7 @@ jobs:
           path: main/_out
       - name: Checkout out base branch
         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: ${{ github.base_ref }}
           path: main/
@@ -37,14 +38,14 @@ jobs:
           override: true
           target: wasm32-unknown-unknown
       - name: Cache cargo build
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
             target
           key: cargo-${{ env.RUSTC_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         if: github.event_name == 'pull_request'
         with:
           python-version: "3.10"
@@ -53,20 +54,24 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install pandas markdown lxml html5lib bs4 tabulate scipy
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - name: Install ic-repl, mops, dfx, and moc
+      - name: Install dfx
+        uses: dfinity/setup-dfx@main
+        with:
+          dfx-version: ${{ env.DFX_VERSION }}
+      - name: Install ic-repl, mops and moc
         run: |
-          echo y | DFX_VERSION=$DFX_VERSION bash -ci "$(curl -fsSL https://smartcontracts.org/install.sh)"
           wget https://github.com/chenyan2002/ic-repl/releases/download/$IC_REPL_VERSION/ic-repl-macos
           cp ./ic-repl-macos /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://nightly.link/dfinity/motoko/actions/artifacts/$MOC_ARTIFACT.zip
+          unzip $MOC_ARTIFACT.zip
+          chmod a+x bin/moc
+          cp -rf bin/moc $(dfx cache show)
           wget https://github.com/dfinity/ic-wasm/releases/download/$IC_WASM_VERSION/ic-wasm-macos
           cp ./ic-wasm-macos /usr/local/bin/ic-wasm
           chmod a+x /usr/local/bin/ic-wasm
@@ -173,7 +178,7 @@ jobs:
           edit-mode: replace
       - name: Save tables as artifact for forked PR
         if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: reports
           path: |

Cargo.toml

@@ -26,8 +26,8 @@ lto = true
 opt-level = 2
 
 [workspace.dependencies]
-ic-cdk = "0.12.0"
-ic-cdk-timers = "0.6.0"
-candid = "0.10.0"
+ic-cdk = "0.13.1"
+ic-cdk-timers = "0.7"
+candid = "0.10.4"
 serde = "1"
 ic-stable-structures = "0.6"

Makefile

@@ -1,4 +1,5 @@
-APPS = dapps collections crypto pub-sub heartbeat motoko
+#APPS = dapps collections crypto pub-sub heartbeat motoko
+APPS = crypto
 
 all:
 	$(foreach test_dir,$(APPS),make -C $(test_dir) &&) true

crypto/motoko/dfx.json

@@ -12,7 +12,7 @@
   "defaults": {
     "build": {
       "packtool": "mops sources",
-      "args": ""
+      "args": "--experimental-rtti"
     }
   }
 }

crypto/perf.sh

@@ -70,12 +70,13 @@ function perf_map(wasm, title, init_size) {
 };
 
 let res1 = perf_sha(sha_mo, "Motoko");
-let res2 = perf_sha(sha_rs, "Rust");
-assert res1 == res2;
+
+// 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 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
-// assert res1 == res2;
+// let res2 = perf_map(map_rs, "Rust", init_size);
+// // Cannot check for equality because witness is not unique
+// // assert res1 == res2;

dapps/rust/dip721-nft/src/lib.rs

@@ -185,7 +185,7 @@ fn total_supply() -> u64 {
 fn get_metadata(/* token_id: u64 */) /* -> Result<&'static MetadataDesc> */
 {
     ic_cdk::setup();
-    let token_id = call::arg_data::<(u64,)>().0;
+    let token_id = call::arg_data::<(u64,)>(call::ArgDecoderConfig::default()).0;
     let res: Result<()> = STATE.with(|state| {
         let state = state.borrow();
         let metadata = &state
@@ -211,7 +211,7 @@ struct ExtendedMetadataResult<'a> {
 fn get_metadata_for_user(/* user: Principal */) /* -> Vec<ExtendedMetadataResult> */
 {
     ic_cdk::setup();
-    let user = call::arg_data::<(Principal,)>().0;
+    let user = call::arg_data::<(Principal,)>(call::ArgDecoderConfig::default()).0;
     STATE.with(|state| {
         let state = state.borrow();
         let metadata: Vec<_> = state

heartbeat/motoko/timer.mo

@@ -2,7 +2,7 @@ import Timer "mo:base/Timer";
 
 actor {
   public func setTimer(sec : Nat) : async Nat {
-    Timer.setTimer(#seconds sec, func () : async () {});
+    Timer.setTimer<system>(#seconds sec, func () : async () {});
   };
   public func cancelTimer(id : Nat) : async () {
     Timer.cancelTimer(id);