@vultisig/core-mpc 0.9.0 → 1.0.0

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @vultisig/core-mpc
 
+## 1.0.0
+
+### Major Changes
+
+- [#157](https://github.com/vultisig/vultisig-sdk/pull/157) [`5286b98`](https://github.com/vultisig/vultisig-sdk/commit/5286b98d19692acd216a2c95d5a7a903217bef36) Thanks [@rcoderdev](https://github.com/rcoderdev)! - Regenerate explicit `package.json` exports for `@vultisig/core-config` and `@vultisig/lib-utils` so directory and flat subpaths resolve under Node, TypeScript, and Vite.
+
+  **Breaking (`@vultisig/core-chain`, `@vultisig/core-mpc`):** Remove the npm dependency cycle by dropping `@vultisig/core-mpc` from `core-chain`. Modules that required MPC types or keysign helpers now live under `@vultisig/core-mpc` (for example `tx/compile/compileTx`, `tx/preSigningHashes`, `chains/cosmos/qbtc/QBTCHelper`, Blockaid keysign input builders, `swap/native/utils/nativeSwapQuoteToSwapPayload`, `swap/utils/getSwapTrackingUrl`, and EVM `incrementKeysignPayloadNonce` at `keysign/signingInputs/resolvers/evm/incrementKeysignPayloadNonce`). `getUtxos` / `getCardanoUtxos` return plain `ChainPlainUtxo`; keysign maps to protobuf in MPC.
+
+  **SDK:** QBTC support, shared import updates, and alignment with the new package boundaries.
+
+### Patch Changes
+
+- Updated dependencies [[`5286b98`](https://github.com/vultisig/vultisig-sdk/commit/5286b98d19692acd216a2c95d5a7a903217bef36)]:
+  - @vultisig/core-config@0.9.1
+  - @vultisig/lib-utils@0.9.1
+  - @vultisig/core-chain@1.0.0
+
+## 0.10.0
+
+### Minor Changes
+
+- [#149](https://github.com/vultisig/vultisig-sdk/pull/149) [`67dc6ce`](https://github.com/vultisig/vultisig-sdk/commit/67dc6ceaa1b318144cfbe3812ddecb14b108eba4) Thanks [@rcoderdev](https://github.com/rcoderdev)! - Sync Windows-style TSS batching: batched FastVault APIs (`/batch/keygen`, `/batch/import`, `/batch/reshare`), batched relay message IDs for ECDSA, EdDSA, MLDSA, and per-chain import, secure vault QR `tssBatching=1` for joiner alignment, sequential fallbacks, and test coverage.
+
+### Patch Changes
+
+- Updated dependencies [[`67dc6ce`](https://github.com/vultisig/vultisig-sdk/commit/67dc6ceaa1b318144cfbe3812ddecb14b108eba4)]:
+  - @vultisig/core-chain@0.10.0
+
 ## 0.9.0
 
 ### Minor Changes

package/dist/chains/cosmos/qbtc/QBTCHelper.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Custom Cosmos transaction builder for QBTC chain.
+ * Bypasses WalletCore's TransactionCompiler because MLDSA keys
+ * are incompatible with WalletCore's secp256k1 verification.
+ * Builds Cosmos protobuf (SignDoc, TxRaw) manually.
+ */
+import { KeysignSignature } from '../../../keysign/KeysignSignature.js';
+import { CosmosSpecific } from '../../../types/vultisig/keysign/v1/blockchain_specific_pb.js';
+import { KeysignPayload } from '../../../types/vultisig/keysign/v1/keysign_message_pb.js';
+type QBTCKeysignInput = {
+    keysignPayload: KeysignPayload;
+    cosmosSpecific: CosmosSpecific;
+};
+/** Returns the SHA256 hash(es) of the SignDoc that must be signed. */
+export declare const getQBTCPreSignedImageHash: ({ keysignPayload, cosmosSpecific, }: QBTCKeysignInput) => Uint8Array[];
+type QBTCSignedTransactionInput = QBTCKeysignInput & {
+    signatures: Record<string, KeysignSignature>;
+};
+/** Assembles the signed transaction ready for broadcast. */
+export declare const getQBTCSignedTransaction: ({ keysignPayload, cosmosSpecific, signatures, }: QBTCSignedTransactionInput) => {
+    serialized: string;
+    transactionHash: string;
+};
+export {};
+//# sourceMappingURL=QBTCHelper.d.ts.map

package/dist/chains/cosmos/qbtc/QBTCHelper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QBTCHelper.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/chains/cosmos/qbtc/QBTCHelper.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,2DAA2D,CAAA;AAC1F,OAAO,EAAE,cAAc,EAAE,MAAM,uDAAuD,CAAA;AAWtF,KAAK,gBAAgB,GAAG;IACtB,cAAc,EAAE,cAAc,CAAA;IAC9B,cAAc,EAAE,cAAc,CAAA;CAC/B,CAAA;AAED,sEAAsE;AACtE,eAAO,MAAM,yBAAyB,GAAI,qCAGvC,gBAAgB,KAAG,UAAU,EAG/B,CAAA;AAED,KAAK,0BAA0B,GAAG,gBAAgB,GAAG;IACnD,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;CAC7C,CAAA;AAED,4DAA4D;AAC5D,eAAO,MAAM,wBAAwB,GAAI,iDAItC,0BAA0B,KAAG;IAC9B,UAAU,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,MAAM,CAAA;CA+BxB,CAAA"}

package/dist/chains/cosmos/qbtc/QBTCHelper.js

@@ -0,0 +1,158 @@
+/**
+ * Custom Cosmos transaction builder for QBTC chain.
+ * Bypasses WalletCore's TransactionCompiler because MLDSA keys
+ * are incompatible with WalletCore's secp256k1 verification.
+ * Builds Cosmos protobuf (SignDoc, TxRaw) manually.
+ */
+import { sha256 } from '@noble/hashes/sha2.js';
+import { shouldBePresent } from '@vultisig/lib-utils/assert/shouldBePresent';
+import { concatBytes, protoBytes, protoString, protoVarint, } from '@vultisig/core-chain/chains/cosmos/qbtc/protoEncoding';
+const pubKeyTypeURL = '/cosmos.crypto.mldsa.PubKey';
+const msgSendTypeURL = '/cosmos.bank.v1beta1.MsgSend';
+const msgTransferTypeURL = '/ibc.applications.transfer.v1.MsgTransfer';
+const msgVoteTypeURL = '/cosmos.gov.v1beta1.MsgVote';
+/** QBTC fee denom and chain ID (Cosmos SDK). */
+const denom = 'qbtc';
+const chainID = 'qbtc-testnet';
+/** Returns the SHA256 hash(es) of the SignDoc that must be signed. */
+export const getQBTCPreSignedImageHash = ({ keysignPayload, cosmosSpecific, }) => {
+    const signDoc = buildSignDoc({ keysignPayload, cosmosSpecific });
+    return [sha256(signDoc)];
+};
+/** Assembles the signed transaction ready for broadcast. */
+export const getQBTCSignedTransaction = ({ keysignPayload, cosmosSpecific, signatures, }) => {
+    const { bodyBytes, authInfoBytes } = buildTxComponents({
+        keysignPayload,
+        cosmosSpecific,
+    });
+    const signDoc = buildSignDocFromComponents({
+        bodyBytes,
+        authInfoBytes,
+        accountNumber: cosmosSpecific.accountNumber,
+    });
+    const hashHex = Buffer.from(sha256(signDoc)).toString('hex');
+    const sig = shouldBePresent(signatures[hashHex], `QBTC signature for hash ${hashHex}`);
+    const sigData = Buffer.from(sig.der_signature, 'hex');
+    const txRaw = buildTxRaw({ bodyBytes, authInfoBytes, signature: sigData });
+    const txBytesBase64 = Buffer.from(txRaw).toString('base64');
+    const serialized = JSON.stringify({
+        tx_bytes: txBytesBase64,
+        mode: 'BROADCAST_MODE_SYNC',
+    });
+    const transactionHash = Buffer.from(sha256(txRaw))
+        .toString('hex')
+        .toUpperCase();
+    return { serialized, transactionHash };
+};
+const buildSignDoc = ({ keysignPayload, cosmosSpecific }) => {
+    const { bodyBytes, authInfoBytes } = buildTxComponents({
+        keysignPayload,
+        cosmosSpecific,
+    });
+    return buildSignDocFromComponents({
+        bodyBytes,
+        authInfoBytes,
+        accountNumber: cosmosSpecific.accountNumber,
+    });
+};
+const buildTxComponents = ({ keysignPayload, cosmosSpecific, }) => {
+    const coin = shouldBePresent(keysignPayload.coin);
+    const pubKeyData = Buffer.from(coin.hexPublicKey, 'hex');
+    const bodyBytes = buildTxBody({ keysignPayload, cosmosSpecific });
+    const authInfoBytes = buildAuthInfo({
+        pubKeyData,
+        sequence: cosmosSpecific.sequence,
+        gas: cosmosSpecific.gas,
+    });
+    return { bodyBytes, authInfoBytes };
+};
+const buildSignDocFromComponents = ({ bodyBytes, authInfoBytes, accountNumber, }) => concatBytes(protoBytes(1, bodyBytes), protoBytes(2, authInfoBytes), protoString(3, chainID), protoVarint(4, accountNumber));
+const buildTxBody = ({ keysignPayload, cosmosSpecific, }) => {
+    const { transactionType, ibcDenomTraces } = cosmosSpecific;
+    let { memo } = keysignPayload;
+    let anyMsg;
+    if (transactionType === 3) {
+        anyMsg = buildIBCTransferAny({ keysignPayload, ibcDenomTraces });
+        const parts = memo?.split(':');
+        memo = parts && parts.length === 4 ? parts[3] : undefined;
+    }
+    else if (transactionType === 1) {
+        anyMsg = buildVoteAny(keysignPayload);
+        memo = undefined;
+    }
+    else {
+        anyMsg = buildMsgSendAny(keysignPayload);
+    }
+    return concatBytes(protoBytes(1, anyMsg), memo ? protoString(2, memo) : new Uint8Array(0));
+};
+const buildMsgSendAny = (keysignPayload) => {
+    const msgSend = buildMsgSend(keysignPayload);
+    return concatBytes(protoString(1, msgSendTypeURL), protoBytes(2, msgSend));
+};
+const buildMsgSend = (keysignPayload) => {
+    const coin = shouldBePresent(keysignPayload.coin);
+    const coinDenom = coin.isNativeToken ? denom : coin.contractAddress;
+    const coinProto = concatBytes(protoString(1, coinDenom), protoString(2, keysignPayload.toAmount));
+    return concatBytes(protoString(1, coin.address), protoString(2, keysignPayload.toAddress), protoBytes(3, coinProto));
+};
+const buildIBCTransferAny = ({ keysignPayload, ibcDenomTraces, }) => {
+    const msgTransfer = buildMsgTransfer({ keysignPayload, ibcDenomTraces });
+    return concatBytes(protoString(1, msgTransferTypeURL), protoBytes(2, msgTransfer));
+};
+const buildMsgTransfer = ({ keysignPayload, ibcDenomTraces, }) => {
+    const memo = shouldBePresent(keysignPayload.memo, 'IBC transfer memo');
+    const parts = memo.split(':');
+    if (parts.length < 2) {
+        throw new Error('QBTC: IBC transfer requires memo with source channel (ibc:channel-N:...)');
+    }
+    const sourceChannel = parts[1];
+    const timeouts = ibcDenomTraces?.latestBlock?.split('_') ?? [];
+    const timeoutStr = timeouts[timeouts.length - 1];
+    if (!timeoutStr || timeoutStr === '0') {
+        throw new Error('QBTC: IBC transfer requires valid timeout timestamp');
+    }
+    const timeout = BigInt(timeoutStr);
+    const coin = shouldBePresent(keysignPayload.coin);
+    const tokenDenom = coin.isNativeToken ? denom : coin.contractAddress;
+    const token = concatBytes(protoString(1, tokenDenom), protoString(2, keysignPayload.toAmount));
+    return concatBytes(protoString(1, 'transfer'), protoString(2, sourceChannel), protoBytes(3, token), protoString(4, coin.address), protoString(5, keysignPayload.toAddress), protoVarint(7, timeout));
+};
+const buildVoteAny = (keysignPayload) => {
+    const msgVote = buildMsgVote(keysignPayload);
+    return concatBytes(protoString(1, msgVoteTypeURL), protoBytes(2, msgVote));
+};
+const voteOptionValues = {
+    YES: 1n,
+    ABSTAIN: 2n,
+    NO: 3n,
+    NO_WITH_VETO: 4n,
+    NOWITHVETO: 4n,
+};
+const buildMsgVote = (keysignPayload) => {
+    const coin = shouldBePresent(keysignPayload.coin);
+    const voteStr = (keysignPayload.memo ?? '').replace('QBTC_VOTE:', '');
+    const parts = voteStr.split(':');
+    if (parts.length !== 2) {
+        throw new Error('QBTC: invalid vote memo format, expected OPTION:PROPOSAL_ID');
+    }
+    const optionKey = parts[0].toUpperCase();
+    const option = voteOptionValues[optionKey];
+    if (option === undefined) {
+        throw new Error(`QBTC: invalid vote option '${parts[0]}', expected one of: ${Object.keys(voteOptionValues).join(', ')}`);
+    }
+    const proposalId = BigInt(parts[1]);
+    return concatBytes(protoVarint(1, proposalId), protoString(2, coin.address), protoVarint(3, option));
+};
+const buildAuthInfo = ({ pubKeyData, sequence, gas, }) => {
+    const pubKeyMsg = protoBytes(1, pubKeyData);
+    const pubKeyAny = concatBytes(protoString(1, pubKeyTypeURL), protoBytes(2, pubKeyMsg));
+    const singleMode = protoVarint(1, 1n);
+    const modeInfo = protoBytes(1, singleMode);
+    const signerInfo = concatBytes(protoBytes(1, pubKeyAny), protoBytes(2, modeInfo), protoVarint(3, sequence));
+    const feeCoin = concatBytes(protoString(1, denom), protoString(2, gas.toString()));
+    const gasLimit = 300000n;
+    const fee = concatBytes(protoBytes(1, feeCoin), protoVarint(2, gasLimit));
+    return concatBytes(protoBytes(1, signerInfo), protoBytes(2, fee));
+};
+const buildTxRaw = ({ bodyBytes, authInfoBytes, signature, }) => concatBytes(protoBytes(1, bodyBytes), protoBytes(2, authInfoBytes), protoBytes(3, signature));
+//# sourceMappingURL=QBTCHelper.js.map

package/dist/chains/cosmos/qbtc/QBTCHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QBTCHelper.js","sourceRoot":"","sources":["../../../../../../../packages/core/mpc/chains/cosmos/qbtc/QBTCHelper.ts"],"names":[],"mappings":"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"}

package/dist/dkls/dkls.d.ts

@@ -15,6 +15,7 @@ export declare class DKLS {
     private inboundSequenceNo;
     private cache;
     private setupMessage;
+    private pendingKeyImportSession;
     private readonly localUI?;
     private readonly publicKey?;
     private readonly chainCode?;
@@ -27,21 +28,23 @@ export declare class DKLS {
     });
     private processOutbound;
     private processInbound;
+    prepareKeygenSetup(): Promise<void>;
     private startKeygen;
-    startKeygenWithRetry(): Promise<{
+    startKeygenWithRetry(messageId?: string): Promise<{
         keyshare: string;
         publicKey: string;
         chaincode: string;
     }>;
     getSetupMessage(): Uint8Array<ArrayBufferLike>;
     private startReshare;
-    startReshareWithRetry(keyshare: string | undefined): Promise<{
+    startReshareWithRetry(keyshare: string | undefined, messageId?: string): Promise<{
         keyshare: string;
         publicKey: string;
         chaincode: string;
     }>;
+    prepareKeyImportSetup(hexPrivateKey: string, hexChainCode: string, messageId?: string): Promise<void>;
     private startKeyImport;
-    startKeyImportWithRetry(privateKey: string, chainCode: string, additionalHeader?: string): Promise<{
+    startKeyImportWithRetry(privateKey: string, chainCode: string, setupMessageId?: string, protocolMessageId?: string): Promise<{
         keyshare: string;
         publicKey: string;
         chaincode: string;

package/dist/dkls/dkls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dkls.d.ts","sourceRoot":"","sources":["../../../../../packages/core/mpc/dkls/dkls.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAY3D,qBAAa,IAAI;IACf,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAU;IAC7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAQ;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAElC;IACT,OAAO,CAAC,gBAAgB,CAAiB;IACzC,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAQ;gBAEjC,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,EAAE,EACzB,kBAAkB,EAAE,MAAM,EAAE,EAC5B,gBAAgB,EAAE,MAAM,EACxB,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,yBAAyB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,IAAI,CAAA;KAChE;YAiBW,eAAe;YA2Cf,cAAc;YA2Dd,WAAW;IA4EZ,oBAAoB;;;;;IAY1B,eAAe;YAIR,YAAY;IAgGb,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS;;;;;YAYjD,cAAc;IA+Ef,uBAAuB,CAClC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM;;;;;CAkB5B"}
+{"version":3,"file":"dkls.d.ts","sourceRoot":"","sources":["../../../../../packages/core/mpc/dkls/dkls.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAY3D,qBAAa,IAAI;IACf,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAU;IAC7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAQ;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAElC;IACT,OAAO,CAAC,gBAAgB,CAAiB;IACzC,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,uBAAuB,CAAkC;IACjE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAQ;gBAEjC,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,EAAE,EACzB,kBAAkB,EAAE,MAAM,EAAE,EAC5B,gBAAgB,EAAE,MAAM,EACxB,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,yBAAyB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,IAAI,CAAA;KAChE;YAiBW,eAAe;YA6Cf,cAAc;IA8Df,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;YAmClC,WAAW;IA6DZ,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM;;;;;IAY7C,eAAe;YAIR,YAAY;IAiGb,qBAAqB,CAChC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,SAAS,CAAC,EAAE,MAAM;;;;;IAcP,qBAAqB,CAChC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;YA+BF,cAAc;IAuFf,uBAAuB,CAClC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,CAAC,EAAE,MAAM,EACvB,iBAAiB,CAAC,EAAE,MAAM;;;;;CAmB7B"}

package/dist/dkls/dkls.js

@@ -27,6 +27,7 @@ export class DKLS {
     inboundSequenceNo = 0;
     cache = {};
     setupMessage = new Uint8Array();
+    pendingKeyImportSession = null;
     localUI;
     publicKey;
     chainCode;
@@ -45,7 +46,7 @@ export class DKLS {
         this.timeoutMs = options?.timeoutMs ?? 60000;
         this.onInboundSequenceNoChange = options?.onInboundSequenceNoChange;
     }
-    async processOutbound(session) {
+    async processOutbound(session, messageId) {
         try {
             const message = session.outputMessage();
             if (message === undefined) {
@@ -55,7 +56,7 @@ export class DKLS {
                 }
                 else {
                     await sleep(100);
-                    return await this.processOutbound(session);
+                    return await this.processOutbound(session, messageId);
                 }
             }
             console.log('outbound message:', message);
@@ -74,29 +75,31 @@ export class DKLS {
                     serverUrl: this.serverURL,
                     message: relayMessage,
                     sessionId: this.sessionId,
+                    messageId,
                 });
                 this.sequenceNo++;
             });
             await sleep(100);
-            return await this.processOutbound(session);
+            return await this.processOutbound(session, messageId);
         }
         catch (error) {
             console.error('processOutbound error:', error);
             await sleep(100);
-            return await this.processOutbound(session);
+            return await this.processOutbound(session, messageId);
         }
     }
-    async processInbound(session, start) {
+    async processInbound(session, start, messageId) {
         try {
             const parsedMessages = await getMpcRelayMessages({
                 serverUrl: this.serverURL,
                 localPartyId: this.localPartyId,
                 sessionId: this.sessionId,
+                messageId,
             });
             if (parsedMessages.length === 0) {
                 // no message to download, backoff for 100ms
                 await sleep(100);
-                return await this.processInbound(session, start);
+                return await this.processInbound(session, start, messageId);
             }
             for (const msg of parsedMessages) {
                 const cacheKey = `${msg.session_id}-${msg.from}-${msg.hash}`;
@@ -120,6 +123,7 @@ export class DKLS {
                     localPartyId: this.localPartyId,
                     sessionId: this.sessionId,
                     messageHash: msg.hash,
+                    messageId,
                 });
             }
             const end = Date.now();
@@ -129,39 +133,54 @@ export class DKLS {
                 return false;
             }
             await sleep(100);
-            return await this.processInbound(session, start);
+            return await this.processInbound(session, start, messageId);
         }
         catch (error) {
             console.error('processInbound error:', error);
             await sleep(100);
-            return await this.processInbound(session, start);
+            return await this.processInbound(session, start, messageId);
         }
     }
-    async startKeygen(attempt) {
+    async prepareKeygenSetup() {
+        if (this.setupMessage.length > 0) {
+            return;
+        }
+        if (this.isInitiateDevice) {
+            const threshold = getKeygenThreshold(this.keygenCommittee.length);
+            this.setupMessage = KeygenSession.setup(undefined, threshold, this.keygenCommittee);
+            const encryptedSetupMsg = toMpcServerMessage(this.setupMessage, this.hexEncryptionKey);
+            await uploadMpcSetupMessage({
+                serverUrl: this.serverURL,
+                message: encryptedSetupMsg,
+                sessionId: this.sessionId,
+            });
+            console.log('uploaded setup message successfully');
+            return;
+        }
+        const encodedEncryptedSetupMsg = await waitForSetupMessage({
+            serverUrl: this.serverURL,
+            sessionId: this.sessionId,
+        });
+        this.setupMessage = fromMpcServerMessage(encodedEncryptedSetupMsg, this.hexEncryptionKey);
+    }
+    async startKeygen(attempt, messageId) {
         console.log('startKeygen attempt:', attempt);
         console.log('session id:', this.sessionId);
         this.isKeygenComplete = false;
         this.inboundSequenceNo = 0;
         this.onInboundSequenceNoChange?.(this.inboundSequenceNo);
         try {
-            if (this.isInitiateDevice && attempt === 0) {
-                const threshold = getKeygenThreshold(this.keygenCommittee.length);
-                this.setupMessage = KeygenSession.setup(undefined, threshold, this.keygenCommittee);
-                // upload setup message to server
-                const encryptedSetupMsg = toMpcServerMessage(this.setupMessage, this.hexEncryptionKey);
-                await uploadMpcSetupMessage({
-                    serverUrl: this.serverURL,
-                    message: encryptedSetupMsg,
-                    sessionId: this.sessionId,
-                });
-                console.log('uploaded setup message successfully');
-            }
-            else {
-                const encodedEncryptedSetupMsg = await waitForSetupMessage({
-                    serverUrl: this.serverURL,
-                    sessionId: this.sessionId,
-                });
-                this.setupMessage = fromMpcServerMessage(encodedEncryptedSetupMsg, this.hexEncryptionKey);
+            if (this.setupMessage.length === 0) {
+                if (this.isInitiateDevice && attempt === 0) {
+                    await this.prepareKeygenSetup();
+                }
+                else {
+                    const encodedEncryptedSetupMsg = await waitForSetupMessage({
+                        serverUrl: this.serverURL,
+                        sessionId: this.sessionId,
+                    });
+                    this.setupMessage = fromMpcServerMessage(encodedEncryptedSetupMsg, this.hexEncryptionKey);
+                }
             }
             let session;
             if ('create' in this.keygenOperation) {
@@ -176,8 +195,8 @@ export class DKLS {
                 throw new Error('Invalid keygen operation');
             }
             const start = Date.now();
-            const outbound = this.processOutbound(session);
-            const inbound = this.processInbound(session, start);
+            const outbound = this.processOutbound(session, messageId);
+            const inbound = this.processInbound(session, start, messageId);
             const [, inboundResult] = await Promise.all([outbound, inbound]);
             if (inboundResult) {
                 const keyShare = session.finish();
@@ -197,11 +216,11 @@ export class DKLS {
             throw error;
         }
     }
-    async startKeygenWithRetry() {
+    async startKeygenWithRetry(messageId) {
         await initializeMpcLib('ecdsa');
         for (let i = 0; i < 3; i++) {
             try {
-                const result = await this.startKeygen(i);
+                const result = await this.startKeygen(i, messageId);
                 return result;
             }
             catch (error) {
@@ -213,7 +232,7 @@ export class DKLS {
     getSetupMessage() {
         return this.setupMessage;
     }
-    async startReshare(dklsKeyshare, attempt) {
+    async startReshare(dklsKeyshare, attempt, messageId) {
         console.log('startReshare dkls, attempt:', attempt);
         this.isKeygenComplete = false;
         this.inboundSequenceNo = 0;
@@ -261,8 +280,8 @@ export class DKLS {
             const session = new QcSession(setupMessage, this.localPartyId, localKeyshare);
             try {
                 const start = Date.now();
-                const outbound = this.processOutbound(session);
-                const inbound = this.processInbound(session, start);
+                const outbound = this.processOutbound(session, messageId);
+                const inbound = this.processInbound(session, start, messageId);
                 const [, inboundResult] = await Promise.all([outbound, inbound]);
                 if (inboundResult) {
                     const keyShare = session.finish();
@@ -289,11 +308,11 @@ export class DKLS {
             throw error;
         }
     }
-    async startReshareWithRetry(keyshare) {
+    async startReshareWithRetry(keyshare, messageId) {
         await initializeMpcLib('ecdsa');
         for (let i = 0; i < 3; i++) {
             try {
-                const result = await this.startReshare(keyshare, i);
+                const result = await this.startReshare(keyshare, i, messageId);
                 return result;
             }
             catch (error) {
@@ -302,33 +321,58 @@ export class DKLS {
         }
         throw new Error('DKLS reshare failed');
     }
-    async startKeyImport(hexPrivateKey, hexChainCode, attempt, additionalHeader) {
+    async prepareKeyImportSetup(hexPrivateKey, hexChainCode, messageId) {
+        if (!this.isInitiateDevice) {
+            return;
+        }
+        const threshold = getKeygenThreshold(this.keygenCommittee.length);
+        const privateKey = Buffer.from(hexPrivateKey, 'hex');
+        const chainCode = Buffer.from(hexChainCode, 'hex');
+        this.pendingKeyImportSession = new KeyImportInitiator(Uint8Array.from(privateKey), Uint8Array.from(chainCode), threshold, this.keygenCommittee);
+        this.setupMessage = this.pendingKeyImportSession.setup;
+        const encryptedSetupMsg = toMpcServerMessage(this.setupMessage, this.hexEncryptionKey);
+        await uploadMpcSetupMessage({
+            serverUrl: this.serverURL,
+            message: encryptedSetupMsg,
+            sessionId: this.sessionId,
+            messageId,
+        });
+        console.log('uploaded setup message successfully');
+    }
+    async startKeyImport(hexPrivateKey, hexChainCode, attempt, setupMessageId, protocolMessageId) {
         console.log('startKeyImport attempt:', attempt);
         this.isKeygenComplete = false;
         try {
             let session = null;
             if (this.isInitiateDevice) {
-                const threshold = getKeygenThreshold(this.keygenCommittee.length);
-                const privateKey = Buffer.from(hexPrivateKey, 'hex');
-                const chainCode = Buffer.from(hexChainCode, 'hex');
-                const keyImportSession = new KeyImportInitiator(Uint8Array.from(privateKey), Uint8Array.from(chainCode), threshold, this.keygenCommittee);
-                this.setupMessage = keyImportSession.setup;
-                session = keyImportSession;
-                // upload setup message to server
-                const encryptedSetupMsg = toMpcServerMessage(this.setupMessage, this.hexEncryptionKey);
-                await uploadMpcSetupMessage({
-                    serverUrl: this.serverURL,
-                    message: encryptedSetupMsg,
-                    sessionId: this.sessionId,
-                    messageId: additionalHeader,
-                });
-                console.log('uploaded setup message successfully');
+                if (attempt === 0 && this.pendingKeyImportSession) {
+                    const pendingSession = this.pendingKeyImportSession;
+                    session = pendingSession;
+                    this.setupMessage = pendingSession.setup;
+                    this.pendingKeyImportSession = null;
+                }
+                else {
+                    const threshold = getKeygenThreshold(this.keygenCommittee.length);
+                    const privateKey = Buffer.from(hexPrivateKey, 'hex');
+                    const chainCode = Buffer.from(hexChainCode, 'hex');
+                    const keyImportSession = new KeyImportInitiator(Uint8Array.from(privateKey), Uint8Array.from(chainCode), threshold, this.keygenCommittee);
+                    this.setupMessage = keyImportSession.setup;
+                    session = keyImportSession;
+                    const encryptedSetupMsg = toMpcServerMessage(this.setupMessage, this.hexEncryptionKey);
+                    await uploadMpcSetupMessage({
+                        serverUrl: this.serverURL,
+                        message: encryptedSetupMsg,
+                        sessionId: this.sessionId,
+                        messageId: setupMessageId,
+                    });
+                    console.log('uploaded setup message successfully');
+                }
             }
             else {
                 const encodedEncryptedSetupMsg = await waitForSetupMessage({
                     serverUrl: this.serverURL,
                     sessionId: this.sessionId,
-                    messageId: additionalHeader,
+                    messageId: setupMessageId,
                 });
                 this.setupMessage = fromMpcServerMessage(encodedEncryptedSetupMsg, this.hexEncryptionKey);
             }
@@ -343,9 +387,10 @@ export class DKLS {
             if (session === null) {
                 throw new Error('DKLS key import session is null');
             }
+            const exchangeMessageId = protocolMessageId;
             const start = Date.now();
-            const outbound = this.processOutbound(session);
-            const inbound = this.processInbound(session, start);
+            const outbound = this.processOutbound(session, exchangeMessageId);
+            const inbound = this.processInbound(session, start, exchangeMessageId);
             const [, inboundResult] = await Promise.all([outbound, inbound]);
             if (inboundResult) {
                 const keyShare = session.finish();
@@ -365,11 +410,11 @@ export class DKLS {
             throw error;
         }
     }
-    async startKeyImportWithRetry(privateKey, chainCode, additionalHeader) {
+    async startKeyImportWithRetry(privateKey, chainCode, setupMessageId, protocolMessageId) {
         await initializeMpcLib('ecdsa');
         for (let i = 0; i < 3; i++) {
             try {
-                const result = await this.startKeyImport(privateKey, chainCode, i, additionalHeader);
+                const result = await this.startKeyImport(privateKey, chainCode, i, setupMessageId, protocolMessageId);
                 return result;
             }
             catch (error) {