@0xsequence/relayer 0.36.8 → 0.36.9

package/dist/0xsequence-relayer.cjs.dev.js

@@ -239,7 +239,7 @@ class ProviderRelayer extends BaseRelayer {
 
   async wait(metaTxnId, timeout) {
     if (typeof metaTxnId !== 'string') {
-      console.log("computing id", metaTxnId.config, metaTxnId.context, metaTxnId.chainId, ...metaTxnId.transactions);
+      utils.logger.info("computing id", metaTxnId.config, metaTxnId.context, metaTxnId.chainId, ...metaTxnId.transactions);
       return this.wait(transactions.computeMetaTxnHash(config.addressOf(metaTxnId.config, metaTxnId.context), metaTxnId.chainId, ...metaTxnId.transactions), timeout);
     } // Transactions can only get executed on nonce change
     // get all nonce changes and look for metaTxnIds in between logs
@@ -639,7 +639,7 @@ class RpcRelayer extends BaseRelayer {
 
   async waitReceipt(metaTxnHash, wait = 1000) {
     if (typeof metaTxnHash !== 'string') {
-      console.log('computing id', metaTxnHash.config, metaTxnHash.context, metaTxnHash.chainId, ...metaTxnHash.transactions);
+      utils.logger.info('computing id', metaTxnHash.config, metaTxnHash.context, metaTxnHash.chainId, ...metaTxnHash.transactions);
       return this.waitReceipt(transactions.computeMetaTxnHash(config.addressOf(metaTxnHash.config, metaTxnHash.context), metaTxnHash.chainId, ...metaTxnHash.transactions));
     }
 
@@ -836,6 +836,8 @@ class RpcRelayer extends BaseRelayer {
       from: typeof metaTxnHash === 'string' ? undefined : config.addressOf(metaTxnHash.config, metaTxnHash.context),
       hash: txReceipt.transactionHash,
       raw: receipt.txnReceipt,
+      receipt: txReceipt,
+      // extended type which is Sequence-specific. Contains the decoded metaTxReceipt
       wait: async function (confirmations) {
         return _this.provider.waitForTransaction(txReceipt.transactionHash, confirmations);
       }

package/dist/0xsequence-relayer.cjs.prod.js

@@ -239,7 +239,7 @@ class ProviderRelayer extends BaseRelayer {
 
   async wait(metaTxnId, timeout) {
     if (typeof metaTxnId !== 'string') {
-      console.log("computing id", metaTxnId.config, metaTxnId.context, metaTxnId.chainId, ...metaTxnId.transactions);
+      utils.logger.info("computing id", metaTxnId.config, metaTxnId.context, metaTxnId.chainId, ...metaTxnId.transactions);
       return this.wait(transactions.computeMetaTxnHash(config.addressOf(metaTxnId.config, metaTxnId.context), metaTxnId.chainId, ...metaTxnId.transactions), timeout);
     } // Transactions can only get executed on nonce change
     // get all nonce changes and look for metaTxnIds in between logs
@@ -639,7 +639,7 @@ class RpcRelayer extends BaseRelayer {
 
   async waitReceipt(metaTxnHash, wait = 1000) {
     if (typeof metaTxnHash !== 'string') {
-      console.log('computing id', metaTxnHash.config, metaTxnHash.context, metaTxnHash.chainId, ...metaTxnHash.transactions);
+      utils.logger.info('computing id', metaTxnHash.config, metaTxnHash.context, metaTxnHash.chainId, ...metaTxnHash.transactions);
       return this.waitReceipt(transactions.computeMetaTxnHash(config.addressOf(metaTxnHash.config, metaTxnHash.context), metaTxnHash.chainId, ...metaTxnHash.transactions));
     }
 
@@ -836,6 +836,8 @@ class RpcRelayer extends BaseRelayer {
       from: typeof metaTxnHash === 'string' ? undefined : config.addressOf(metaTxnHash.config, metaTxnHash.context),
       hash: txReceipt.transactionHash,
       raw: receipt.txnReceipt,
+      receipt: txReceipt,
+      // extended type which is Sequence-specific. Contains the decoded metaTxReceipt
       wait: async function (confirmations) {
         return _this.provider.waitForTransaction(txReceipt.transactionHash, confirmations);
       }

package/dist/0xsequence-relayer.esm.js

@@ -231,7 +231,7 @@ class ProviderRelayer extends BaseRelayer {
 
   async wait(metaTxnId, timeout) {
     if (typeof metaTxnId !== 'string') {
-      console.log("computing id", metaTxnId.config, metaTxnId.context, metaTxnId.chainId, ...metaTxnId.transactions);
+      logger.info("computing id", metaTxnId.config, metaTxnId.context, metaTxnId.chainId, ...metaTxnId.transactions);
       return this.wait(computeMetaTxnHash(addressOf(metaTxnId.config, metaTxnId.context), metaTxnId.chainId, ...metaTxnId.transactions), timeout);
     } // Transactions can only get executed on nonce change
     // get all nonce changes and look for metaTxnIds in between logs
@@ -631,7 +631,7 @@ class RpcRelayer extends BaseRelayer {
 
   async waitReceipt(metaTxnHash, wait = 1000) {
     if (typeof metaTxnHash !== 'string') {
-      console.log('computing id', metaTxnHash.config, metaTxnHash.context, metaTxnHash.chainId, ...metaTxnHash.transactions);
+      logger.info('computing id', metaTxnHash.config, metaTxnHash.context, metaTxnHash.chainId, ...metaTxnHash.transactions);
       return this.waitReceipt(computeMetaTxnHash(addressOf(metaTxnHash.config, metaTxnHash.context), metaTxnHash.chainId, ...metaTxnHash.transactions));
     }
 
@@ -828,6 +828,8 @@ class RpcRelayer extends BaseRelayer {
       from: typeof metaTxnHash === 'string' ? undefined : addressOf(metaTxnHash.config, metaTxnHash.context),
       hash: txReceipt.transactionHash,
       raw: receipt.txnReceipt,
+      receipt: txReceipt,
+      // extended type which is Sequence-specific. Contains the decoded metaTxReceipt
       wait: async function (confirmations) {
         return _this.provider.waitForTransaction(txReceipt.transactionHash, confirmations);
       }

package/dist/declarations/src/index.d.ts

@@ -1,5 +1,5 @@
 import { ethers, providers } from 'ethers';
-import { SignedTransactions, Transaction } from '@0xsequence/transactions';
+import { SignedTransactions, Transaction, TransactionResponse } from '@0xsequence/transactions';
 import { WalletContext } from '@0xsequence/network';
 import { WalletConfig } from '@0xsequence/config';
 import { proto } from './rpc-relayer';
@@ -12,8 +12,8 @@ export interface Relayer {
     }>;
     gasRefundOptions(config: WalletConfig, context: WalletContext, ...transactions: Transaction[]): Promise<FeeOption[]>;
     getNonce(config: WalletConfig, context: WalletContext, space?: ethers.BigNumberish, blockTag?: providers.BlockTag): Promise<ethers.BigNumberish>;
-    relay(signedTxs: SignedTransactions, quote?: FeeQuote): Promise<providers.TransactionResponse>;
-    wait(metaTxnId: string | SignedTransactions, timeout: number): Promise<providers.TransactionResponse>;
+    relay(signedTxs: SignedTransactions, quote?: FeeQuote): Promise<TransactionResponse>;
+    wait(metaTxnId: string | SignedTransactions, timeout: number): Promise<TransactionResponse>;
 }
 export * from './local-relayer';
 export * from './base-relayer';

package/dist/declarations/src/local-relayer.d.ts

@@ -1,6 +1,6 @@
-import { TransactionRequest, TransactionResponse } from '@ethersproject/providers';
+import { TransactionRequest } from '@ethersproject/providers';
 import { Signer as AbstractSigner } from 'ethers';
-import { SignedTransactions, Transaction } from '@0xsequence/transactions';
+import { SignedTransactions, Transaction, TransactionResponse } from '@0xsequence/transactions';
 import { WalletContext } from '@0xsequence/network';
 import { WalletConfig } from '@0xsequence/config';
 import { FeeOption, FeeQuote, Relayer } from '.';

package/dist/declarations/src/provider-relayer.d.ts

@@ -1,6 +1,6 @@
-import { TransactionResponse, BlockTag, Provider } from '@ethersproject/providers';
+import { BlockTag, Provider } from '@ethersproject/providers';
 import { ethers, providers } from 'ethers';
-import { SignedTransactions, Transaction } from '@0xsequence/transactions';
+import { SignedTransactions, Transaction, TransactionResponse } from '@0xsequence/transactions';
 import { WalletContext } from '@0xsequence/network';
 import { WalletConfig } from '@0xsequence/config';
 import { BaseRelayer, BaseRelayerOptions } from './base-relayer';

package/dist/declarations/src/rpc-relayer/index.d.ts

@@ -1,6 +1,5 @@
-import { TransactionResponse } from '@ethersproject/providers';
 import { ethers } from 'ethers';
-import { Transaction, SignedTransactions } from '@0xsequence/transactions';
+import { Transaction, SignedTransactions, TransactionResponse } from '@0xsequence/transactions';
 import { BaseRelayer, BaseRelayerOptions } from '../base-relayer';
 import { FeeOption, FeeQuote, Relayer, SimulateResult } from '..';
 import { WalletContext } from '@0xsequence/network';
@@ -24,5 +23,28 @@ export declare class RpcRelayer extends BaseRelayer implements Relayer {
     gasRefundOptions(config: WalletConfig, context: WalletContext, ...transactions: Transaction[]): Promise<FeeOption[]>;
     getNonce(config: WalletConfig, context: WalletContext, space?: ethers.BigNumberish): Promise<ethers.BigNumberish>;
     relay(signedTxs: SignedTransactions, quote?: FeeQuote): Promise<TransactionResponse>;
-    wait(metaTxnHash: string | SignedTransactions, wait?: number): Promise<TransactionResponse>;
+    wait(metaTxnHash: string | SignedTransactions, wait?: number): Promise<TransactionResponse<RelayerTxReceipt>>;
 }
+export declare type RelayerTxReceipt = {
+    blockHash: string;
+    blockNumber: string;
+    contractAddress: string;
+    cumulativeGasUsed: string;
+    gasUsed: string;
+    logs: {
+        address: string;
+        blockHash: string;
+        blockNumber: string;
+        data: string;
+        logIndex: string;
+        removed: boolean;
+        topics: string[];
+        transactionHash: string;
+        transactionIndex: string;
+    }[];
+    logsBloom: string;
+    root: string;
+    status: string;
+    transactionHash: string;
+    transactionIndex: string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/relayer",
-  "version": "0.36.8",
+  "version": "0.36.9",
   "description": "relayer sub-package for Sequence",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/relayer",
   "source": "src/index.ts",
@@ -17,10 +17,10 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@0xsequence/abi": "^0.36.8",
-    "@0xsequence/config": "^0.36.8",
-    "@0xsequence/transactions": "^0.36.8",
-    "@0xsequence/utils": "^0.36.8",
+    "@0xsequence/abi": "^0.36.9",
+    "@0xsequence/config": "^0.36.9",
+    "@0xsequence/transactions": "^0.36.9",
+    "@0xsequence/utils": "^0.36.9",
     "@ethersproject/providers": "^5.5.1",
     "ethers": "^5.5.2",
     "fetch-ponyfill": "^7.1.0"

package/src/index.ts

@@ -1,5 +1,5 @@
 import { ethers, providers } from 'ethers'
-import { SignedTransactions, Transaction } from '@0xsequence/transactions'
+import { SignedTransactions, Transaction, TransactionResponse } from '@0xsequence/transactions'
 import { WalletContext } from '@0xsequence/network'
 import { WalletConfig } from '@0xsequence/config'
 import { proto } from './rpc-relayer'
@@ -39,10 +39,10 @@ export interface Relayer {
 
   // relayer will submit the transaction(s) to the network and return the transaction response.
   // The quote should be the one returned from getFeeOptions, if any.
-  relay(signedTxs: SignedTransactions, quote?: FeeQuote): Promise<providers.TransactionResponse>
+  relay(signedTxs: SignedTransactions, quote?: FeeQuote): Promise<TransactionResponse>
 
   // wait for transaction confirmation
-  wait(metaTxnId: string | SignedTransactions, timeout: number): Promise<providers.TransactionResponse>
+  wait(metaTxnId: string | SignedTransactions, timeout: number): Promise<TransactionResponse>
 }
 
 export * from './local-relayer'

package/src/local-relayer.ts

@@ -1,7 +1,7 @@
-import { TransactionRequest, TransactionResponse } from '@ethersproject/providers'
+import { TransactionRequest } from '@ethersproject/providers'
 import { Signer as AbstractSigner, ethers } from 'ethers'
 import { walletContracts } from '@0xsequence/abi'
-import { SignedTransactions, Transaction, sequenceTxAbiEncode } from '@0xsequence/transactions'
+import { SignedTransactions, Transaction, sequenceTxAbiEncode, TransactionResponse } from '@0xsequence/transactions'
 import { WalletContext } from '@0xsequence/network'
 import { WalletConfig } from '@0xsequence/config'
 import { logger } from '@0xsequence/utils'

package/src/provider-relayer.ts

@@ -1,12 +1,12 @@
-import { TransactionResponse, BlockTag, Provider } from '@ethersproject/providers'
+import { BlockTag, Provider } from '@ethersproject/providers'
 import { ethers, providers } from 'ethers'
 import { walletContracts } from '@0xsequence/abi'
-import { computeMetaTxnHash, encodeNonce, SignedTransactions, Transaction } from '@0xsequence/transactions'
+import { computeMetaTxnHash, encodeNonce, SignedTransactions, Transaction, TransactionResponse } from '@0xsequence/transactions'
 import { WalletContext } from '@0xsequence/network'
 import { WalletConfig, addressOf } from '@0xsequence/config'
 import { BaseRelayer, BaseRelayerOptions } from './base-relayer'
 import { FeeOption, FeeQuote, Relayer, SimulateResult } from '.'
-import { Optionals, Mask } from '@0xsequence/utils'
+import { logger, Optionals, Mask } from '@0xsequence/utils'
 
 const DEFAULT_GAS_LIMIT = ethers.BigNumber.from(800000)
 
@@ -130,7 +130,7 @@ export abstract class ProviderRelayer extends BaseRelayer implements Relayer {
 
   async wait(metaTxnId: string | SignedTransactions, timeout: number): Promise<providers.TransactionResponse & { receipt: providers.TransactionReceipt }> {
     if (typeof metaTxnId !== 'string') {
-      console.log("computing id", metaTxnId.config, metaTxnId.context, metaTxnId.chainId, ...metaTxnId.transactions)
+      logger.info("computing id", metaTxnId.config, metaTxnId.context, metaTxnId.chainId, ...metaTxnId.transactions)
       return this.wait(
         computeMetaTxnHash(addressOf(metaTxnId.config, metaTxnId.context), metaTxnId.chainId, ...metaTxnId.transactions),
         timeout

package/src/rpc-relayer/index.ts

@@ -1,4 +1,3 @@
-import { TransactionResponse } from '@ethersproject/providers'
 import { ethers } from 'ethers'
 import fetchPonyfill from 'fetch-ponyfill'
 import { walletContracts } from '@0xsequence/abi'
@@ -10,7 +9,8 @@ import {
   sequenceTxAbiEncode,
   SignedTransactions,
   computeMetaTxnHash,
-  decodeNonce
+  decodeNonce,
+  TransactionResponse
 } from '@0xsequence/transactions'
 import { BaseRelayer, BaseRelayerOptions } from '../base-relayer'
 import { FeeOption, FeeQuote, Relayer, SimulateResult } from '..'
@@ -41,7 +41,7 @@ export class RpcRelayer extends BaseRelayer implements Relayer {
 
   async waitReceipt(metaTxnHash: string | SignedTransactions, wait: number = 1000): Promise<proto.GetMetaTxnReceiptReturn> {
     if (typeof metaTxnHash !== 'string') {
-      console.log('computing id', metaTxnHash.config, metaTxnHash.context, metaTxnHash.chainId, ...metaTxnHash.transactions)
+      logger.info('computing id', metaTxnHash.config, metaTxnHash.context, metaTxnHash.chainId, ...metaTxnHash.transactions)
       return this.waitReceipt(
         computeMetaTxnHash(addressOf(metaTxnHash.config, metaTxnHash.context), metaTxnHash.chainId, ...metaTxnHash.transactions)
       )
@@ -216,7 +216,7 @@ export class RpcRelayer extends BaseRelayer implements Relayer {
     return this.wait(metaTxn.txnHash)
   }
 
-  async wait(metaTxnHash: string | SignedTransactions, wait: number = 1000): Promise<TransactionResponse> {
+  async wait(metaTxnHash: string | SignedTransactions, wait: number = 1000): Promise<TransactionResponse<RelayerTxReceipt>> {
     const { receipt } = await this.waitReceipt(metaTxnHash, wait)
 
     if (!receipt.txnReceipt || FAILED_STATUSES.includes(receipt.status as proto.ETHTxnStatus)) {
@@ -232,7 +232,8 @@ export class RpcRelayer extends BaseRelayer implements Relayer {
       from: typeof metaTxnHash === 'string' ? undefined : addressOf(metaTxnHash.config, metaTxnHash.context),
       hash: txReceipt.transactionHash,
       raw: receipt.txnReceipt,
-      wait: async (confirmations?: number) => this.provider!.waitForTransaction(txReceipt.transactionHash, confirmations)
+      receipt: txReceipt, // extended type which is Sequence-specific. Contains the decoded metaTxReceipt
+      wait: async (confirmations?: number) => this.provider!.waitForTransaction(txReceipt.transactionHash, confirmations),
     } as TransactionResponse
   }
 }
@@ -241,7 +242,7 @@ class MetaTransactionResponseException {
   constructor(public receipt: proto.MetaTxnReceipt) {}
 }
 
-type RelayerTxReceipt = {
+export type RelayerTxReceipt = {
   blockHash: string
   blockNumber: string
   contractAddress: string