@sonarwatch/portfolio-plugins 0.15.19 → 0.15.20
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/CHANGELOG.md +9 -0
- package/package.json +1 -1
- package/src/AirdropFetcher.d.ts +6 -3
- package/src/AirdropFetcher.js +25 -19
- package/src/AirdropFetcher.js.map +1 -1
- package/src/plugins/hawksight/positionsFetcher.js +5 -3
- package/src/plugins/hawksight/positionsFetcher.js.map +1 -1
- package/src/plugins/jupiter/exchange/limitFetcher.js +3 -1
- package/src/plugins/jupiter/exchange/limitFetcher.js.map +1 -1
- package/src/plugins/jupiter/exchange/structs.d.ts +4 -2
- package/src/plugins/jupiter/exchange/structs.js +4 -2
- package/src/plugins/jupiter/exchange/structs.js.map +1 -1
- package/src/plugins/jupiter/governance/asrAirdropFetcher.js +18 -3
- package/src/plugins/jupiter/governance/asrAirdropFetcher.js.map +1 -1
- package/src/plugins/jupiter/governance/voteFetcher.js +1 -3
- package/src/plugins/jupiter/governance/voteFetcher.js.map +1 -1
- package/src/plugins/jupiter/helpers.js +1 -1
- package/src/plugins/jupiter/helpers.js.map +1 -1
- package/src/plugins/jupiter/launchpad/structs.d.ts +2 -0
- package/src/plugins/jupiter/launchpad/structs.js +3 -1
- package/src/plugins/jupiter/launchpad/structs.js.map +1 -1
- package/src/plugins/jupiter/pricingJob.js +0 -1
- package/src/plugins/jupiter/pricingJob.js.map +1 -1
- package/src/plugins/sanctum/s1AirdropFetcher.js +42 -12
- package/src/plugins/sanctum/s1AirdropFetcher.js.map +1 -1
- package/src/plugins/solayer/airdropFetcher.js +24 -34
- package/src/plugins/solayer/airdropFetcher.js.map +1 -1
- package/src/plugins/x-staking-solana/constants.js +3 -3
- package/src/plugins/x-staking-solana/constants.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,15 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [0.15.20](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.19...plugins-0.15.20) (2025-06-02)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* update lockedUntil attribute ([6c87db2](https://github.com/sonarwatch/portfolio/commit/6c87db209f31d0049166c40d0649da4a9022f6a6))
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
5
14
|
## [0.15.19](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.18...plugins-0.15.19) (2025-05-27)
|
|
6
15
|
|
|
7
16
|
|
package/package.json
CHANGED
package/src/AirdropFetcher.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AddressSystemType, AirdropRaw, AirdropFetcherResult, AirdropFetchersResult, IsClaimed, NetworkIdType } from '@sonarwatch/portfolio-core';
|
|
1
|
+
import { AddressSystemType, AirdropRaw, AirdropFetcherResult, AirdropFetchersResult, IsClaimed, NetworkIdType, Claim } from '@sonarwatch/portfolio-core';
|
|
2
2
|
import { Cache } from './Cache';
|
|
3
3
|
import { Fetcher } from './Fetcher';
|
|
4
4
|
export type AirdropFetcherExecutor = (owner: string, cache: Cache) => Promise<AirdropRaw>;
|
|
@@ -14,7 +14,7 @@ export declare function setAirdropItemPrices(params: {
|
|
|
14
14
|
}[], networkId: NetworkIdType, cache: Cache): Promise<void>;
|
|
15
15
|
export declare function runAirdropFetchersByNetworkId(owner: string, networkId: NetworkIdType, fetchers: AirdropFetcher[], cache: Cache, useCache?: boolean): Promise<AirdropFetchersResult>;
|
|
16
16
|
export type AirdropStatics = Omit<AirdropRaw, 'status' | 'items'>;
|
|
17
|
-
export
|
|
17
|
+
export type AirdropRawParams = {
|
|
18
18
|
statics: AirdropStatics;
|
|
19
19
|
items: {
|
|
20
20
|
amount: number;
|
|
@@ -22,8 +22,11 @@ export declare function getAirdropRaw(params: {
|
|
|
22
22
|
imageUri?: string;
|
|
23
23
|
address?: string;
|
|
24
24
|
isClaimed: IsClaimed;
|
|
25
|
+
claims?: Claim[];
|
|
26
|
+
ref?: string;
|
|
25
27
|
}[];
|
|
26
|
-
}
|
|
28
|
+
};
|
|
29
|
+
export declare function getAirdropRaw(params: AirdropRawParams): AirdropRaw;
|
|
27
30
|
export declare function runAirdropFetchers(owner: string, addressSystem: AddressSystemType, fetchers: AirdropFetcher[], cache: Cache, useCache?: boolean): Promise<AirdropFetchersResult>;
|
|
28
31
|
export declare function runAirdropFetcher(owner: string, fetcher: AirdropFetcher, cache: Cache, useCache?: boolean): Promise<AirdropFetcherResult>;
|
|
29
32
|
export declare function airdropFetcherToFetcher(airdropFetcher: AirdropFetcher, platformId: string, id: string, claimEnd?: number, useCache?: boolean): Fetcher;
|
package/src/AirdropFetcher.js
CHANGED
|
@@ -83,7 +83,7 @@ function enhanceAirdropItem(airdropItem, airdropId, airdropStatus, price, owner,
|
|
|
83
83
|
return Object.assign(Object.assign({}, airdropItem), { address: airdropItem.address
|
|
84
84
|
? (0, portfolio_core_1.formatTokenAddress)(airdropItem.address, networkId)
|
|
85
85
|
: undefined, airdropId,
|
|
86
|
-
price, status: (0, portfolio_core_1.getAirdropItemStatus)(airdropStatus, airdropItem.amount, airdropItem.isClaimed), value: price ? price * airdropItem.amount : null, owner });
|
|
86
|
+
price, status: (0, portfolio_core_1.getAirdropItemStatus)(airdropStatus, airdropItem.amount, airdropItem.isClaimed, airdropItem.claims), claims: airdropItem.claims, value: price ? price * airdropItem.amount : null, owner });
|
|
87
87
|
}
|
|
88
88
|
const runAirdropFetcherTimeout = 10000;
|
|
89
89
|
function runAirdropFetchersByNetworkId(owner, networkId, fetchers, cache, useCache = false) {
|
|
@@ -110,6 +110,8 @@ function getAirdropItems(items) {
|
|
|
110
110
|
label: item.label,
|
|
111
111
|
address: item.address,
|
|
112
112
|
imageUri: item.imageUri,
|
|
113
|
+
claims: item.claims,
|
|
114
|
+
ref: item.ref,
|
|
113
115
|
};
|
|
114
116
|
});
|
|
115
117
|
}
|
|
@@ -221,26 +223,30 @@ function airdropFetcherToFetcher(airdropFetcher, platformId, id, claimEnd, useCa
|
|
|
221
223
|
const assets = [];
|
|
222
224
|
airdrop.items.forEach((item) => {
|
|
223
225
|
if (item.status !== portfolio_core_1.AirdropItemStatus.claimable &&
|
|
224
|
-
item.status !== portfolio_core_1.AirdropItemStatus.claimableLater
|
|
226
|
+
item.status !== portfolio_core_1.AirdropItemStatus.claimableLater &&
|
|
227
|
+
item.status !== portfolio_core_1.AirdropItemStatus.partiallyClaimed)
|
|
225
228
|
return;
|
|
229
|
+
const amountLeftToClaim = item.claims
|
|
230
|
+
? item.claims.reduce((acc, c) => acc - c.amount, item.amount)
|
|
231
|
+
: item.amount;
|
|
226
232
|
const asset = item.address
|
|
227
|
-
? (0, tokenPriceToAssetToken_1.default)(item.address,
|
|
228
|
-
:
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
233
|
+
? Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(item.address, amountLeftToClaim, airdropFetcher.networkId, undefined, item.price || undefined, { isClaimable: true, lockedUntil: airdrop.claimStart }, airdrop.claimLink)), { ref: item.ref }) : {
|
|
234
|
+
type: portfolio_core_1.PortfolioAssetType.generic,
|
|
235
|
+
data: {
|
|
236
|
+
amount: amountLeftToClaim,
|
|
237
|
+
price: item.price,
|
|
238
|
+
},
|
|
239
|
+
name: item.label,
|
|
240
|
+
networkId: airdropFetcher.networkId,
|
|
241
|
+
attributes: {
|
|
242
|
+
isClaimable: true,
|
|
243
|
+
lockedUntil: airdrop.claimStart,
|
|
244
|
+
},
|
|
245
|
+
value: item.value,
|
|
246
|
+
imageUri: item.imageUri,
|
|
247
|
+
link: airdrop.claimLink,
|
|
248
|
+
ref: item.ref,
|
|
249
|
+
};
|
|
244
250
|
assets.push(asset);
|
|
245
251
|
});
|
|
246
252
|
if (assets.length === 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AirdropFetcher.js","sourceRoot":"","sources":["../../../../packages/plugins/src/AirdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"AirdropFetcher.js","sourceRoot":"","sources":["../../../../packages/plugins/src/AirdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DA8BoC;AAGpC,iGAAyE;AACzE,+EAAuD;AAa1C,QAAA,2BAA2B,GAAG,kBAAkB,CAAC;AAC9D,SAAsB,oBAAoB,CACxC,MAGG,EACH,SAAwB,EACxB,KAAY;;QAEZ,MAAM,KAAK,CAAC,QAAQ,CAClB,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;YAChC,GAAG,EAAE,KAAK;YACV,KAAK,EAAE,KAAK;SACb,CAAC,CAAC,EACH;YACE,SAAS;YACT,MAAM,EAAE,mCAA2B;SACpC,CACF,CAAC;IACJ,CAAC;CAAA;AAlBD,oDAkBC;AAED,SAAe,oBAAoB,CACjC,MAAgB,EAChB,UAAyB,EACzB,KAAY;;QAEZ,MAAM,SAAS,GAA0B,IAAI,GAAG,EAAE,CAAC;QACnD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAE1C,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAS,MAAM,EAAE;YAClD,SAAS,EAAE,UAAU;YACrB,MAAM,EAAE,mCAA2B;SACpC,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACtB,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;CAAA;AAED,SAAe,qBAAqB,CAClC,OAAmB,EACnB,SAAwB,EACxB,KAAY;;QAEZ,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1B,IAAI,CAAC,CAAC,OAAO;gBAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;;gBACpC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpD,KAAK,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC;YAC/C,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC;SAC/C,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;gBACd,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBAC7C,IAAI,MAAM;oBAAE,OAAO,MAAM,CAAC,KAAK,CAAC;YAClC,CAAC;YACD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAe,cAAc,CAC3B,UAAsB,EACtB,KAAa,EACb,SAAwB,EACxB,KAAY;;QAEZ,MAAM,aAAa,GAAG,IAAA,iCAAgB,EACpC,UAAU,CAAC,UAAU,EACrB,UAAU,CAAC,QAAQ,CACpB,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QACzE,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK;aAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAChB,kBAAkB,CAChB,CAAC,EACD,UAAU,CAAC,EAAE,EACb,aAAa,EACb,MAAM,CAAC,KAAK,CAAC,EACb,KAAK,EACL,SAAS,CACV,CACF;aACA,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,4BAAW,EAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,uCACK,UAAU,KACb,KAAK;YACL,SAAS,EACT,MAAM,EAAE,aAAa,EACrB,KAAK,EACL,KAAK,EAAE,IAAA,+BAAc,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAChD;IACJ,CAAC;CAAA;AAED,SAAS,kBAAkB,CACzB,WAA2B,EAC3B,SAAiB,EACjB,aAA4B,EAC5B,KAAe,EACf,KAAa,EACb,SAAwB;IAExB,uCACK,WAAW,KACd,OAAO,EAAE,WAAW,CAAC,OAAO;YAC1B,CAAC,CAAC,IAAA,mCAAkB,EAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC;YACpD,CAAC,CAAC,SAAS,EACb,SAAS;QACT,KAAK,EACL,MAAM,EAAE,IAAA,qCAAoB,EAC1B,aAAa,EACb,WAAW,CAAC,MAAM,EAClB,WAAW,CAAC,SAAS,EACrB,WAAW,CAAC,MAAM,CACnB,EACD,MAAM,EAAE,WAAW,CAAC,MAAM,EAC1B,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAChD,KAAK,IACL;AACJ,CAAC;AAED,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAEvC,SAAsB,6BAA6B,CACjD,KAAa,EACb,SAAwB,EACxB,QAA0B,EAC1B,KAAY,EACZ,QAAQ,GAAG,KAAK;;QAEhB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC;QAC1E,IAAI,CAAC,gBAAgB;YACnB,MAAM,IAAI,KAAK,CACb,uDAAuD,SAAS,EAAE,CACnE,CAAC;QAEJ,MAAM,EAAE,aAAa,EAAE,GAAG,yBAAQ,CAAC,SAAS,CAAC,CAAC;QAC9C,OAAO,kBAAkB,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC7E,CAAC;CAAA;AAfD,sEAeC;AAiBD,SAAgB,aAAa,CAAC,MAAwB;IACpD,uCACK,MAAM,CAAC,OAAO,KACjB,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,IACpC;AACJ,CAAC;AALD,sCAKC;AAED,SAAS,eAAe,CACtB,KAQG;IAEH,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,MAAM,UAAU,GAAG,IAAA,iCAAgB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjD,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS;YACxD,UAAU;YACV,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,IAAI,CAAC,GAAG;SACd,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAsB,kBAAkB,CACtC,KAAa,EACb,aAAgC,EAChC,QAA0B,EAC1B,KAAY,EACZ,QAAQ,GAAG,KAAK;;QAEhB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAA,8BAAa,EAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACnD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,yBAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,aAAa,KAAK,aAAa,CAC7D,CAAC;QACF,IAAI,CAAC,gBAAgB;YACnB,MAAM,IAAI,KAAK,CACb,mDAAmD,aAAa,EAAE,CACnE,CAAC;QAEJ,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAa,EAChC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,EACxE,CAAC,CACF,CAAC;QAEF,MAAM,QAAQ,GAA2B,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC3C,IAAI,OAA6B,CAAC;YAClC,IAAI,CAAC,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBAC7B,OAAO,GAAG;oBACR,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;oBACtB,MAAM,EAAE,WAAW;oBACnB,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ;oBAC1B,KAAK,EAAE,SAAS;iBACjB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG;oBACR,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;oBACtB,MAAM,EAAE,QAAQ;oBAChB,QAAQ,EAAE,SAAS;oBACnB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,IAAI,eAAe;iBAC3C,CAAC;YACJ,CAAC;YACD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEvB,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU;gBAAE,OAAO,EAAE,CAAC;YACvC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;QACzB,CAAC,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,OAAO;YACL,IAAI,EAAE,GAAG;YACT,KAAK,EAAE,MAAM;YACb,aAAa;YACb,cAAc,EAAE,QAAQ;YACxB,QAAQ;YACR,QAAQ,EAAE,GAAG,GAAG,SAAS;SAC1B,CAAC;IACJ,CAAC;CAAA;AAtDD,gDAsDC;AAED,MAAM,kBAAkB,GAAG,YAAY,CAAC;AACxC,SAAe,yBAAyB,CACtC,KAAa,EACb,OAAuB,EACvB,KAAY,EACZ,QAAQ,GAAG,KAAK;;QAEhB,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,OAAO,CACrC,GAAG,OAAO,CAAC,EAAE,IAAI,KAAK,EAAE,EACxB;gBACE,MAAM,EAAE,kBAAkB;gBAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B,CACF,CAAC;YACF,IAAI,WAAW;gBACb,OAAO,cAAc,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAErD,IAAI,QAAQ,EAAE,CAAC;YACb,0BAA0B;YAC1B,4CAA4C;YAC5C,6DAA6D;YAC7D,IAAI,GAAG,GAAG,MAAM,CAAC;YACjB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,iCAAgB,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAAE,GAAG,GAAG,MAAM,CAAC;iBACrE,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC;gBAAE,GAAG,GAAG,MAAM,CAAC;iBACnE,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;gBACxD,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC;YACnD,CAAC;YACD,MAAM,KAAK,CAAC,OAAO,CAAa,GAAG,OAAO,CAAC,EAAE,IAAI,KAAK,EAAE,EAAE,OAAO,EAAE;gBACjE,GAAG;gBACH,MAAM,EAAE,kBAAkB;gBAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B,CAAC,CAAC;QACL,CAAC;QAED,OAAO,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;CAAA;AAED,SAAsB,iBAAiB,CACrC,KAAa,EACb,OAAuB,EACvB,KAAY,EACZ,QAAQ,GAAG,KAAK;;QAEhB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAA,yCAAwB,EAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,yBAAyB,CAC9C,KAAK,EACL,OAAO,EACP,KAAK,EACL,QAAQ,CACT,CAAC,IAAI,CAAC,CAAC,OAAO,EAAwB,EAAE;YACvC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,OAAO;gBACL,KAAK,EAAE,MAAM;gBACb,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,UAAU,EAAE,OAAO,CAAC,SAAS;gBAC7B,QAAQ,EAAE,GAAG,GAAG,SAAS;gBACzB,OAAO;gBACP,IAAI,EAAE,GAAG;aACV,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,IAAA,+BAAc,EACnB,cAAc,EACd,wBAAwB,EACxB,sBAAsB,OAAO,CAAC,EAAE,EAAE,CACnC,CAAC;IACJ,CAAC;CAAA;AA7BD,8CA6BC;AAED,SAAgB,uBAAuB,CACrC,cAA8B,EAC9B,UAAkB,EAClB,EAAU,EACV,QAAiB,EACjB,QAAQ,GAAG,KAAK;IAEhB,OAAO;QACL,EAAE;QACF,SAAS,EAAE,cAAc,CAAC,SAAS;QACnC,QAAQ,EAAE,CACR,KAAa,EACb,KAAY,EACyB,EAAE;YACvC,IAAI,QAAQ,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ;gBAAE,OAAO,EAAE,CAAC;YAEjD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,iBAAiB,CACzC,KAAK,EACL,cAAc,EACd,KAAK,EACL,QAAQ,CACT,CAAC;YAEF,MAAM,MAAM,GAAoD,EAAE,CAAC;YACnE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC7B,IACE,IAAI,CAAC,MAAM,KAAK,kCAAiB,CAAC,SAAS;oBAC3C,IAAI,CAAC,MAAM,KAAK,kCAAiB,CAAC,cAAc;oBAChD,IAAI,CAAC,MAAM,KAAK,kCAAiB,CAAC,gBAAgB;oBAElD,OAAO;gBAET,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM;oBACnC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;oBAC7D,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;gBAEhB,MAAM,KAAK,GAAgD,IAAI,CAAC,OAAO;oBACrE,CAAC,iCACM,IAAA,gCAAsB,EACvB,IAAI,CAAC,OAAO,EACZ,iBAAiB,EACjB,cAAc,CAAC,SAAS,EACxB,SAAS,EACT,IAAI,CAAC,KAAK,IAAI,SAAS,EACvB,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,UAAU,EAAE,EACtD,OAAO,CAAC,SAAS,CAClB,KACD,GAAG,EAAE,IAAI,CAAC,GAAG,IAEjB,CAAC,CAAC;oBACE,IAAI,EAAE,mCAAkB,CAAC,OAAO;oBAChC,IAAI,EAAE;wBACJ,MAAM,EAAE,iBAAiB;wBACzB,KAAK,EAAE,IAAI,CAAC,KAAK;qBAClB;oBACD,IAAI,EAAE,IAAI,CAAC,KAAK;oBAChB,SAAS,EAAE,cAAc,CAAC,SAAS;oBACnC,UAAU,EAAE;wBACV,WAAW,EAAE,IAAI;wBACjB,WAAW,EAAE,OAAO,CAAC,UAAU;qBAChC;oBACD,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,IAAI,EAAE,OAAO,CAAC,SAAS;oBACvB,GAAG,EAAE,IAAI,CAAC,GAAG;iBACd,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;YAEH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,EAAE,CAAC;YACnC,OAAO;gBACL;oBACE,SAAS,EAAE,cAAc,CAAC,SAAS;oBACnC,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE;wBACJ,MAAM;qBACP;oBACD,UAAU;oBACV,IAAI,EAAE,qCAAoB,CAAC,QAAQ;oBACnC,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;oBACjD,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,SAAS;iBAChC;aACF,CAAC;QACJ,CAAC,CAAA;KACF,CAAC;AACJ,CAAC;AArFD,0DAqFC"}
|
|
@@ -27,9 +27,11 @@ const constants_2 = require("../marinade/constants");
|
|
|
27
27
|
const hasTransactions_1 = require("../../utils/hasTransactions");
|
|
28
28
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
29
29
|
const derivedAddresses = (0, helper_1.getHawksightUserPdas)(new web3_js_1.PublicKey(owner));
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
const hasAnyTransactions = yield Promise.all([
|
|
31
|
+
(0, hasTransactions_1.hasTransactions)(derivedAddresses[0].toString(), portfolio_core_1.NetworkId.solana),
|
|
32
|
+
(0, hasTransactions_1.hasTransactions)(derivedAddresses[1].toString(), portfolio_core_1.NetworkId.solana),
|
|
33
|
+
]).then((results) => results[0] || results[1]);
|
|
34
|
+
if (!hasAnyTransactions)
|
|
33
35
|
return [];
|
|
34
36
|
const dasUrl = (0, getSolanaDasEndpoint_1.default)();
|
|
35
37
|
const displayOptions = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/hawksight/positionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AACpC,6CAA4C;AAG5C,2CAAyC;AACzC,qCAAgD;AAChD,oFAA4D;AAC5D,gGAAuE;AACvE,uEAAqD;AACrD,yEAAsE;AACtE,oGAA4E;AAC5E,oFAAiF;AAEjF,wGAAqG;AACrG,qDAAiD;AACjD,iEAA8D;AAE9D,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,gBAAgB,GAAG,IAAA,6BAAoB,EAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpE,
|
|
1
|
+
{"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/hawksight/positionsFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,7 +88,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
88
88
|
const initialInputAmount = orderAcc.oriMakingAmount
|
|
89
89
|
.div(Math.pow(10, inputDecimals))
|
|
90
90
|
.toNumber();
|
|
91
|
-
const expectedOutputAmount =
|
|
91
|
+
const expectedOutputAmount = (accountv2 && accountv2.sl_taking_amount.isPositive()
|
|
92
|
+
? accountv2.sl_taking_amount
|
|
93
|
+
: orderAcc.oriTakingAmount)
|
|
92
94
|
.div(Math.pow(10, outputDecimals))
|
|
93
95
|
.toNumber();
|
|
94
96
|
const element = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limitFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/limitFetcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"limitFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/limitFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,14 +37,16 @@ export type LimitOrderV2 = {
|
|
|
37
37
|
makingAmount: BigNumber;
|
|
38
38
|
takingAmount: BigNumber;
|
|
39
39
|
borrowMakingAmount: BigNumber;
|
|
40
|
-
expiredAt: BigNumber
|
|
40
|
+
expiredAt: COption<BigNumber>;
|
|
41
41
|
feeBps: number;
|
|
42
42
|
feeAccount: PublicKey;
|
|
43
43
|
createdAt: BigNumber;
|
|
44
44
|
updatedAt: BigNumber;
|
|
45
45
|
bump: number;
|
|
46
|
+
slippage_bps: number;
|
|
47
|
+
sl_taking_amount: BigNumber;
|
|
46
48
|
};
|
|
47
|
-
export declare const limitOrderV2Struct:
|
|
49
|
+
export declare const limitOrderV2Struct: FixableBeetStruct<LimitOrderV2, Partial<LimitOrderV2>>;
|
|
48
50
|
export type DCA = {
|
|
49
51
|
buffer: Buffer;
|
|
50
52
|
user: PublicKey;
|
|
@@ -22,7 +22,7 @@ exports.limitOrderStruct = new beet_1.BeetStruct([
|
|
|
22
22
|
['base', beet_solana_1.publicKey],
|
|
23
23
|
['referral', beet_solana_1.publicKey],
|
|
24
24
|
], (args) => args);
|
|
25
|
-
exports.limitOrderV2Struct = new beet_1.
|
|
25
|
+
exports.limitOrderV2Struct = new beet_1.FixableBeetStruct([
|
|
26
26
|
['buffer', (0, solana_1.blob)(8)],
|
|
27
27
|
['maker', beet_solana_1.publicKey],
|
|
28
28
|
['inputMint', beet_solana_1.publicKey],
|
|
@@ -36,12 +36,14 @@ exports.limitOrderV2Struct = new beet_1.BeetStruct([
|
|
|
36
36
|
['makingAmount', solana_1.u64],
|
|
37
37
|
['takingAmount', solana_1.u64],
|
|
38
38
|
['borrowMakingAmount', solana_1.u64],
|
|
39
|
-
['expiredAt', solana_1.i64],
|
|
39
|
+
['expiredAt', (0, beet_1.coption)(solana_1.i64)],
|
|
40
40
|
['feeBps', beet_1.u16],
|
|
41
41
|
['feeAccount', beet_solana_1.publicKey],
|
|
42
42
|
['createdAt', solana_1.i64],
|
|
43
43
|
['updatedAt', solana_1.i64],
|
|
44
44
|
['bump', beet_1.u8],
|
|
45
|
+
['slippage_bps', beet_1.u16],
|
|
46
|
+
['sl_taking_amount', solana_1.u64],
|
|
45
47
|
], (args) => args);
|
|
46
48
|
exports.dcaStruct = new beet_1.BeetStruct([
|
|
47
49
|
['buffer', (0, solana_1.blob)(8)],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/structs.ts"],"names":[],"mappings":";;;AAAA,oDAUmC;AACnC,kEAA6D;AAG7D,kDAA6D;AAqBhD,QAAA,gBAAgB,GAAG,IAAI,iBAAU,CAC5C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,WAAW,EAAE,uBAAS,CAAC;IACxB,CAAC,YAAY,EAAE,uBAAS,CAAC;IACzB,CAAC,SAAS,EAAE,WAAI,CAAC;IACjB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,mBAAmB,EAAE,uBAAS,CAAC;IAChC,CAAC,oBAAoB,EAAE,uBAAS,CAAC;IACjC,CAAC,SAAS,EAAE,uBAAS,CAAC;IACtB,CAAC,KAAK,EAAE,YAAG,CAAC;IACZ,CAAC,WAAW,EAAE,YAAG,CAAC;IAClB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,UAAU,EAAE,uBAAS,CAAC;CACxB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAkB,CAC7B,CAAC;
|
|
1
|
+
{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/structs.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,9 @@ function getAsrAirdropExecutor(config) {
|
|
|
56
56
|
const claimAddresses = claimsProof.data.claim.map((cp) => asrDeriveClaimStatus(owner, cp, config.distributorProgram));
|
|
57
57
|
const client = (0, clients_1.getClientSolana)();
|
|
58
58
|
const claimAccounts = yield (0, getMultipleAccountsInfoSafe_1.getMultipleAccountsInfoSafe)(client, claimAddresses);
|
|
59
|
+
const txClaimAccounts = yield Promise.all([
|
|
60
|
+
...claimAddresses.map((add) => client.getSignaturesForAddress(add)),
|
|
61
|
+
]);
|
|
59
62
|
return (0, AirdropFetcher_1.getAirdropRaw)({
|
|
60
63
|
statics: config.statics,
|
|
61
64
|
items: claimAccounts
|
|
@@ -66,15 +69,27 @@ function getAsrAirdropExecutor(config) {
|
|
|
66
69
|
const asrItem = config.items.get(claimProofRes.mint);
|
|
67
70
|
if (!asrItem)
|
|
68
71
|
return [];
|
|
72
|
+
const claimTx = txClaimAccounts[i][0];
|
|
69
73
|
const { label, decimals } = asrItem;
|
|
74
|
+
const amount = new bignumber_js_1.default(claimProofRes.amount)
|
|
75
|
+
.div(Math.pow(10, decimals))
|
|
76
|
+
.toNumber();
|
|
70
77
|
return [
|
|
71
78
|
{
|
|
72
|
-
amount
|
|
73
|
-
.div(Math.pow(10, decimals))
|
|
74
|
-
.toNumber(),
|
|
79
|
+
amount,
|
|
75
80
|
isClaimed: !!claimAcc,
|
|
76
81
|
label,
|
|
77
82
|
address: claimProofRes.mint,
|
|
83
|
+
ref: claimAcc ? claimAddresses[i].toString() : undefined,
|
|
84
|
+
claims: claimAcc && claimTx && claimTx.blockTime
|
|
85
|
+
? [
|
|
86
|
+
{
|
|
87
|
+
date: claimTx.blockTime * 1000,
|
|
88
|
+
amount,
|
|
89
|
+
txId: claimTx.signature,
|
|
90
|
+
},
|
|
91
|
+
]
|
|
92
|
+
: undefined,
|
|
78
93
|
},
|
|
79
94
|
];
|
|
80
95
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asrAirdropFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/governance/asrAirdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,gEAAqC;AACrC,2CAAiE;AACjE,4DAAgF;AAEhF,mGAAgG;AAChG,oDAAyD;AACzD,sDAAuD;AACvD,uFAAoF;AACpF,4CAAuC;AAEvC,SAAS,gBAAgB,CAAC,KAAe;IACvC,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACtD,MAAM,EAAE,CAAC;QACT,KAAK;QACL,OAAO;QACP,SAAS,EAAE,KAAK;KACjB,CAAC,CAAC,CAAC;AACN,CAAC;AAED,SAAS,oBAAoB,CAC3B,QAAgB,EAChB,UAAsB,EACtB,kBAA2B;IAE3B,IAAI,kBAAkB,EAAE,CAAC;QACvB,OAAO,IAAA,qCAAiB,EACtB,QAAQ,EACR,UAAU,CAAC,WAAW,EACtB,kBAAkB,CACnB,CAAC;IACJ,CAAC;IACD,IAAI,UAAU,CAAC,IAAI,KAAK,mBAAO,EAAE,CAAC;QAChC,OAAO,IAAA,qCAAiB,EAAC,QAAQ,EAAE,UAAU,CAAC,WAAW,EAAE,yBAAa,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,IAAA,qCAAiB,EAAC,QAAQ,EAAE,UAAU,CAAC,WAAW,EAAE,yBAAa,CAAC,CAAC;AAC5E,CAAC;AAED,SAAgB,qBAAqB,CACnC,MAAiB;IAEjB,OAAO,CAAO,KAAa,EAAE,EAAE;QAC7B,MAAM,WAAW,GAAsC,MAAM,eAAK;aAC/D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;aACzC,KAAK,CAAC,GAAG,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QACL,IACE,CAAC,WAAW;YACZ,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK;YACvB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;YAEnC,OAAO,IAAA,8BAAa,EAAC;gBACnB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,KAAK,EAAE,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC;aACtC,CAAC,CAAC;QAEL,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CACvD,oBAAoB,CAAC,KAAK,EAAE,EAAE,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAC3D,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;QAEjC,MAAM,aAAa,GAAG,MAAM,IAAA,yDAA2B,EACrD,MAAM,EACN,cAAc,CACf,CAAC;QAEF,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,KAAK,EAAE,aAAa;iBACjB,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;gBACnB,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAChD,IAAI,CAAC,aAAa,CAAC,IAAI;oBAAE,OAAO,EAAE,CAAC;gBACnC,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBACrD,IAAI,CAAC,OAAO;oBAAE,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"asrAirdropFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/governance/asrAirdropFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,9 +35,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
35
35
|
address: constants_2.jupMint,
|
|
36
36
|
amount: escrowAccount.amount,
|
|
37
37
|
attributes: {
|
|
38
|
-
lockedUntil:
|
|
39
|
-
? undefined
|
|
40
|
-
: escrowAccount.escrowEndsAt.times(1000).toNumber(),
|
|
38
|
+
lockedUntil: -1,
|
|
41
39
|
},
|
|
42
40
|
ref: escrowAccount.pubkey.toString(),
|
|
43
41
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"voteFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/governance/voteFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,oDAAyD;AACzD,qFAAkF;AAClF,wCAAwC;AACxC,kDAA0E;AAC1E,2CAAyC;AACzC,kDAAiE;AACjE,wCAAkD;AAClD,mFAAgF;AAChF,4CAAsD;AAEtD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,YAAY,GAAG,IAAA,oBAAU,EAAC,KAAK,CAAC,CAAC;IACvC,MAAM,aAAa,GAAG,MAAM,IAAA,2CAAoB,EAC9C,MAAM,EACN,sBAAY,EACZ,YAAY,CACb,CAAC;IACF,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAC;IAE9B,MAAM,wBAAwB,GAAG,MAAM,IAAA,iCAAwB,EAC7D,MAAM,EACN,8BAAoB,EACpB,yBAAa,EACb,IAAA,8BAAoB,EAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CACtD,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAEnE,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;QAC1C,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,qBAAqB;KAC5B,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,CAAC;QACf,OAAO,EAAE,mBAAO;QAChB,MAAM,EAAE,aAAa,CAAC,MAAM;QAC5B,UAAU,EAAE;YACV,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"voteFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/governance/voteFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,oDAAyD;AACzD,qFAAkF;AAClF,wCAAwC;AACxC,kDAA0E;AAC1E,2CAAyC;AACzC,kDAAiE;AACjE,wCAAkD;AAClD,mFAAgF;AAChF,4CAAsD;AAEtD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,YAAY,GAAG,IAAA,oBAAU,EAAC,KAAK,CAAC,CAAC;IACvC,MAAM,aAAa,GAAG,MAAM,IAAA,2CAAoB,EAC9C,MAAM,EACN,sBAAY,EACZ,YAAY,CACb,CAAC;IACF,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAC;IAE9B,MAAM,wBAAwB,GAAG,MAAM,IAAA,iCAAwB,EAC7D,MAAM,EACN,8BAAoB,EACpB,yBAAa,EACb,IAAA,8BAAoB,EAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CACtD,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAEnE,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;QAC1C,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,qBAAqB;KAC5B,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,CAAC;QACf,OAAO,EAAE,mBAAO;QAChB,MAAM,EAAE,aAAa,CAAC,MAAM;QAC5B,UAAU,EAAE;YACV,WAAW,EAAE,CAAC,CAAC;SAChB;QACD,GAAG,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE;KACrC,CAAC,CAAC;IAEH,wBAAwB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3C,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,mBAAO;YAChB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACtE,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;SAC/B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,OAAO;IACxB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
|
|
@@ -25,7 +25,7 @@ function getVotePda(owner) {
|
|
|
25
25
|
}
|
|
26
26
|
exports.getVotePda = getVotePda;
|
|
27
27
|
const maxIdsPerRequest = 100;
|
|
28
|
-
const jupPriceApiUrl = 'https
|
|
28
|
+
const jupPriceApiUrl = 'https://lite-api.jup.ag/price/v2';
|
|
29
29
|
function getJupiterPrices(mints, vsMint) {
|
|
30
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
31
|
let res;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA4C;AAC5C,kDAA6C;AAE7C,2CAAwE;AAExE,SAAgB,UAAU,CAAC,KAAa;IACtC,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QACrB,wBAAY,CAAC,OAAO,EAAE;QACtB,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE;KAC/B,EACD,yBAAa,CACd,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AATD,gCASC;AAED,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA4C;AAC5C,kDAA6C;AAE7C,2CAAwE;AAExE,SAAgB,UAAU,CAAC,KAAa;IACtC,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QACrB,wBAAY,CAAC,OAAO,EAAE;QACtB,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE;KAC/B,EACD,yBAAa,CACd,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AATD,gCASC;AAED,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,cAAc,GAAG,kCAAkC,CAAC;AAE1D,SAAsB,gBAAgB,CAAC,KAAkB,EAAE,MAAiB;;QAC1E,IAAI,GAAG,CAAC;QACR,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,IAAI,QAAQ,CAAC;QACb,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,GAAG,GAAG,gBAAgB,CAAC;QAC3B,MAAM,QAAQ,GAAG,GAAG,cAAc,IAAI,wBAAY,aAAZ,wBAAY,cAAZ,wBAAY,GAAI,EAAE,EAAE,CAAC;QAE3D,GAAG,CAAC;YACF,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACnC,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAwC,QAAQ,EAAE;gBACrE,MAAM,EAAE;oBACN,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;oBAChD,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE;iBAC3B;aACF,CAAC,CAAC;YACH,KAAK,GAAG,GAAG,CAAC;YACZ,GAAG,IAAI,gBAAgB,CAAC;YACxB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QAE1B,MAAM,MAAM,GAAwB,IAAI,GAAG,EAAE,CAAC;QAC9C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBAClD,IAAI,KAAK;oBAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CAAA;AA5BD,4CA4BC"}
|
|
@@ -15,6 +15,8 @@ export type Escrow = {
|
|
|
15
15
|
escrowEndsAt: BigNumber;
|
|
16
16
|
voteDelegate: PublicKey;
|
|
17
17
|
isMaxLock: boolean;
|
|
18
|
+
partialUnstakingAmount: BigNumber;
|
|
19
|
+
padding: BigNumber;
|
|
18
20
|
buffers: BigNumber[];
|
|
19
21
|
};
|
|
20
22
|
export declare const escrowStruct: BeetStruct<Escrow, Partial<Escrow>>;
|
|
@@ -15,7 +15,9 @@ exports.escrowStruct = new beet_1.BeetStruct([
|
|
|
15
15
|
['escrowEndsAt', solana_1.i64],
|
|
16
16
|
['voteDelegate', beet_solana_1.publicKey],
|
|
17
17
|
['isMaxLock', beet_1.bool],
|
|
18
|
-
['
|
|
18
|
+
['partialUnstakingAmount', solana_1.u64],
|
|
19
|
+
['padding', solana_1.u64],
|
|
20
|
+
['buffers', (0, beet_1.uniformFixedSizeArray)(solana_1.u128, 9)],
|
|
19
21
|
], (args) => args);
|
|
20
22
|
exports.partialUnstakeStruct = new beet_1.FixableBeetStruct([
|
|
21
23
|
['buffer', (0, solana_1.blob)(8)],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/launchpad/structs.ts"],"names":[],"mappings":";;;AAAA,oDAOmC;AACnC,kEAA6D;AAG7D,kDAA6D;
|
|
1
|
+
{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/launchpad/structs.ts"],"names":[],"mappings":";;;AAAA,oDAOmC;AACnC,kEAA6D;AAG7D,kDAA6D;AAkBhD,QAAA,YAAY,GAAG,IAAI,iBAAU,CACxC;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,cAAc,EAAE,uBAAS,CAAC;IAC3B,CAAC,WAAW,EAAE,WAAI,CAAC;IACnB,CAAC,wBAAwB,EAAE,YAAG,CAAC;IAC/B,CAAC,SAAS,EAAE,YAAG,CAAC;IAChB,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,aAAI,EAAE,CAAC,CAAC,CAAC;CAC5C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CACzB,CAAC;AAUW,QAAA,oBAAoB,GAAG,IAAI,wBAAiB,CACvD;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,aAAI,EAAE,CAAC,CAAC,CAAC;IAC3C,CAAC,MAAM,EAAE,IAAA,YAAK,EAAC,SAAE,CAAC,CAAC;CACpB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAsB,CACjC,CAAC;AAYW,QAAA,iBAAiB,GAAG,IAAI,iBAAU,CAC7C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,uBAAuB,EAAE,YAAG,CAAC;IAC9B,CAAC,gBAAgB,EAAE,YAAG,CAAC;IACvB,CAAC,UAAU,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACrB,CAAC,OAAO,EAAE,uBAAS,CAAC;CACrB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAmB,CAC9B,CAAC"}
|
|
@@ -58,7 +58,6 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
58
58
|
});
|
|
59
59
|
const solTokenPrice = { price: solPrice };
|
|
60
60
|
const prices = yield (0, helpers_1.getJupiterPrices)([...mintsPk], new web3_js_1.PublicKey(vsToken));
|
|
61
|
-
console.log(prices.get('SAVEDpx3nFNdzG3ymJfShYnrBuYy7LtQEABZQ3qtTFt'));
|
|
62
61
|
const sources = [];
|
|
63
62
|
prices.forEach((price, mint) => {
|
|
64
63
|
const decimals = decimalsMap.get(mint);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pricingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/pricingJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAMoC;AACpC,6CAA4C;AAG5C,oDAAkD;AAClD,uCAA6C;AAC7C,0FAAuF;AACvF,iDAAsD;AACtD,+CAAoD;AAEpD,2CAAqD;AACrD,oDAAgF;AAEhF,MAAM,KAAK,GAAG;IACZ,8CAA8C,EAAE,0CAA0C;IAC1F,8CAA8C,EAAE,iCAAiC;IACjF,6CAA6C,EAAE,iCAAiC;IAChF,8CAA8C,EAAE,yCAAyC;IACzF,8CAA8C,EAAE,oCAAoC;IACpF,8CAA8C,EAAE,iCAAiC;CAClF,CAAC;AACF,MAAM,OAAO,GAAG,2CAA0B,CAAC;AAE3C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,CAAC,UAAU,EAAE,cAAc,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnE,IAAA,0BAAgB,EAAC,CAAC,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,mBAAS,CAAC,uBAAc,CAAC,CAAC;QACzE,KAAK,CAAC,OAAO,CAAkB,kCAAsB,EAAE;YACrD,MAAM,EAAE,sBAAU;YAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC;QACF,KAAK,CAAC,OAAO,CAAW,mBAAO,EAAE;YAC/B,MAAM,EAAE,sBAAiB;YACzB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC;KACH,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc;QAAE,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IAC1E,IAAI,CAAC,YAAY;QAAE,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAEhE,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,QAAQ;QAAE,OAAO;IAEtB,MAAM,OAAO,GAAmB,IAAI,GAAG,CAAC;QACtC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC;QACrC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC;KACrD,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,IAAA,mDAAwB,EAAC,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAE7E,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvC,OAAO,CAAC,GAAG,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1C,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IAE1C,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAgB,EAAC,CAAC,GAAG,OAAO,CAAC,EAAE,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAE5E,
|
|
1
|
+
{"version":3,"file":"pricingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/pricingJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,8 +23,8 @@ const clients_1 = require("../../utils/clients");
|
|
|
23
23
|
const constants_2 = require("../jupiter/launchpad/constants");
|
|
24
24
|
const constants_3 = require("./constants");
|
|
25
25
|
const claimStart = new bignumber_js_1.default(1721314800000);
|
|
26
|
-
const earnestClaimDuration =
|
|
27
|
-
const earnestClaimEnd =
|
|
26
|
+
const earnestClaimDuration = 172 * 24 * 60 * 60 * 1000;
|
|
27
|
+
const earnestClaimEnd = new bignumber_js_1.default(1736208000000);
|
|
28
28
|
const capitalClaimDuration = 14 * 24 * 60 * 60 * 1000;
|
|
29
29
|
const capitalClaimEnd = claimStart.plus(capitalClaimDuration);
|
|
30
30
|
const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -54,10 +54,12 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
54
54
|
const claimStatusAddress = (0, deriveClaimStatus_1.deriveClaimStatus)(owner, claimProofBase.data.merkle_tree, constants_2.lfgDisProgram);
|
|
55
55
|
const claimStatusAccount = yield client.getAccountInfo(claimStatusAddress);
|
|
56
56
|
let capitalAmount = new bignumber_js_1.default(0);
|
|
57
|
+
let claimedTs;
|
|
58
|
+
let firstTx;
|
|
57
59
|
if (claimStatusAccount) {
|
|
58
60
|
const txs = yield client.getSignaturesForAddress(claimStatusAddress);
|
|
59
|
-
|
|
60
|
-
|
|
61
|
+
[firstTx] = txs;
|
|
62
|
+
claimedTs = firstTx.blockTime;
|
|
61
63
|
if (claimedTs) {
|
|
62
64
|
const ratio = new bignumber_js_1.default(claimedTs * 1000)
|
|
63
65
|
.minus(claimStart)
|
|
@@ -85,6 +87,16 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
85
87
|
isClaimed: claimStatusAccount !== null,
|
|
86
88
|
label: 'CLOUD',
|
|
87
89
|
address: constants_3.cloudMint,
|
|
90
|
+
claims: claimedTs && firstTx
|
|
91
|
+
? [
|
|
92
|
+
{
|
|
93
|
+
date: claimedTs,
|
|
94
|
+
amount: capitalAmount.div(Math.pow(10, constants_3.cloudDecimals)).toNumber(),
|
|
95
|
+
txId: firstTx.signature,
|
|
96
|
+
},
|
|
97
|
+
]
|
|
98
|
+
: undefined,
|
|
99
|
+
ref: claimStatusAccount ? claimStatusAddress.toString() : undefined,
|
|
88
100
|
},
|
|
89
101
|
];
|
|
90
102
|
// Check Earnestness
|
|
@@ -103,16 +115,22 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
103
115
|
const earnClaimStatusAddress = (0, deriveClaimStatus_1.deriveClaimStatus)(owner, claimProofEarn.data.merkle_tree, constants_2.lfgDisProgram);
|
|
104
116
|
const earnClaimStatusAccount = yield client.getAccountInfo(earnClaimStatusAddress);
|
|
105
117
|
let earnestAmount = new bignumber_js_1.default(0);
|
|
118
|
+
let earnestClaimTx;
|
|
119
|
+
let earnestClaimTime;
|
|
106
120
|
if (earnClaimStatusAccount) {
|
|
107
121
|
const txs = yield client.getSignaturesForAddress(earnClaimStatusAddress);
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
if (
|
|
111
|
-
|
|
112
|
-
.
|
|
113
|
-
|
|
114
|
-
.
|
|
115
|
-
|
|
122
|
+
[earnestClaimTx] = txs;
|
|
123
|
+
earnestClaimTime = earnestClaimTx.blockTime;
|
|
124
|
+
if (earnestClaimTime) {
|
|
125
|
+
if (earnestClaimEnd.isLessThanOrEqualTo(earnestClaimTime * 1000))
|
|
126
|
+
earnestAmount = new bignumber_js_1.default(claimProofEarn.data.amount).times(2);
|
|
127
|
+
else {
|
|
128
|
+
const ratio = new bignumber_js_1.default(earnestClaimTime * 1000)
|
|
129
|
+
.minus(claimStart)
|
|
130
|
+
.dividedBy(earnestClaimDuration)
|
|
131
|
+
.plus(1);
|
|
132
|
+
earnestAmount = new bignumber_js_1.default(claimProofEarn.data.amount).times(ratio);
|
|
133
|
+
}
|
|
116
134
|
}
|
|
117
135
|
else {
|
|
118
136
|
earnestAmount = new bignumber_js_1.default(claimProofEarn.data.amount);
|
|
@@ -133,6 +151,18 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
133
151
|
isClaimed: earnClaimStatusAccount !== null,
|
|
134
152
|
label: 'CLOUD',
|
|
135
153
|
address: constants_3.cloudMint,
|
|
154
|
+
claims: earnestClaimTime && earnestClaimTx
|
|
155
|
+
? [
|
|
156
|
+
{
|
|
157
|
+
date: earnestClaimTime,
|
|
158
|
+
amount: earnestAmount.div(Math.pow(10, constants_3.cloudDecimals)).toNumber(),
|
|
159
|
+
txId: earnestClaimTx.signature,
|
|
160
|
+
},
|
|
161
|
+
]
|
|
162
|
+
: undefined,
|
|
163
|
+
ref: earnClaimStatusAccount
|
|
164
|
+
? earnClaimStatusAddress.toString()
|
|
165
|
+
: undefined,
|
|
136
166
|
});
|
|
137
167
|
}
|
|
138
168
|
return (0, AirdropFetcher_1.getAirdropRaw)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s1AirdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sanctum/s1AirdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,kDAA6C;AAC7C,+DAAuD;AACvD,oDAAoD;AACpD,yDAK8B;AAC9B,oFAAiF;AACjF,iDAAsD;AAEtD,8DAA8E;AAC9E,2CAKqB;AAErB,MAAM,UAAU,GAAG,IAAI,sBAAS,CAAC,aAAa,CAAC,CAAC;AAChD,MAAM,oBAAoB,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACvD,MAAM,eAAe,GAAG,
|
|
1
|
+
{"version":3,"file":"s1AirdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sanctum/s1AirdropFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,11 +16,13 @@ exports.fetcher = exports.airdropFetcher = void 0;
|
|
|
16
16
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
17
17
|
const axios_1 = __importDefault(require("axios"));
|
|
18
18
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
19
|
+
const tx_parser_1 = require("@sonarwatch/tx-parser");
|
|
20
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
19
21
|
const AirdropFetcher_1 = require("../../AirdropFetcher");
|
|
20
22
|
const constants_1 = require("./constants");
|
|
21
23
|
const clients_1 = require("../../utils/clients");
|
|
22
24
|
const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
|
-
const
|
|
25
|
+
const client = (0, clients_1.getClientSolana)();
|
|
24
26
|
let res;
|
|
25
27
|
try {
|
|
26
28
|
res = yield axios_1.default.get(constants_1.airdropApi + owner);
|
|
@@ -50,46 +52,34 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
50
52
|
},
|
|
51
53
|
],
|
|
52
54
|
});
|
|
53
|
-
const claimedAmount = new bignumber_js_1.default(res.data.claimedAmount);
|
|
54
55
|
const totalAmount = new bignumber_js_1.default(res.data.totalAmount);
|
|
55
|
-
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
const ratio = diffCurrentEpoch / diffAirDropEpoch;
|
|
61
|
-
if (diffAirDropEpoch > 0 && diffCurrentEpoch > 0) {
|
|
62
|
-
const availableAmount = totalAmount
|
|
63
|
-
.times(ratio)
|
|
64
|
-
.minus(claimedAmount)
|
|
65
|
-
.decimalPlaces(0, bignumber_js_1.default.ROUND_DOWN);
|
|
66
|
-
return (0, AirdropFetcher_1.getAirdropRaw)({
|
|
67
|
-
statics: constants_1.airdropStatics,
|
|
68
|
-
items: [
|
|
69
|
-
{
|
|
70
|
-
amount: availableAmount.dividedBy(Math.pow(10, constants_1.layerDecimals)).toNumber(),
|
|
71
|
-
isClaimed: false,
|
|
72
|
-
label: 'LAYER',
|
|
73
|
-
address: constants_1.layerMint,
|
|
74
|
-
},
|
|
75
|
-
{
|
|
76
|
-
amount: claimedAmount.dividedBy(Math.pow(10, constants_1.layerDecimals)).toNumber(),
|
|
77
|
-
isClaimed: true,
|
|
78
|
-
label: 'LAYER',
|
|
79
|
-
address: constants_1.layerMint,
|
|
80
|
-
},
|
|
81
|
-
],
|
|
82
|
-
});
|
|
83
|
-
}
|
|
84
|
-
}
|
|
56
|
+
// This is for test purpose
|
|
57
|
+
const claimAccount = new web3_js_1.PublicKey('35YYQV8wTUWxKoyMSAzhLSshxYSuiWZmtnsb94asAZfk');
|
|
58
|
+
const claimSignatures = yield (0, tx_parser_1.getSignatures)(client, claimAccount.toString());
|
|
59
|
+
const claimTransaction = yield (0, tx_parser_1.getTransactions)(client, claimSignatures.map((s) => s.signature));
|
|
60
|
+
const claimTransactionParsed = claimTransaction.map((t) => (0, tx_parser_1.parseTransaction)(t, owner));
|
|
85
61
|
return (0, AirdropFetcher_1.getAirdropRaw)({
|
|
86
62
|
statics: constants_1.airdropStatics,
|
|
87
63
|
items: [
|
|
88
64
|
{
|
|
89
|
-
amount:
|
|
90
|
-
isClaimed:
|
|
65
|
+
amount: totalAmount.dividedBy(Math.pow(10, constants_1.layerDecimals)).toNumber(),
|
|
66
|
+
isClaimed: false,
|
|
91
67
|
label: 'LAYER',
|
|
92
68
|
address: constants_1.layerMint,
|
|
69
|
+
claims: claimTransactionParsed.flatMap((t) => {
|
|
70
|
+
var _a;
|
|
71
|
+
if (t && t.blockTime) {
|
|
72
|
+
const layerChange = (_a = t === null || t === void 0 ? void 0 : t.balanceChanges.find((b) => b.address === constants_1.layerMint)) === null || _a === void 0 ? void 0 : _a.change;
|
|
73
|
+
if (layerChange)
|
|
74
|
+
return {
|
|
75
|
+
amount: layerChange,
|
|
76
|
+
date: t.blockTime * 1000,
|
|
77
|
+
txId: t.signature,
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
return [];
|
|
81
|
+
}),
|
|
82
|
+
ref: '35YYQV8wTUWxKoyMSAzhLSshxYSuiWZmtnsb94asAZfk',
|
|
93
83
|
},
|
|
94
84
|
],
|
|
95
85
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solayer/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAC7C,gEAAqC;AACrC,yDAK8B;AAC9B,2CAMqB;AAErB,iDAAsD;AAEtD,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,
|
|
1
|
+
{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solayer/airdropFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.xStakingConfigs = void 0;
|
|
4
4
|
const constants_1 = require("../aurory/constants");
|
|
5
5
|
const constants_2 = require("../allbridge/constants");
|
|
6
|
-
const constants_3 = require("../sanctum/constants");
|
|
7
6
|
exports.xStakingConfigs = [
|
|
8
7
|
{
|
|
9
8
|
mint: constants_1.auryMint,
|
|
@@ -59,8 +58,9 @@ exports.xStakingConfigs = [
|
|
|
59
58
|
vault: '5jbzpJeGZFpPFrwXAdeWn25UJiParK8rayQYJY3r14cv',
|
|
60
59
|
xMint: 'sc1dNAxRBj5CNWaGC26AR7PEW75R36Umzt1V8vuP8kZ',
|
|
61
60
|
xDecimals: 9,
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
// Had to remove because mobile app have a price for sCLOUD so it's double counting
|
|
62
|
+
// platformId: sanctumPlatformId,
|
|
63
|
+
// label: 'Staked',
|
|
64
64
|
},
|
|
65
65
|
{
|
|
66
66
|
mint: 'A8bcY1eSenMiMy75vgSnp6ShMfWHRHjeM6JxfM1CNDL',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/x-staking-solana/constants.ts"],"names":[],"mappings":";;;AACA,mDAM6B;AAC7B,sDAA2E;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/x-staking-solana/constants.ts"],"names":[],"mappings":";;;AACA,mDAM6B;AAC7B,sDAA2E;AAE9D,QAAA,eAAe,GAAoB;IAC9C;QACE,IAAI,EAAE,oBAAQ;QACd,QAAQ,EAAR,oBAAQ;QACR,KAAK,EAAE,uBAAW;QAClB,KAAK,EAAE,qBAAS;QAChB,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE,sBAAgB;KAC7B;IACD;QACE,IAAI,EAAE,8CAA8C;QACpD,QAAQ,EAAE,CAAC;QACX,KAAK,EAAE,8CAA8C;QACrD,KAAK,EAAE,8CAA8C;QACrD,SAAS,EAAE,CAAC;QACZ,sCAAsC;KACvC;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,KAAK,EAAE,8CAA8C;QACrD,KAAK,EAAE,6CAA6C;QACpD,SAAS,EAAE,CAAC;QACZ,qCAAqC;KACtC;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,KAAK,EAAE,8CAA8C;QACrD,KAAK,EAAE,6CAA6C;QACpD,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE,sBAAmB;KAChC;IACD;QACE,IAAI,EAAE,8CAA8C;QACpD,QAAQ,EAAE,CAAC;QACX,KAAK,EAAE,8CAA8C;QACrD,KAAK,EAAE,6CAA6C;QACpD,SAAS,EAAE,CAAC;QACZ,mCAAmC;KACpC;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,KAAK,EAAE,8CAA8C;QACrD,KAAK,EAAE,6CAA6C;QACpD,SAAS,EAAE,CAAC;QACZ,+BAA+B;KAChC;IACD;QACE,IAAI,EAAE,8CAA8C;QACpD,QAAQ,EAAE,CAAC;QACX,KAAK,EAAE,8CAA8C;QACrD,KAAK,EAAE,6CAA6C;QACpD,SAAS,EAAE,CAAC;QACZ,mFAAmF;QACnF,iCAAiC;QACjC,mBAAmB;KACpB;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,KAAK,EAAE,8CAA8C;QACrD,KAAK,EAAE,8CAA8C;QACrD,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE,QAAQ;QACpB,KAAK,EAAE,QAAQ;KAChB;CACF,CAAC"}
|