@human-protocol/sdk 6.0.0 → 6.1.0

package/src/types.ts

@@ -1,4 +1,4 @@
-import { TransactionLike } from 'ethers';
+import { Overrides, TransactionLike } from 'ethers';
 
 /**
  * Enum for escrow statuses.
@@ -86,4 +86,19 @@ export type NetworkData = {
   oldFactoryAddress: string;
 };
 
+/**
+ * Options that configure how long to wait for transaction confirmations.
+ */
+export type WaitOptions = {
+  /** Number of block confirmations to wait for. */
+  confirmations?: number;
+  /** Milliseconds to wait before aborting `tx.wait()`. */
+  timeoutMs?: number;
+};
+
+/**
+ * Extends ethers overrides with `wait()` options that control confirmation count and timeout.
+ */
+export type TransactionOverrides = Overrides & WaitOptions;
+
 export type TransactionLikeWithNonce = TransactionLike & { nonce: number };

package/src/utils.ts

@@ -3,7 +3,6 @@ import { ethers } from 'ethers';
 import gqlFetch from 'graphql-request';
 
 import { isURL } from 'validator';
-import { SUBGRAPH_API_KEY_PLACEHOLDER } from './constants';
 import { ChainId } from './enums';
 import {
   ContractExecutionError,
@@ -17,8 +16,8 @@ import {
   TransactionReplaced,
   WarnSubgraphApiKeyNotProvided,
 } from './error';
-import { NetworkData } from './types';
 import { SubgraphOptions } from './interfaces';
+import { NetworkData } from './types';
 
 /**
  * Handles and throws appropriate error types based on the Ethereum error.
@@ -88,10 +87,7 @@ export const isValidJson = (input: string): boolean => {
 export const getSubgraphUrl = (networkData: NetworkData) => {
   let subgraphUrl = networkData.subgraphUrl;
   if (process.env.SUBGRAPH_API_KEY) {
-    subgraphUrl = networkData.subgraphUrlApiKey.replace(
-      SUBGRAPH_API_KEY_PLACEHOLDER,
-      process.env.SUBGRAPH_API_KEY
-    );
+    subgraphUrl = networkData.subgraphUrlApiKey;
   } else if (networkData.chainId !== ChainId.LOCALHOST) {
     // eslint-disable-next-line no-console
     console.warn(WarnSubgraphApiKeyNotProvided);