@render-foundation/utils 0.0.9 → 0.0.12

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.
Files changed (44) hide show
  1. package/lib/cjs/errorReporter.js +77 -0
  2. package/lib/cjs/errorReporter.js.map +1 -0
  3. package/lib/cjs/index.js +2 -0
  4. package/lib/cjs/index.js.map +1 -1
  5. package/lib/cjs/logger.js +18 -0
  6. package/lib/cjs/logger.js.map +1 -0
  7. package/lib/cjs/pgClient.js +45 -15
  8. package/lib/cjs/pgClient.js.map +1 -1
  9. package/lib/cjs/renderClient.js +4 -3
  10. package/lib/cjs/renderClient.js.map +1 -1
  11. package/lib/cjs/squadsV3.js +5 -4
  12. package/lib/cjs/squadsV3.js.map +1 -1
  13. package/lib/cjs/wormhole.js +2 -1
  14. package/lib/cjs/wormhole.js.map +1 -1
  15. package/lib/esm/src/errorReporter.js +68 -0
  16. package/lib/esm/src/errorReporter.js.map +1 -0
  17. package/lib/esm/src/index.js +2 -0
  18. package/lib/esm/src/index.js.map +1 -1
  19. package/lib/esm/src/logger.js +15 -0
  20. package/lib/esm/src/logger.js.map +1 -0
  21. package/lib/esm/src/pgClient.js +41 -15
  22. package/lib/esm/src/pgClient.js.map +1 -1
  23. package/lib/esm/src/renderClient.js +4 -3
  24. package/lib/esm/src/renderClient.js.map +1 -1
  25. package/lib/esm/src/squadsV3.js +5 -4
  26. package/lib/esm/src/squadsV3.js.map +1 -1
  27. package/lib/esm/src/wormhole.js +2 -1
  28. package/lib/esm/src/wormhole.js.map +1 -1
  29. package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
  30. package/lib/types/src/errorReporter.d.ts +12 -0
  31. package/lib/types/src/errorReporter.d.ts.map +1 -0
  32. package/lib/types/src/index.d.ts +2 -0
  33. package/lib/types/src/index.d.ts.map +1 -1
  34. package/lib/types/src/logger.d.ts +14 -0
  35. package/lib/types/src/logger.d.ts.map +1 -0
  36. package/lib/types/src/pgClient.d.ts +5 -2
  37. package/lib/types/src/pgClient.d.ts.map +1 -1
  38. package/lib/types/src/renderClient.d.ts +2 -1
  39. package/lib/types/src/renderClient.d.ts.map +1 -1
  40. package/lib/types/src/squadsV3.d.ts +2 -1
  41. package/lib/types/src/squadsV3.d.ts.map +1 -1
  42. package/lib/types/src/wormhole.d.ts +2 -1
  43. package/lib/types/src/wormhole.d.ts.map +1 -1
  44. package/package.json +7 -3
@@ -1,5 +1,6 @@
1
1
  import { Pool } from 'pg';
2
2
  import { Kysely, NoResultError, PostgresDialect, sql } from 'kysely';
3
+ import { consoleLogger } from "./logger";
3
4
  const transferFromDB = (o) => {
4
5
  return {
5
6
  id: o.id,
@@ -27,7 +28,7 @@ const transferFromDB = (o) => {
27
28
  } : undefined
28
29
  };
29
30
  };
