mleku/warp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: readStateFor should require 'toSortKey' #317

Browse Source
This commit is contained in:
ppe
2023-01-12 10:31:42 +01:00
committed by just_ppe
parent 4b0a23565a
commit 4ae5c10924
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/contract/HandlerBasedContract.ts
View File

@@ -170,8 +170,8 @@ export class HandlerBasedContract<State> implements Contract<State> {
return result;
}
async readStateFor(interactions?: GQLNodeInterface[]): Promise<SortKeyCacheResult<EvalStateResult<State>>> {
return this.readState(undefined, undefined, interactions);
async readStateFor(sortKey: string, interactions: GQLNodeInterface[]): Promise<SortKeyCacheResult<EvalStateResult<State>>> {
return this.readState(sortKey, undefined, interactions);
}
async viewState<Input, View>(
@@ -458,11 +458,20 @@ export class HandlerBasedContract<State> implements Contract<State> {
if (cachedState && cachedState.sortKey == upToSortKey) {
this.logger.debug('State fully cached, not loading interactions.');
if (forceDefinitionLoad || evolvedSrcTxId) {
if (forceDefinitionLoad || evolvedSrcTxId || interactions?.length) {
contractDefinition = await definitionLoader.load<State>(contractTxId, evolvedSrcTxId);
handler = await this.safeGetHandler(contractDefinition);
if (interactions?.length) {
sortedInteractions = this._sorter.sort(interactions.map(i => ({node: i, cursor: null})));
}
}
} else {
// if we want to apply some 'external' interactions on top of the state cached at given sort key
// AND we don't have the state cached at the exact requested sort key - throw.
// NOTE: this feature is used by the D.R.E. nodes.
if (interactions?.length) {
throw new Error(`Cannot apply requested interactions at ${upToSortKey}`);
}
[contractDefinition, sortedInteractions] = await Promise.all([
definitionLoader.load<State>(contractTxId, evolvedSrcTxId),
interactions