refactor: create the IClientVerifyingProvider child interface and add rpcCall to the client Client instead of exposing the provider in a getter

This commit is contained in:
Derrick Hammer 2023-07-11 04:27:11 -04:00
parent 5dd99f24e9
commit 2a27a16c25
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
2 changed files with 14 additions and 9 deletions

View File

@ -13,10 +13,11 @@ import {
optimisticUpdateVerify, optimisticUpdateVerify,
} from "#util.js"; } from "#util.js";
import { equalBytes } from "@noble/curves/abstract/utils.js"; import { equalBytes } from "@noble/curves/abstract/utils.js";
import { IClientVerifyingProvider } from "#client/verifyingProvider.js";
interface Config extends BaseClientOptions { interface Config extends BaseClientOptions {
prover: IClientProver; prover: IClientProver;
provider: IVerifyingProviderConstructor; provider: IVerifyingProviderConstructor<IClientVerifyingProvider>;
rpcHandler: Function; rpcHandler: Function;
} }
@ -27,16 +28,12 @@ export default class Client extends BaseClient {
super(options); super(options);
} }
private _provider?: IVerifyingProvider; private provider?: IClientVerifyingProvider;
get provider(): IVerifyingProvider {
return this._provider as IVerifyingProvider;
}
async sync(): Promise<void> { async sync(): Promise<void> {
await super.sync(); await super.sync();
if (!this._provider) { if (!this.provider) {
const { blockHash, blockNumber } = await this.getNextValidExecutionInfo(); const { blockHash, blockNumber } = await this.getNextValidExecutionInfo();
const factory = this.options.provider; const factory = this.options.provider;
const provider = new factory( const provider = new factory(
@ -51,7 +48,7 @@ export default class Client extends BaseClient {
provider.update(ei.blockNumber, ei.blockHash); provider.update(ei.blockNumber, ei.blockHash);
}); });
this._provider = provider; this.provider = provider;
this.booted = true; this.booted = true;
} }
} }
@ -123,4 +120,8 @@ export default class Client extends BaseClient {
return committee; return committee;
} }
public async rpcCall(method: string, params: any) {
return this.provider?.rpcMethod(method, params);
}
} }

View File

@ -48,7 +48,11 @@ import { keccak256 } from "ethereum-cryptography/keccak";
import { fromHexString } from "@chainsafe/ssz"; import { fromHexString } from "@chainsafe/ssz";
import { RPC } from "#client/rpc.js"; import { RPC } from "#client/rpc.js";
export default class VerifyingProvider implements IVerifyingProvider { export interface IClientVerifyingProvider extends IVerifyingProvider {
rpcMethod(method: string, params: any);
}
export default class VerifyingProvider implements IClientVerifyingProvider {
common: Common; common: Common;
vm: VM | null = null; vm: VM | null = null;
private blockHashes: { [blockNumberHex: string]: Bytes32 } = {}; private blockHashes: { [blockNumberHex: string]: Bytes32 } = {};