@helium/distributor-oracle 0.0.33 → 0.0.34
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.js +21 -8
- package/lib/cjs/client.js.map +1 -1
- package/lib/cjs/server.js +56 -24
- package/lib/cjs/server.js.map +1 -1
- package/lib/esm/src/client.js +22 -9
- package/lib/esm/src/client.js.map +1 -1
- package/lib/esm/src/server.js +54 -26
- package/lib/esm/src/server.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/client.d.ts.map +1 -1
- package/lib/types/src/server.d.ts +5 -5
- package/lib/types/src/server.d.ts.map +1 -1
- package/package.json +9 -8
package/lib/cjs/client.js
CHANGED
|
@@ -14,9 +14,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.formTransaction = exports.getPendingRewards = exports.getBulkRewards = exports.getCurrentRewards = void 0;
|
|
16
16
|
const anchor_1 = require("@coral-xyz/anchor");
|
|
17
|
+
const helium_entity_manager_sdk_1 = require("@helium/helium-entity-manager-sdk");
|
|
17
18
|
const lazy_distributor_sdk_1 = require("@helium/lazy-distributor-sdk");
|
|
18
19
|
const spl_utils_1 = require("@helium/spl-utils");
|
|
19
|
-
const helium_entity_manager_sdk_1 = require("@helium/helium-entity-manager-sdk");
|
|
20
20
|
const spl_token_1 = require("@solana/spl-token");
|
|
21
21
|
const web3_js_1 = require("@solana/web3.js");
|
|
22
22
|
const axios_1 = __importDefault(require("axios"));
|
|
@@ -107,13 +107,26 @@ function formTransaction({ program, provider, rewards, hotspot, lazyDistributor,
|
|
|
107
107
|
let tx = new web3_js_1.Transaction();
|
|
108
108
|
const destinationAccount = yield (0, spl_token_1.getAssociatedTokenAddress)(rewardsMint, asset.ownership.owner, true);
|
|
109
109
|
if (!(yield provider.connection.getAccountInfo(recipient))) {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
.
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
110
|
+
let initRecipientIx;
|
|
111
|
+
if (asset.compression.compressed) {
|
|
112
|
+
initRecipientIx = yield (yield (0, lazy_distributor_sdk_1.initializeCompressionRecipient)({
|
|
113
|
+
program,
|
|
114
|
+
assetId: hotspot,
|
|
115
|
+
lazyDistributor,
|
|
116
|
+
assetEndpoint,
|
|
117
|
+
owner: wallet,
|
|
118
|
+
getAssetProofFn,
|
|
119
|
+
})).instruction();
|
|
120
|
+
}
|
|
121
|
+
else {
|
|
122
|
+
initRecipientIx = yield program.methods
|
|
123
|
+
.initializeRecipientV0()
|
|
124
|
+
.accounts({
|
|
125
|
+
lazyDistributor,
|
|
126
|
+
mint: hotspot,
|
|
127
|
+
})
|
|
128
|
+
.instruction();
|
|
129
|
+
}
|
|
117
130
|
tx.add(initRecipientIx);
|
|
118
131
|
}
|
|
119
132
|
tx.add(...ixs);
|
package/lib/cjs/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAgE;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/server.js
CHANGED
|
@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.OracleServer = exports.PgDatabase = void 0;
|
|
16
16
|
const dotenv_1 = __importDefault(require("dotenv"));
|
|
17
|
-
const express_1 = __importDefault(require("express"));
|
|
18
17
|
dotenv_1.default.config();
|
|
19
18
|
// @ts-ignore
|
|
20
19
|
const anchor_1 = require("@coral-xyz/anchor");
|
|
@@ -23,11 +22,12 @@ const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
|
|
|
23
22
|
const lazy_distributor_sdk_1 = require("@helium/lazy-distributor-sdk");
|
|
24
23
|
const spl_utils_1 = require("@helium/spl-utils");
|
|
25
24
|
const web3_js_1 = require("@solana/web3.js");
|
|
26
|
-
const body_parser_1 = __importDefault(require("body-parser"));
|
|
27
|
-
const cors_1 = __importDefault(require("cors"));
|
|
28
25
|
const sequelize_1 = require("sequelize");
|
|
29
26
|
const fs_1 = __importDefault(require("fs"));
|
|
30
27
|
const model_1 = require("./model");
|
|
28
|
+
const fastify_1 = __importDefault(require("fastify"));
|
|
29
|
+
const cors_1 = __importDefault(require("@fastify/cors"));
|
|
30
|
+
const mpl_bubblegum_1 = require("@metaplex-foundation/mpl-bubblegum");
|
|
31
31
|
const HNT = process.env.HNT_MINT ? new web3_js_1.PublicKey(process.env.HNT_MINT) : spl_utils_1.HNT_MINT;
|
|
32
32
|
const DAO = (0, helium_sub_daos_sdk_1.daoKey)(HNT)[0];
|
|
33
33
|
const ENTITY_CREATOR = (0, helium_entity_manager_sdk_1.entityCreatorKey)(DAO)[0];
|
|
@@ -46,7 +46,8 @@ class PgDatabase {
|
|
|
46
46
|
}
|
|
47
47
|
});
|
|
48
48
|
return rewards.map(rew => [rew.address, rew.rewards]).reduce((acc, [key, val]) => {
|
|
49
|
-
|
|
49
|
+
// TODO: Remove when 6 decimals
|
|
50
|
+
acc[key] = new anchor_1.BN(val).div(new anchor_1.BN(100)).toString();
|
|
50
51
|
return acc;
|
|
51
52
|
}, {});
|
|
52
53
|
});
|
|
@@ -81,24 +82,35 @@ class OracleServer {
|
|
|
81
82
|
this.oracle = oracle;
|
|
82
83
|
this.db = db;
|
|
83
84
|
this.port = 8080;
|
|
84
|
-
const
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
85
|
+
const server = (0, fastify_1.default)({
|
|
86
|
+
logger: true,
|
|
87
|
+
});
|
|
88
|
+
server.register(cors_1.default, {
|
|
89
|
+
origin: "*",
|
|
90
|
+
});
|
|
91
|
+
server.get("/health", () => __awaiter(this, void 0, void 0, function* () {
|
|
92
|
+
return { ok: true };
|
|
93
|
+
}));
|
|
94
|
+
this.app = server;
|
|
88
95
|
this.addRoutes();
|
|
89
96
|
}
|
|
90
97
|
start() {
|
|
91
|
-
|
|
92
|
-
|
|
98
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
99
|
+
this.server = yield this.app.listen({
|
|
100
|
+
port: this.port,
|
|
101
|
+
host: "0.0.0.0"
|
|
102
|
+
});
|
|
103
|
+
console.log(`Oracle server listening on port ${this.port}`);
|
|
93
104
|
});
|
|
94
105
|
}
|
|
95
106
|
close() {
|
|
96
|
-
this
|
|
107
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
108
|
+
yield this.app.close();
|
|
109
|
+
});
|
|
97
110
|
}
|
|
98
111
|
addRoutes() {
|
|
99
112
|
this.app.post("/bulk-rewards", this.getAllRewardsHandler.bind(this));
|
|
100
113
|
this.app.get("/", this.getCurrentRewardsHandler.bind(this));
|
|
101
|
-
this.app.get("/health", (req, res) => res.json({ ok: true }));
|
|
102
114
|
this.app.post("/", this.signTransactionHandler.bind(this));
|
|
103
115
|
}
|
|
104
116
|
getCurrentRewardsHandler(req, res) {
|
|
@@ -106,7 +118,11 @@ class OracleServer {
|
|
|
106
118
|
let assetId = req.query.assetId;
|
|
107
119
|
let entityKey = req.query.entityKey;
|
|
108
120
|
if (!assetId && !entityKey) {
|
|
109
|
-
res
|
|
121
|
+
res
|
|
122
|
+
.status(400)
|
|
123
|
+
.send({
|
|
124
|
+
error: "Must provide either `entityKey` or `assetId` parameter",
|
|
125
|
+
});
|
|
110
126
|
return;
|
|
111
127
|
}
|
|
112
128
|
if (entityKey) {
|
|
@@ -119,11 +135,11 @@ class OracleServer {
|
|
|
119
135
|
asset = new web3_js_1.PublicKey(assetId);
|
|
120
136
|
}
|
|
121
137
|
catch (err) {
|
|
122
|
-
res.status(400).
|
|
138
|
+
res.status(400).send({ error: "Invalid asset id" });
|
|
123
139
|
return;
|
|
124
140
|
}
|
|
125
141
|
const currentRewards = yield this.db.getCurrentRewards(asset);
|
|
126
|
-
res.
|
|
142
|
+
res.send({
|
|
127
143
|
currentRewards,
|
|
128
144
|
});
|
|
129
145
|
});
|
|
@@ -132,11 +148,11 @@ class OracleServer {
|
|
|
132
148
|
return __awaiter(this, void 0, void 0, function* () {
|
|
133
149
|
const entityKeys = req.body.entityKeys;
|
|
134
150
|
if (!entityKeys) {
|
|
135
|
-
res.status(400).
|
|
151
|
+
res.status(400).send({ error: "No entityKeys field" });
|
|
136
152
|
return;
|
|
137
153
|
}
|
|
138
154
|
const currentRewards = yield this.db.getBulkRewards(entityKeys);
|
|
139
|
-
res.
|
|
155
|
+
res.send({
|
|
140
156
|
currentRewards,
|
|
141
157
|
});
|
|
142
158
|
});
|
|
@@ -145,7 +161,7 @@ class OracleServer {
|
|
|
145
161
|
var _a;
|
|
146
162
|
return __awaiter(this, void 0, void 0, function* () {
|
|
147
163
|
if (!req.body.transaction) {
|
|
148
|
-
res.status(400).
|
|
164
|
+
res.status(400).send({ error: "No transaction field" });
|
|
149
165
|
return;
|
|
150
166
|
}
|
|
151
167
|
const tx = web3_js_1.Transaction.from(req.body.transaction.data);
|
|
@@ -153,12 +169,16 @@ class OracleServer {
|
|
|
153
169
|
const setRewardIxs = [];
|
|
154
170
|
let recipientToLazyDistToMint = {};
|
|
155
171
|
const initRecipientTx = this.program.idl.instructions.find((x) => x.name === "initializeRecipientV0");
|
|
172
|
+
const initCompressionRecipientTx = this.program.idl.instructions.find((x) => x.name === "initializeCompressionRecipientV0");
|
|
156
173
|
const lazyDistributorIdxInitRecipient = initRecipientTx.accounts.findIndex((x) => x.name === "lazyDistributor");
|
|
174
|
+
const lazyDistributorIdxInitCompressionRecipient = initCompressionRecipientTx.accounts.findIndex((x) => x.name === "lazyDistributor");
|
|
157
175
|
const mintIdx = initRecipientTx.accounts.findIndex((x) => x.name === "mint");
|
|
176
|
+
const merkleTreeIdxInitCompressionRecipient = initCompressionRecipientTx.accounts.findIndex((x) => x.name === "merkleTree");
|
|
158
177
|
const recipientIdxInitRecipient = initRecipientTx.accounts.findIndex((x) => x.name === "recipient");
|
|
178
|
+
const recipientIdxInitCompressionRecipient = initCompressionRecipientTx.accounts.findIndex((x) => x.name === "recipient");
|
|
159
179
|
for (const ix of tx.instructions) {
|
|
160
180
|
if (!ix.programId.equals(lazy_distributor_sdk_1.PROGRAM_ID)) {
|
|
161
|
-
res.status(400).
|
|
181
|
+
res.status(400).send({ error: "Invalid instructions in transaction" });
|
|
162
182
|
return;
|
|
163
183
|
}
|
|
164
184
|
let decoded = this.program.coder.instruction.decode(ix.data);
|
|
@@ -166,12 +186,14 @@ class OracleServer {
|
|
|
166
186
|
(decoded.name !== "setCurrentRewardsV0" &&
|
|
167
187
|
decoded.name !== "distributeRewardsV0" &&
|
|
168
188
|
decoded.name !== "distributeCompressionRewardsV0" &&
|
|
169
|
-
decoded.name !== "initializeRecipientV0"
|
|
170
|
-
|
|
189
|
+
decoded.name !== "initializeRecipientV0" &&
|
|
190
|
+
decoded.name !== "initializeCompressionRecipientV0")) {
|
|
191
|
+
res.status(400).send({ error: "Invalid instructions in transaction" });
|
|
171
192
|
return;
|
|
172
193
|
}
|
|
173
194
|
if (decoded.name === "setCurrentRewardsV0")
|
|
174
195
|
setRewardIxs.push(ix);
|
|
196
|
+
// Since recipient wont exist to fetch to get the mint id, grab it from the init recipient ix
|
|
175
197
|
if (decoded.name === "initializeRecipientV0") {
|
|
176
198
|
const recipient = ix.keys[recipientIdxInitRecipient].pubkey.toBase58();
|
|
177
199
|
recipientToLazyDistToMint[recipient] || (recipientToLazyDistToMint[recipient] = {});
|
|
@@ -179,6 +201,16 @@ class OracleServer {
|
|
|
179
201
|
recipientToLazyDistToMint[recipient][lazyDist] =
|
|
180
202
|
ix.keys[mintIdx].pubkey;
|
|
181
203
|
}
|
|
204
|
+
// Since recipient wont exist to fetch to get the asset id, grab it from the init recipient ix
|
|
205
|
+
if (decoded.name === "initializeCompressionRecipientV0") {
|
|
206
|
+
const recipient = ix.keys[recipientIdxInitCompressionRecipient].pubkey.toBase58();
|
|
207
|
+
recipientToLazyDistToMint[recipient] || (recipientToLazyDistToMint[recipient] = {});
|
|
208
|
+
const lazyDist = ix.keys[lazyDistributorIdxInitCompressionRecipient].pubkey.toBase58();
|
|
209
|
+
const merkleTree = ix.keys[merkleTreeIdxInitCompressionRecipient].pubkey;
|
|
210
|
+
const index = decoded.data.args.index;
|
|
211
|
+
recipientToLazyDistToMint[recipient][lazyDist] =
|
|
212
|
+
(yield (0, mpl_bubblegum_1.getLeafAssetId)(merkleTree, new anchor_1.BN(index)));
|
|
213
|
+
}
|
|
182
214
|
}
|
|
183
215
|
const setRewardsIx = this.program.idl.instructions.find((x) => x.name === "setCurrentRewardsV0");
|
|
184
216
|
const payerKeyIdx = setRewardsIx.accounts.findIndex((x) => x.name === "payer");
|
|
@@ -199,7 +231,7 @@ class OracleServer {
|
|
|
199
231
|
const currentRewards = yield this.db.getCurrentRewards(mint);
|
|
200
232
|
// @ts-ignore
|
|
201
233
|
if (decoded.data.args.currentRewards.toNumber() > currentRewards) {
|
|
202
|
-
res.status(400).
|
|
234
|
+
res.status(400).send({ error: "Invalid amount" });
|
|
203
235
|
return;
|
|
204
236
|
}
|
|
205
237
|
}
|
|
@@ -208,7 +240,7 @@ class OracleServer {
|
|
|
208
240
|
if ((_a = tx.feePayer) === null || _a === void 0 ? void 0 : _a.equals(this.oracle.publicKey)) {
|
|
209
241
|
res
|
|
210
242
|
.status(400)
|
|
211
|
-
.
|
|
243
|
+
.send({ error: "Cannot set this oracle as the fee payer" });
|
|
212
244
|
return;
|
|
213
245
|
}
|
|
214
246
|
tx.partialSign(this.oracle);
|
|
@@ -216,7 +248,7 @@ class OracleServer {
|
|
|
216
248
|
requireAllSignatures: false,
|
|
217
249
|
verifySignatures: false,
|
|
218
250
|
});
|
|
219
|
-
res.
|
|
251
|
+
res.send({ success: true, transaction: serialized });
|
|
220
252
|
});
|
|
221
253
|
}
|
|
222
254
|
}
|
package/lib/cjs/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/src/client.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BN } from "@coral-xyz/anchor";
|
|
2
|
-
import { compressedRecipientKey, distributeCompressionRewards, recipientKey } from "@helium/lazy-distributor-sdk";
|
|
3
|
-
import { getAsset, getAssetProof } from "@helium/spl-utils";
|
|
4
2
|
import { init, keyToAssetKey } from "@helium/helium-entity-manager-sdk";
|
|
3
|
+
import { compressedRecipientKey, distributeCompressionRewards, initializeCompressionRecipient, recipientKey } from "@helium/lazy-distributor-sdk";
|
|
4
|
+
import { getAsset, getAssetProof } from "@helium/spl-utils";
|
|
5
5
|
import { getAssociatedTokenAddress } from "@solana/spl-token";
|
|
6
6
|
import { Transaction } from "@solana/web3.js";
|
|
7
7
|
import axios from "axios";
|
|
@@ -82,13 +82,26 @@ export async function formTransaction({ program, provider, rewards, hotspot, laz
|
|
|
82
82
|
let tx = new Transaction();
|
|
83
83
|
const destinationAccount = await getAssociatedTokenAddress(rewardsMint, asset.ownership.owner, true);
|
|
84
84
|
if (!(await provider.connection.getAccountInfo(recipient))) {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
85
|
+
let initRecipientIx;
|
|
86
|
+
if (asset.compression.compressed) {
|
|
87
|
+
initRecipientIx = await (await initializeCompressionRecipient({
|
|
88
|
+
program,
|
|
89
|
+
assetId: hotspot,
|
|
90
|
+
lazyDistributor,
|
|
91
|
+
assetEndpoint,
|
|
92
|
+
owner: wallet,
|
|
93
|
+
getAssetProofFn,
|
|
94
|
+
})).instruction();
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
initRecipientIx = await program.methods
|
|
98
|
+
.initializeRecipientV0()
|
|
99
|
+
.accounts({
|
|
100
|
+
lazyDistributor,
|
|
101
|
+
mint: hotspot,
|
|
102
|
+
})
|
|
103
|
+
.instruction();
|
|
104
|
+
}
|
|
92
105
|
tx.add(initRecipientIx);
|
|
93
106
|
}
|
|
94
107
|
tx.add(...ixs);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,EAAE,EAAW,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/client.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/src/server.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import dotenv from "dotenv";
|
|
2
|
-
import express from "express";
|
|
3
2
|
dotenv.config();
|
|
4
3
|
// @ts-ignore
|
|
5
4
|
import { AnchorProvider, BN, getProvider, setProvider } from "@coral-xyz/anchor";
|
|
@@ -8,11 +7,12 @@ import { daoKey } from "@helium/helium-sub-daos-sdk";
|
|
|
8
7
|
import { init, PROGRAM_ID } from "@helium/lazy-distributor-sdk";
|
|
9
8
|
import { AccountFetchCache, getAsset, HNT_MINT } from "@helium/spl-utils";
|
|
10
9
|
import { Keypair, PublicKey, Transaction } from "@solana/web3.js";
|
|
11
|
-
import bodyParser from "body-parser";
|
|
12
|
-
import cors from "cors";
|
|
13
10
|
import { Op } from "sequelize";
|
|
14
11
|
import fs from "fs";
|
|
15
12
|
import { Reward } from "./model";
|
|
13
|
+
import Fastify from "fastify";
|
|
14
|
+
import cors from "@fastify/cors";
|
|
15
|
+
import { getLeafAssetId } from "@metaplex-foundation/mpl-bubblegum";
|
|
16
16
|
const HNT = process.env.HNT_MINT ? new PublicKey(process.env.HNT_MINT) : HNT_MINT;
|
|
17
17
|
const DAO = daoKey(HNT)[0];
|
|
18
18
|
const ENTITY_CREATOR = entityCreatorKey(DAO)[0];
|
|
@@ -32,7 +32,8 @@ export class PgDatabase {
|
|
|
32
32
|
}
|
|
33
33
|
});
|
|
34
34
|
return rewards.map(rew => [rew.address, rew.rewards]).reduce((acc, [key, val]) => {
|
|
35
|
-
|
|
35
|
+
// TODO: Remove when 6 decimals
|
|
36
|
+
acc[key] = new BN(val).div(new BN(100)).toString();
|
|
36
37
|
return acc;
|
|
37
38
|
}, {});
|
|
38
39
|
}
|
|
@@ -69,31 +70,42 @@ export class OracleServer {
|
|
|
69
70
|
this.hemProgram = hemProgram;
|
|
70
71
|
this.oracle = oracle;
|
|
71
72
|
this.db = db;
|
|
72
|
-
const
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
73
|
+
const server = Fastify({
|
|
74
|
+
logger: true,
|
|
75
|
+
});
|
|
76
|
+
server.register(cors, {
|
|
77
|
+
origin: "*",
|
|
78
|
+
});
|
|
79
|
+
server.get("/health", async () => {
|
|
80
|
+
return { ok: true };
|
|
81
|
+
});
|
|
82
|
+
this.app = server;
|
|
76
83
|
this.addRoutes();
|
|
77
84
|
}
|
|
78
|
-
start() {
|
|
79
|
-
this.server = this.app.listen(
|
|
80
|
-
|
|
85
|
+
async start() {
|
|
86
|
+
this.server = await this.app.listen({
|
|
87
|
+
port: this.port,
|
|
88
|
+
host: "0.0.0.0"
|
|
81
89
|
});
|
|
90
|
+
console.log(`Oracle server listening on port ${this.port}`);
|
|
82
91
|
}
|
|
83
|
-
close() {
|
|
84
|
-
this.
|
|
92
|
+
async close() {
|
|
93
|
+
await this.app.close();
|
|
85
94
|
}
|
|
86
95
|
addRoutes() {
|
|
87
96
|
this.app.post("/bulk-rewards", this.getAllRewardsHandler.bind(this));
|
|
88
97
|
this.app.get("/", this.getCurrentRewardsHandler.bind(this));
|
|
89
|
-
this.app.get("/health", (req, res) => res.json({ ok: true }));
|
|
90
98
|
this.app.post("/", this.signTransactionHandler.bind(this));
|
|
91
99
|
}
|
|
92
100
|
async getCurrentRewardsHandler(req, res) {
|
|
93
101
|
let assetId = req.query.assetId;
|
|
94
102
|
let entityKey = req.query.entityKey;
|
|
95
103
|
if (!assetId && !entityKey) {
|
|
96
|
-
res
|
|
104
|
+
res
|
|
105
|
+
.status(400)
|
|
106
|
+
.send({
|
|
107
|
+
error: "Must provide either `entityKey` or `assetId` parameter",
|
|
108
|
+
});
|
|
97
109
|
return;
|
|
98
110
|
}
|
|
99
111
|
if (entityKey) {
|
|
@@ -106,28 +118,28 @@ export class OracleServer {
|
|
|
106
118
|
asset = new PublicKey(assetId);
|
|
107
119
|
}
|
|
108
120
|
catch (err) {
|
|
109
|
-
res.status(400).
|
|
121
|
+
res.status(400).send({ error: "Invalid asset id" });
|
|
110
122
|
return;
|
|
111
123
|
}
|
|
112
124
|
const currentRewards = await this.db.getCurrentRewards(asset);
|
|
113
|
-
res.
|
|
125
|
+
res.send({
|
|
114
126
|
currentRewards,
|
|
115
127
|
});
|
|
116
128
|
}
|
|
117
129
|
async getAllRewardsHandler(req, res) {
|
|
118
130
|
const entityKeys = req.body.entityKeys;
|
|
119
131
|
if (!entityKeys) {
|
|
120
|
-
res.status(400).
|
|
132
|
+
res.status(400).send({ error: "No entityKeys field" });
|
|
121
133
|
return;
|
|
122
134
|
}
|
|
123
135
|
const currentRewards = await this.db.getBulkRewards(entityKeys);
|
|
124
|
-
res.
|
|
136
|
+
res.send({
|
|
125
137
|
currentRewards,
|
|
126
138
|
});
|
|
127
139
|
}
|
|
128
140
|
async signTransactionHandler(req, res) {
|
|
129
141
|
if (!req.body.transaction) {
|
|
130
|
-
res.status(400).
|
|
142
|
+
res.status(400).send({ error: "No transaction field" });
|
|
131
143
|
return;
|
|
132
144
|
}
|
|
133
145
|
const tx = Transaction.from(req.body.transaction.data);
|
|
@@ -135,12 +147,16 @@ export class OracleServer {
|
|
|
135
147
|
const setRewardIxs = [];
|
|
136
148
|
let recipientToLazyDistToMint = {};
|
|
137
149
|
const initRecipientTx = this.program.idl.instructions.find((x) => x.name === "initializeRecipientV0");
|
|
150
|
+
const initCompressionRecipientTx = this.program.idl.instructions.find((x) => x.name === "initializeCompressionRecipientV0");
|
|
138
151
|
const lazyDistributorIdxInitRecipient = initRecipientTx.accounts.findIndex((x) => x.name === "lazyDistributor");
|
|
152
|
+
const lazyDistributorIdxInitCompressionRecipient = initCompressionRecipientTx.accounts.findIndex((x) => x.name === "lazyDistributor");
|
|
139
153
|
const mintIdx = initRecipientTx.accounts.findIndex((x) => x.name === "mint");
|
|
154
|
+
const merkleTreeIdxInitCompressionRecipient = initCompressionRecipientTx.accounts.findIndex((x) => x.name === "merkleTree");
|
|
140
155
|
const recipientIdxInitRecipient = initRecipientTx.accounts.findIndex((x) => x.name === "recipient");
|
|
156
|
+
const recipientIdxInitCompressionRecipient = initCompressionRecipientTx.accounts.findIndex((x) => x.name === "recipient");
|
|
141
157
|
for (const ix of tx.instructions) {
|
|
142
158
|
if (!ix.programId.equals(PROGRAM_ID)) {
|
|
143
|
-
res.status(400).
|
|
159
|
+
res.status(400).send({ error: "Invalid instructions in transaction" });
|
|
144
160
|
return;
|
|
145
161
|
}
|
|
146
162
|
let decoded = this.program.coder.instruction.decode(ix.data);
|
|
@@ -148,12 +164,14 @@ export class OracleServer {
|
|
|
148
164
|
(decoded.name !== "setCurrentRewardsV0" &&
|
|
149
165
|
decoded.name !== "distributeRewardsV0" &&
|
|
150
166
|
decoded.name !== "distributeCompressionRewardsV0" &&
|
|
151
|
-
decoded.name !== "initializeRecipientV0"
|
|
152
|
-
|
|
167
|
+
decoded.name !== "initializeRecipientV0" &&
|
|
168
|
+
decoded.name !== "initializeCompressionRecipientV0")) {
|
|
169
|
+
res.status(400).send({ error: "Invalid instructions in transaction" });
|
|
153
170
|
return;
|
|
154
171
|
}
|
|
155
172
|
if (decoded.name === "setCurrentRewardsV0")
|
|
156
173
|
setRewardIxs.push(ix);
|
|
174
|
+
// Since recipient wont exist to fetch to get the mint id, grab it from the init recipient ix
|
|
157
175
|
if (decoded.name === "initializeRecipientV0") {
|
|
158
176
|
const recipient = ix.keys[recipientIdxInitRecipient].pubkey.toBase58();
|
|
159
177
|
recipientToLazyDistToMint[recipient] ||= {};
|
|
@@ -161,6 +179,16 @@ export class OracleServer {
|
|
|
161
179
|
recipientToLazyDistToMint[recipient][lazyDist] =
|
|
162
180
|
ix.keys[mintIdx].pubkey;
|
|
163
181
|
}
|
|
182
|
+
// Since recipient wont exist to fetch to get the asset id, grab it from the init recipient ix
|
|
183
|
+
if (decoded.name === "initializeCompressionRecipientV0") {
|
|
184
|
+
const recipient = ix.keys[recipientIdxInitCompressionRecipient].pubkey.toBase58();
|
|
185
|
+
recipientToLazyDistToMint[recipient] ||= {};
|
|
186
|
+
const lazyDist = ix.keys[lazyDistributorIdxInitCompressionRecipient].pubkey.toBase58();
|
|
187
|
+
const merkleTree = ix.keys[merkleTreeIdxInitCompressionRecipient].pubkey;
|
|
188
|
+
const index = decoded.data.args.index;
|
|
189
|
+
recipientToLazyDistToMint[recipient][lazyDist] =
|
|
190
|
+
(await getLeafAssetId(merkleTree, new BN(index)));
|
|
191
|
+
}
|
|
164
192
|
}
|
|
165
193
|
const setRewardsIx = this.program.idl.instructions.find((x) => x.name === "setCurrentRewardsV0");
|
|
166
194
|
const payerKeyIdx = setRewardsIx.accounts.findIndex((x) => x.name === "payer");
|
|
@@ -181,7 +209,7 @@ export class OracleServer {
|
|
|
181
209
|
const currentRewards = await this.db.getCurrentRewards(mint);
|
|
182
210
|
// @ts-ignore
|
|
183
211
|
if (decoded.data.args.currentRewards.toNumber() > currentRewards) {
|
|
184
|
-
res.status(400).
|
|
212
|
+
res.status(400).send({ error: "Invalid amount" });
|
|
185
213
|
return;
|
|
186
214
|
}
|
|
187
215
|
}
|
|
@@ -190,7 +218,7 @@ export class OracleServer {
|
|
|
190
218
|
if (tx.feePayer?.equals(this.oracle.publicKey)) {
|
|
191
219
|
res
|
|
192
220
|
.status(400)
|
|
193
|
-
.
|
|
221
|
+
.send({ error: "Cannot set this oracle as the fee payer" });
|
|
194
222
|
return;
|
|
195
223
|
}
|
|
196
224
|
tx.partialSign(this.oracle);
|
|
@@ -198,7 +226,7 @@ export class OracleServer {
|
|
|
198
226
|
requireAllSignatures: false,
|
|
199
227
|
verifySignatures: false,
|
|
200
228
|
});
|
|
201
|
-
res.
|
|
229
|
+
res.send({ success: true, transaction: serialized });
|
|
202
230
|
}
|
|
203
231
|
}
|
|
204
232
|
(async function () {
|