feat(wallet,dashboard): sunset Vesting

apps/core/src/constants/timelock.constants.ts

@@ -2,5 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export const TIMELOCK_MODULE = 'timelock';
+export const TIMELOCKED_STAKING_MODULE = 'timelocked_staking';
 export const TIMELOCK_IOTA_TYPE = `0x2::${TIMELOCK_MODULE}::TimeLock<0x2::balance::Balance<0x2::iota::IOTA>>`;
-export const TIMELOCK_STAKED_TYPE = `0x3::timelocked_staking::TimelockedStakedIota`;
+export const TIMELOCK_STAKED_TYPE = `0x3::${TIMELOCKED_STAKING_MODULE}::TimelockedStakedIota`;

apps/core/src/hooks/index.ts

@@ -32,7 +32,6 @@ export * from './useQueryTransactionsByAddress';
 export * from './useGetTransaction';
 export * from './useSortedCoinsByCategories';
 export * from './useGetNFTDisplay';
-export * from './useUnlockTimelockedObjectsTransaction';
 export * from './useGetAllOwnedObjects';
 export * from './useGetTimelockedStakedObjects';
 export * from './useGetStakingValidatorDetails';

apps/core/src/types/index.ts

@@ -9,3 +9,5 @@ export * from './gasSummary';
 export * from './transactionExecute';
 export * from './validators';
 export * from './schema';
+export * from './nestedResult';
+export * from './stakeObject';

apps/core/src/types/nestedResult.ts

@@ -0,0 +1,7 @@
+// Copyright (c) 2026 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+export type NestedResultType = {
+    $kind: 'NestedResult';
+    NestedResult: [number, number];
+};

apps/core/src/types/stakeObject.ts

@@ -0,0 +1,30 @@
+// Copyright (c) 2026 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+// Timelocked stake: fields.staked_iota.fields.{pool_id, stake_activation_epoch}
+export interface TimelockedStakeObjectInput {
+    objectId: string;
+    content: {
+        dataType: 'moveObject';
+        fields: {
+            staked_iota: {
+                fields: {
+                    pool_id: string;
+                    stake_activation_epoch: string;
+                };
+            };
+        };
+    };
+}
+
+// Regular stake: fields.{pool_id, stake_activation_epoch}
+export interface RegularStakeObjectInput {
+    objectId: string;
+    content: {
+        dataType: 'moveObject';
+        fields: {
+            pool_id: string;
+            stake_activation_epoch: string;
+        };
+    };
+}

apps/core/src/utils/migration/createMigrationTransaction.ts

@@ -11,11 +11,7 @@ import {
     NftOutputObject,
     NftOutputObjectSchema,
 } from './types';
