fix: Various fixes

- Include full transaction data in TX completed event
- Fix race condition when deep linking onboarding cards

Author: micwallace

javascript/engine-js/src/ITokenScript.ts

@@ -18,6 +18,7 @@ import {ViewController} from './view/ViewController';
 import {ViewStyles} from './view/ViewStyles';
 
 import {ScriptInfo} from './repo/sources/SourceInterface';
+import {TransactionResponse} from "ethers";
 
 export interface ITokenContext extends ITokenCollection {
   originId: string;
@@ -103,7 +104,7 @@ export interface ITokenScript {
     id?: string,
   ): void;
   getAsnModuleDefinition(name: string): Element | null;
-  executeTransaction(transaction: Transaction, listener?: ITransactionListener, waitForConfirmation?: boolean): Promise<any | false>;
+  executeTransaction(transaction: Transaction, listener?: ITransactionListener, waitForConfirmation?: boolean): Promise<ITransactionStatus | false>;
 
   // Only for full TokenScript
   getViewController(viewBinding?: IViewBinding): ViewController;

javascript/engine-js/src/view/ViewController.ts

@@ -110,9 +110,9 @@ export class ViewController {
 
 		this.dispatchViewEvent(ViewEvent.GET_USER_INPUT, null, null);
 
-		const processed = await this.currentCard.executeTransaction(listener, txName);
+		const txStatus = await this.currentCard.executeTransaction(listener, txName);
 
-		if (processed === false)
+		if (txStatus === false)
 			return;
 
 		// Pause to let token discovery service update
@@ -132,8 +132,12 @@ export class ViewController {
 		if (reloadCard && updateViewData && (!context || tokens[context.originId]?.tokenDetails?.[context.selectedTokenIndex]))
 			await this.updateCardData();
 
-		if (listener)
-			listener({status: "completed"})
+		if (listener) {
+			listener({
+				...txStatus,
+				status: 'completed',
+			});
+		}
 	}
 
 	/**

javascript/engine-js/src/wallet/EthersAdapter.ts

@@ -6,9 +6,9 @@ import {
 	ethers,
 	EventLog,
 	getBigInt,
-	Network, Overrides, ZeroAddress
+	Network, Overrides, TransactionResponse, ZeroAddress
 } from "ethers";
-import {ITransactionListener} from "../ITokenScript";
+import {ITransactionListener, ITransactionStatus} from "../ITokenScript";
 import {ErrorDecoder, ErrorType} from "ethers-decode-error";
 import {WaterfallFallbackProvider} from "./WaterfallFallbackProvider";
 
@@ -59,7 +59,7 @@ export class EthersAdapter implements IWalletAdapter {
 		return (await contract.getFunction(method).staticCall(...(args.map((arg: any) => arg.value))));
 	}
 
-	async sendTransaction(chain: number, contractAddr: string, method: string, args: any[], outputTypes: string[], value?: bigint, waitForConfirmation: boolean = true, listener?: ITransactionListener, errorAbi: any[] = []){
+	async sendTransaction(chain: number, contractAddr: string, method: string, args: any[], outputTypes: string[], value?: bigint, waitForConfirmation: boolean = true, listener?: ITransactionListener, errorAbi: any[] = []): Promise<ITransactionStatus|false> {
 
 		console.log("Send ethereum transaction. chain " + chain + "; contract " + contractAddr + "; method " + method + "; value " + value + "; args", args);
 
@@ -81,7 +81,7 @@ export class EthersAdapter implements IWalletAdapter {
 		if (value)
 			overrides.value = value;
 
-		let tx;
+		let tx: TransactionResponse;
 
 		// Getting a function only by name could be ambiguous, so we try the full signature first
 		// TODO: Add support for struct/tuple method signatures
@@ -96,7 +96,7 @@ export class EthersAdapter implements IWalletAdapter {
 		}
 
 		try {
-			tx = await contractMethod(...(args.map((arg: any) => arg.value)), overrides) as ContractTransaction;
+			tx = await contractMethod(...(args.map((arg: any) => arg.value)), overrides);
 		} catch (e: any){
 
 			if (EthersAdapter.isTransactionRejection(e))
@@ -141,7 +141,7 @@ export class EthersAdapter implements IWalletAdapter {
 		});
 
 		if (waitForConfirmation)
-			await tx.wait().then((transactionReceipt) => {
+			await tx.wait(1).then((transactionReceipt) => {
 
 				if (transactionReceipt.status !== 1) {
 					console.error(transactionReceipt);
@@ -159,7 +159,11 @@ export class EthersAdapter implements IWalletAdapter {
 				return transactionReceipt;
 			});
 
-		return tx;
+		return {
+			status: 'confirmed',
+			txNumber: tx.hash,
+			txLink
+		}
 	}
 
 	private static isTransactionRejection(e: any){

javascript/engine-js/src/wallet/IWalletAdapter.ts

@@ -1,5 +1,5 @@
 import {EventLog, Log} from "ethers";
-import {ITransactionListener} from "../ITokenScript";
+import {ITransactionListener, ITransactionStatus} from "../ITokenScript";
 import {IChainConfig} from "./EthersAdapter";
 
 export interface RpcRequest {
@@ -47,7 +47,7 @@ export interface IWalletAdapter {
 		waitForConfirmation?: boolean,
 		listener?: ITransactionListener,
 		errorAbi?: any[]
-	): Promise<any|false>;
+	): Promise<ITransactionStatus|false>;
 	getChain(): Promise<number>;
 	getRpcUrls(chainId: number): string[];
 	rpcProxy(request: RpcRequest): Promise<any>;

javascript/tokenscript-viewer/src/components/common/card-view/card-popover.tsx

@@ -48,7 +48,7 @@ export class CardPopover implements IViewBinding {
 	}) showToast: EventEmitter<ShowToastEventArgs>;
 
 	@Watch('tokenScript')
-	async loadTs(){
+	loadTs(){
 		this.tokenScript.setViewBinding(this);
 		this.tokenScript.on("TX_STATUS", (data: ITransactionStatus) => {
 			if (data.status !== "error"){

javascript/tokenscript-viewer/src/components/common/tokens-grid/tokens-grid.tsx

@@ -132,7 +132,7 @@ export class TokensGrid {
 				await cardRes.card.isEnabledOrReason() === true
 			) {
 				this.urlActionInvoked = true;
-				this.showCard(cardRes.card);
+				setTimeout(() => this.showCard(cardRes.card), 100);
 				return;
 			}
 		}