Merge branch 'ethereum-attestation-service:master' into master

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.2.0
+
+- Add a method to receive the tx receipt to the Transaction object
+
 ## 2.1.4
 
 - Support legacy versions by coercing them to full semver

README.md

@@ -144,6 +144,8 @@ const tx = await eas.attest({
 const newAttestationUID = await tx.wait();
 
 console.log("New attestation UID:", newAttestationUID);
+
+console.log("Transaction receipt:", tx.receipt);
 ```
 
 ### Creating Offchain Attestations

dist/transaction.d.ts

@@ -7,6 +7,7 @@ export interface TransactionSigner {
 }
 export declare class Transaction<T> {
     readonly data: ContractTransaction;
+    receipt?: TransactionReceipt;
     private readonly signer;
     private readonly waitCallback;
     constructor(data: ContractTransaction, signer: TransactionSigner, waitCallback: (receipt: TransactionReceipt) => Promise<T>);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethereum-attestation-service/eas-sdk",
-  "version": "2.1.4",
+  "version": "2.2.0",
   "description": "Ethereum Attestation Service - TypeScript/JavaScript SDK",
   "repository": "git@github.com:ethereum-attestation-service/eas-sdk.git",
   "author": "Leonid Beder <leonid@lbeder.com>",

src/transaction.ts

@@ -17,6 +17,7 @@ export interface TransactionSigner {
 
 export class Transaction<T> {
   public readonly data: ContractTransaction;
+  public receipt?: TransactionReceipt;
   private readonly signer: TransactionSigner;
   private readonly waitCallback: (receipt: TransactionReceipt) => Promise<T>;
 
@@ -31,13 +32,17 @@ export class Transaction<T> {
   }
 
   public async wait(confirmations?: number): Promise<T> {
+    if (this.receipt) {
+      throw new Error(`Transaction already broadcast: ${this.receipt}`);
+    }
+
     const tx = await this.signer.sendTransaction(this.data);
-    const receipt = await tx.wait(confirmations);
-    if (!receipt) {
+    this.receipt = await tx.wait(confirmations);
+    if (!this.receipt) {
       throw new Error(`Unable to confirm: ${tx}`);
     }
 
-    return this.waitCallback(receipt);
+    return this.waitCallback(this.receipt);
   }
 }