Remove legacy archive push integration (#1218)

This PR removes the old archive integration mode where II pushed
entries to the archive using notify calls.

* 🤖 npm run generate auto-update

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

Author: Frederik Rothenberger

src/canister_tests/src/framework.rs

@@ -165,18 +165,14 @@ pub fn install_ii_canister_with_arg(
     canister_id
 }
 
-pub fn arg_with_wasm_hash(
-    wasm: Vec<u8>,
-    archive_integration: Option<ArchiveIntegration>,
-) -> Option<InternetIdentityInit> {
+pub fn arg_with_wasm_hash(wasm: Vec<u8>) -> Option<InternetIdentityInit> {
     Some(InternetIdentityInit {
         assigned_user_number_range: None,
         archive_config: Some(ArchiveConfig {
             module_hash: archive_wasm_hash(&wasm),
             entries_buffer_limit: 10_000,
             polling_interval_ns: Duration::from_secs(1).as_nanos() as u64,
             entries_fetch_limit: 10,
-            archive_integration,
         }),
         canister_creation_cycles_cost: Some(0),
     })

src/frontend/generated/internet_identity_idl.js

@@ -2,14 +2,10 @@ export const idlFactory = ({ IDL }) => {
   const ArchiveConfig = IDL.Record({
     'polling_interval_ns' : IDL.Nat64,
     'entries_buffer_limit' : IDL.Nat64,
-    'archive_integration' : IDL.Opt(
-      IDL.Variant({ 'pull' : IDL.Null, 'push' : IDL.Null })
-    ),
     'module_hash' : IDL.Vec(IDL.Nat8),
     'entries_fetch_limit' : IDL.Nat16,
   });
   const InternetIdentityInit = IDL.Record({
-    'upgrade_persistent_state' : IDL.Opt(IDL.Bool),
     'assigned_user_number_range' : IDL.Opt(IDL.Tuple(IDL.Nat64, IDL.Nat64)),
     'archive_config' : IDL.Opt(ArchiveConfig),
     'canister_creation_cycles_cost' : IDL.Opt(IDL.Nat64),
@@ -195,14 +191,10 @@ export const init = ({ IDL }) => {
   const ArchiveConfig = IDL.Record({
     'polling_interval_ns' : IDL.Nat64,
     'entries_buffer_limit' : IDL.Nat64,
-    'archive_integration' : IDL.Opt(
-      IDL.Variant({ 'pull' : IDL.Null, 'push' : IDL.Null })
-    ),
     'module_hash' : IDL.Vec(IDL.Nat8),
     'entries_fetch_limit' : IDL.Nat16,
   });
   const InternetIdentityInit = IDL.Record({
-    'upgrade_persistent_state' : IDL.Opt(IDL.Bool),
     'assigned_user_number_range' : IDL.Opt(IDL.Tuple(IDL.Nat64, IDL.Nat64)),
     'archive_config' : IDL.Opt(ArchiveConfig),
     'canister_creation_cycles_cost' : IDL.Opt(IDL.Nat64),

src/frontend/generated/internet_identity_types.d.ts

@@ -12,7 +12,6 @@ export type AddTentativeDeviceResponse = {
 export interface ArchiveConfig {
   'polling_interval_ns' : bigint,
   'entries_buffer_limit' : bigint,
-  'archive_integration' : [] | [{ 'pull' : null } | { 'push' : null }],
   'module_hash' : Array<number>,
   'entries_fetch_limit' : number,
 }
@@ -77,7 +76,6 @@ export interface IdentityAnchorInfo {
   'device_registration' : [] | [DeviceRegistrationInfo],
 }
 export interface InternetIdentityInit {
-  'upgrade_persistent_state' : [] | [boolean],
   'assigned_user_number_range' : [] | [[bigint, bigint]],
   'archive_config' : [] | [ArchiveConfig],
   'canister_creation_cycles_cost' : [] | [bigint],

src/internet_identity/internet_identity.did

@@ -149,28 +149,12 @@ type ArchiveConfig = record {
     module_hash : blob;
     // Buffered archive entries limit. If reached, II will stop accepting new anchor operations
     // until the buffered operations are acknowledged by the archive.
-    // Currently unused: in preparation of switching the archive integration to pull.
-    // Configured value will be discarded for storage_layout_version < 6.
     entries_buffer_limit: nat64;
     // The maximum number of entries to be transferred to the archive per call.
-    // Currently unused: in preparation of switching the archive integration to pull.
-    // Configured value will be discarded for storage_layout_version < 6.
     entries_fetch_limit: nat16;
     // Polling interval to fetch new entries from II (in nanoseconds).
     // Changes to this parameter will only take effect after an archive deployment.
-    // Currently unused: in preparation of switching the archive integration to pull.
-    // Configured value will be discarded for storage_layout_version < 6.
     polling_interval_ns: nat64;
-
-    // How the entries get transferred to the archive.
-    // This is opt, so that the config parameter can be removed after switching from push to pull.
-    // Configured value will be discarded for storage_layout_version < 6.
-    archive_integration: opt variant {
-        // II pushes the entries to the archive (legacy variant).
-        push;
-        // The archive pulls the entries from II.
-        pull;
-    }
 };
 
 // Information about the archive.
@@ -198,8 +182,6 @@ type InternetIdentityInit = record {
     // The canister creation cost on mainnet is currently 100'000'000'000 cycles. If this value is higher thant the
     // canister creation cost, the newly created canister will keep extra cycles.
     canister_creation_cycles_cost : opt nat64;
-    // Config flag to upgrade the persistent state. If set to opt true it will migrate the storage layout to version 6.
-    upgrade_persistent_state: opt bool;
 };
 
 type ChallengeKey = text;

src/internet_identity/src/archive.rs

@@ -8,9 +8,8 @@ use ic_cdk::api::management_canister::main::{
     InstallCodeArgument,
 };
 use ic_cdk::api::time;
-use ic_cdk::{call, caller, id, notify, trap};
+use ic_cdk::{call, caller, id, trap};
 use internet_identity_interface::archive::*;
-use internet_identity_interface::ArchiveIntegration::Pull;
 use internet_identity_interface::*;
 use serde_bytes::ByteBuf;
 use sha2::Digest;
@@ -65,8 +64,6 @@ pub struct ArchiveData {
     // until the archive acknowledges entries and they can safely be deleted from this buffer.
     // The limit is configurable (entries_buffer_limit).
     // This is an Rc to avoid unnecessary copies of (potentially) a lot of data when cloning.
-    // Currently unused: in preparation of switching the archive integration to pull.
-    // Anything stored here will be discarded for storage_layout_version < 6.
     pub entries_buffer: Rc<Vec<BufferedEntry>>,
 }
 
@@ -340,27 +337,15 @@ pub fn archive_operation(anchor_number: AnchorNumber, caller: Principal, operati
     };
     let encoded_entry = candid::encode_one(entry).expect("failed to encode archive entry");
 
-    // Depending on the II layout version and the config we need to either send out the entry or just buffer it.
-    if state::storage(|s| s.version()) >= 6 && config.archive_integration == Some(Pull) {
-        // add entry to buffer (which is emptied by the archive periodically, see fetch_entries and acknowledge entries)
-        state::archive_data_mut(|data| {
-            Rc::make_mut(&mut data.entries_buffer).push(BufferedEntry {
-                anchor_number,
-                timestamp,
-                entry: ByteBuf::from(encoded_entry),
-                sequence_number: data.sequence_number,
-            });
+    // add entry to buffer (which is emptied by the archive periodically, see fetch_entries and acknowledge entries)
+    state::archive_data_mut(|data| {
+        Rc::make_mut(&mut data.entries_buffer).push(BufferedEntry {
+            anchor_number,
+            timestamp,
+            entry: ByteBuf::from(encoded_entry),
+            sequence_number: data.sequence_number,
         });
-    } else {
-        // Notify can still trap if the message cannot be enqueued rolling back the anchor operation.
-        // Therefore we only increment the sequence number after notifying successfully.
-        let () = notify(
-            data.archive_canister,
-            "write_entry",
-            (anchor_number, timestamp, encoded_entry),
-        )
-        .expect("failed to send archive entry notification");
-    }
+    });
 
     state::archive_data_mut(|data| {
         data.sequence_number += 1;

src/internet_identity/src/storage/tests.rs

@@ -5,7 +5,6 @@ use crate::storage::{Header, PersistentStateError, StorageError};
 use crate::Storage;
 use candid::Principal;
 use ic_stable_structures::{Memory, VectorMemory};
-use internet_identity_interface::ArchiveIntegration::Push;
 use internet_identity_interface::{ArchiveConfig, DeviceProtection, KeyType, Purpose};
 use serde_bytes::ByteBuf;
 use std::rc::Rc;
@@ -343,7 +342,6 @@ fn sample_persistent_state() -> PersistentState {
                 entries_buffer_limit: 10_000,
                 polling_interval_ns: 60_000_000_000,
                 entries_fetch_limit: 1_000,
-                archive_integration: Some(Push),
             },
         },
         canister_creation_cycles_cost: 12_346_000_000,