@render-foundation/utils 0.0.143 → 0.0.144
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/client/pg/base.js.map +1 -1
- package/lib/cjs/client/pg/v2Client.js +4 -2
- package/lib/cjs/client/pg/v2Client.js.map +1 -1
- package/lib/cjs/client/render.js +30 -7
- package/lib/cjs/client/render.js.map +1 -1
- package/lib/esm/src/client/pg/base.js.map +1 -1
- package/lib/esm/src/client/pg/v2Client.js +4 -2
- package/lib/esm/src/client/pg/v2Client.js.map +1 -1
- package/lib/esm/src/client/render.js +30 -7
- package/lib/esm/src/client/render.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/client/pg/base.d.ts +1 -0
- package/lib/types/src/client/pg/base.d.ts.map +1 -1
- package/lib/types/src/client/pg/v2Client.d.ts +2 -0
- package/lib/types/src/client/pg/v2Client.d.ts.map +1 -1
- package/lib/types/src/client/render.d.ts +7 -2
- package/lib/types/src/client/render.d.ts.map +1 -1
- package/lib/types/src/dbTypesV2.d.ts +2 -0
- package/lib/types/src/dbTypesV2.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -48,9 +48,10 @@ export const renderClient = (authToken) => {
|
|
|
48
48
|
jobId: Number(j.id),
|
|
49
49
|
finishedAt: new Date(Date.parse(j.attributes.finishedAt)),
|
|
50
50
|
rndrUsed: Number(j.attributes.rndrUsed),
|
|
51
|
+
obhUsed: Number(j.attributes.obhUsed),
|
|
51
52
|
}));
|
|
52
53
|
},
|
|
53
|
-
async fetchNodeOperatorRewards(startTime, endTime, log = consoleLogger) {
|
|
54
|
+
async fetchNodeOperatorRewards(startTime, endTime, obhUsed = false, log = consoleLogger) {
|
|
54
55
|
const startTimeStr = startTime.toISOString();
|
|
55
56
|
const endTimeStr = endTime.toISOString();
|
|
56
57
|
const url = `https://${host}/api/v3/services/solana/payments?finished_after=${startTimeStr}&finished_before=${endTimeStr}`;
|
|
@@ -64,14 +65,36 @@ export const renderClient = (authToken) => {
|
|
|
64
65
|
if (res.status != 200) {
|
|
65
66
|
throw new Error(`failed fetching node operator rewards. code: ${res.status} body: ${JSON.stringify(await res.text())}`);
|
|
66
67
|
}
|
|
67
|
-
return
|
|
68
|
+
return await res.json();
|
|
68
69
|
});
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
const
|
|
72
|
-
|
|
70
|
+
if (obhUsed) {
|
|
71
|
+
const solKeyToDue = {};
|
|
72
|
+
for (const r of res.data
|
|
73
|
+
.attributes.paymentsOwed) {
|
|
74
|
+
const [addr, amt] = Object.entries(r)[0];
|
|
75
|
+
solKeyToDue[addr] = {
|
|
76
|
+
obhUsed: Number(amt.obh_used),
|
|
77
|
+
rndrUsed: amt.rndr_used,
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
return {
|
|
81
|
+
withObh: solKeyToDue,
|
|
82
|
+
withoutObh: {},
|
|
83
|
+
jobIds: res.meta.jobIds,
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
const solKeyToDue = {};
|
|
88
|
+
for (const r of res.data.attributes.paymentsOwed) {
|
|
89
|
+
const [addr, amt] = Object.entries(r)[0];
|
|
90
|
+
solKeyToDue[addr] = Number(amt);
|
|
91
|
+
}
|
|
92
|
+
return {
|
|
93
|
+
withoutObh: solKeyToDue,
|
|
94
|
+
withObh: {},
|
|
95
|
+
jobIds: res.meta.jobIds,
|
|
96
|
+
};
|
|
73
97
|
}
|
|
74
|
-
return { solKeyToDue, jobIds: res.meta.jobIds };
|
|
75
98
|
},
|
|
76
99
|
async markJobsPayed(ids, finishedAfter, finishedBefore, totalDistributed, log = consoleLogger) {
|
|
77
100
|
const payload = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../src/client/render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,WAAW,CAAA;AACvD,OAAO,KAAK,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../src/client/render.ts"],"names":[],"mappings":"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"}
|