Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/shuttle/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @farcaster/hub-shuttle

## 0.9.5

### Patch Changes

- 872c2c78: feat: add support for backfilling lend storage messages

## 0.9.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/shuttle/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@farcaster/shuttle",
"version": "0.9.4",
"version": "0.9.5",
"main": "./dist/index.js",
"module": "./dist/index.mjs",
"types": "./dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/shuttle/src/example-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"main": "./app.ts",
"license": "MIT",
"dependencies": {
"@farcaster/shuttle": "^0.9.3",
"@farcaster/shuttle": "^0.9.5",
"@figma/hot-shots": "^9.0.0-figma.1",
"commander": "^11.0.0",
"ioredis": "^5.3.2",
Expand Down
12 changes: 12 additions & 0 deletions packages/shuttle/src/shuttle.integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,18 @@ describe("shuttle", () => {
}),
);
},
getAllLendStorageMessagesByFid: async (
_request: FidRequest,
_metadata: Metadata,
_options: Partial<CallOptions>,
) => {
return ok(
MessagesResponse.create({
messages: [],
nextPageToken: undefined,
}),
);
},
};

// Only include 2 of the 3 messages in the time window
Expand Down
36 changes: 35 additions & 1 deletion packages/shuttle/src/shuttle/messageReconciliation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ export class MessageReconciliation {
startTimestamp?: number,
stopTimestamp?: number,
) {
// Don't reconcile storage lends
for (const type of [
MessageType.CAST_ADD,
MessageType.REACTION_ADD,
MessageType.LINK_ADD,
MessageType.VERIFICATION_ADD_ETH_ADDRESS,
MessageType.USER_DATA_ADD,
MessageType.LEND_STORAGE,
]) {
this.log.debug(`Reconciling messages for FID ${fid} of type ${type}`);
await this.reconcileMessagesOfTypeForFid(fid, type, onHubMessage, onDbMessage, startTimestamp, stopTimestamp);
Expand Down Expand Up @@ -149,6 +149,9 @@ export class MessageReconciliation {
case MessageType.USER_DATA_ADD:
fn = this.getAllUserDataMessagesByFidInBatchesOf;
break;
case MessageType.LEND_STORAGE:
fn = this.getAllLendStorageMessagesByFidInBatchesOf;
break;
default:
throw `Unknown message type ${type}`;
}
Expand Down Expand Up @@ -177,6 +180,10 @@ export class MessageReconciliation {
return await this.client.getAllUserDataMessagesByFid(request);
}

private async getAllLendStorageMessagesByFid(request: FidTimestampRequest) {
return await this.client.getAllLendStorageMessagesByFid(request);
}

private async *getAllCastMessagesByFidInBatchesOf(
fid: number,
pageSize: number,
Expand Down Expand Up @@ -314,6 +321,33 @@ export class MessageReconciliation {
}
}

private async *getAllLendStorageMessagesByFidInBatchesOf(
fid: number,
pageSize: number,
startTimestamp?: number,
stopTimestamp?: number,
) {
let result = await this.getAllLendStorageMessagesByFid({ pageSize, fid, startTimestamp, stopTimestamp });
for (;;) {
if (result.isErr()) {
throw new Error(`Unable to get all lend storage messages for FID ${fid}: ${result.error?.message}`);
}

const { messages, nextPageToken: pageToken } = result.value;

yield messages;

if (!pageToken?.length) break;
result = await this.getAllLendStorageMessagesByFid({
pageSize,
pageToken,
fid,
startTimestamp,
stopTimestamp,
});
}
}

private async allActiveDbMessagesOfTypeForFid(
fid: number,
type: MessageType,
Expand Down
Loading