@render-foundation/utils 0.0.134 → 0.0.137
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/lib/cjs/backfiller.js +438 -0
- package/lib/cjs/backfiller.js.map +1 -0
- package/lib/cjs/client/pg/v2Client.js +3 -2
- package/lib/cjs/client/pg/v2Client.js.map +1 -1
- package/lib/cjs/index.js +1 -0
- package/lib/cjs/index.js.map +1 -1
- package/lib/esm/src/backfiller.js +412 -0
- package/lib/esm/src/backfiller.js.map +1 -0
- package/lib/esm/src/client/pg/v2Client.js +3 -2
- package/lib/esm/src/client/pg/v2Client.js.map +1 -1
- package/lib/esm/src/index.js +1 -0
- package/lib/esm/src/index.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/backfiller.d.ts +52 -0
- package/lib/types/src/backfiller.d.ts.map +1 -0
- package/lib/types/src/client/pg/v2Client.d.ts +2 -1
- package/lib/types/src/client/pg/v2Client.d.ts.map +1 -1
- package/lib/types/src/dbTypesV2.d.ts +3 -1
- package/lib/types/src/dbTypesV2.d.ts.map +1 -1
- package/lib/types/src/index.d.ts +1 -0
- package/lib/types/src/index.d.ts.map +1 -1
- package/package.json +2 -1
|
@@ -0,0 +1,438 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.Backfiller = exports.solscan = void 0;
|
|
13
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
14
|
+
const constants_1 = require("./constants");
|
|
15
|
+
const emission_distributor_sdk_1 = require("@render-foundation/emission-distributor-sdk");
|
|
16
|
+
const solscan = (cookie) => {
|
|
17
|
+
const headers = {
|
|
18
|
+
accept: 'application/json, text/plain, */*',
|
|
19
|
+
'accept-language': 'en-US,en;q=0.5',
|
|
20
|
+
cookie: cookie,
|
|
21
|
+
origin: 'https://solscan.io',
|
|
22
|
+
priority: 'u=1, i',
|
|
23
|
+
referer: 'https://solscan.io/',
|
|
24
|
+
'sec-ch-ua': '"Chromium";v="128", "Not;A=Brand";v="24", "Brave";v="128"',
|
|
25
|
+
'sec-ch-ua-mobile': '?0',
|
|
26
|
+
'sec-ch-ua-platform': '"macOS"',
|
|
27
|
+
'sec-fetch-dest': 'empty',
|
|
28
|
+
'sec-fetch-mode': 'cors',
|
|
29
|
+
'sec-fetch-site': 'same-site',
|
|
30
|
+
'sec-gpc': '1',
|
|
31
|
+
'sol-aut': 'qLtYhOMdWlJna=dQB9dls0fK=qTU9TcGxYIj2L-3',
|
|
32
|
+
'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36',
|
|
33
|
+
};
|
|
34
|
+
const url = 'https://api-v2.solscan.io';
|
|
35
|
+
return {
|
|
36
|
+
getBalanceChange(f) {
|
|
37
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
38
|
+
const r = {
|
|
39
|
+
page: '1',
|
|
40
|
+
page_size: '100',
|
|
41
|
+
};
|
|
42
|
+
if (f.mint) {
|
|
43
|
+
r['token'] = f.mint.toString();
|
|
44
|
+
}
|
|
45
|
+
if (f.flow) {
|
|
46
|
+
r['flow'] = f.flow;
|
|
47
|
+
}
|
|
48
|
+
if (f.tokenAcct) {
|
|
49
|
+
r['address'] = f.tokenAcct.toString();
|
|
50
|
+
}
|
|
51
|
+
const params = new URLSearchParams(r);
|
|
52
|
+
const ep = `${url}/v2/account/balance_change?${params}`;
|
|
53
|
+
console.log(`fetching ${ep}`);
|
|
54
|
+
const res = yield fetch(ep, { headers });
|
|
55
|
+
const body = yield res.json();
|
|
56
|
+
return body.data.map(({ trans_id, block_time, amount, token_decimals }) => ({
|
|
57
|
+
amount: amount,
|
|
58
|
+
tokenDecimals: token_decimals,
|
|
59
|
+
sig: trans_id,
|
|
60
|
+
blockTime: block_time,
|
|
61
|
+
}));
|
|
62
|
+
});
|
|
63
|
+
},
|
|
64
|
+
getTransfers(f) {
|
|
65
|
+
var _a, _b;
|
|
66
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
const r = {
|
|
68
|
+
page: '1',
|
|
69
|
+
page_size: (_b = (_a = f.pageSize) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '100',
|
|
70
|
+
};
|
|
71
|
+
if (f.mint) {
|
|
72
|
+
r['token'] = f.mint.toString();
|
|
73
|
+
}
|
|
74
|
+
if (f.flow) {
|
|
75
|
+
r['flow'] = f.flow;
|
|
76
|
+
}
|
|
77
|
+
if (f.addr) {
|
|
78
|
+
r['address'] = f.addr.toString();
|
|
79
|
+
}
|
|
80
|
+
const params = new URLSearchParams(r);
|
|
81
|
+
const ep = `${url}/v2/account/transfer?${params}`;
|
|
82
|
+
const res = yield fetch(ep, { headers });
|
|
83
|
+
if (res.status != 200) {
|
|
84
|
+
throw new Error(`failed ${yield res.text()}`);
|
|
85
|
+
}
|
|
86
|
+
const body = yield res.json();
|
|
87
|
+
return body.data.map(({ trans_id, block_time, amount, token_decimals, to_address, from_address }) => ({
|
|
88
|
+
amount: amount,
|
|
89
|
+
tokenDecimals: token_decimals,
|
|
90
|
+
fromAddress: new web3_js_1.PublicKey(from_address),
|
|
91
|
+
toAddress: new web3_js_1.PublicKey(to_address),
|
|
92
|
+
sig: trans_id,
|
|
93
|
+
blockTime: block_time,
|
|
94
|
+
}));
|
|
95
|
+
});
|
|
96
|
+
},
|
|
97
|
+
};
|
|
98
|
+
};
|
|
99
|
+
exports.solscan = solscan;
|
|
100
|
+
class Backfiller {
|
|
101
|
+
constructor(conn, pg) {
|
|
102
|
+
this._types = {};
|
|
103
|
+
this._txs = [];
|
|
104
|
+
this.solscan = { pageSize: 100 };
|
|
105
|
+
this.indexLoans = () => __awaiter(this, void 0, void 0, function* () {
|
|
106
|
+
const trs = [
|
|
107
|
+
{
|
|
108
|
+
transfer: {
|
|
109
|
+
toSolKey: '2P2gisXpbsYEUsTDQKdcDKSg1UZvx7qxfLTkvJGZdeJC',
|
|
110
|
+
fromSolKey: constants_1.v3SquadsVault,
|
|
111
|
+
solTx: '3oC8BybX5YrkfPyvV8rAE1tnJr6egtZFHLghqHuLi3eaT4aWm87qZPJFrjFRn6nwVemd2ponsew85tBs6VVQzTJv',
|
|
112
|
+
executedAt: new Date('December 22, 2023 04:13:58 UTC'),
|
|
113
|
+
symbol: 'RENDER',
|
|
114
|
+
channel: 'loan',
|
|
115
|
+
amountPayed: BigInt(44999 * Math.pow(10, 8)),
|
|
116
|
+
},
|
|
117
|
+
},
|
|
118
|
+
{
|
|
119
|
+
transfer: {
|
|
120
|
+
toSolKey: '2P2gisXpbsYEUsTDQKdcDKSg1UZvx7qxfLTkvJGZdeJC',
|
|
121
|
+
fromSolKey: constants_1.v3SquadsVault,
|
|
122
|
+
channel: 'loan',
|
|
123
|
+
solTx: '2f5sEBHcP8wpF79voUEUiP8pryDt7FvqrTXQrEpXzAxbzyFYPkavZGtJc5N8CXhfbJav8hQTr9YcENKseiouaWzc',
|
|
124
|
+
executedAt: new Date('December 22, 2023 02:39:53 UTC'),
|
|
125
|
+
symbol: 'RENDER',
|
|
126
|
+
amountPayed: BigInt(1 * Math.pow(10, 8)),
|
|
127
|
+
},
|
|
128
|
+
},
|
|
129
|
+
{
|
|
130
|
+
transfer: {
|
|
131
|
+
toSolKey: '5DGbogKUo8haEYC9Tt4FTHE5ue55bjLC4DpSgE1g6yT1',
|
|
132
|
+
fromSolKey: constants_1.v3SquadsVault,
|
|
133
|
+
channel: 'loan',
|
|
134
|
+
solTx: '42n55BZcKVBCSZQoaneBQLn57v7zZGZorGe3uBLheGu4BQtpaTChdT1z3vHwgU4MHghJw3wJ72rFLkib761ewJCj',
|
|
135
|
+
executedAt: new Date('January 12, 2024 00:17:02 UTC'),
|
|
136
|
+
symbol: 'RENDER',
|
|
137
|
+
amountPayed: BigInt(1 * Math.pow(10, 8)),
|
|
138
|
+
},
|
|
139
|
+
},
|
|
140
|
+
{
|
|
141
|
+
transfer: {
|
|
142
|
+
toSolKey: '5DGbogKUo8haEYC9Tt4FTHE5ue55bjLC4DpSgE1g6yT1',
|
|
143
|
+
fromSolKey: constants_1.v3SquadsVault,
|
|
144
|
+
channel: 'loan',
|
|
145
|
+
solTx: 'THJLvA1UTqH22hNP7Ecnfn4iY736VJAZ8scgSUjrDDaGpSQJmGYKJYXGtDu6TB96fKo6mJBtUBZvLb4ors17JUR',
|
|
146
|
+
executedAt: new Date('January 17, 2024 22:09:58 UTC'),
|
|
147
|
+
symbol: 'RENDER',
|
|
148
|
+
amountPayed: BigInt(49999 * Math.pow(10, 8)),
|
|
149
|
+
},
|
|
150
|
+
},
|
|
151
|
+
{
|
|
152
|
+
transfer: {
|
|
153
|
+
toSolKey: '5DGbogKUo8haEYC9Tt4FTHE5ue55bjLC4DpSgE1g6yT1',
|
|
154
|
+
fromSolKey: constants_1.devsSquadsVault,
|
|
155
|
+
channel: 'loan',
|
|
156
|
+
solTx: '5BcxrMExq34jtMB5c3bH3A8TN4pCp9sxjC5HMcS7Mh8pig3r2eQhvRnJeE1RBTyQ4JDXyANWmDU9SKdYFyT2wDoq',
|
|
157
|
+
executedAt: new Date('February 28, 2024 22:43:21 UTC'),
|
|
158
|
+
symbol: 'RENDER',
|
|
159
|
+
amountPayed: BigInt(1 * Math.pow(10, 8)),
|
|
160
|
+
},
|
|
161
|
+
},
|
|
162
|
+
{
|
|
163
|
+
transfer: {
|
|
164
|
+
toSolKey: '5DGbogKUo8haEYC9Tt4FTHE5ue55bjLC4DpSgE1g6yT1',
|
|
165
|
+
fromSolKey: constants_1.devsSquadsVault,
|
|
166
|
+
channel: 'loan',
|
|
167
|
+
solTx: '5E4E35CT4e3fhbMAwcKdfAvJL4uUHR8hHE8REmKnDCEsFZ6mxaE1YyeYK8Sbg5AJqBJxsZkcYSohY8T14YLC5pXs',
|
|
168
|
+
executedAt: new Date('February 29, 2024 01:17:51 UTC'),
|
|
169
|
+
symbol: 'RENDER',
|
|
170
|
+
amountPayed: BigInt(199999 * Math.pow(10, 8)),
|
|
171
|
+
},
|
|
172
|
+
}
|
|
173
|
+
];
|
|
174
|
+
for (const t of trs) {
|
|
175
|
+
try {
|
|
176
|
+
yield this.pg.createPayments(this.pg.db, [t]);
|
|
177
|
+
}
|
|
178
|
+
catch (e) {
|
|
179
|
+
console.log(`except ${e}`);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
});
|
|
183
|
+
this.conn = conn;
|
|
184
|
+
this.pg = pg;
|
|
185
|
+
}
|
|
186
|
+
emit() {
|
|
187
|
+
this._types['emit'] = {};
|
|
188
|
+
return this;
|
|
189
|
+
}
|
|
190
|
+
loans() {
|
|
191
|
+
this._types['loan'] = {};
|
|
192
|
+
return this;
|
|
193
|
+
}
|
|
194
|
+
buyBurnUSDCInflow(solscanCookie) {
|
|
195
|
+
this._types['buyBurnUSDCInflow'] = {};
|
|
196
|
+
this.solscan.cookie = solscanCookie;
|
|
197
|
+
return this;
|
|
198
|
+
}
|
|
199
|
+
manualMint(solscanCookie) {
|
|
200
|
+
this._types['manualMint'] = {};
|
|
201
|
+
this.solscan.cookie = solscanCookie;
|
|
202
|
+
return this;
|
|
203
|
+
}
|
|
204
|
+
vaultOutflows(p) {
|
|
205
|
+
this._types['vaultOutflows'] = {};
|
|
206
|
+
this.solscan.cookie = p.solscanCookie;
|
|
207
|
+
this.solscan.pageSize = p.pageSize;
|
|
208
|
+
return this;
|
|
209
|
+
}
|
|
210
|
+
txs(...sigs) {
|
|
211
|
+
this._txs.push(...sigs);
|
|
212
|
+
}
|
|
213
|
+
findEmitTxs() {
|
|
214
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
215
|
+
const ad = (0, emission_distributor_sdk_1.emissionDistributorKey)(new web3_js_1.PublicKey(constants_1.renderMint))[0];
|
|
216
|
+
let sigs = yield this.conn.getSignaturesForAddress(new web3_js_1.PublicKey(ad), undefined, 'confirmed');
|
|
217
|
+
let rev = [];
|
|
218
|
+
while (sigs.length == 1000) {
|
|
219
|
+
console.log(`sigs len ${sigs.length}`);
|
|
220
|
+
rev = sigs.concat(rev);
|
|
221
|
+
sigs = yield this.conn.getSignaturesForAddress(new web3_js_1.PublicKey(ad), { before: sigs[sigs.length - 1].signature }, 'confirmed');
|
|
222
|
+
console.log(`looping`);
|
|
223
|
+
}
|
|
224
|
+
rev = sigs.concat(rev);
|
|
225
|
+
console.log(`rev ${rev.length}`);
|
|
226
|
+
let proced = 0;
|
|
227
|
+
const found = {};
|
|
228
|
+
for (const s of rev) {
|
|
229
|
+
const p = yield this.conn.getParsedTransaction(s.signature, {
|
|
230
|
+
maxSupportedTransactionVersion: 0,
|
|
231
|
+
commitment: 'confirmed',
|
|
232
|
+
});
|
|
233
|
+
if (p.meta.err) {
|
|
234
|
+
continue;
|
|
235
|
+
}
|
|
236
|
+
for (const l of p.meta.logMessages) {
|
|
237
|
+
if (l.includes('DistributeEmissionsV0')) {
|
|
238
|
+
found[s.signature] = {};
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
proced += 1;
|
|
242
|
+
if (proced % 50 == 0) {
|
|
243
|
+
console.log(`proced ${proced}`);
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
console.log(`emit txs: ${Object.keys(found)}`);
|
|
247
|
+
//console.log(`last ${sigs.slice(sigs.length - 5).map((s) => s.signature)}`)
|
|
248
|
+
return found;
|
|
249
|
+
});
|
|
250
|
+
}
|
|
251
|
+
run() {
|
|
252
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
253
|
+
for (const t of Object.keys(this._types)) {
|
|
254
|
+
if (t == 'emit') {
|
|
255
|
+
const txs = yield this.findEmitTxs();
|
|
256
|
+
yield this.indexTxs(Object.keys(txs), 'emit');
|
|
257
|
+
}
|
|
258
|
+
else if (t == 'buyBurnUSDCInflow') {
|
|
259
|
+
const trs = yield (0, exports.solscan)(this.solscan.cookie).getTransfers({
|
|
260
|
+
mint: new web3_js_1.PublicKey(constants_1.usdcMint),
|
|
261
|
+
flow: 'in',
|
|
262
|
+
addr: new web3_js_1.PublicKey(constants_1.buyAndBurnEscrow),
|
|
263
|
+
});
|
|
264
|
+
for (const t of trs) {
|
|
265
|
+
console.log(`buyBurnUSDCInflows: ${JSON.stringify(t)}`);
|
|
266
|
+
const { stop } = yield this.indexTransfers({ [constants_1.buyAndBurnEscrow]: { mint: constants_1.usdcMint, amt: t.amount } }, { blockTime: t.blockTime, sig: t.sig }, t.fromAddress.toString(), 'internal');
|
|
267
|
+
if (stop) {
|
|
268
|
+
break;
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
else if (t == 'manualMint') {
|
|
273
|
+
const trs = yield (0, exports.solscan)(this.solscan.cookie).getBalanceChange({
|
|
274
|
+
mint: new web3_js_1.PublicKey(constants_1.renderMint),
|
|
275
|
+
flow: 'in',
|
|
276
|
+
tokenAcct: new web3_js_1.PublicKey(constants_1.bridgeEscrow),
|
|
277
|
+
});
|
|
278
|
+
for (const t of trs) {
|
|
279
|
+
console.log(`manualMints: ${JSON.stringify(t)}`);
|
|
280
|
+
const { stop } = yield this.indexTransfers({ [constants_1.bridgeEscrow]: { mint: constants_1.renderMint, amt: t.amount } }, { blockTime: t.blockTime, sig: t.sig }, constants_1.renderMint, 'manual_mint');
|
|
281
|
+
if (stop) {
|
|
282
|
+
break;
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
else if (t == 'vaultOutflows') {
|
|
287
|
+
const trs = yield (0, exports.solscan)(this.solscan.cookie).getTransfers({
|
|
288
|
+
mint: new web3_js_1.PublicKey(constants_1.renderMint),
|
|
289
|
+
flow: 'out',
|
|
290
|
+
addr: new web3_js_1.PublicKey(constants_1.devsSquadsVault),
|
|
291
|
+
pageSize: this.solscan.pageSize
|
|
292
|
+
});
|
|
293
|
+
for (const t of trs) {
|
|
294
|
+
console.log(`vaultOutflow: ${JSON.stringify(t)}`);
|
|
295
|
+
const { stop } = yield this.indexTransfers({ [t.toAddress.toString()]: { mint: constants_1.renderMint, amt: t.amount } }, { blockTime: t.blockTime, sig: t.sig }, constants_1.devsSquadsVault, 'internal');
|
|
296
|
+
if (stop) {
|
|
297
|
+
break;
|
|
298
|
+
}
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
else if (t == 'loan') {
|
|
302
|
+
yield this.indexLoans();
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
});
|
|
306
|
+
}
|
|
307
|
+
indexTransfers(onchain, tx, sender, channel, reindexTx = false) {
|
|
308
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
309
|
+
const ents = Object.entries(onchain).filter(([k, { mint, amt }]) => amt != 0);
|
|
310
|
+
if (reindexTx) {
|
|
311
|
+
let res = yield this.pg.db.trx
|
|
312
|
+
.deleteFrom('sol_tx')
|
|
313
|
+
.where('sig', '=', tx.sig)
|
|
314
|
+
.executeTakeFirstOrThrow();
|
|
315
|
+
console.log(`deleted ${res.numDeletedRows} tx`);
|
|
316
|
+
}
|
|
317
|
+
console.log(`diffs: ${ents.map(([k, v]) => `k ${k} v -> ${JSON.stringify(v)}`)}`);
|
|
318
|
+
const insertedIds = [];
|
|
319
|
+
for (const [k, { amt, mint }] of ents) {
|
|
320
|
+
if (k == sender) {
|
|
321
|
+
continue;
|
|
322
|
+
}
|
|
323
|
+
const trx = yield this.pg.startTransaction();
|
|
324
|
+
try {
|
|
325
|
+
const { inserted } = yield this.pg.createPayments(trx, [
|
|
326
|
+
{
|
|
327
|
+
transfer: {
|
|
328
|
+
fromSolKey: sender,
|
|
329
|
+
toSolKey: k,
|
|
330
|
+
symbol: (() => {
|
|
331
|
+
if (mint == constants_1.renderMint) {
|
|
332
|
+
return 'RENDER';
|
|
333
|
+
}
|
|
334
|
+
if (mint == constants_1.usdcMint) {
|
|
335
|
+
return 'USDC';
|
|
336
|
+
}
|
|
337
|
+
throw new Error(`unknown mint ${mint}`);
|
|
338
|
+
})(),
|
|
339
|
+
channel: channel,
|
|
340
|
+
solTx: tx.sig,
|
|
341
|
+
executedAt: new Date(tx.blockTime * 1000),
|
|
342
|
+
amountPayed: BigInt(amt),
|
|
343
|
+
},
|
|
344
|
+
},
|
|
345
|
+
]);
|
|
346
|
+
console.log(`inserted ${JSON.stringify(inserted)}`);
|
|
347
|
+
insertedIds.push(...inserted.map((t) => t.transferId).filter((i) => !!i));
|
|
348
|
+
trx.commit();
|
|
349
|
+
}
|
|
350
|
+
catch (e) {
|
|
351
|
+
trx.rollback();
|
|
352
|
+
if (`${e}`.includes('duplicate key value violates unique constraint')) {
|
|
353
|
+
console.log(`caught up indexing ${e}`);
|
|
354
|
+
return { stop: true };
|
|
355
|
+
}
|
|
356
|
+
throw e;
|
|
357
|
+
}
|
|
358
|
+
}
|
|
359
|
+
console.log(`tx ${tx.sig} -> insertedIds ${insertedIds.length}`);
|
|
360
|
+
return { stop: false };
|
|
361
|
+
});
|
|
362
|
+
}
|
|
363
|
+
indexTxs(txs, channel, reindexTx = false, deleteFailed = false, mints = [constants_1.renderMint, constants_1.usdcMint],
|
|
364
|
+
// squadsV4
|
|
365
|
+
senders = [constants_1.passthruEscrow, constants_1.v3SquadsVault, constants_1.upgradeRewardsEscrow, constants_1.upgradeRewardsCircuitBreaker, constants_1.renderMint], assertSender = '') {
|
|
366
|
+
var _a, _b;
|
|
367
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
368
|
+
let proced = 0;
|
|
369
|
+
console.log(`processing ${txs.length} txs`);
|
|
370
|
+
const insertedIds = [];
|
|
371
|
+
for (const solTx of txs) {
|
|
372
|
+
if (solTx == '') {
|
|
373
|
+
continue;
|
|
374
|
+
}
|
|
375
|
+
console.log(`solTx ${solTx}`);
|
|
376
|
+
const tx = yield this.conn.getParsedTransaction(solTx, {
|
|
377
|
+
maxSupportedTransactionVersion: 0,
|
|
378
|
+
commitment: 'confirmed',
|
|
379
|
+
});
|
|
380
|
+
if (!tx || tx.meta.err) {
|
|
381
|
+
console.log(`shouldnt exist ${solTx} in db. deleting`);
|
|
382
|
+
let res = yield this.pg.db.trx
|
|
383
|
+
.deleteFrom('sol_tx')
|
|
384
|
+
.where('sig', '=', solTx)
|
|
385
|
+
.executeTakeFirstOrThrow();
|
|
386
|
+
console.log(`deleted ${res.numDeletedRows} tx`);
|
|
387
|
+
continue;
|
|
388
|
+
}
|
|
389
|
+
const onchain = {};
|
|
390
|
+
for (const b of tx.meta.postTokenBalances) {
|
|
391
|
+
const mint = mints.find((m) => b.mint == m);
|
|
392
|
+
const amt = Number((_a = b.uiTokenAmount.amount) !== null && _a !== void 0 ? _a : 0);
|
|
393
|
+
if (mint) {
|
|
394
|
+
onchain[b.owner] = { mint, amt };
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
let sender;
|
|
398
|
+
for (const b of tx.meta.preTokenBalances) {
|
|
399
|
+
const mint = mints.find((m) => b.mint == m);
|
|
400
|
+
const amt = Number((_b = b.uiTokenAmount.amount) !== null && _b !== void 0 ? _b : 0);
|
|
401
|
+
if (mint) {
|
|
402
|
+
onchain[b.owner] = { mint, amt: onchain[b.owner].amt - amt };
|
|
403
|
+
if (onchain[b.owner].amt < 0) {
|
|
404
|
+
sender = senders.find((s) => s == b.owner.toString());
|
|
405
|
+
if (!sender) {
|
|
406
|
+
throw new Error(`sender ${b.owner} not in expected senders ${senders}`);
|
|
407
|
+
}
|
|
408
|
+
if (assertSender != '' && sender != assertSender) {
|
|
409
|
+
throw new Error(`assert sender ${b.owner} != ${assertSender}`);
|
|
410
|
+
}
|
|
411
|
+
}
|
|
412
|
+
}
|
|
413
|
+
}
|
|
414
|
+
if (channel == 'emit') {
|
|
415
|
+
sender = constants_1.renderMint;
|
|
416
|
+
}
|
|
417
|
+
if (!sender) {
|
|
418
|
+
console.log(`no matching sender found`);
|
|
419
|
+
}
|
|
420
|
+
if (Object.keys(onchain).length == 0) {
|
|
421
|
+
console.log(`skipping ${solTx}. nothing to index`);
|
|
422
|
+
continue;
|
|
423
|
+
}
|
|
424
|
+
const { stop } = yield this.indexTransfers(onchain, { blockTime: tx.blockTime, sig: solTx }, sender, channel);
|
|
425
|
+
if (stop) {
|
|
426
|
+
break;
|
|
427
|
+
}
|
|
428
|
+
proced += 1;
|
|
429
|
+
if (proced % 10 == 0) {
|
|
430
|
+
console.log(`proced ${proced}`);
|
|
431
|
+
}
|
|
432
|
+
}
|
|
433
|
+
console.log(`done. inserted ${insertedIds.length} transfers: ${insertedIds.join(',')}`);
|
|
434
|
+
});
|
|
435
|
+
}
|
|
436
|
+
}
|
|
437
|
+
exports.Backfiller = Backfiller;
|
|
438
|
+
//# sourceMappingURL=backfiller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"backfiller.js","sourceRoot":"","sources":["../../src/backfiller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1122,7 +1122,7 @@ const pgClient = (config) => {
|
|
|
1122
1122
|
getBurnAdjustments(trx, ps, log = logger_1.consoleLogger) {
|
|
1123
1123
|
return __awaiter(this, void 0, void 0, function* () {
|
|
1124
1124
|
if (ps.toFill) {
|
|
1125
|
-
const q =
|
|
1125
|
+
const q = trx
|
|
1126
1126
|
.selectFrom(exports.BURN_ADJUSTMENT_TABLE)
|
|
1127
1127
|
.selectAll(exports.BURN_ADJUSTMENT_TABLE)
|
|
1128
1128
|
.innerJoin(exports.JOB_TABLE, `${exports.JOB_TABLE}.id`, `${exports.BURN_ADJUSTMENT_TABLE}.job_id`)
|
|
@@ -1138,7 +1138,7 @@ const pgClient = (config) => {
|
|
|
1138
1138
|
`${exports.JOB_TABLE}.completed_at`,
|
|
1139
1139
|
`${exports.JOB_TABLE}.render_amt`,
|
|
1140
1140
|
])
|
|
1141
|
-
.havingRef((0, kysely_1.sql) `SUM(COALESCE("burn"."to_burn", 0)) - SUM(COALESCE("burn"."burned", 0))`, '<', `${exports.BURN_ADJUSTMENT_TABLE}.
|
|
1141
|
+
.havingRef((0, kysely_1.sql) `SUM(COALESCE("burn"."to_burn", 0)) - SUM(COALESCE("burn"."burned", 0))`, '<', `${exports.BURN_ADJUSTMENT_TABLE}.down_adj_to_burn`);
|
|
1142
1142
|
log.info(`getBurnAdjustments ${q.compile().sql}`);
|
|
1143
1143
|
const res = yield q.execute();
|
|
1144
1144
|
return res.map((r) => ({
|
|
@@ -1146,6 +1146,7 @@ const pgClient = (config) => {
|
|
|
1146
1146
|
createdAt: r.created_at,
|
|
1147
1147
|
jobId: Number(r.job_id),
|
|
1148
1148
|
downAdjRndrUsed: Number(r.down_adj_rndr_used),
|
|
1149
|
+
downAdjToBurn: Number(r.down_adj_to_burn),
|
|
1149
1150
|
adjusted: Number(r.tot_to_burn) - Number(r.tot_burned),
|
|
1150
1151
|
job: {
|
|
1151
1152
|
id: Number(r.job_id),
|