Fix merge misses

bindings/core/src/method/wallet.rs

@@ -52,11 +52,6 @@ pub enum WalletMethod {
     /// Read accounts.
     /// Expected response: [`Accounts`](crate::Response::Accounts)
     GetAccounts,
-    /// Get historic chrysalis data.
-    /// Expected response: [`ChrysalisData`](crate::Response::ChrysalisData)
-    #[cfg(feature = "storage")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "storage")))]
-    GetChrysalisData,
     /// Consume an account method.
     /// Returns [`Response`](crate::Response)
     #[serde(rename_all = "camelCase")]

bindings/core/src/method_handler/wallet.rs

@@ -63,7 +63,6 @@ pub(crate) async fn call_wallet_method_internal(wallet: &Wallet, method: WalletM
             }
             Response::Accounts(account_dtos)
         }
-        WalletMethod::GetChrysalisData => Response::ChrysalisData(wallet.get_chrysalis_data().await?),
         WalletMethod::CallAccountMethod { account_id, method } => {
             let account = wallet.get_account(account_id).await?;
             call_account_method_internal(&account, method).await?

bindings/core/src/response.rs

@@ -1,7 +1,6 @@
 // Copyright 2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use std::collections::HashMap;
 #[cfg(not(target_family = "wasm"))]
 use std::collections::HashSet;
 
@@ -44,6 +43,7 @@ use serde::Serialize;
 use {
     iota_sdk::types::api::plugins::participation::types::{ParticipationEventId, ParticipationEventStatus},
     iota_sdk::wallet::account::{AccountParticipationOverview, ParticipationEventWithNodes},
+    std::collections::HashMap,
 };
 
 use crate::{error::Error, OmittedDebug};
@@ -260,9 +260,6 @@ pub enum Response {
     /// - [`AddressesWithUnspentOutputs`](crate::method::AccountMethod::AddressesWithUnspentOutputs)
     AddressesWithUnspentOutputs(Vec<AddressWithUnspentOutputs>),
     /// Response for:
-    /// - [`GetChrysalisData`](crate::method::WalletMethod::GetChrysalisData)
-    ChrysalisData(Option<HashMap<String, String>>),
-    /// Response for:
     /// - [`MinimumRequiredStorageDeposit`](crate::method::ClientMethod::MinimumRequiredStorageDeposit)
     /// - [`ComputeStorageDeposit`](crate::method::UtilsMethod::ComputeStorageDeposit)
     MinimumRequiredStorageDeposit(String),

bindings/nodejs/lib/bindings.ts

@@ -27,7 +27,6 @@ const {
     getClientFromWallet,
     getSecretManagerFromWallet,
     migrateStrongholdSnapshotV2ToV3,
-    migrateDbChrysalisToStardust,
 } = addon;
 
 const callClientMethodAsync = (
@@ -117,5 +116,4 @@ export {
     getSecretManagerFromWallet,
     listenMqtt,
     migrateStrongholdSnapshotV2ToV3,
-    migrateDbChrysalisToStardust,
 };

bindings/nodejs/lib/types/wallet/bridge/index.ts

@@ -60,7 +60,6 @@ import type {
     __GetAccountMethod__,
     __GetAccountIndexesMethod__,
     __GetAccountsMethod__,
-    __GetChrysalisDataMethod__,
     __GetLedgerNanoStatusMethod__,
     __GenerateEd25519AddressMethod__,
     __IsStrongholdPasswordAvailableMethod__,
@@ -146,7 +145,6 @@ export type __Method__ =
     | __GetAccountMethod__
     | __GetAccountIndexesMethod__
     | __GetAccountsMethod__
-    | __GetChrysalisDataMethod__
     | __GetLedgerNanoStatusMethod__
     | __GenerateEd25519AddressMethod__
     | __IsStrongholdPasswordAvailableMethod__

bindings/nodejs/lib/types/wallet/bridge/wallet.ts

@@ -59,10 +59,6 @@ export type __GetAccountMethod__ = {
     data: { accountId: AccountIdentifier };
 };
 
-export type __GetChrysalisDataMethod__ = {
-    name: 'getChrysalisData';
-};
-
 export type __GetLedgerNanoStatusMethod__ = {
     name: 'getLedgerNanoStatus';
 };

bindings/nodejs/lib/utils/utils.ts

@@ -14,6 +14,7 @@ import {
     Output,
     IRent,
     OutputId,
+    u64,
 } from '../types';
 import {
     AccountId,
@@ -142,7 +143,7 @@ export class Utils {
      * @param rent Rent cost of objects which take node resources.
      * @returns The required storage deposit.
      */
-    static computeStorageDeposit(output: Output, rent: IRent): bigint {
+    static computeStorageDeposit(output: Output, rent: IRent): u64 {
         const minStorageDepositAmount = callUtilsMethod({
             name: 'computeStorageDeposit',
             data: {

bindings/nodejs/lib/wallet/index.ts

@@ -5,4 +5,3 @@ export * from './account';
 export * from './wallet';
 export * from './wallet-method-handler';
 export * from '../types/wallet';
-export { migrateDbChrysalisToStardust } from '../bindings';

bindings/nodejs/lib/wallet/wallet.ts

@@ -148,17 +148,6 @@ export class Wallet {
         return this.methodHandler.getClient();
     }
 
-    /**
-     * Get chrysalis data.
-     */
-    async getChrysalisData(): Promise<Record<string, string>> {
-        const response = await this.methodHandler.callMethod({
-            name: 'getChrysalisData',
-        });
-
-        return JSON.parse(response).payload;
-    }
-
     /**
      * Get secret manager.
      */

bindings/wasm/lib/bindings.ts

@@ -9,7 +9,7 @@ import { __UtilsMethods__ } from './utils';
 // Import needs to be in a single line, otherwise it breaks
 // prettier-ignore
 // @ts-ignore: path is set to match runtime transpiled js path when bundled.
-import { initLogger, createClient, destroyClient, createSecretManager, createWallet, callClientMethodAsync, callSecretManagerMethodAsync, callUtilsMethodRust, callWalletMethodAsync, destroyWallet, listenWalletAsync, getClientFromWallet, getSecretManagerFromWallet, listenMqtt, migrateStrongholdSnapshotV2ToV3, migrateDbChrysalisToStardust } from '../wasm/iota_sdk_wasm';
+import { initLogger, createClient, destroyClient, createSecretManager, createWallet, callClientMethodAsync, callSecretManagerMethodAsync, callUtilsMethodRust, callWalletMethodAsync, destroyWallet, listenWalletAsync, getClientFromWallet, getSecretManagerFromWallet, listenMqtt, migrateStrongholdSnapshotV2ToV3 } from '../wasm/iota_sdk_wasm';
 
 const callUtilsMethod = (method: __UtilsMethods__): any => {
     const response = JSON.parse(callUtilsMethodRust(JSON.stringify(method)));
@@ -36,5 +36,4 @@ export {
     getSecretManagerFromWallet,
     listenMqtt,
     migrateStrongholdSnapshotV2ToV3,
-    migrateDbChrysalisToStardust,
 };

bindings/wasm/src/wallet.rs

@@ -141,14 +141,3 @@ pub async fn listen_wallet(
 
     Ok(JsValue::UNDEFINED)
 }
-
-/// Rocksdb chrysalis migration is not supported for WebAssembly bindings.
-///
-/// Throws an error if called, only included for compatibility
-/// with the Node.js bindings TypeScript definitions.
-#[wasm_bindgen(js_name = migrateDbChrysalisToStardust)]
-pub fn migrate_db_chrysalis_to_stardust(_storage_path: String, _password: Option<String>) -> Result<(), JsValue> {
-    let js_error = js_sys::Error::new("Rocksdb chrysalis migration is not supported for WebAssembly");
-
-    Err(JsValue::from(js_error))
-}