[Issue-3901] feat: skip later confirmation in signing multi-transaction

Koniverse · Dec 16, 2024 · 4310974 · 4310974
1 parent aecd1c0
commit 4310974
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 8 deletions.
diff --git a/packages/extension-base/src/background/KoniTypes.ts b/packages/extension-base/src/background/KoniTypes.ts
@@ -1114,6 +1114,7 @@ export interface ConfirmationsQueueItemOptions {
   requiredPassword?: boolean;
   address?: string;
   networkKey?: string;
+  isPassConfirmation?: boolean;
 }
 
 export interface ConfirmationsQueueItem<T> extends ConfirmationsQueueItemOptions, ConfirmationRequestBase {

diff --git a/packages/extension-base/src/koni/background/handlers/Extension.ts b/packages/extension-base/src/koni/background/handlers/Extension.ts
@@ -1446,8 +1446,7 @@ export default class KoniExtension {
   }
 
   private async makeCrossChainTransfer (inputData: RequestCrossChainTransfer): Promise<SWTransactionResponse> {
-    const { destinationNetworkKey, from, originNetworkKey, to, tokenSlug, transferAll, transferBounceable, value } = inputData;
-
+    const { destinationNetworkKey, from, isPassConfirmation, originNetworkKey, to, tokenSlug, transferAll, transferBounceable, value } = inputData;
     const originTokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destinationNetworkKey, tokenSlug);
     const [errors, fromKeyPair] = validateXcmTransferRequest(destinationTokenInfo, from, value);
@@ -1552,6 +1551,7 @@ export default class KoniExtension {
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
       ignoreWarnings,
       isTransferAll: transferAll,
+      isPassConfirmation,
       errors,
       additionalValidator: additionalValidator,
       eventsHandler: eventsHandler

diff --git a/packages/extension-base/src/services/request-service/handler/EvmRequestHandler.ts b/packages/extension-base/src/services/request-service/handler/EvmRequestHandler.ts
@@ -106,6 +106,10 @@ export default class EvmRequestHandler {
       this.#requestService.popupOpen();
     }
 
+    if (options.isPassConfirmation) {
+      await this.completeConfirmation({ evmSendTransactionRequest: { id, url, isApproved: true, payload: '' } });
+    }
+
     this.#requestService.updateIconV2();
 
     return promise;

diff --git a/packages/extension-base/src/services/transaction-service/index.ts b/packages/extension-base/src/services/transaction-service/index.ts
@@ -869,7 +869,7 @@ export default class TransactionService {
     return ethers.Transaction.from(txObject).unsignedSerialized as HexString;
   }
 
-  private async signAndSendEvmTransaction ({ address, chain, id, transaction, url }: SWTransaction): Promise<TransactionEmitter> {
+  private async signAndSendEvmTransaction ({ address, chain, id, isPassConfirmation, transaction, url }: SWTransaction): Promise<TransactionEmitter> {
     const payload = (transaction as EvmSendTransactionRequest);
     const evmApi = this.state.chainService.getEvmApi(chain);
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
@@ -1027,7 +1027,7 @@ export default class TransactionService {
           emitter.emit('error', eventData);
         });
     } else {
-      this.state.requestService.addConfirmation(id, url || EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {})
+      this.state.requestService.addConfirmation(id, url || EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, { isPassConfirmation })
         .then(async ({ isApproved, payload }) => {
           if (isApproved) {
             let signedTransaction: string | undefined;

diff --git a/packages/extension-base/src/services/transaction-service/types.ts b/packages/extension-base/src/services/transaction-service/types.ts
@@ -27,6 +27,7 @@ export interface SWTransaction extends ValidateTransactionResponse, Partial<Pick
   transaction: SubmittableExtrinsic | TransactionConfig | TonTransactionConfig;
   additionalValidator?: (inputTransaction: SWTransactionResponse) => Promise<void>;
   eventsHandler?: (eventEmitter: TransactionEmitter) => void;
+  isPassConfirmation?: boolean
 }
 
 export type SWTransactionResult = Omit<SWTransaction, 'transaction' | 'additionalValidator' | 'eventsHandler'>
@@ -41,6 +42,7 @@ export interface SWTransactionInput extends SwInputBase, Partial<Pick<SWTransact
   errors?: SWTransaction['errors'];
   edAsWarning?: boolean;
   isTransferAll?: boolean;
+  isPassConfirmation?: boolean
   resolveOnDone?: boolean;
   skipFeeValidation?: boolean;
 }

diff --git a/packages/extension-base/src/types/transaction/request.ts b/packages/extension-base/src/types/transaction/request.ts
@@ -16,6 +16,7 @@ export interface RequestBaseTransfer {
   value?: string;
   transferAll?: boolean;
   transferBounceable?: boolean;
+  isPassConfirmation?: boolean;
 }
 
 export interface RequestCheckTransfer extends RequestBaseTransfer {

diff --git a/packages/extension-koni-ui/src/Popup/Transaction/variants/SendFund.tsx b/packages/extension-koni-ui/src/Popup/Transaction/variants/SendFund.tsx
@@ -51,6 +51,7 @@ type ComponentProps = {
 interface TransferOptions {
   isTransferAll: boolean;
   isTransferBounceable: boolean;
+  isPassConfirmation: boolean;
 }
 
 function getTokenItems (
@@ -458,7 +459,8 @@ const Component = ({ className = '', isAllAccount, targetAccountProxy }: Compone
         to,
         value,
         transferAll: options.isTransferAll,
-        transferBounceable: options.isTransferBounceable
+        transferBounceable: options.isTransferBounceable,
+        isPassConfirmation: options.isPassConfirmation
       });
     }
 
@@ -482,6 +484,8 @@ const Component = ({ className = '', isAllAccount, targetAccountProxy }: Compone
 
   // Submit transaction
   const doSubmit = useCallback((values: TransferParams, options: TransferOptions) => {
+    let isPassConfirmation = false;
+
     if (isShowWarningOnSubmit(values)) {
       return;
     }
@@ -511,12 +515,21 @@ const Component = ({ className = '', isAllAccount, targetAccountProxy }: Compone
           return await submitData(step + 1);
         } else {
           const stepType = processState.steps[step].type;
-          const submitPromise: Promise<SWTransactionResponse> | undefined = stepType === CommonStepType.TOKEN_APPROVAL ? handleBridgeSpendingApproval(values) : handleBasicSubmit(values, options);
+          let submitPromise: Promise<SWTransactionResponse> | undefined;
+
+          if (stepType === CommonStepType.TOKEN_APPROVAL) {
+            submitPromise = handleBridgeSpendingApproval(values);
+          } else {
+            options.isPassConfirmation = isPassConfirmation;
+            submitPromise = handleBasicSubmit(values, options);
+          }
 
           const rs = await submitPromise;
           const success = onSuccess(isLastStep, needRollback)(rs);
 
           if (success) {
+            isPassConfirmation = true;
+
             return await submitData(step + 1);
           } else {
             return false;
@@ -537,7 +550,7 @@ const Component = ({ className = '', isAllAccount, targetAccountProxy }: Compone
           setLoading(false);
         });
     }, 300);
-  }, [handleBasicSubmit, handleBridgeSpendingApproval, isShowWarningOnSubmit, onError, onSuccess, processState]);
+  }, [handleBasicSubmit, handleBridgeSpendingApproval, isShowWarningOnSubmit, onError, onSuccess, processState.currentStep, processState.steps]);
 
   const onSetMaxTransferable = useCallback((value: boolean) => {
     const bnMaxTransfer = new BN(maxTransfer);
@@ -550,7 +563,8 @@ const Component = ({ className = '', isAllAccount, targetAccountProxy }: Compone
   const onSubmit: FormCallbacks<TransferParams>['onFinish'] = useCallback((values: TransferParams) => {
     const options: TransferOptions = {
       isTransferAll: isTransferAll,
-      isTransferBounceable: false
+      isTransferBounceable: false,
+      isPassConfirmation: false
     };
 
     let checkTransferAll = false;