@helium/distributor-oracle 0.11.5 → 0.11.7
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 +65 -4
- package/lib/cjs/pgDatabase.js.map +1 -1
- package/lib/cjs/server.js +103 -75
- package/lib/cjs/server.js.map +1 -1
- package/lib/esm/src/pgDatabase.js +60 -4
- package/lib/esm/src/pgDatabase.js.map +1 -1
- package/lib/esm/src/server.js +101 -77
- package/lib/esm/src/server.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/database.d.ts +4 -0
- package/lib/types/src/database.d.ts.map +1 -1
- package/lib/types/src/pgDatabase.d.ts +8 -5
- package/lib/types/src/pgDatabase.d.ts.map +1 -1
- package/lib/types/src/server.d.ts +2 -0
- package/lib/types/src/server.d.ts.map +1 -1
- package/package.json +10 -10
|
@@ -24,6 +24,10 @@ export interface Database {
|
|
|
24
24
|
entities: Pick<RewardableEntity, "keyToAsset">[];
|
|
25
25
|
nextBatchNumber: number;
|
|
26
26
|
}>;
|
|
27
|
+
getRewardableEntitiesByDestination(destination: PublicKey, limit: number, batchNumber?: number): Promise<{
|
|
28
|
+
entities: Pick<RewardableEntity, "keyToAsset">[];
|
|
29
|
+
nextBatchNumber: number;
|
|
30
|
+
}>;
|
|
27
31
|
}
|
|
28
32
|
export type KeyToAssetV0 = anchor.IdlAccounts<HeliumEntityManager>["keyToAssetV0"] & {
|
|
29
33
|
address: PublicKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../src/database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,oBAAY,UAAU;IACpB,GAAG,QAAQ;IACX,MAAM,WAAW;CAClB;AAED,MAAM,WAAW,QAAQ;IACvB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,yBAAyB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClE,iBAAiB,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACzD,iBAAiB,EAAE,CACjB,KAAK,EAAE,MAAM,KACV,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,uBAAuB,EAAE,CACvB,WAAW,EAAE,MAAM,KAChB,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1E,gBAAgB,CAAC,IAAI,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,qBAAqB,CACnB,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,MAAM,EACb,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC;QACT,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,EAAE,CAAC;QACjD,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC,CAAC;CACJ;AAED,MAAM,MAAM,YAAY,GACtB,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,cAAc,CAAC,GAAG;IACxD,OAAO,EAAE,SAAS,CAAC;CACpB,CAAC;AAEJ,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,GAAG;IAC7E,OAAO,EAAE,SAAS,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC"}
|
|
1
|
+
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../src/database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,oBAAY,UAAU;IACpB,GAAG,QAAQ;IACX,MAAM,WAAW;CAClB;AAED,MAAM,WAAW,QAAQ;IACvB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,yBAAyB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClE,iBAAiB,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACzD,iBAAiB,EAAE,CACjB,KAAK,EAAE,MAAM,KACV,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,uBAAuB,EAAE,CACvB,WAAW,EAAE,MAAM,KAChB,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1E,gBAAgB,CAAC,IAAI,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,qBAAqB,CACnB,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,MAAM,EACb,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC;QACT,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,EAAE,CAAC;QACjD,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC,CAAC;IACH,kCAAkC,CAChC,WAAW,EAAE,SAAS,EACtB,KAAK,EAAE,MAAM,EACb,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC;QACT,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,EAAE,CAAC;QACjD,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC,CAAC;CACJ;AAED,MAAM,MAAM,YAAY,GACtB,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,cAAc,CAAC,GAAG;IACxD,OAAO,EAAE,SAAS,CAAC;CACpB,CAAC;AAEJ,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,GAAG;IAC7E,OAAO,EAAE,SAAS,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { HeliumEntityManager } from "@helium/idls/lib/types/helium_entity_manage
|
|
|
3
3
|
import { LazyDistributor } from "@helium/idls/lib/types/lazy_distributor";
|
|
4
4
|
import { Asset, SearchAssetsOpts } from "@helium/spl-utils";
|
|
5
5
|
import { PublicKey } from "@solana/web3.js";
|
|
6
|
-
import { Database, DeviceType } from "./database";
|
|
6
|
+
import { Database, DeviceType, RewardableEntity } from "./database";
|
|
7
7
|
export declare class PgDatabase implements Database {
|
|
8
8
|
readonly issuanceProgram: Program<HeliumEntityManager>;
|
|
9
9
|
readonly lazyDistributorProgram: Program<LazyDistributor>;
|
|
@@ -11,11 +11,14 @@ export declare class PgDatabase implements Database {
|
|
|
11
11
|
readonly getAssetFn: (url: string, asset: PublicKey) => Promise<Asset | undefined>;
|
|
12
12
|
readonly searchAssetsFn: (url: string, searchParams: SearchAssetsOpts) => Promise<Asset[]>;
|
|
13
13
|
constructor(issuanceProgram: Program<HeliumEntityManager>, lazyDistributorProgram: Program<LazyDistributor>, lazyDistributor: PublicKey, getAssetFn?: (url: string, asset: PublicKey) => Promise<Asset | undefined>, searchAssetsFn?: (url: string, searchParams: SearchAssetsOpts) => Promise<Asset[]>);
|
|
14
|
-
private
|
|
14
|
+
private getOrCreateWalletClaimJobForOwner;
|
|
15
|
+
private getOrCreateWalletClaimJobForDestination;
|
|
15
16
|
getRewardableEntities(wallet: PublicKey, limit: number, batchNumber?: number): Promise<{
|
|
16
|
-
entities:
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
entities: Pick<RewardableEntity, "keyToAsset">[];
|
|
18
|
+
nextBatchNumber: number;
|
|
19
|
+
}>;
|
|
20
|
+
getRewardableEntitiesByDestination(destination: PublicKey, limit: number, batchNumber?: number): Promise<{
|
|
21
|
+
entities: Pick<RewardableEntity, "keyToAsset">[];
|
|
19
22
|
nextBatchNumber: number;
|
|
20
23
|
}>;
|
|
21
24
|
getTotalRewards(): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pgDatabase.d.ts","sourceRoot":"","sources":["../../../src/pgDatabase.ts"],"names":[],"mappings":"AACA,OAAO,EAAM,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAMhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EACL,KAAK,EACL,gBAAgB,EAGjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,QAAQ,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"pgDatabase.d.ts","sourceRoot":"","sources":["../../../src/pgDatabase.ts"],"names":[],"mappings":"AACA,OAAO,EAAM,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAMhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EACL,KAAK,EACL,gBAAgB,EAGjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAOpE,qBAAa,UAAW,YAAW,QAAQ;IAEvC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC,mBAAmB,CAAC;IACtD,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC,eAAe,CAAC;IACzD,QAAQ,CAAC,eAAe,EAAE,SAAS;IACnC,QAAQ,CAAC,UAAU,EAAE,CACnB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,SAAS,KACb,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAC/B,QAAQ,CAAC,cAAc,EAAE,CACvB,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,gBAAgB,KAC3B,OAAO,CAAC,KAAK,EAAE,CAAC;gBAVZ,eAAe,EAAE,OAAO,CAAC,mBAAmB,CAAC,EAC7C,sBAAsB,EAAE,OAAO,CAAC,eAAe,CAAC,EAChD,eAAe,EAAE,SAAS,EAC1B,UAAU,GAAE,CACnB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,SAAS,KACb,OAAO,CAAC,KAAK,GAAG,SAAS,CAAY,EACjC,cAAc,GAAE,CACvB,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,gBAAgB,KAC3B,OAAO,CAAC,KAAK,EAAE,CAAgB;YAGxB,iCAAiC;YAwDjC,uCAAuC;IAuD/C,qBAAqB,CACzB,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,MAAM,EACb,WAAW,GAAE,MAAU,GACtB,OAAO,CAAC;QACT,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,EAAE,CAAC;QACjD,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;IAuBI,kCAAkC,CACtC,WAAW,EAAE,SAAS,EACtB,KAAK,EAAE,MAAM,EACb,WAAW,GAAE,MAAU,GACtB,OAAO,CAAC;QACT,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,EAAE,CAAC;QACjD,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;IAuBI,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAWxC,gBAAgB,CAAC,IAAI,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAqB9C,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAiBrE,iBAAiB,CAAC,OAAO,EAAE,SAAS;IA8BpC,yBAAyB,CAAC,YAAY,EAAE,MAAM;IAM9C,iBAAiB,CAAC,KAAK,EAAE,MAAM;;;;IA6C/B,uBAAuB,CAAC,WAAW,EAAE,MAAM;;;;CA8ClD"}
|
|
@@ -34,7 +34,9 @@ export declare class OracleServer {
|
|
|
34
34
|
private tuktukAssetHandler;
|
|
35
35
|
private handleKta;
|
|
36
36
|
private tuktukKtaHandler;
|
|
37
|
+
private handleTuktukWalletOrDestination;
|
|
37
38
|
private tuktukWalletHandler;
|
|
39
|
+
private tuktukDestinationHandler;
|
|
38
40
|
private signBulkTransactionsHandler;
|
|
39
41
|
private signTransactionHandler;
|
|
40
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/server.ts"],"names":[],"mappings":"AAUA,OAAO,EAML,OAAO,EAER,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAiBtE,OAAO,EAGL,OAAO,EAGP,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAgB,EACd,eAAe,EAGhB,MAAM,SAAS,CAAC;AASjB,OAAO,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/server.ts"],"names":[],"mappings":"AAUA,OAAO,EAML,OAAO,EAER,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAiBtE,OAAO,EAGL,OAAO,EAGP,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAgB,EACd,eAAe,EAGhB,MAAM,SAAS,CAAC;AASjB,OAAO,EAAE,QAAQ,EAAgC,MAAM,YAAY,CAAC;AAIpE,cAAc,YAAY,CAAC;AAE3B,qBAAa,YAAY;IAOd,aAAa,EAAE,GAAG;IAClB,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC;IACjC,UAAU,EAAE,OAAO,CAAC,mBAAmB,CAAC;IACxC,eAAe,EAAE,GAAG;IAC3B,OAAO,CAAC,MAAM;IACP,EAAE,EAAE,QAAQ;IACnB,QAAQ,CAAC,eAAe,EAAE,SAAS;IACnC,QAAQ,CAAC,GAAG,EAAE,SAAS;IAdzB,GAAG,EAAE,eAAe,CAAC;IACrB,IAAI,SAAQ;IACZ,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;gBAIlB,aAAa,EAAE,GAAG,EAClB,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC,EACnC,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,EACjC,UAAU,EAAE,OAAO,CAAC,mBAAmB,CAAC,EACxC,eAAe,EAAE,GAAG,EACnB,MAAM,EAAE,OAAO,EAChB,EAAE,EAAE,QAAQ,EACV,eAAe,EAAE,SAAS,EAC1B,GAAG,GAAE,SAAe;IA+BlB,KAAK;IAQL,KAAK;IAIlB,OAAO,CAAC,SAAS;YAmDH,iBAAiB;YAoBjB,0BAA0B;YAa1B,6BAA6B;YAa7B,uBAAuB;YAavB,wBAAwB;YAgDxB,oBAAoB;YAiBpB,eAAe;YAuSf,WAAW;YA2DX,kBAAkB;YAmDlB,SAAS;YA0MT,gBAAgB;YAiDhB,+BAA+B;YAsH/B,mBAAmB;YAoCnB,wBAAwB;YAqCxB,2BAA2B;YAqC3B,sBAAsB;CAoBrC"}
|
package/package.json
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"registry": "https://registry.npmjs.org/"
|
|
6
6
|
},
|
|
7
7
|
"license": "Apache-2.0",
|
|
8
|
-
"version": "0.11.
|
|
8
|
+
"version": "0.11.7",
|
|
9
9
|
"description": "Oracle server for the lazy distributor",
|
|
10
10
|
"repository": {
|
|
11
11
|
"type": "git",
|
|
@@ -36,15 +36,15 @@
|
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@coral-xyz/anchor": "^0.31.0",
|
|
38
38
|
"@fastify/cors": "^8.1.1",
|
|
39
|
-
"@helium/account-fetch-cache": "^0.11.
|
|
39
|
+
"@helium/account-fetch-cache": "^0.11.7",
|
|
40
40
|
"@helium/address": "^4.12.0",
|
|
41
|
-
"@helium/helium-entity-manager-sdk": "^0.11.
|
|
42
|
-
"@helium/helium-sub-daos-sdk": "^0.11.
|
|
43
|
-
"@helium/hpl-crons-sdk": "^0.11.
|
|
44
|
-
"@helium/idls": "^0.11.
|
|
45
|
-
"@helium/lazy-distributor-sdk": "^0.11.
|
|
46
|
-
"@helium/rewards-oracle-sdk": "^0.11.
|
|
47
|
-
"@helium/spl-utils": "^0.11.
|
|
41
|
+
"@helium/helium-entity-manager-sdk": "^0.11.7",
|
|
42
|
+
"@helium/helium-sub-daos-sdk": "^0.11.7",
|
|
43
|
+
"@helium/hpl-crons-sdk": "^0.11.7",
|
|
44
|
+
"@helium/idls": "^0.11.7",
|
|
45
|
+
"@helium/lazy-distributor-sdk": "^0.11.7",
|
|
46
|
+
"@helium/rewards-oracle-sdk": "^0.11.7",
|
|
47
|
+
"@helium/spl-utils": "^0.11.7",
|
|
48
48
|
"@helium/tuktuk-sdk": "^0.0.9",
|
|
49
49
|
"@metaplex-foundation/mpl-bubblegum": "^0.7.0",
|
|
50
50
|
"@solana/spl-memo": "^0.2.5",
|
|
@@ -75,5 +75,5 @@
|
|
|
75
75
|
"ts-node": "^10.9.1",
|
|
76
76
|
"typescript": "^5.2.2"
|
|
77
77
|
},
|
|
78
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "a809bb14642b7b11ceaec2e9c220247bf1375d1d"
|
|
79
79
|
}
|