@helium/distributor-oracle 0.11.7 → 0.11.8
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/pgDatabase.js
CHANGED
|
@@ -155,6 +155,15 @@ class PgDatabase {
|
|
|
155
155
|
getTotalRewards() {
|
|
156
156
|
return __awaiter(this, void 0, void 0, function* () {
|
|
157
157
|
const totalRewards = (yield model_1.Reward.findAll({
|
|
158
|
+
include: [
|
|
159
|
+
{
|
|
160
|
+
model: model_1.KeyToAsset,
|
|
161
|
+
required: true,
|
|
162
|
+
where: {
|
|
163
|
+
dao: constants_1.DAO.toBase58(),
|
|
164
|
+
},
|
|
165
|
+
},
|
|
166
|
+
],
|
|
158
167
|
attributes: [
|
|
159
168
|
[model_1.sequelize.fn("SUM", model_1.sequelize.col("rewards")), "rewards"],
|
|
160
169
|
],
|
|
@@ -182,6 +191,15 @@ class PgDatabase {
|
|
|
182
191
|
getBulkRewards(entityKeys) {
|
|
183
192
|
return __awaiter(this, void 0, void 0, function* () {
|
|
184
193
|
const rewards = yield model_1.Reward.findAll({
|
|
194
|
+
include: [
|
|
195
|
+
{
|
|
196
|
+
model: model_1.KeyToAsset,
|
|
197
|
+
required: true,
|
|
198
|
+
where: {
|
|
199
|
+
dao: constants_1.DAO.toBase58(),
|
|
200
|
+
},
|
|
201
|
+
},
|
|
202
|
+
],
|
|
185
203
|
where: {
|
|
186
204
|
address: {
|
|
187
205
|
[sequelize_1.Op.in]: entityKeys,
|
|
@@ -218,7 +236,20 @@ class PgDatabase {
|
|
|
218
236
|
}
|
|
219
237
|
getCurrentRewardsByEntity(entityKeyStr) {
|
|
220
238
|
return __awaiter(this, void 0, void 0, function* () {
|
|
221
|
-
const reward = (yield model_1.Reward.
|
|
239
|
+
const reward = (yield model_1.Reward.findOne({
|
|
240
|
+
where: {
|
|
241
|
+
address: entityKeyStr,
|
|
242
|
+
},
|
|
243
|
+
include: [
|
|
244
|
+
{
|
|
245
|
+
model: model_1.KeyToAsset,
|
|
246
|
+
required: true,
|
|
247
|
+
where: {
|
|
248
|
+
dao: constants_1.DAO.toBase58(),
|
|
249
|
+
},
|
|
250
|
+
},
|
|
251
|
+
],
|
|
252
|
+
}));
|
|
222
253
|
return new anchor_1.BN(reward === null || reward === void 0 ? void 0 : reward.rewards).toString() || "0";
|
|
223
254
|
});
|
|
224
255
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pgDatabase.js","sourceRoot":"","sources":["../../src/pgDatabase.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,aAAa;AACb,8CAAgD;AAChD,iFAI2C;AAG3C,iDAK2B;AAC3B,6CAA4C;AAC5C,yCAA2C;AAC3C,2CAAkC;AAClC,yCAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"pgDatabase.js","sourceRoot":"","sources":["../../src/pgDatabase.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { PublicKey } from "@solana/web3.js";
|
|
|
6
6
|
import { Op, QueryTypes } from "sequelize";
|
|
7
7
|
import { DAO } from "./constants";
|
|
8
8
|
import { DeviceType } from "./database";
|
|
9
|
-
import { Reward, WalletClaimJob, sequelize } from "./model";
|
|
9
|
+
import { KeyToAsset, Reward, WalletClaimJob, sequelize } from "./model";
|
|
10
10
|
const ENTITY_CREATOR = entityCreatorKey(DAO)[0];
|
|
11
11
|
const getRewardTypeForDevice = (deviceType) => `${deviceType.toString().toLowerCase()}_gateway`;
|
|
12
12
|
export class PgDatabase {
|
|
@@ -137,6 +137,15 @@ export class PgDatabase {
|
|
|
137
137
|
}
|
|
138
138
|
async getTotalRewards() {
|
|
139
139
|
const totalRewards = (await Reward.findAll({
|
|
140
|
+
include: [
|
|
141
|
+
{
|
|
142
|
+
model: KeyToAsset,
|
|
143
|
+
required: true,
|
|
144
|
+
where: {
|
|
145
|
+
dao: DAO.toBase58(),
|
|
146
|
+
},
|
|
147
|
+
},
|
|
148
|
+
],
|
|
140
149
|
attributes: [
|
|
141
150
|
[sequelize.fn("SUM", sequelize.col("rewards")), "rewards"],
|
|
142
151
|
],
|
|
@@ -162,6 +171,15 @@ export class PgDatabase {
|
|
|
162
171
|
}
|
|
163
172
|
async getBulkRewards(entityKeys) {
|
|
164
173
|
const rewards = await Reward.findAll({
|
|
174
|
+
include: [
|
|
175
|
+
{
|
|
176
|
+
model: KeyToAsset,
|
|
177
|
+
required: true,
|
|
178
|
+
where: {
|
|
179
|
+
dao: DAO.toBase58(),
|
|
180
|
+
},
|
|
181
|
+
},
|
|
182
|
+
],
|
|
165
183
|
where: {
|
|
166
184
|
address: {
|
|
167
185
|
[Op.in]: entityKeys,
|
|
@@ -194,7 +212,20 @@ export class PgDatabase {
|
|
|
194
212
|
return this.getCurrentRewardsByEntity(entityKey);
|
|
195
213
|
}
|
|
196
214
|
async getCurrentRewardsByEntity(entityKeyStr) {
|
|
197
|
-
const reward = (await Reward.
|
|
215
|
+
const reward = (await Reward.findOne({
|
|
216
|
+
where: {
|
|
217
|
+
address: entityKeyStr,
|
|
218
|
+
},
|
|
219
|
+
include: [
|
|
220
|
+
{
|
|
221
|
+
model: KeyToAsset,
|
|
222
|
+
required: true,
|
|
223
|
+
where: {
|
|
224
|
+
dao: DAO.toBase58(),
|
|
225
|
+
},
|
|
226
|
+
},
|
|
227
|
+
],
|
|
228
|
+
}));
|
|
198
229
|
return new BN(reward?.rewards).toString() || "0";
|
|
199
230
|
}
|
|
200
231
|
async getRewardsByOwner(owner) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pgDatabase.js","sourceRoot":"","sources":["../../../src/pgDatabase.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,OAAO,EAAE,EAAE,EAAW,MAAM,mBAAmB,CAAC;AAChD,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAGL,QAAQ,EACR,YAAY,GACb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAY,UAAU,EAAoB,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"pgDatabase.js","sourceRoot":"","sources":["../../../src/pgDatabase.ts"],"names":[],"mappings":"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"}
|