-
-type NestedResultType = {
-    $kind: 'NestedResult';
-    NestedResult: [number, number];
-};
+import { NestedResultType } from '../../types';
 
 export async function getNativeTokensFromBag(bagId: string, client: IotaClient) {
     const nativeTokenDynamicFields = await client.getDynamicFields({

apps/core/src/utils/transaction/createCollectAllTimelocksTransaction.ts

@@ -0,0 +1,115 @@
+// Copyright (c) 2026 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { Transaction } from '@iota/iota-sdk/transactions';
+import {
+    IOTA_TYPE_ARG,
+    IOTA_FRAMEWORK_ADDRESS,
+    IOTA_CLOCK_OBJECT_ID,
+    IOTA_SYSTEM_ADDRESS,
+} from '@iota/iota-sdk/utils';
+import { NestedResultType, RegularStakeObjectInput, TimelockedStakeObjectInput } from '../../types';
+
+interface CreateCollectAllTimelocksTransactionOptions {
+    address: string;
+    timelockObjectIds: string[];
+    timelockedStakedObjects?: TimelockedStakeObjectInput[];
+    existingStakedObjects?: RegularStakeObjectInput[];
+}
+
+export function createCollectAllTimelocksTransaction({
+    address,
+    timelockObjectIds,
+    timelockedStakedObjects = [],
+    existingStakedObjects = [],
+}: CreateCollectAllTimelocksTransactionOptions) {
+    const ptb = new Transaction();
+    const coins: NestedResultType[] = [];
+
+    // Unlock regular timelocks and convert to coins
+    for (const objectId of timelockObjectIds) {
+        const [unlock] = ptb.moveCall({
+            target: `${IOTA_FRAMEWORK_ADDRESS}::timelock::unlock_with_clock`,
+            typeArguments: [`${IOTA_FRAMEWORK_ADDRESS}::balance::Balance<${IOTA_TYPE_ARG}>`],
+            arguments: [ptb.object(objectId), ptb.object(IOTA_CLOCK_OBJECT_ID)],
+        });
+
+        const [coin] = ptb.moveCall({
+            target: `${IOTA_FRAMEWORK_ADDRESS}::coin::from_balance`,
+            typeArguments: [IOTA_TYPE_ARG],
+            arguments: [ptb.object(unlock)],
+        });
+
+        coins.push(coin);
+    }
+
+    // Unlock timelock stakes and group by (pool_id, stake_activation_epoch)
+    const stakedIotaByKey = new Map<string, NestedResultType[]>();
+
+    for (const stakedObject of timelockedStakedObjects) {
+        const [unlockedStakedIota] = ptb.moveCall({
+            target: `${IOTA_SYSTEM_ADDRESS}::timelocked_staking::unlock_with_clock`,
+            arguments: [ptb.object(stakedObject.objectId), ptb.object(IOTA_CLOCK_OBJECT_ID)],
+        });
+
+        const poolKey = extractPoolKey(stakedObject);
+        if (poolKey) {
+            if (!stakedIotaByKey.has(poolKey)) {
+                stakedIotaByKey.set(poolKey, []);
+            }
+            stakedIotaByKey.get(poolKey)!.push(unlockedStakedIota);
+        } else {
+            ptb.transferObjects([unlockedStakedIota], ptb.pure.address(address));
+        }
+    }
+
+    for (const [poolKey, stakedIotaObjects] of stakedIotaByKey.entries()) {
+        const existingStake = findExistingStakeForKey(existingStakedObjects, poolKey);
+
+        if (existingStake) {
+            // Join all unlocked stakes into the existing regular stake
+            for (const stake of stakedIotaObjects) {
+                ptb.moveCall({
+                    target: `${IOTA_SYSTEM_ADDRESS}::staking_pool::join_staked_iota`,
+                    arguments: [ptb.object(existingStake.objectId), stake],
+                });
+            }
+        } else if (stakedIotaObjects.length === 1) {
+            ptb.transferObjects([stakedIotaObjects[0]], ptb.pure.address(address));
+        } else {
+            // Join all into the first one, then transfer
+            const [first, ...rest] = stakedIotaObjects;
+            for (const stake of rest) {
+                ptb.moveCall({
+                    target: `${IOTA_SYSTEM_ADDRESS}::staking_pool::join_staked_iota`,
+                    arguments: [first, stake],
+                });
+            }
+            ptb.transferObjects([first], ptb.pure.address(address));
+        }
+    }
+
+    // Transfer all collected coins
+    if (coins.length > 0) {
+        ptb.transferObjects(coins, ptb.pure.address(address));
+    }
+
+    return ptb;
+}
+
+function extractPoolKey(stakedObject: TimelockedStakeObjectInput): string | null {
+    const stakedIotaFields = stakedObject.content.fields.staked_iota?.fields;
+    if (stakedIotaFields?.pool_id && stakedIotaFields?.stake_activation_epoch) {
+        return `${stakedIotaFields.pool_id}:${stakedIotaFields.stake_activation_epoch}`;
+    }
+    return null;
+}
+
+function findExistingStakeForKey(
+    existingStakes: RegularStakeObjectInput[],
+    poolKey: string,
+): RegularStakeObjectInput | undefined {
+    return existingStakes.find(
+        (s) => `${s.content.fields.pool_id}:${s.content.fields.stake_activation_epoch}` === poolKey,
+    );
+}

apps/core/src/utils/transaction/createUnlockTimelockedObjectsTransaction.ts

@@ -1,8 +1,7 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { Transaction } from '@iota/iota-sdk/transactions';
-import { IOTA_TYPE_ARG, IOTA_FRAMEWORK_ADDRESS, IOTA_CLOCK_OBJECT_ID } from '@iota/iota-sdk/utils';
+import { createCollectAllTimelocksTransaction } from './createCollectAllTimelocksTransaction';
 
 interface CreateUnlockTimelockedObjectTransactionOptions {
     address: string;
@@ -13,25 +12,8 @@ export function createUnlockTimelockedObjectsTransaction({
     address,
     objectIds,
 }: CreateUnlockTimelockedObjectTransactionOptions) {
-    const ptb = new Transaction();
-    const coins: { $kind: 'NestedResult'; NestedResult: [number, number] }[] = [];
-
-    for (const objectId of objectIds) {
-        const [unlock] = ptb.moveCall({
-            target: `${IOTA_FRAMEWORK_ADDRESS}::timelock::unlock_with_clock`,
-            typeArguments: [`${IOTA_FRAMEWORK_ADDRESS}::balance::Balance<${IOTA_TYPE_ARG}>`],
-            arguments: [ptb.object(objectId), ptb.object(IOTA_CLOCK_OBJECT_ID)],
-        });
-
-        // Convert Balance to Coin
-        const [coin] = ptb.moveCall({
-            target: `${IOTA_FRAMEWORK_ADDRESS}::coin::from_balance`,
-            typeArguments: [IOTA_TYPE_ARG],
-            arguments: [ptb.object(unlock)],
-        });
-
-        coins.push(coin);
-    }
-    ptb.transferObjects(coins, ptb.pure.address(address));
-    return ptb;
+    return createCollectAllTimelocksTransaction({
+        address,
+        timelockObjectIds: objectIds,
+    });
 }

apps/core/src/utils/transaction/index.ts

@@ -13,5 +13,6 @@ export * from './createTokenTransferTransaction';
 export * from './getObjectDisplayLookup';
 export * from './createNftSendValidationSchema';
 export * from './createUnlockTimelockedObjectsTransaction';
+export * from './createCollectAllTimelocksTransaction';
 export * from './isMigrationTransaction';
 export * from './isUnlockTimelockedObjectTransaction';