Resolve merge conflict

solana-labs · Apr 26, 2022 · 17e74eb · 17e74eb
2 parents e97499f + 39f8cc0
commit 17e74eb
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/web3.js/src/transaction.ts b/web3.js/src/transaction.ts
@@ -198,6 +198,17 @@ export class Transaction {
    */
   nonceInfo?: NonceInformation;
 
+  // The new signature
+  constructor(opts?: TransactionCtorFields);
+
+  /**
+   * @deprecated `recentBlockhash` has been deprecated.
+   * Please pass `latestBlockhash: {blockHash: BlockHash, lastValidBlockHeight: number}` instead.
+   * This will be removed in X.0.0 version of @solana/web3.js.
+   */
+
+  constructor(opts?: TransactionCtorFields_DEPRECATED);
+
   /**
    * Construct an empty Transaction
    */