How to extend signer to always wait for transaction?

[mds1]

If I have a Wallet with an attached JsonRpcProvider, how can I modify or extend the class to always .wait() when sending a transaction, regardless of whether that is a regular call transaction or a contract deployment transaction from a factory?

[mds1]

Simplest way seems to be

class WaitWallet extends Wallet {
  sendTransaction(transaction: Deferrable<TransactionRequest>): Promise<TransactionResponse> {
    return this.sendTransaction(transaction).then((tx) => {
      return this.provider.waitForTransaction(tx.hash).then((receipt) => {
        return tx
      })
    })
  }
}