chainprovider -> chainrpcprovider

Author: jakekidd

modules/browser-node/src/index.ts

@@ -2,7 +2,7 @@ import { deployments, VectorChainService } from "@connext/vector-contracts";
 import { VectorEngine } from "@connext/vector-engine";
 import {
   ChainAddresses,
-  ChainProviders,
+  ChainRpcProviders,
   ChannelRpcMethods,
   CreateUpdateDetails,
   EngineEvent,
@@ -35,7 +35,7 @@ export type BrowserNodeSignerConfig = {
   messagingUrl?: string;
   logger?: BaseLogger;
   signer: IChannelSigner;
-  chainProviders: ChainProviders;
+  chainProviders: ChainRpcProviders;
   chainAddresses: ChainAddresses;
 };
 
@@ -49,7 +49,7 @@ export class BrowserNode implements INodeService {
   private supportedChains: number[] = [];
   private routerPublicIdentifier?: string;
   private iframeSrc?: string;
-  private chainProviders: ChainProviders = {};
+  private chainProviders: ChainRpcProviders = {};
   private chainAddresses?: ChainAddresses;
   private messagingUrl?: string;
   private natsUrl?: string;
@@ -60,7 +60,7 @@ export class BrowserNode implements INodeService {
     routerPublicIdentifier?: string;
     supportedChains?: number[];
     iframeSrc?: string;
-    chainProviders: ChainProviders;
+    chainProviders: ChainRpcProviders;
     messagingUrl?: string;
     natsUrl?: string;
     authUrl?: string;

modules/contracts/src.ts/constants.ts

@@ -1,7 +1,7 @@
 import { HDNode } from "@ethersproject/hdnode";
 import { Wallet } from "@ethersproject/wallet";
 import { JsonRpcProvider } from "@ethersproject/providers";
-import { ChainProvider } from "@connext/vector-types";
+import { ChainRpcProvider } from "@connext/vector-types";
 import { network, ethers } from "hardhat";
 import pino from "pino";
 
@@ -18,8 +18,8 @@ export const logger = pino({ level: defaultLogLevel });
 export const networkName = network.name;
 
 export const provider = urls
-  ? new ChainProvider(parseInt(chainId), (urls as string).split(","))
-  : new ChainProvider(parseInt(chainId), [ethers.provider as JsonRpcProvider]);
+  ? new ChainRpcProvider(parseInt(chainId), (urls as string).split(","))
+  : new ChainRpcProvider(parseInt(chainId), [ethers.provider as JsonRpcProvider]);
 
 const hdNode = HDNode.fromMnemonic(mnemonic).derivePath("m/44'/60'/0'/0");
 

modules/contracts/src.ts/services/ethReader.spec.ts

@@ -1,4 +1,4 @@
-import { ChainError, ChainProvider, FullChannelState, Result } from "@connext/vector-types";
+import { ChainError, ChainRpcProvider, FullChannelState, Result } from "@connext/vector-types";
 import { createTestChannelState, expect, getTestLoggers, mkHash } from "@connext/vector-utils";
 import { TransactionReceipt } from "@ethersproject/providers";
 import { AddressZero, One, Zero } from "@ethersproject/constants";
@@ -9,8 +9,8 @@ import { EthereumChainReader, MIN_GAS_PRICE, BUMP_GAS_PRICE } from "./ethReader"
 
 let ethReader: EthereumChainReader;
 let channelState: FullChannelState;
-let provider1337: SinonStubbedInstance<ChainProvider>;
-let provider1338: SinonStubbedInstance<ChainProvider>;
+let provider1337: SinonStubbedInstance<ChainRpcProvider>;
+let provider1338: SinonStubbedInstance<ChainRpcProvider>;
 
 const assertResult = (result: Result<any>, isError: boolean, unwrappedVal?: any) => {
   if (isError) {
@@ -46,7 +46,7 @@ describe("ethReader", () => {
   beforeEach(() => {
     // eth service deps
 
-    const _provider = createStubInstance(ChainProvider);
+    const _provider = createStubInstance(ChainRpcProvider);
     _provider.getTransaction.resolves(_txResponse);
     provider1337 = _provider;
     provider1338 = _provider;
@@ -70,9 +70,9 @@ describe("ethReader", () => {
     reset();
   });
 
-  describe.skip("getChainProviders", () => {
-    it("happy: getChainProvider", async () => {
-      const result = await ethReader.getChainProviders();
+  describe.skip("getChainRpcProviders", () => {
+    it("happy: getChainRpcProvider", async () => {
+      const result = await ethReader.getChainRpcProviders();
       console.log(result);
     });
   });

modules/contracts/src.ts/services/ethReader.ts

@@ -8,7 +8,7 @@ import {
   IVectorChainReader,
   Result,
   ChainError,
-  ChainProviders,
+  ChainRpcProviders,
   RegisteredTransfer,
   TransferName,
   ChannelDispute,
@@ -26,7 +26,7 @@ import {
   CoreChannelState,
   CoreTransferState,
   TransferDispute,
-  ChainProvider,
+  ChainRpcProvider,
 } from "@connext/vector-types";
 import axios from "axios";
 import { encodeBalance, encodeTransferResolver, encodeTransferState } from "@connext/vector-utils";
@@ -61,12 +61,12 @@ export class EthereumChainReader implements IVectorChainReader {
   private contracts: Map<string, Contract> = new Map();
   constructor(
     // The chainProviders specified here are hydrated.
-    public readonly chainProviders: { [chainId: string]: ChainProvider },
+    public readonly chainProviders: { [chainId: string]: ChainRpcProvider },
     public readonly log: pino.BaseLogger,
   ) {}
 
-  getChainProviders(): Result<ChainProviders, ChainError> {
-    const ret: ChainProviders = {};
+  getChainRpcProviders(): Result<ChainRpcProviders, ChainError> {
+    const ret: ChainRpcProviders = {};
     Object.entries(this.chainProviders).forEach(([name, value]) => {
       ret[parseInt(name)] = value.providerUrls;
     });

modules/contracts/src.ts/services/ethService.spec.ts

@@ -1,6 +1,6 @@
 import {
   ChainError,
-  ChainProvider,
+  ChainRpcProvider,
   FullChannelState,
   IChainServiceStore,
   IChannelSigner,
@@ -31,8 +31,8 @@ import { BIG_GAS_PRICE, EthereumChainService } from "./ethService";
 let storeMock: SinonStubbedInstance<IChainServiceStore>;
 let signer: SinonStubbedInstance<IChannelSigner>;
 let ethService: EthereumChainService;
-let provider1337: SinonStubbedInstance<ChainProvider>;
-let provider1338: SinonStubbedInstance<ChainProvider>;
+let provider1337: SinonStubbedInstance<ChainRpcProvider>;
+let provider1338: SinonStubbedInstance<ChainRpcProvider>;
 
 let sendTxWithRetriesMock: SinonStub;
 let approveMock: SinonStub;
@@ -97,7 +97,7 @@ describe("ethService unit test", () => {
     signer.connect.returns(signer as any);
     (signer as any)._isSigner = true;
 
-    const _provider = createStubInstance(ChainProvider);
+    const _provider = createStubInstance(ChainRpcProvider);
     _provider.getTransaction.resolves(txResponse);
     provider1337 = _provider;
     provider1338 = _provider;

modules/contracts/src.ts/services/ethService.ts

@@ -17,7 +17,7 @@ import {
   StringifiedTransactionResponse,
   getConfirmationsForChain,
   StoredTransaction,
-  ChainProvider,
+  ChainRpcProvider,
 } from "@connext/vector-types";
 import {
   delay,
@@ -55,7 +55,7 @@ export const BIG_GAS_PRICE = parseUnits("1500", "gwei");
 
 // TODO: Deprecate. Note that this is used in autoRebalance.ts.
 export const waitForTransaction = async (
-  provider: ChainProvider,
+  provider: ChainRpcProvider,
   transactionHash: string,
   confirmations?: number,
   timeout?: number,
@@ -85,7 +85,7 @@ export class EthereumChainService extends EthereumChainReader implements IVector
   };
   constructor(
     private readonly store: IChainServiceStore,
-    chainProviders: { [chainId: string]: ChainProvider },
+    chainProviders: { [chainId: string]: ChainRpcProvider },
     signer: string | Signer,
     log: BaseLogger,
     private readonly defaultRetries = 3,

modules/engine/src/index.ts

@@ -624,7 +624,7 @@ export class VectorEngine implements IVectorEngine {
       );
     }
 
-    const chainProviders = this.chainService.getChainProviders();
+    const chainProviders = this.chainService.getChainRpcProviders();
     if (chainProviders.isError) {
       return Result.fail(chainProviders.getError()!);
     }

modules/engine/src/isAlive.ts

@@ -11,7 +11,7 @@ export async function sendIsAlive(
 ): Promise<void> {
   const method = "sendIsAlive";
   const channels = await store.getChannelStates();
-  const providers = chainService.getChainProviders();
+  const providers = chainService.getChainRpcProviders();
   if (providers.isError) {
     logger.error({ ...providers.getError(), method }, "Error getting chain providers");
     return;

modules/engine/src/testing/env.ts

@@ -1,9 +1,9 @@
-import { ChainProviders } from "@connext/vector-types";
+import { ChainRpcProviders } from "@connext/vector-types";
 import { Wallet } from "@ethersproject/wallet";
 import pino from "pino";
 
 type EngineTestEnv = {
-  chainProviders: ChainProviders;
+  chainProviders: ChainRpcProviders;
   chainAddresses: any;
   sugarDaddy: Wallet;
   logLevel?: pino.Level;

modules/engine/src/testing/index.spec.ts

@@ -43,7 +43,7 @@ describe("VectorEngine", () => {
     });
     chainService = Sinon.createStubInstance(VectorChainService);
 
-    chainService.getChainProviders.returns(Result.ok(env.chainProviders));
+    chainService.getChainRpcProviders.returns(Result.ok(env.chainProviders));
   });
 
   afterEach(() => Sinon.restore());