Support for Wallet Test Framework

background/networks.ts

@@ -162,6 +162,7 @@ export type LegacyEVMTransactionRequest = Pick<
   estimatedRollupFee: bigint
   estimatedRollupGwei: bigint
   nonce?: number
+  broadcastOnSign: boolean
 }
 
 /**
@@ -219,6 +220,7 @@ export type EIP1559TransactionRequest = Pick<
   gasLimit: bigint
   chainID: EIP1559Transaction["network"]["chainID"]
   nonce?: number
+  broadcastOnSign: boolean
 }
 
 export type TransactionRequest =

background/services/chain/index.ts

@@ -530,8 +530,17 @@ export default class ChainService extends BaseService<Events> {
     transactionRequest: EnrichedLegacyTransactionRequest
     gasEstimationError: string | undefined
   }> {
-    const { from, to, value, gasLimit, input, gasPrice, nonce, annotation } =
-      partialRequest
+    const {
+      from,
+      to,
+      value,
+      gasLimit,
+      input,
+      gasPrice,
+      nonce,
+      annotation,
+      broadcastOnSign,
+    } = partialRequest
     // Basic transaction construction based on the provided options, with extra data from the chain service
     const transactionRequest: EnrichedLegacyTransactionRequest = {
       from,
@@ -553,6 +562,7 @@ export default class ChainService extends BaseService<Events> {
           ? await this.estimateL1RollupGasPrice(network)
           : 0n,
       estimatedRollupFee: 0n,
+      broadcastOnSign,
     }
 
     if (network.chainID === OPTIMISM.chainID) {
@@ -628,6 +638,7 @@ export default class ChainService extends BaseService<Events> {
       maxPriorityFeePerGas,
       nonce,
       annotation,
+      broadcastOnSign,
     } = partialRequest
 
     // Basic transaction construction based on the provided options, with extra data from the chain service
@@ -644,6 +655,7 @@ export default class ChainService extends BaseService<Events> {
       chainID: network.chainID,
       nonce,
       annotation,
+      broadcastOnSign,
     }
 
     // Always estimate gas to decide whether the transaction will likely fail.

background/services/chain/tests/index.unit.test.ts

@@ -67,6 +67,7 @@ describe("Chain Service", () => {
           nonce: 1,
           maxPriorityFeePerGas: 1n,
           maxFeePerGas: 2n,
+          broadcastOnSign: true,
         }
 
       const stub = sandbox.stub(
@@ -98,6 +99,7 @@ describe("Chain Service", () => {
           network: OPTIMISM,
           nonce: 1,
           gasPrice: 1_000n,
+          broadcastOnSign: true,
         }
 
       const stub = sandbox.stub(

background/services/enrichment/types.ts

@@ -99,13 +99,15 @@ export type EnrichedEIP1559TransactionSignatureRequest =
     from: string
     annotation?: TransactionAnnotation
     network: EVMNetwork
+    broadcastOnSign: boolean
   }
 
 export type EnrichedLegacyTransactionSignatureRequest =
   Partial<LegacyEVMTransactionRequest> & {
     from: string
     annotation?: TransactionAnnotation
     network: EVMNetwork
+    broadcastOnSign: boolean
   }
 
 export type EnrichedEIP1559TransactionRequest = EIP1559TransactionRequest & {
@@ -121,10 +123,18 @@ export type EnrichedEVMTransactionRequest =
   | EnrichedLegacyTransactionRequest
 
 type PartialEIP1559TransactionRequestWithFrom =
-  Partial<EIP1559TransactionRequest> & { from: string; network: EVMNetwork }
+  Partial<EIP1559TransactionRequest> & {
+    from: string
+    network: EVMNetwork
+    broadcastOnSign: boolean
+  }
 
 type PartialLegacyEVMTransactionRequestWithFrom =
-  Partial<LegacyEVMTransactionRequest> & { from: string; network: EVMNetwork }
+  Partial<LegacyEVMTransactionRequest> & {
+    from: string
+    network: EVMNetwork
+    broadcastOnSign: boolean
+  }
 
 export type PartialTransactionRequestWithFrom =
   | PartialEIP1559TransactionRequestWithFrom

background/services/internal-ethereum-provider/index.ts

@@ -109,6 +109,7 @@ type Events = ServiceLifecycleEvents & {
     Partial<EnrichedEVMTransactionRequest> & {
       from: string
       network: EVMNetwork
+      broadcastOnSign: boolean
     },
     SignedTransaction
   >
@@ -245,6 +246,7 @@ export default class InternalEthereumProviderService extends BaseService<Events>
             ...(params[0] as JsonRpcTransactionRequest),
           },
           origin,
+          true,
         ).then(async (signed) => {
           await this.chainService.broadcastSignedTransaction(signed)
           return signed.hash
@@ -253,6 +255,7 @@ export default class InternalEthereumProviderService extends BaseService<Events>
         return this.signTransaction(
           params[0] as JsonRpcTransactionRequest,
           origin,
+          false,
         ).then((signedTransaction) =>
           serializeEthersTransaction(
             ethersTransactionFromSignedTransaction(signedTransaction),
@@ -394,6 +397,7 @@ export default class InternalEthereumProviderService extends BaseService<Events>
   private async signTransaction(
     transactionRequest: JsonRpcTransactionRequest,
     origin: string,
+    broadcastOnSign: boolean,
   ): Promise<SignedTransaction> {
     const annotation =
       origin === TAHO_INTERNAL_ORIGIN &&
@@ -457,6 +461,7 @@ export default class InternalEthereumProviderService extends BaseService<Events>
           from,
           network: currentNetwork,
           annotation,
+          broadcastOnSign,
         },
         resolver: resolve,
         rejecter: reject,

background/tests/factories.ts

@@ -245,6 +245,7 @@ export const createTransactionRequest = (
   gasLimit: 0n,
   chainID: "0",
   network: ETHEREUM,
+  broadcastOnSign: true,
   ...overrides,
 })
 
@@ -264,6 +265,7 @@ export const createLegacyTransactionRequest = (
   to: "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
   type: 0,
   value: 10000000000000000n,
+  broadcastOnSign: true,
   ...overrides,
 })
 

ui/components/DAppConnection/DAppConnectionInfoBar.tsx

@@ -35,6 +35,7 @@ function DefaultConnectionPopover({ close }: PopoverProps): ReactElement {
     >
       <section>
         <SharedIcon
+          id="close"
           icon="close.svg"
           width={12}
           aria-label={tShared("close")}

ui/components/Shared/SharedAddress.tsx

@@ -8,6 +8,7 @@ import SharedTooltip from "./SharedTooltip"
 import { trimWithEllipsis } from "../../utils/textUtils"
 
 type SharedAddressProps = {
+  id?: string
   address: string
   name?: string | undefined
   elide: boolean
@@ -31,6 +32,7 @@ type SharedAddressProps = {
  * `nameResolverSystem` prop is ignored.
  */
 export default function SharedAddress({
+  id,
   name,
   address,
   elide,
@@ -48,6 +50,7 @@ export default function SharedAddress({
 
   return (
     <button
+      id={id}
       type="button"
       onClick={copyAddress}
       title={`Copy to clipboard:\n${address}`}

ui/components/Shared/SharedCurrentAccountInformation.tsx

@@ -5,6 +5,7 @@ import { useAreInternalSignersUnlocked } from "../../hooks/signing-hooks"
 import SharedAvatar from "./SharedAvatar"
 
 type Props = {
+  address: string
   shortenedAddress: string
   name: string | undefined
   avatarURL: string | undefined
@@ -13,6 +14,7 @@ type Props = {
 }
 
 export default function SharedCurrentAccountInformation({
+  address,
   shortenedAddress,
   name,
   avatarURL,
@@ -23,7 +25,7 @@ export default function SharedCurrentAccountInformation({
   const icon = areInternalSignersUnlocked ? "unlock" : "lock"
   return (
     <div className={classNames("account_info_wrap", { hover: showHoverStyle })}>
-      <span className="account_info_label ellipsis">
+      <span title={address} className="account_info_label ellipsis">
         {name ?? shortenedAddress}
       </span>
       <SharedAvatar

ui/components/Shared/SharedIcon.tsx

@@ -1,6 +1,7 @@
 import React, { CSSProperties, ReactElement } from "react"
 
 type Props = {
+  id?: string
   icon: string
   width: number
   height?: number
@@ -14,7 +15,14 @@ type Props = {
 }
 
 export default function SharedIcon(props: Props): ReactElement {
-  const { icon, width, height = width, color = "transparent", style } = props
+  const {
+    id,
+    icon,
+    width,
+    height = width,
+    color = "transparent",
+    style,
+  } = props
 
   if ("onClick" in props) {
     const {
@@ -27,6 +35,7 @@ export default function SharedIcon(props: Props): ReactElement {
 
     return (
       <button
+        id={id}
         className="icon"
         type="button"
         onClick={onClick}
@@ -60,7 +69,7 @@ export default function SharedIcon(props: Props): ReactElement {
   }
 
   return (
-    <i className="icon" style={style}>
+    <i id={id} className="icon" style={style}>
       <style jsx>{`
         .icon {
           display: inline-block;

ui/components/Shared/__tests__/SharedCurrentAccountInformation.test.tsx

@@ -4,6 +4,7 @@ import SharedCurrentAccountInformation from "../SharedCurrentAccountInformation"
 import { renderWithProviders } from "../../../tests/test-utils"
 
 const name = "Name"
+const address = "0x208e0000000000000000000000000000000090cd"
 const shortenedAddress = "0x208e…090cd"
 const keyringId = "lock"
 const lock = "lock"
@@ -14,6 +15,7 @@ describe("SharedCurrentAccountInformation", () => {
     const ui = renderWithProviders(
       <SharedCurrentAccountInformation
         name={name}
+        address=""
         shortenedAddress=""
         avatarURL={undefined}
       />,
@@ -26,6 +28,7 @@ describe("SharedCurrentAccountInformation", () => {
     const ui = renderWithProviders(
       <SharedCurrentAccountInformation
         name={undefined}
+        address={address}
         shortenedAddress={shortenedAddress}
         avatarURL={undefined}
       />,
@@ -38,6 +41,7 @@ describe("SharedCurrentAccountInformation", () => {
     const ui = renderWithProviders(
       <SharedCurrentAccountInformation
         name={name}
+        address=""
         shortenedAddress=""
         avatarURL={undefined}
         showLockStatus={false}
@@ -52,6 +56,7 @@ describe("SharedCurrentAccountInformation", () => {
     const ui = renderWithProviders(
       <SharedCurrentAccountInformation
         name={name}
+        address=""
         shortenedAddress=""
         avatarURL={undefined}
         showLockStatus
@@ -68,6 +73,7 @@ describe("SharedCurrentAccountInformation", () => {
     const ui = renderWithProviders(
       <SharedCurrentAccountInformation
         name={name}
+        address=""
         shortenedAddress=""
         avatarURL={undefined}
         showLockStatus

ui/components/SignData/EIP191Info.tsx

@@ -17,7 +17,7 @@ export default function EIP191Info({
     <>
       <div className="message">
         <div className="message-title">{t("message")}</div>
-        <div className="light">{`${signingData}`}</div>
+        <div id="message-content" className="light">{`${signingData}`}</div>
       </div>
       <div className="message">
         <div className="signed">{t("signed")}</div>

ui/components/Signing/SignatureDetails/TransactionSignatureDetails/TransactionSignatureSummary/ContractInteractionSummary.tsx

@@ -23,6 +23,7 @@ export default function ContractInteractionSummary({
             t("newlyCreatedContract")
           ) : (
             <SharedAddress
+              id="recipientAddress"
               address={transactionRequest.to}
               name={
                 annotation !== undefined && "contractInfo" in annotation

ui/components/Signing/SignatureDetails/TransactionSignatureDetails/TransactionSignatureSummary/TransferSummary.tsx

@@ -51,7 +51,11 @@ export function TransferSummaryBase({
         <div className="container">
           <div className="label">{t("sendTo")}</div>
           <div className="send_to">
-            <SharedAddress address={recipientAddress} name={recipientName} />
+            <SharedAddress
+              id="recipientAddress"
+              address={recipientAddress}
+              name={recipientName}
+            />
           </div>
         </div>
         <div className="divider" />

ui/components/Signing/SignatureDetails/TransactionSignatureDetails/index.tsx

@@ -11,12 +11,12 @@ export type TransactionSignatureDetailsProps = {
 export default function TransactionSignatureDetails({
   transactionRequest,
 }: TransactionSignatureDetailsProps): ReactElement {
-  const { annotation } = transactionRequest
+  const { annotation, broadcastOnSign } = transactionRequest
   const annotatedTransactionType = annotation?.type ?? "contract-interaction"
 
   return (
     <>
-      <div className="standard_width">
+      <div className="standard_width" data-broadcast-on-sign={broadcastOnSign}>
         <TransactionSignatureSummary
           transactionRequest={transactionRequest}
           annotation={annotation}

ui/components/Signing/Signer/SignerBaseFrame.tsx

@@ -30,11 +30,17 @@ export default function SignerBaseFrame({
     <>
       <div className="signature-details">{children}</div>
       <footer>
-        <TransactionButton size="large" type="secondary" onClick={onReject}>
+        <TransactionButton
+          id="reject"
+          size="large"
+          type="secondary"
+          onClick={onReject}
+        >
           {t("reject")}
         </TransactionButton>
 
         <TransactionButton
+          id="sign"
           type="primaryGreen"
           size="large"
           onClick={onConfirm}

ui/components/Signing/Signer/TransactionButton.tsx

@@ -18,6 +18,7 @@ export type TransactionButtonProps = SharedButtonProps & {
 
 // TODO: Rename this to signing button
 export default function TransactionButton({
+  id,
   type,
   size,
   isDisabled,
@@ -93,6 +94,7 @@ export default function TransactionButton({
 
   const renderButton = () => (
     <SharedButton
+      id={id}
       type={type}
       size={size}
       onClick={onClick}