@filoz/repair-cli 0.2.0 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +1 -1
- package/dist/src/cli.js +2 -0
- package/dist/src/cli.js.map +1 -1
- package/dist/src/commands/datasets.d.ts +1 -0
- package/dist/src/commands/datasets.d.ts.map +1 -1
- package/dist/src/commands/datasets.js +5 -5
- package/dist/src/commands/datasets.js.map +1 -1
- package/dist/src/commands/providers.d.ts +1 -0
- package/dist/src/commands/providers.d.ts.map +1 -1
- package/dist/src/commands/repair.d.ts +1 -0
- package/dist/src/commands/repair.d.ts.map +1 -1
- package/dist/src/commands/repair.js +4 -0
- package/dist/src/commands/repair.js.map +1 -1
- package/dist/src/commands/replicate.d.ts +1 -0
- package/dist/src/commands/replicate.d.ts.map +1 -1
- package/dist/src/commands/replicate.js +4 -0
- package/dist/src/commands/replicate.js.map +1 -1
- package/dist/src/commands/session-key.d.ts +25 -0
- package/dist/src/commands/session-key.d.ts.map +1 -0
- package/dist/src/commands/session-key.js +114 -0
- package/dist/src/commands/session-key.js.map +1 -0
- package/dist/src/commands/setup.d.ts +0 -1
- package/dist/src/commands/setup.d.ts.map +1 -1
- package/dist/src/commands/setup.js +2 -4
- package/dist/src/commands/setup.js.map +1 -1
- package/dist/src/commands/wallet.d.ts +1 -0
- package/dist/src/commands/wallet.d.ts.map +1 -1
- package/dist/src/commands/wallet.js +75 -26
- package/dist/src/commands/wallet.js.map +1 -1
- package/dist/src/db/dedupe-cids.d.ts +1 -1
- package/dist/src/db/update-operation.d.ts +2 -2
- package/dist/src/db/update-operation.d.ts.map +1 -1
- package/dist/src/db/update-operation.js +2 -2
- package/dist/src/db/upsert-operations.js +1 -1
- package/dist/src/local-schema.d.ts +8 -11
- package/dist/src/local-schema.d.ts.map +1 -1
- package/dist/src/local-schema.js +1 -1
- package/dist/src/local-schema.js.map +1 -1
- package/dist/src/middleware.d.ts +2 -0
- package/dist/src/middleware.d.ts.map +1 -1
- package/dist/src/middleware.js +2 -0
- package/dist/src/middleware.js.map +1 -1
- package/dist/src/pipeline/add-pieces.d.ts.map +1 -1
- package/dist/src/pipeline/add-pieces.js +20 -5
- package/dist/src/pipeline/add-pieces.js.map +1 -1
- package/dist/src/pipeline/create-datasets.d.ts +4 -2
- package/dist/src/pipeline/create-datasets.d.ts.map +1 -1
- package/dist/src/pipeline/create-datasets.js +5 -5
- package/dist/src/pipeline/create-datasets.js.map +1 -1
- package/dist/src/utils.d.ts +34 -30
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +48 -3
- package/dist/src/utils.js.map +1 -1
- package/package.json +1 -1
- package/readme.md +40 -3
- package/src/cli.ts +2 -0
- package/src/commands/datasets.ts +7 -5
- package/src/commands/repair.ts +4 -0
- package/src/commands/replicate.ts +4 -0
- package/src/commands/session-key.ts +121 -0
- package/src/commands/setup.ts +2 -4
- package/src/commands/wallet.ts +75 -26
- package/src/db/update-operation.ts +3 -3
- package/src/db/upsert-operations.ts +1 -1
- package/src/local-schema.ts +1 -7
- package/src/middleware.ts +2 -0
- package/src/pipeline/add-pieces.ts +22 -5
- package/src/pipeline/create-datasets.ts +20 -5
- package/src/utils.ts +75 -5
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import * as p from '@clack/prompts';
|
|
1
2
|
import { calibration } from '@filoz/synapse-core/chains';
|
|
2
3
|
import * as ERC20 from '@filoz/synapse-core/erc20';
|
|
3
4
|
import * as Pay from '@filoz/synapse-core/pay';
|
|
4
5
|
import { claimTokens, formatBalance, formatFraction, parseUnits } from '@filoz/synapse-core/utils';
|
|
5
6
|
import { Cli, z } from 'incur';
|
|
7
|
+
import { isAddress } from 'viem';
|
|
6
8
|
import { getBalance, waitForTransactionReceipt } from 'viem/actions';
|
|
7
9
|
import { contextMiddleware, contextSchema } from "../middleware.js";
|
|
8
10
|
import { globalOptions, hashLink } from "../utils.js";
|
|
@@ -14,57 +16,74 @@ wallet.command('fund', {
|
|
|
14
16
|
description: 'Fund a calibration wallet from a faucet',
|
|
15
17
|
options: globalOptions,
|
|
16
18
|
middleware: [contextMiddleware],
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
outputPolicy: 'agent-only',
|
|
20
|
+
run: async (c) => {
|
|
21
|
+
const { client, chain, isInteractive } = c.var;
|
|
19
22
|
if (chain.id !== calibration.id) {
|
|
20
23
|
return c.error({
|
|
21
24
|
code: 'INVALID_CHAIN',
|
|
22
25
|
message: `Wallet fund is only available on Filecoin Calibration (chain ID ${calibration.id})`,
|
|
23
26
|
});
|
|
24
27
|
}
|
|
25
|
-
|
|
28
|
+
const spinner = p.spinner();
|
|
26
29
|
try {
|
|
30
|
+
if (isInteractive) {
|
|
31
|
+
spinner.start('Funding wallet...');
|
|
32
|
+
}
|
|
27
33
|
const hashes = await claimTokens({ address: client.account.address });
|
|
28
|
-
|
|
34
|
+
if (isInteractive) {
|
|
35
|
+
spinner.message(`Waiting for tx ${hashLink(hashes[0].tx_hash, chain)} to be mined...`);
|
|
36
|
+
}
|
|
29
37
|
await waitForTransactionReceipt(client, {
|
|
30
38
|
hash: hashes[0].tx_hash,
|
|
31
39
|
});
|
|
32
40
|
const balance = await getBalance(client, {
|
|
33
41
|
address: client.account.address,
|
|
34
42
|
});
|
|
35
|
-
|
|
43
|
+
if (isInteractive) {
|
|
44
|
+
spinner.stop('Wallet funded successfully.');
|
|
45
|
+
}
|
|
46
|
+
return c.ok({
|
|
36
47
|
address: client.account.address,
|
|
37
48
|
balance: formatBalance({ value: balance }),
|
|
38
|
-
|
|
49
|
+
transactionHash: hashes[0].tx_hash,
|
|
50
|
+
});
|
|
39
51
|
}
|
|
40
52
|
catch (error) {
|
|
53
|
+
const msg = error instanceof Error ? error.message : 'Failed to fund wallet';
|
|
54
|
+
if (isInteractive) {
|
|
55
|
+
spinner.error(msg);
|
|
56
|
+
}
|
|
41
57
|
if (c.options.debug) {
|
|
42
58
|
console.error(error);
|
|
43
59
|
}
|
|
44
60
|
return c.error({
|
|
45
61
|
code: 'FAILED_TO_FUND_WALLET',
|
|
46
|
-
message:
|
|
62
|
+
message: msg,
|
|
47
63
|
});
|
|
48
64
|
}
|
|
49
65
|
},
|
|
50
66
|
});
|
|
51
67
|
wallet.command('balance', {
|
|
52
68
|
description: 'Get wallet and pay account summary',
|
|
53
|
-
options: globalOptions
|
|
69
|
+
options: globalOptions.extend({
|
|
70
|
+
address: z.string().refine(isAddress, 'Invalid address').optional().describe('Address to get balance for'),
|
|
71
|
+
}),
|
|
54
72
|
middleware: [contextMiddleware],
|
|
55
73
|
async run(c) {
|
|
56
74
|
const { client } = c.var;
|
|
75
|
+
const address = c.options.address ?? client.account.address;
|
|
57
76
|
const balanceFIL = await getBalance(client, {
|
|
58
|
-
address
|
|
77
|
+
address,
|
|
59
78
|
});
|
|
60
79
|
const balanceUSDFC = await ERC20.balance(client, {
|
|
61
|
-
address
|
|
80
|
+
address,
|
|
62
81
|
});
|
|
63
82
|
const summary = await Pay.getAccountSummary(client, {
|
|
64
|
-
address
|
|
83
|
+
address,
|
|
65
84
|
});
|
|
66
85
|
return {
|
|
67
|
-
address
|
|
86
|
+
address,
|
|
68
87
|
fil: formatBalance({ value: balanceFIL }),
|
|
69
88
|
usdfc: formatBalance({ value: balanceUSDFC.value }),
|
|
70
89
|
pay: {
|
|
@@ -90,27 +109,42 @@ wallet.command('deposit', {
|
|
|
90
109
|
}),
|
|
91
110
|
options: globalOptions,
|
|
92
111
|
middleware: [contextMiddleware],
|
|
93
|
-
|
|
94
|
-
|
|
112
|
+
outputPolicy: 'agent-only',
|
|
113
|
+
run: async (c) => {
|
|
114
|
+
const { client, chain, isInteractive } = c.var;
|
|
115
|
+
const spinner = p.spinner();
|
|
95
116
|
try {
|
|
96
|
-
|
|
117
|
+
if (isInteractive) {
|
|
118
|
+
spinner.start(`Depositing ${c.args.amount} USDFC to pay account...`);
|
|
119
|
+
}
|
|
97
120
|
const hash = await Pay.depositAndApprove(client, {
|
|
98
121
|
amount: parseUnits(c.args.amount),
|
|
99
122
|
});
|
|
100
|
-
|
|
123
|
+
if (isInteractive) {
|
|
124
|
+
spinner.message(`Waiting for tx ${hashLink(hash, chain)} to be mined...`);
|
|
125
|
+
}
|
|
101
126
|
await waitForTransactionReceipt(client, {
|
|
102
127
|
hash,
|
|
103
128
|
});
|
|
104
|
-
|
|
105
|
-
|
|
129
|
+
if (isInteractive) {
|
|
130
|
+
spinner.stop('Deposit successful.');
|
|
131
|
+
}
|
|
132
|
+
return c.ok({
|
|
133
|
+
amount: c.args.amount,
|
|
134
|
+
transactionHash: hash,
|
|
135
|
+
});
|
|
106
136
|
}
|
|
107
137
|
catch (error) {
|
|
138
|
+
const msg = error instanceof Error ? error.message : 'Failed to deposit';
|
|
139
|
+
if (isInteractive) {
|
|
140
|
+
spinner.error(msg);
|
|
141
|
+
}
|
|
108
142
|
if (c.options.debug) {
|
|
109
143
|
console.error(error);
|
|
110
144
|
}
|
|
111
145
|
return c.error({
|
|
112
146
|
code: 'FAILED_TO_DEPOSIT',
|
|
113
|
-
message:
|
|
147
|
+
message: msg,
|
|
114
148
|
});
|
|
115
149
|
}
|
|
116
150
|
},
|
|
@@ -122,27 +156,42 @@ wallet.command('withdraw', {
|
|
|
122
156
|
}),
|
|
123
157
|
options: globalOptions,
|
|
124
158
|
middleware: [contextMiddleware],
|
|
125
|
-
|
|
126
|
-
|
|
159
|
+
outputPolicy: 'agent-only',
|
|
160
|
+
run: async (c) => {
|
|
161
|
+
const { client, chain, isInteractive } = c.var;
|
|
162
|
+
const spinner = p.spinner();
|
|
127
163
|
try {
|
|
128
|
-
|
|
164
|
+
if (isInteractive) {
|
|
165
|
+
spinner.start(`Withdrawing ${c.args.amount} USDFC from pay account...`);
|
|
166
|
+
}
|
|
129
167
|
const hash = await Pay.withdraw(client, {
|
|
130
168
|
amount: parseUnits(c.args.amount),
|
|
131
169
|
});
|
|
132
|
-
|
|
170
|
+
if (isInteractive) {
|
|
171
|
+
spinner.message(`Waiting for tx ${hashLink(hash, chain)} to be mined...`);
|
|
172
|
+
}
|
|
133
173
|
await waitForTransactionReceipt(client, {
|
|
134
174
|
hash,
|
|
135
175
|
});
|
|
136
|
-
|
|
137
|
-
|
|
176
|
+
if (isInteractive) {
|
|
177
|
+
spinner.stop('Withdrawal successful.');
|
|
178
|
+
}
|
|
179
|
+
return c.ok({
|
|
180
|
+
amount: c.args.amount,
|
|
181
|
+
transactionHash: hash,
|
|
182
|
+
});
|
|
138
183
|
}
|
|
139
184
|
catch (error) {
|
|
185
|
+
const msg = error instanceof Error ? error.message : 'Failed to withdraw';
|
|
186
|
+
if (isInteractive) {
|
|
187
|
+
spinner.error(msg);
|
|
188
|
+
}
|
|
140
189
|
if (c.options.debug) {
|
|
141
190
|
console.error(error);
|
|
142
191
|
}
|
|
143
192
|
return c.error({
|
|
144
193
|
code: 'FAILED_TO_WITHDRAW',
|
|
145
|
-
message:
|
|
194
|
+
message: msg,
|
|
146
195
|
});
|
|
147
196
|
}
|
|
148
197
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../../src/commands/wallet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,KAAK,KAAK,MAAM,2BAA2B,CAAA;AAClD,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAClG,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAA;AACpE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAErD,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE;IACzC,WAAW,EAAE,iBAAiB;IAC9B,IAAI,EAAE,aAAa;CACpB,CAAC,CAAA;AAEF,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;IACrB,WAAW,EAAE,yCAAyC;IACtD,OAAO,EAAE,aAAa;IACtB,UAAU,EAAE,CAAC,iBAAiB,CAAC;IAC/B,
|
|
1
|
+
{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../../src/commands/wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export declare function dedupeCids({ indexerDb, localDb, dataSetId, operations }
|
|
|
16
16
|
repairId: number;
|
|
17
17
|
type: import("../local-schema.ts").OperationType;
|
|
18
18
|
alternateProvider: string;
|
|
19
|
-
|
|
19
|
+
txHash: string | null;
|
|
20
20
|
error: string | null;
|
|
21
21
|
}[]>;
|
|
22
22
|
//# sourceMappingURL=dedupe-cids.d.ts.map
|
|
@@ -4,8 +4,8 @@ export type UpdateOperationOptions = {
|
|
|
4
4
|
localDb: LocalDatabase;
|
|
5
5
|
operationId: number;
|
|
6
6
|
status: localSchema.OperationStatus;
|
|
7
|
-
|
|
7
|
+
txHash?: string | null;
|
|
8
8
|
error?: string | null;
|
|
9
9
|
};
|
|
10
|
-
export declare function updateOperation({ localDb, operationId, status,
|
|
10
|
+
export declare function updateOperation({ localDb, operationId, status, txHash, error }: UpdateOperationOptions): Promise<void>;
|
|
11
11
|
//# sourceMappingURL=update-operation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-operation.d.ts","sourceRoot":"","sources":["../../../src/db/update-operation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,aAAa,CAAA;IACtB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,WAAW,CAAC,eAAe,CAAA;IACnC,MAAM,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"update-operation.d.ts","sourceRoot":"","sources":["../../../src/db/update-operation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,aAAa,CAAA;IACtB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,WAAW,CAAC,eAAe,CAAA;IACnC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACtB,CAAA;AAKD,wBAAsB,eAAe,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,sBAAsB,iBAU5G"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { eq } from 'drizzle-orm';
|
|
2
2
|
import * as localSchema from "../local-schema.js";
|
|
3
|
-
export async function updateOperation({ localDb, operationId, status,
|
|
3
|
+
export async function updateOperation({ localDb, operationId, status, txHash, error }) {
|
|
4
4
|
await localDb
|
|
5
5
|
.update(localSchema.operations)
|
|
6
6
|
.set({
|
|
7
7
|
status,
|
|
8
|
-
|
|
8
|
+
txHash,
|
|
9
9
|
error: error ?? null,
|
|
10
10
|
updatedAt: Date.now(),
|
|
11
11
|
})
|
|
@@ -7,7 +7,7 @@ export async function upsertOperations({ localDb, operations }) {
|
|
|
7
7
|
.values(operations.map((operation) => ({ ...operation, updatedAt: now })))
|
|
8
8
|
.onConflictDoUpdate({
|
|
9
9
|
target: localDb._.fullSchema.operations.id,
|
|
10
|
-
set: buildConflictUpdateColumns(localSchema.operations, ['status', 'error', 'updatedAt', '
|
|
10
|
+
set: buildConflictUpdateColumns(localSchema.operations, ['status', 'error', 'updatedAt', 'txHash']),
|
|
11
11
|
});
|
|
12
12
|
}
|
|
13
13
|
//# sourceMappingURL=upsert-operations.js.map
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import type { MetadataObject } from '@filoz/synapse-core';
|
|
2
|
-
import type * as SP from '@filoz/synapse-core/sp';
|
|
3
2
|
import * as t from 'drizzle-orm/sqlite-core';
|
|
4
3
|
export type RepairStatus = 'pending' | 'completed' | 'failed';
|
|
5
4
|
export type OperationStatus = 'pending' | 'completed' | 'failed' | 'skipped';
|
|
6
5
|
export type OperationType = 'create_dataset' | 'add_piece';
|
|
7
|
-
export type OperationResult = Omit<SP.AddPiecesSuccess, 'txStatus' | 'addMessageOk' | 'piecesAdded' | 'pieceCount' | 'confirmedPieceIds'>;
|
|
8
6
|
export declare const jsonType: {
|
|
9
7
|
(): t.SQLiteCustomColumnBuilder<{
|
|
10
8
|
name: "";
|
|
@@ -390,25 +388,24 @@ export declare const operations: t.SQLiteTableWithColumns<{
|
|
|
390
388
|
}, {}, {
|
|
391
389
|
length: number | undefined;
|
|
392
390
|
}>;
|
|
393
|
-
|
|
394
|
-
name: "
|
|
391
|
+
txHash: t.SQLiteColumn<{
|
|
392
|
+
name: "tx_hash";
|
|
395
393
|
tableName: "operations";
|
|
396
|
-
dataType: "
|
|
397
|
-
columnType: "
|
|
398
|
-
data:
|
|
399
|
-
driverParam:
|
|
394
|
+
dataType: "string";
|
|
395
|
+
columnType: "SQLiteText";
|
|
396
|
+
data: string;
|
|
397
|
+
driverParam: string;
|
|
400
398
|
notNull: false;
|
|
401
399
|
hasDefault: false;
|
|
402
400
|
isPrimaryKey: false;
|
|
403
401
|
isAutoincrement: false;
|
|
404
402
|
hasRuntimeDefault: false;
|
|
405
|
-
enumValues:
|
|
403
|
+
enumValues: [string, ...string[]];
|
|
406
404
|
baseColumn: never;
|
|
407
405
|
identity: undefined;
|
|
408
406
|
generated: undefined;
|
|
409
407
|
}, {}, {
|
|
410
|
-
|
|
411
|
-
sqliteColumnBuilderBrand: "SQLiteCustomColumnBuilderBrand";
|
|
408
|
+
length: number | undefined;
|
|
412
409
|
}>;
|
|
413
410
|
error: t.SQLiteColumn<{
|
|
414
411
|
name: "error";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-schema.d.ts","sourceRoot":"","sources":["../../src/local-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"local-schema.d.ts","sourceRoot":"","sources":["../../src/local-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGzD,OAAO,KAAK,CAAC,MAAM,yBAAyB,CAAA;AAI5C,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAA;AAC7D,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAA;AAC5E,MAAM,MAAM,aAAa,GAAG,gBAAgB,GAAG,WAAW,CAAA;AAM1D,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;CAUnB,CAAA;AAEF,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;CAUrB,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,OAAO,CAAC,YAAY,CAAA;AACtD,MAAM,MAAM,YAAY,GAAG,OAAO,OAAO,CAAC,YAAY,CAAA;AACtD,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AAEhD,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAWlB,CAAA;AAEF,MAAM,MAAM,eAAe,GAAG,OAAO,UAAU,CAAC,YAAY,CAAA;AAC5D,MAAM,MAAM,eAAe,GAAG,OAAO,UAAU,CAAC,YAAY,CAAA;AAE5D,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAerB,CAAA;AAEF,eAAO,MAAM,eAAe;;EAEzB,CAAA;AAEH,eAAO,MAAM,kBAAkB;;EAK5B,CAAA"}
|
package/dist/src/local-schema.js
CHANGED
|
@@ -47,7 +47,7 @@ export const operations = table('operations', {
|
|
|
47
47
|
cid: t.text().notNull(),
|
|
48
48
|
metadata: jsonType().$type().notNull(),
|
|
49
49
|
alternateProvider: t.text('alternate_provider').notNull(),
|
|
50
|
-
|
|
50
|
+
txHash: t.text('tx_hash'),
|
|
51
51
|
error: t.text(),
|
|
52
52
|
createdAt: t.integer('created_at').notNull(),
|
|
53
53
|
updatedAt: t.integer('updated_at').notNull(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-schema.js","sourceRoot":"","sources":["../../src/local-schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"local-schema.js","sourceRoot":"","sources":["../../src/local-schema.ts"],"names":[],"mappings":"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"}
|
package/dist/src/middleware.d.ts
CHANGED
|
@@ -23,6 +23,7 @@ export declare const contextSchema: z.ZodObject<{
|
|
|
23
23
|
client: z.ZodCustom<Client<Transport, Chain, Account>, Client<Transport, Chain, Account>>;
|
|
24
24
|
chain: z.ZodCustom<Chain, Chain>;
|
|
25
25
|
source: z.ZodString;
|
|
26
|
+
isInteractive: z.ZodBoolean;
|
|
26
27
|
}, z.core.$strip>;
|
|
27
28
|
export declare const contextMiddleware: import("incur").MiddlewareHandler<z.ZodObject<{
|
|
28
29
|
indexerDb: z.ZodCustom<IndexerDatabase, IndexerDatabase>;
|
|
@@ -45,5 +46,6 @@ export declare const contextMiddleware: import("incur").MiddlewareHandler<z.ZodO
|
|
|
45
46
|
client: z.ZodCustom<Client<Transport, Chain, Account>, Client<Transport, Chain, Account>>;
|
|
46
47
|
chain: z.ZodCustom<Chain, Chain>;
|
|
47
48
|
source: z.ZodString;
|
|
49
|
+
isInteractive: z.ZodBoolean;
|
|
48
50
|
}, z.core.$strip>, undefined>;
|
|
49
51
|
//# sourceMappingURL=middleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAc,CAAC,EAAE,MAAM,OAAO,CAAA;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAEtD,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAGhE,eAAO,MAAM,aAAa
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAc,CAAC,EAAE,MAAM,OAAO,CAAA;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAEtD,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAGhE,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;iBAQxB,CAAA;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;6BA4B5B,CAAA"}
|
package/dist/src/middleware.js
CHANGED
|
@@ -9,6 +9,7 @@ export const contextSchema = z.object({
|
|
|
9
9
|
client: z.custom(),
|
|
10
10
|
chain: z.custom(),
|
|
11
11
|
source: z.string(),
|
|
12
|
+
isInteractive: z.boolean(),
|
|
12
13
|
});
|
|
13
14
|
export const contextMiddleware = middleware(async (c, next) => {
|
|
14
15
|
const { dbPath, chainId, indexerMainnetUrl, indexerCalibrationUrl, source } = config.store;
|
|
@@ -30,6 +31,7 @@ export const contextMiddleware = middleware(async (c, next) => {
|
|
|
30
31
|
c.set('client', client);
|
|
31
32
|
c.set('chain', chain);
|
|
32
33
|
c.set('source', source);
|
|
34
|
+
c.set('isInteractive', !c.agent && !c.formatExplicit);
|
|
33
35
|
await next();
|
|
34
36
|
localDb.$client.close();
|
|
35
37
|
await indexerDb.$client.end();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,OAAO,CAAA;AAErC,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAA;AAEpD,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEnE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAmB;IACtC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAiB;IAClC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAiB;IACjC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAqC;IACrD,KAAK,EAAE,CAAC,CAAC,MAAM,EAAS;IACxB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,OAAO,CAAA;AAErC,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAA;AAEpD,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEnE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAmB;IACtC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAiB;IAClC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAiB;IACjC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAqC;IACrD,KAAK,EAAE,CAAC,CAAC,MAAM,EAAS;IACxB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,aAAa,EAAE,CAAC,CAAC,OAAO,EAAE;CAC3B,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,UAAU,CAAuB,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;IAClF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAA;IAE1F,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,IAAI,CAAC,iBAAiB,IAAI,CAAC,qBAAqB,IAAI,CAAC,MAAM,EAAE,CAAC;QACnF,OAAO,CAAC,CAAC,KAAK,CAAC;YACb,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,kDAAkD;YAC3D,SAAS,EAAE,KAAK;SACjB,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAA;IACjD,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,qBAAqB,EAAE;QAC7F,MAAM,EAAE,aAAa;KACtB,CAAC,CAAA;IAEF,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACzB,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;IAC7B,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACvB,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACvB,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACrB,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACvB,CAAC,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAA;IACrD,MAAM,IAAI,EAAE,CAAA;IAEZ,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IACvB,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,CAAA;AAC/B,CAAC,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-pieces.d.ts","sourceRoot":"","sources":["../../../src/pipeline/add-pieces.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG/E,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,aAAa,CAAA;IACtB,SAAS,EAAE,eAAe,CAAA;IAC1B,MAAM,EAAE,YAAY,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,YAAY,CAAA;CACrB,CAAA;
|
|
1
|
+
{"version":3,"file":"add-pieces.d.ts","sourceRoot":"","sources":["../../../src/pipeline/add-pieces.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG/E,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,aAAa,CAAA;IACtB,SAAS,EAAE,eAAe,CAAA;IAC1B,MAAM,EAAE,YAAY,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,YAAY,CAAA;CACrB,CAAA;AA0ID,wBAAsB,YAAY,CAAC,EACjC,OAAO,EACP,SAAS,EACT,MAAM,EACN,WAAW,EACX,SAAS,EACT,MAAM,GACP,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiE3C"}
|
|
@@ -7,18 +7,26 @@ import { dedupeCids } from "../db/dedupe-cids.js";
|
|
|
7
7
|
import { getTargetDataset } from "../db/get-target-dataset.js";
|
|
8
8
|
import { repairUpdate } from "../db/repair-update.js";
|
|
9
9
|
import { upsertOperations } from "../db/upsert-operations.js";
|
|
10
|
-
import { excludeOperationsByCid, hashLink, operationsToPullPieces } from "../utils.js";
|
|
10
|
+
import { completeConfirmedOperations, excludeOperationsByCid, hashLink, operationsToPullPieces } from "../utils.js";
|
|
11
11
|
function createAddPiecesWorker({ localDb, indexerDb, repair, client, state, log }) {
|
|
12
12
|
return async (options) => {
|
|
13
13
|
let completedOps = 0;
|
|
14
14
|
let failedOps = 0;
|
|
15
15
|
let operations = options.operations;
|
|
16
|
+
const isRepair = repair.repairDataSetId == null;
|
|
16
17
|
const group = log.group(`Batch ${options.batchNumber}/${state.totalBatches}`);
|
|
17
18
|
try {
|
|
18
19
|
const dataset = await getTargetDataset({ localDb, repairId: repair.id, client });
|
|
19
|
-
if (
|
|
20
|
+
if (isRepair) {
|
|
20
21
|
operations = await dedupeCids({ indexerDb, localDb, dataSetId: dataset.dataSetId, operations });
|
|
21
22
|
}
|
|
23
|
+
const operationsBeforeConfirmationCheck = operations.length;
|
|
24
|
+
operations = await completeConfirmedOperations({ localDb, client, operations });
|
|
25
|
+
const confirmedOperations = operationsBeforeConfirmationCheck - operations.length;
|
|
26
|
+
if (confirmedOperations > 0) {
|
|
27
|
+
state.completedOperations += confirmedOperations;
|
|
28
|
+
completedOps += confirmedOperations;
|
|
29
|
+
}
|
|
22
30
|
group.message(`Pulling ${operations.length} pieces...`);
|
|
23
31
|
if (operations.length > 0) {
|
|
24
32
|
const pullResult = await SP.waitForPullPieces(client, {
|
|
@@ -59,11 +67,18 @@ function createAddPiecesWorker({ localDb, indexerDb, repair, client, state, log
|
|
|
59
67
|
clientDataSetId: dataset.clientDataSetId,
|
|
60
68
|
pieces: operations.map((operation) => ({
|
|
61
69
|
pieceCid: Piece.from(operation.cid),
|
|
62
|
-
metadata: operation.metadata,
|
|
70
|
+
metadata: isRepair ? undefined : operation.metadata,
|
|
71
|
+
})),
|
|
72
|
+
});
|
|
73
|
+
await upsertOperations({
|
|
74
|
+
localDb,
|
|
75
|
+
operations: operations.map((operation) => ({
|
|
76
|
+
...operation,
|
|
77
|
+
txHash: addPiecesResult.txHash,
|
|
63
78
|
})),
|
|
64
79
|
});
|
|
65
80
|
group.message(`Waiting for add pieces ${hashLink(addPiecesResult.txHash, client.chain)}...`);
|
|
66
|
-
const
|
|
81
|
+
const waitForAddPieces = await SP.waitForAddPieces(addPiecesResult);
|
|
67
82
|
state.completedOperations += operations.length;
|
|
68
83
|
completedOps += operations.length;
|
|
69
84
|
await upsertOperations({
|
|
@@ -72,7 +87,7 @@ function createAddPiecesWorker({ localDb, indexerDb, repair, client, state, log
|
|
|
72
87
|
...operation,
|
|
73
88
|
status: 'completed',
|
|
74
89
|
error: null,
|
|
75
|
-
|
|
90
|
+
txHash: waitForAddPieces.txHash,
|
|
76
91
|
})),
|
|
77
92
|
});
|
|
78
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-pieces.js","sourceRoot":"","sources":["../../../src/pipeline/add-pieces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,KAAK,KAAK,MAAM,2BAA2B,CAAA;AAClD,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACvD,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAG7D,OAAO,EAAE,sBAAsB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"add-pieces.js","sourceRoot":"","sources":["../../../src/pipeline/add-pieces.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Address } from 'viem';
|
|
1
2
|
import type { RepairSelect } from '../local-schema.ts';
|
|
2
3
|
import type { IndexerDatabase, LocalDatabase, WalletClient } from '../types.ts';
|
|
3
4
|
export type EnsureRepairDatasetOptions = {
|
|
@@ -6,7 +7,8 @@ export type EnsureRepairDatasetOptions = {
|
|
|
6
7
|
indexerDb: IndexerDatabase;
|
|
7
8
|
client: WalletClient;
|
|
8
9
|
repair: RepairSelect;
|
|
10
|
+
payer: Address;
|
|
9
11
|
};
|
|
10
|
-
export declare function ensureRepairDataset({ source, localDb, indexerDb, client, repair }: EnsureRepairDatasetOptions): Promise<bigint>;
|
|
11
|
-
export declare function ensureReplicateDataset({ localDb, indexerDb, client, repair }: EnsureRepairDatasetOptions): Promise<bigint>;
|
|
12
|
+
export declare function ensureRepairDataset({ source, localDb, indexerDb, client, repair, payer, }: EnsureRepairDatasetOptions): Promise<bigint>;
|
|
13
|
+
export declare function ensureReplicateDataset({ localDb, indexerDb, client, repair, payer, }: EnsureRepairDatasetOptions): Promise<bigint>;
|
|
12
14
|
//# sourceMappingURL=create-datasets.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-datasets.d.ts","sourceRoot":"","sources":["../../../src/pipeline/create-datasets.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create-datasets.d.ts","sourceRoot":"","sources":["../../../src/pipeline/create-datasets.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAGnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG/E,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,aAAa,CAAA;IACtB,SAAS,EAAE,eAAe,CAAA;IAC1B,MAAM,EAAE,YAAY,CAAA;IACpB,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAOD,wBAAsB,mBAAmB,CAAC,EACxC,MAAM,EACN,OAAO,EACP,SAAS,EACT,MAAM,EACN,MAAM,EACN,KAAK,GACN,EAAE,0BAA0B,mBA8C5B;AAOD,wBAAsB,sBAAsB,CAAC,EAC3C,OAAO,EACP,SAAS,EACT,MAAM,EACN,MAAM,EACN,KAAK,GACN,EAAE,0BAA0B,mBAqD5B"}
|
|
@@ -5,7 +5,7 @@ import { eq } from 'drizzle-orm';
|
|
|
5
5
|
import { findRepairDataset } from "../db/find-repair-dataset.js";
|
|
6
6
|
import { repairUpdate } from "../db/repair-update.js";
|
|
7
7
|
import { hashLink } from "../utils.js";
|
|
8
|
-
export async function ensureRepairDataset({ source, localDb, indexerDb, client, repair }) {
|
|
8
|
+
export async function ensureRepairDataset({ source, localDb, indexerDb, client, repair, payer, }) {
|
|
9
9
|
const log = p.taskLog({
|
|
10
10
|
title: 'Ensuring repair dataset',
|
|
11
11
|
});
|
|
@@ -18,7 +18,7 @@ export async function ensureRepairDataset({ source, localDb, indexerDb, client,
|
|
|
18
18
|
const existingDatasetId = await findRepairDataset({
|
|
19
19
|
indexerDb,
|
|
20
20
|
providerId: repair.targetProviderId,
|
|
21
|
-
payer
|
|
21
|
+
payer,
|
|
22
22
|
source,
|
|
23
23
|
});
|
|
24
24
|
if (existingDatasetId) {
|
|
@@ -29,7 +29,7 @@ export async function ensureRepairDataset({ source, localDb, indexerDb, client,
|
|
|
29
29
|
const { txHash, statusUrl } = await SP.createDataSet(client, {
|
|
30
30
|
payee: provider.payee,
|
|
31
31
|
serviceURL: provider.pdp.serviceURL,
|
|
32
|
-
payer
|
|
32
|
+
payer,
|
|
33
33
|
cdn: false,
|
|
34
34
|
metadata: {
|
|
35
35
|
source,
|
|
@@ -50,7 +50,7 @@ export async function ensureRepairDataset({ source, localDb, indexerDb, client,
|
|
|
50
50
|
});
|
|
51
51
|
return datasetId;
|
|
52
52
|
}
|
|
53
|
-
export async function ensureReplicateDataset({ localDb, indexerDb, client, repair }) {
|
|
53
|
+
export async function ensureReplicateDataset({ localDb, indexerDb, client, repair, payer, }) {
|
|
54
54
|
const log = p.taskLog({
|
|
55
55
|
title: 'Ensuring replication dataset',
|
|
56
56
|
});
|
|
@@ -80,7 +80,7 @@ export async function ensureReplicateDataset({ localDb, indexerDb, client, repai
|
|
|
80
80
|
const { txHash, statusUrl } = await SP.createDataSet(client, {
|
|
81
81
|
payee: provider.payee,
|
|
82
82
|
serviceURL: provider.pdp.serviceURL,
|
|
83
|
-
payer
|
|
83
|
+
payer,
|
|
84
84
|
cdn: sourceDataSet.withCdn,
|
|
85
85
|
metadata: sourceDataSet.metadata ?? undefined,
|
|
86
86
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-datasets.js","sourceRoot":"","sources":["../../../src/pipeline/create-datasets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAA;AACnC,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"create-datasets.js","sourceRoot":"","sources":["../../../src/pipeline/create-datasets.ts"],"names":[],"mappings":"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"}
|