30
- export const pgClient = (config) => {
31
+ export const pgClient = (config, log = consoleLogger) => {
31
32
  const dialect = new PostgresDialect({
32
33
  pool: new Pool({
33
34
  ...config,
@@ -71,12 +72,12 @@ export const pgClient = (config) => {
71
72
  throw new Error('wtf');
72
73
  })(),
73
74
  }).returning((eb) => ['id as id']).executeTakeFirst());
74
- console.log(`inserted transfer ${JSON.stringify(t, (key, value) => typeof value === 'bigint'
75
+ log.info(`inserted transfer ${JSON.stringify(t, (key, value) => typeof value === 'bigint'
75
76
  ? value.toString()
76
77
  : value // return everything else unchanged
77
78
  )}`);
78
79
  if (t.operatorRewards) {
79
- console.log(`inserting operator rewards ${transferId}`);
80
+ log.info(`inserting operator rewards ${transferId}`);
80
81
  const x = (await db.insertInto(NODE_OPERATOR_REWARDS_TRANSFER).values({
81
82
  end_time: t.operatorRewards.endTime,
82
83
  start_time: t.operatorRewards.startTime,
@@ -85,14 +86,14 @@ export const pgClient = (config) => {
85
86
  }).executeTakeFirst()).insertId;
86
87
  }
87
88
  else if (t.computeClientRewards) {
88
- console.log(`inserting compute client rewards ${transferId}`);
89
+ log.info(`inserting compute client rewards ${transferId}`);
89
90
  const x = (await db.insertInto(COMPUTE_CLIENT_REWARDS_TRANSFER).values({
90
91
  device_id: t.computeClientRewards.deviceId,
91
92
  transfer_id: transferId
92
93
  }).executeTakeFirst()).insertId;
93
94
  }
94
95
  else if (t.upgradeRewards) {
95
- console.log(`inserting upgrade rewards ${transferId}`);
96
+ log.info(`inserting upgrade rewards ${transferId}`);
96
97
  const x = (await db.insertInto(UPGRADE_REWARDS_TRANSFER).values({
97
98
  epoch_id: t.upgradeRewards.epochId,
98
99
  epoch_start_time: t.upgradeRewards.epochStartTime,
@@ -107,19 +108,19 @@ export const pgClient = (config) => {
107
108
  async saveNodeOperatorEpoch(epochId, transfers, jobIds) {
108
109
  await db.transaction().execute(async (trx) => {
109
110
  await createTransfers(trx, transfers);
110
- console.log(`inserted transfers`);
111
+ log.info(`inserted transfers`);
111
112
  for (const id of jobIds) {
112
113
  await trx.insertInto(JOB_ID).values({
113
114
  id: BigInt(id),
114
115
  epoch_id: epochId,
115
116
  }).executeTakeFirstOrThrow();
116
117
  }
117
- console.log(`inserted jobids`);
118
+ log.info(`inserted jobids`);
118
119
  const now = new Date(Date.now());
119
120
  const res = await trx.updateTable(NODE_OPERATOR_EPOCH)
120
121
  .set({ saved_at: now })
121
122
  .where('id', '=', epochId.toString()).executeTakeFirstOrThrow();
122
- console.log(`saved node operator epoch: ${res.numUpdatedRows}`);
123
+ log.info(`saved node operator epoch: ${res.numUpdatedRows}`);
123
124
  });
124
125
  return;
125
126
  },
@@ -141,7 +142,7 @@ export const pgClient = (config) => {
141
142
  }
142
143
  catch (e) {
143
144
  if (e instanceof NoResultError) {
144
- console.log(`no node operator epoch found`);
145
+ log.info(`no node operator epoch found`);
145
146
  return undefined;
146
147
  }
147
148
  throw e;
@@ -167,7 +168,7 @@ export const pgClient = (config) => {
167
168
  const res = await db.updateTable(SQUADS_TX)
168
169
  .set({ tx_status: status })
169
170
  .where('sq_tx', '=', tx).execute();
170
- console.log(`updated ${tx} -> ${status}`);
171
+ log.info(`updated ${tx} -> ${status}`);
171
172
  },
172
173
  async setSqTx(transferIds, sqTx) {
173
174
  const { id } = (await db.insertInto(SQUADS_TX)
@@ -176,7 +177,7 @@ export const pgClient = (config) => {
176
177
  const res = await db.updateTable(TRANSFER)
177
178
  .set({ sq_tx_id: id })
178
179
  .where('id', 'in', transferIds.map(id => id.toString())).execute();
179
- console.log(`set sqTx ${sqTx} on ${transferIds.length} transfers`);
180
+ log.info(`set sqTx ${sqTx} on ${transferIds.length} transfers`);
180
181
  },
181
182
  /*
182
183
  [
@@ -223,7 +224,7 @@ export const pgClient = (config) => {
223
224
  base = base.orderBy('transfer.sol_key asc');
224
225
  }
225
226
  const res = await base.execute();
226
- console.log(`fetched ${base.compile().sql} ${res.length} transfers`);
227
+ log.info(`fetched ${base.compile().sql} ${res.length} transfers`);
227
228
  return res.map(r => transferFromDB(r));
228
229
  },
229
230
  async payoutTransfersSquads(ts, payedAt, solTx, sqTx) {
@@ -240,10 +241,35 @@ export const pgClient = (config) => {
240
241
  }).where('id', '=', id).executeTakeFirstOrThrow();
241
242
  numUpdated += res.numUpdatedRows;
242
243
  }
243
- console.log(`marked ${numUpdated} transfers payed out`);
244
+ log.info(`marked ${numUpdated} transfers payed out`);
244
245
  return;
245
246
  },
246
- async payoutTransfer(id, payedAt, solTx, amtPayed, sqTx) {
247
+ async payoutTransfers(idToAmt, payedAt, solTx) {
248
+ const res = await db.transaction().execute(async (tx) => {
249
+ for (const [id, amt] of Object.entries(idToAmt)) {
250
+ const res = await tx.updateTable(TRANSFER).set({
251
+ payed_at: payedAt,
252
+ sol_tx: solTx,
253
+ amount_payed: amt,
254
+ })
255
+ .where('id', '=', id.toString())
256
+ .executeTakeFirstOrThrow();
257
+ log.info(`marked ${res.numUpdatedRows} transfer payed out`);
258
+ }
259
+ });
260
+ },
261
+ async payoutTransfer(id, payedAt, solTx, amtPayed) {
262
+ const res = await db.updateTable(TRANSFER).set({
263
+ payed_at: payedAt,
264
+ sol_tx: solTx,
265
+ amount_payed: amtPayed,
266
+ })
267
+ .where('id', '=', id.toString())
268
+ .executeTakeFirst();
269
+ log.info(`marked ${res.numUpdatedRows} transfer payed out`);
270
+ return;
271
+ },
272
+ async payoutTransferSq(id, payedAt, solTx, amtPayed, sqTx) {
247
273
  const { id: sqTxId } = (await db.insertInto(SQUADS_TX)
248
274
  .values({ sq_tx: sqTx, tx_status: 'executed' })
249
275
  .onConflict((oc) => oc
@@ -258,7 +284,7 @@ export const pgClient = (config) => {
258
284
  })
259
285
  .where('id', '=', id.toString())
260
286
  .executeTakeFirst();
261
- console.log(`marked ${res.numUpdatedRows} transfer payed out`);
287
+ log.info(`marked ${res.numUpdatedRows} transfer payed out`);
262
288
  return;
263
289
  },
264
290
  async createTransfers(transfers) {
@@ -1 +1 @@
1
- {"version":3,"file":"pgClient.js","sourceRoot":"","sources":["../../../src/pgClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pgClient.js","sourceRoot":"","sources":["../../../src/pgClient.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,12 @@
1
- export const renderClient = (authToken) => {
1
+ import { consoleLogger } from "./logger";
2
+ export const renderClient = (authToken, log = consoleLogger) => {
2
3
  const host = `rndr.x.io`;
3
4
  return {
4
5
  async fetchNodeOperatorRewards(startTime, endTime) {
5
6
  const startTimeStr = startTime.toISOString().split('T')[0];
6
7
  const endTimeStr = endTime.toISOString().split('T')[0];
7
8
  const url = `https://${host}/api/v3/services/solana/payments?finished_after=${startTimeStr}&finished_before=${endTimeStr}`;
8
- console.log(`fetching ${url}`);
9
+ log.info(`fetching ${url}`);
9
10
  const res = await fetch(url, { headers: {
10
11
  Authorization: `${authToken}`,
11
12
  Accept: 'application/vnd.api+json'
@@ -48,7 +49,7 @@ export const renderClient = (authToken) => {
48
49
  }
49
50
  return (await res.text());
50
51
  });
51
- console.log(`markJobsPayed ${res}`);
52
+ log.info(`markJobsPayed ${res}`);
52
53
  return;
53
54
  }
54
55
  };
@@ -1 +1 @@
1
- {"version":3,"file":"renderClient.js","sourceRoot":"","sources":["../../../src/renderClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"renderClient.js","sourceRoot":"","sources":["../../../src/renderClient.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,8 @@ import { DEFAULT_MULTISIG_PROGRAM_ID, getAuthorityPDA, getTxPDA } from "@sqds/sd
2
2
  import BN from "bn.js";
3
3
  import { Transaction } from "@solana/web3.js";
4
4
  import { sendAndConfirmWithRetry } from "@render-foundation/spl-utils";
5
- export const executeSqV3Transaction = async (connection, squadsMsKey, clients, instrs) => {
5
+ import { consoleLogger } from "./logger";
6
+ export const executeSqV3Transaction = async (connection, squadsMsKey, clients, instrs, log = consoleLogger) => {
6
7
  const msAuthorityK = getAuthorityPDA(squadsMsKey, new BN(1), DEFAULT_MULTISIG_PROGRAM_ID)[0];
7
8
  let txPDA;
8
9
  const primClient = clients[0];
@@ -29,8 +30,8 @@ export const executeSqV3Transaction = async (connection, squadsMsKey, clients, i
29
30
  skipPreflight: true,
30
31
  maxRetries: 10,
31
32
  }, 'finalized');
32
- console.log(`created tx ${txPDA}`);
33
- console.log(`executing tx ${txPDA}`);
33
+ log.info(`created tx ${txPDA}`);
34
+ log.info(`executing tx ${txPDA}`);
34
35
  let execTx = new Transaction().add(await primClient.buildExecuteTransaction(txPDA, primClient.wallet.publicKey));
35
36
  execTx.recentBlockhash = (await connection.getLatestBlockhash()).blockhash;
36
37
  execTx.feePayer = primClient.wallet.publicKey;
@@ -40,7 +41,7 @@ export const executeSqV3Transaction = async (connection, squadsMsKey, clients, i
40
41
  skipPreflight: true,
41
42
  maxRetries: 10,
42
43
  }, 'confirmed');
43
- console.log(`executed ${txid}`);
44
+ log.info(`executed ${txid}`);
44
45
  return { txSig: txid, txPDA };
45
46
  };
46
47
  //# sourceMappingURL=squadsV3.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"squadsV3.js","sourceRoot":"","sources":["../../../src/squadsV3.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"squadsV3.js","sourceRoot":"","sources":["../../../src/squadsV3.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import * as anchor from "@coral-xyz/anchor";
2
2
  import { CONTRACTS } from "@certusone/wormhole-sdk";
3
- export const fetchEthInfo = async (seq, wormEnv = 'MAINNET', ethChainId = 2, retries = 3) => {
3
+ import { consoleLogger } from "./logger";
4
+ export const fetchEthInfo = async (seq, wormEnv = 'MAINNET', ethChainId = 2, retries = 3, log = consoleLogger) => {
4
5
  const hexEmitter = Buffer.alloc(32)
5
6
  .fill(Uint8Array.from(anchor.utils.bytes.hex.decode(CONTRACTS[wormEnv].ethereum.token_bridge)), 12)
6
7
  .toString('hex');
@@ -1 +1 @@
1
- {"version":3,"file":"wormhole.js","sourceRoot":"","sources":["../../../src/wormhole.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAIlD,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,GAAW,EACX,UAAiC,SAAS,EAC1C,aAAqB,CAAC,EACtB,OAAO,GAAG,CAAC,EACiB,EAAE;IAE9B,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;SAChC,IAAI,CACH,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAC3C,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAC1C,EACD,EAAE,CACH;SACA,QAAQ,CAAC,KAAK,CAAC,CAAA;IAClB,MAAM,GAAG,GAAG,cAAc,OAAO,CAAC,WAAW,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,EAAE,qCAAqC,UAAU,IAAI,UAAU,IAAI,GAAG,EAAE,CAAA;IAEhL,MAAM,KAAK,GAAG,KAAK,EAAE,SAAS,GAAG,CAAC,EAA8B,EAAE;QAChE,IAAI,SAAS,IAAI,OAAO,EAAE,CAAC;YACzB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,OAAO,aAAa,GAAG,EAAE,CAAC,CAAC,CAAA;QAC7F,CAAC;QACD,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAC/B,KAAK,EAAC,GAAG,EAAC,EAAE;gBACV,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,CAAC,MAAM,aAAa,GAAG,WAAW,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;gBACzG,CAAC;gBACD,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAY,CAAA;YACtC,CAAC,EACD,GAAG,CAAC,EAAE;gBACJ,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACvE,CAAC,CACF,CAAA;YACD,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QACnB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,aAAa;YACb,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;YACrC,OAAO,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAA;QAC7B,CAAC;IACH,CAAC,CAAA;IAED,OAAO,CAAC,MAAM,KAAK,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA"}
1
+ {"version":3,"file":"wormhole.js","sourceRoot":"","sources":["../../../src/wormhole.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAe,MAAM,UAAU,CAAC;AAIrD,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,GAAW,EACX,UAAiC,SAAS,EAC1C,aAAqB,CAAC,EACtB,OAAO,GAAG,CAAC,EACX,MAAoB,aAAa,EACL,EAAE;IAE9B,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;SAChC,IAAI,CACH,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAC3C,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAC1C,EACD,EAAE,CACH;SACA,QAAQ,CAAC,KAAK,CAAC,CAAA;IAClB,MAAM,GAAG,GAAG,cAAc,OAAO,CAAC,WAAW,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,EAAE,qCAAqC,UAAU,IAAI,UAAU,IAAI,GAAG,EAAE,CAAA;IAEhL,MAAM,KAAK,GAAG,KAAK,EAAE,SAAS,GAAG,CAAC,EAA8B,EAAE;QAChE,IAAI,SAAS,IAAI,OAAO,EAAE,CAAC;YACzB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,OAAO,aAAa,GAAG,EAAE,CAAC,CAAC,CAAA;QAC7F,CAAC;QACD,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAC/B,KAAK,EAAC,GAAG,EAAC,EAAE;gBACV,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,CAAC,MAAM,aAAa,GAAG,WAAW,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;gBACzG,CAAC;gBACD,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAY,CAAA;YACtC,CAAC,EACD,GAAG,CAAC,EAAE;gBACJ,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACvE,CAAC,CACF,CAAA;YACD,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QACnB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,aAAa;YACb,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;YACrC,OAAO,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAA;QAC7B,CAAC;IACH,CAAC,CAAA;IAED,OAAO,CAAC,MAAM,KAAK,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA"}