chore(ICRC_Index): FI-1468: Remove old ICRC index canister (#3286)

The old ICRC index canister, which stores the blocks on the heap (as opposed to the `index-ng` canister which stores the blocks in stable memory), is deprecated. To avoid confusion, remove it from the repository. --------- Co-authored-by: IDX GitHub Automation <[email protected]>
dfinity · Dec 27, 2024 · 575ca53 · 575ca53
1 parent baaf256
commit 575ca53
Show file tree

Hide file tree

Showing 19 changed files with 71 additions and 2,038 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -288,7 +288,6 @@ members = [
     "rs/rosetta-api/icp/ledger_canister_blocks_synchronizer",
     "rs/rosetta-api/icp/ledger_canister_blocks_synchronizer/test_utils",
     "rs/ledger_suite/icrc1",
-    "rs/ledger_suite/icrc1/index",
     "rs/ledger_suite/icrc1/index-ng",
     "rs/ledger_suite/icrc1/ledger",
     "rs/ledger_suite/tests/sm-tests",

diff --git a/publish/canisters/BUILD.bazel b/publish/canisters/BUILD.bazel
@@ -18,7 +18,6 @@ CANISTERS = {
     "ic-ckbtc-minter_debug.wasm.gz": "//rs/bitcoin/ckbtc/minter:ckbtc_minter_debug",
     "ic-ckbtc-kyt.wasm.gz": "//rs/bitcoin/ckbtc/kyt:kyt_canister",
     "ic-cketh-minter.wasm.gz": "//rs/ethereum/cketh/minter:cketh_minter",
-    "ic-icrc1-index.wasm.gz": "//rs/ledger_suite/icrc1/index:index_canister",
     "ic-icrc1-index-ng.wasm.gz": "//rs/ledger_suite/icrc1/index-ng:index_ng_canister",
     "ic-icrc1-index-ng-u256.wasm.gz": "//rs/ledger_suite/icrc1/index-ng:index_ng_canister_u256",
     "ic-icrc1-ledger.wasm.gz": "//rs/ledger_suite/icrc1/ledger:ledger_canister",

diff --git a/rs/bitcoin/ckbtc/mainnet/README.md b/rs/bitcoin/ckbtc/mainnet/README.md
@@ -3,7 +3,6 @@
 Root canister id: `r7inp-6aaaa-aaaaa-aaabq-cai`.
 Subnet: `pzp6e-ekpqk-3c5x7-2h6so-njoeq-mt45d-h3h6c-q3mxf-vpeq5-fk5o7-yae`
 
-
 ## Installing the minter ([`mqygn-kiaaa-aaaar-qaadq-cai`](https://dashboard.internetcomputer.org/canister/mqygn-kiaaa-aaaar-qaadq-cai))
 
 Notes on init args:
@@ -81,7 +80,7 @@ Notes on init args:
 * The transfer fee is 10 ckBTC Satoshis.
 * There are no initial balances: the minter is responsible for minting all ckBTC.
 * Archive max memory size is 3 GiB, or 3_221_225_472 bytes. We can afford to use that much memory because archives store transactions in stable memory.
-* The `max_memo_length` was last udpated to 80 in [NNS proposal 123422](https://dashboard.internetcomputer.org/proposal/123422).
+* The `max_memo_length` was last updated to 80 in [NNS proposal 123422](https://dashboard.internetcomputer.org/proposal/123422).
 
 The metadata contains the official ckBTC logo.
 
@@ -138,7 +137,7 @@ bazel build //rs/registry/admin:ic-admin
 Encoding the init args:
 
 ```shell
-didc encode -d ../../../ledger_suite/icrc1/index/index.did -t '(InitArgs)' '(record { ledger_id = principal "mxzaz-hqaaa-aaaar-qaada-cai" })' | xxd -r -p > index_arg.bin
+didc encode -d ../../../ledger_suite/icrc1/index-ng/index-ng.did -t '(opt IndexArg)' '(opt variant { Init = record { ledger_id = principal "mxzaz-hqaaa-aaaar-qaada-cai" } })' | xxd -r -p > index_arg.bin
 ```
 
 Submitting the install proposal:
@@ -156,7 +155,7 @@ bazel build //rs/registry/admin:ic-admin
     --proposer $NEURON_ID \
     --canister-id n5wcd-faaaa-aaaar-qaaea-cai \
     --mode install \
-    --wasm-module-path ./ic-icrc1-index.wasm.gz \
+    --wasm-module-path ./ic-icrc1-index-ng.wasm.gz \
     --wasm-module-sha256 $WASM_SHA256 \
     --arg index_arg.bin \
     --summary-file ./index_proposal.md
@@ -177,7 +176,7 @@ bazel build //rs/registry/admin:ic-admin
     --proposer $NEURON_ID \
     --canister-id n5wcd-faaaa-aaaar-qaaea-cai \
     --mode upgrade \
-    --wasm-module-path ./ic-icrc1-index.wasm.gz \
+    --wasm-module-path ./ic-icrc1-index-ng.wasm.gz \
     --wasm-module-sha256 $WASM_SHA256 \
     --summary-file ./index_upgrade.md
 ```

diff --git a/rs/bitcoin/ckbtc/mainnet/dfx.json b/rs/bitcoin/ckbtc/mainnet/dfx.json
@@ -32,10 +32,10 @@
     "index": {
       "type": "custom",
       "build": [
-        "bazel build //rs/ledger_suite/icrc1/index:index_canister"
+        "bazel build //rs/ledger_suite/icrc1/index-ng:index_ng_canister"
       ],
-      "wasm": "../../../../bazel-bin/rs/ledger_suite/icrc1/index/index_canister.wasm",
-      "candid": "../../../ledger_suite/icrc1/index/index.did",
+      "wasm": "../../../../bazel-bin/rs/ledger_suite/icrc1/index-ng/index_ng_canister.wasm",
+      "candid": "../../../ledger_suite/icrc1/index-ng/index-ng.did",
       "shrink": false
     },
     "btc_checker": {

diff --git a/rs/bitcoin/ckbtc/staging/dfx.json b/rs/bitcoin/ckbtc/staging/dfx.json
@@ -1,63 +1,63 @@
 {
-    "version": 1,
-    "dfx": "0.12.1",
-    "canisters": {
-        "minter": {
-            "type": "custom",
-            "build": [
-                "bazel build //rs/bitcoin/ckbtc/minter:ckbtc_minter"
-            ],
-            "wasm": "../../../../bazel-bin/rs/bitcoin/ckbtc/minter/ckbtc_minter.wasm",
-            "candid": "../minter/ckbtc_minter.did",
-            "shrink": false
-        },
-        "ledger": {
-            "type": "custom",
-            "build": [
-                "bazel build //rs/ledger_suite/icrc1/ledger:ledger_canister"
-            ],
-            "wasm": "../../../../bazel-bin/rs/ledger_suite/icrc1/ledger/ledger_canister.wasm",
-            "candid": "../../../ledger_suite/icrc1/ledger/ledger.did",
-            "shrink": false
-        },
-        "archive": {
-            "type": "custom",
-            "build": [
-                "bazel build //rs/ledger_suite/icrc1/archive:archive_canister"
-            ],
-            "wasm": "../../../../bazel-bin/rs/ledger_suite/icrc1/archive/archive_canister.wasm",
-            "candid": "../../../ledger_suite/icrc1/archive/archive.did",
-            "shrink": false
-        },
-        "index": {
-            "type": "custom",
-            "build": [
-                "bazel build //rs/ledger_suite/icrc1/index:index_canister"
-            ],
-            "wasm": "../../../../bazel-bin/rs/ledger_suite/icrc1/index/index_canister.wasm",
-            "candid": "../../../ledger_suite/icrc1/index/index.did",
-            "shrink": false
-        },
-        "kyt": {
-            "type": "custom",
-            "build": [
-                "bazel build //rs/bitcoin/ckbtc/kyt:kyt_canister"
-            ],
-            "wasm": "../../../../bazel-bin/rs/bitcoin/ckbtc/kyt/kyt_canister.wasm",
-            "candid": "../kyt/kyt.did",
-            "shrink": false
-        }
+  "version": 1,
+  "dfx": "0.12.1",
+  "canisters": {
+    "minter": {
+      "type": "custom",
+      "build": [
+        "bazel build //rs/bitcoin/ckbtc/minter:ckbtc_minter"
+      ],
+      "wasm": "../../../../bazel-bin/rs/bitcoin/ckbtc/minter/ckbtc_minter.wasm",
+      "candid": "../minter/ckbtc_minter.did",
+      "shrink": false
     },
-    "defaults": {
-        "build": {
-            "packtool": "",
-            "args": ""
-        }
+    "ledger": {
+      "type": "custom",
+      "build": [
+        "bazel build //rs/ledger_suite/icrc1/ledger:ledger_canister"
+      ],
+      "wasm": "../../../../bazel-bin/rs/ledger_suite/icrc1/ledger/ledger_canister.wasm",
+      "candid": "../../../ledger_suite/icrc1/ledger/ledger.did",
+      "shrink": false
     },
-    "networks": {
-        "local": {
-            "bind": "127.0.0.1:8000",
-            "type": "ephemeral"
-        }
+    "archive": {
+      "type": "custom",
+      "build": [
+        "bazel build //rs/ledger_suite/icrc1/archive:archive_canister"
+      ],
+      "wasm": "../../../../bazel-bin/rs/ledger_suite/icrc1/archive/archive_canister.wasm",
+      "candid": "../../../ledger_suite/icrc1/archive/archive.did",
+      "shrink": false
+    },
+    "index": {
+      "type": "custom",
+      "build": [
+        "bazel build //rs/ledger_suite/icrc1/index-ng:index_ng_canister"
+      ],
+      "wasm": "../../../../bazel-bin/rs/ledger_suite/icrc1/index-ng/index_ng_canister.wasm",
+      "candid": "../../../ledger_suite/icrc1/index-ng/index-ng.did",
+      "shrink": false
+    },
+    "kyt": {
+      "type": "custom",
+      "build": [
+        "bazel build //rs/bitcoin/ckbtc/kyt:kyt_canister"
+      ],
+      "wasm": "../../../../bazel-bin/rs/bitcoin/ckbtc/kyt/kyt_canister.wasm",
+      "candid": "../kyt/kyt.did",
+      "shrink": false
+    }
+  },
+  "defaults": {
+    "build": {
+      "packtool": "",
+      "args": ""
+    }
+  },
+  "networks": {
+    "local": {
+      "bind": "127.0.0.1:8000",
+      "type": "ephemeral"
     }
-}
+  }
+}
diff --git a/rs/ledger_suite/icrc1/index-ng/BUILD.bazel b/rs/ledger_suite/icrc1/index-ng/BUILD.bazel
@@ -98,16 +98,13 @@ rust_test(
         ],
         crate_features = conf["crate_features"],
         data = [
-            "//rs/ledger_suite/icrc1/index:index_canister.wasm",
-        ] + [
             conf["index_wasm"],
             conf["ledger_wasm"],
         ],
         env = {
             "RUST_TEST_THREADS": "4",
             "CARGO_MANIFEST_DIR": "rs/ledger_suite/icrc1/index-ng",
             "IC_ICRC1_INDEX_NG_WASM_PATH": "$(rootpath " + conf["index_wasm"] + ")",
-            "IC_ICRC1_INDEX_WASM_PATH": "$(rootpath //rs/ledger_suite/icrc1/index:index_canister.wasm)",
             "IC_ICRC1_LEDGER_WASM_PATH": "$(rootpath " + conf["ledger_wasm"] + ")",
         },
         extra_srcs = ["tests/common/mod.rs"],
@@ -119,7 +116,6 @@ rust_test(
             "//rs/ledger_suite/common/ledger_canister_core",
             "//rs/ledger_suite/common/ledger_core",
             "//rs/ledger_suite/icrc1",
-            "//rs/ledger_suite/icrc1/index",
             "//rs/ledger_suite/icrc1/ledger",
             "//rs/ledger_suite/icrc1/test_utils",
             "//rs/ledger_suite/icrc1/tokens_u64",

diff --git a/rs/ledger_suite/icrc1/index-ng/Cargo.toml b/rs/ledger_suite/icrc1/index-ng/Cargo.toml
@@ -38,7 +38,6 @@ serde_json = { workspace = true }
 candid_parser = { workspace = true }
 ic-agent = { workspace = true }
 ic-base-types = { path = "../../../types/base_types" }
-ic-icrc1-index = { path = "../index" }
 ic-icrc1-ledger = { path = "../ledger" }
 ic-ledger-suite-state-machine-tests = { path = "../../tests/sm-tests" }
 ic-icrc1-test-utils = { path = "../test_utils" }