npm i && build

dominant-strategies · Mar 14, 2024 · 47cfd64 · 47cfd64
1 parent 3b3fca2
commit 47cfd64
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/lib.esm/providers/abstract-provider.d.ts b/lib.esm/providers/abstract-provider.d.ts
@@ -230,19 +230,17 @@ export type PerformActionRequest = {
     method: "getTransactionResult";
     hash: string;
 } | {
-<<<<<<< HEAD
     method: "getRunningLocations";
 } | {
     method: "getProtocolTrieExpansionCount";
-=======
+} | {
     method: "getQiRateAtBlock";
     blockTag: BlockTag;
     amt: number;
 } | {
     method: "getQuaiRateAtBlock";
     blockTag: BlockTag;
     amt: number;
->>>>>>> d8ef1416 (add quai-qi conversion to provider)
 };
 /**
  *  Options for configuring some internal aspects of an [[AbstractProvider]].

diff --git a/lib.esm/providers/abstract-provider.d.ts.map b/lib.esm/providers/abstract-provider.d.ts.map
diff --git a/lib.esm/providers/abstract-provider.js.map b/lib.esm/providers/abstract-provider.js.map
diff --git a/lib.esm/providers/provider-jsonrpc.d.ts.map b/lib.esm/providers/provider-jsonrpc.d.ts.map
diff --git a/lib.esm/providers/provider-jsonrpc.js b/lib.esm/providers/provider-jsonrpc.js
diff --git a/lib.esm/providers/provider-jsonrpc.js.map b/lib.esm/providers/provider-jsonrpc.js.map
diff --git a/package-lock.json b/package-lock.json