refactor: if we have a _latestOptimisticUpdate, check the estimated current block against the block we have, and return it as cached data if we don't need to fetch again. Also use a mutex to prevent race conditions

This commit is contained in:
Derrick Hammer 2023-07-13 04:00:42 -04:00
parent 36f9f4c910
commit 391a4f968a
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 34 additions and 5 deletions

View File

@ -13,7 +13,11 @@ import {
getDefaultClientConfig, getDefaultClientConfig,
optimisticUpdateVerify, optimisticUpdateVerify,
} from "#util.js"; } from "#util.js";
import { LightClientUpdate, OptimisticUpdateCallback } from "#types.js"; import {
LightClientUpdate,
OptimisticUpdate,
OptimisticUpdateCallback,
} from "#types.js";
import { assertValidLightClientUpdate } from "@lodestar/light-client/validation"; import { assertValidLightClientUpdate } from "@lodestar/light-client/validation";
import * as capella from "@lodestar/types/capella"; import * as capella from "@lodestar/types/capella";
@ -35,6 +39,7 @@ export default abstract class BaseClient {
protected options: BaseClientOptions; protected options: BaseClientOptions;
private genesisTime = this.config.genesis.time; private genesisTime = this.config.genesis.time;
private syncMutex = new Mutex(); private syncMutex = new Mutex();
private optimisticMutex = new Mutex();
constructor(options: BaseClientOptions) { constructor(options: BaseClientOptions) {
this.options = options; this.options = options;
@ -168,14 +173,39 @@ export default abstract class BaseClient {
protected async getLatestExecution(): Promise<ExecutionInfo | null> { protected async getLatestExecution(): Promise<ExecutionInfo | null> {
await this._sync(); await this._sync();
const getExecInfo = (u: OptimisticUpdate) => {
return {
blockHash: toHexString(u.attestedHeader.execution.blockHash),
blockNumber: u.attestedHeader.execution.blockNumber,
};
};
if (this._latestOptimisticUpdate) {
const update = capella.ssz.LightClientOptimisticUpdate.deserialize(
this._latestOptimisticUpdate,
);
const diffInSeconds = Date.now() / 1000 - this.genesisTime;
const currentSlot = Math.floor(
diffInSeconds / this.config.chainConfig.SECONDS_PER_SLOT,
);
if (currentSlot <= update.attestedHeader.beacon.slot) {
this.optimisticMutex.release();
return getExecInfo(update);
}
}
await this.optimisticMutex.acquire();
const update = await this.options.optimisticUpdateCallback(); const update = await this.options.optimisticUpdateCallback();
const verify = await optimisticUpdateVerify( const verify = await optimisticUpdateVerify(
this.latestCommittee as Uint8Array[], this.latestCommittee as Uint8Array[],
update, update,
); );
// TODO: check the update against the latest sync committee // TODO: check the update against the latest sync committee
if (!verify.correct) { if (!verify.correct) {
this.optimisticMutex.release();
console.error(`Invalid Optimistic Update: ${verify.reason}`); console.error(`Invalid Optimistic Update: ${verify.reason}`);
return null; return null;
} }
@ -187,10 +217,9 @@ export default abstract class BaseClient {
`Optimistic update verified for slot ${update.attestedHeader.beacon.slot}`, `Optimistic update verified for slot ${update.attestedHeader.beacon.slot}`,
); );
return { this.optimisticMutex.release();
blockHash: toHexString(update.attestedHeader.execution.blockHash),
blockNumber: update.attestedHeader.execution.blockNumber, return getExecInfo(update);
};
} }
protected async syncUpdateVerifyGetCommittee( protected async syncUpdateVerifyGetCommittee(