@moonwell-fi/moonwell-sdk 0.9.24 → 0.9.25
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 +6 -0
- package/_cjs/actions/governance/getDiscussions.js +1 -1
- package/_cjs/actions/governance/getDiscussions.js.map +1 -1
- package/_cjs/actions/governance/getStakingInfo.js +3 -6
- package/_cjs/actions/governance/getStakingInfo.js.map +1 -1
- package/_cjs/actions/governance/getUserStakingInfo.js +8 -3
- package/_cjs/actions/governance/getUserStakingInfo.js.map +1 -1
- package/_cjs/common/index.js +1 -1
- package/_cjs/common/index.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_esm/actions/governance/getDiscussions.js +1 -1
- package/_esm/actions/governance/getDiscussions.js.map +1 -1
- package/_esm/actions/governance/getStakingInfo.js +3 -6
- package/_esm/actions/governance/getStakingInfo.js.map +1 -1
- package/_esm/actions/governance/getUserStakingInfo.js +8 -3
- package/_esm/actions/governance/getUserStakingInfo.js.map +1 -1
- package/_esm/common/index.js +1 -1
- package/_esm/common/index.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_types/actions/governance/getStakingInfo.d.ts.map +1 -1
- package/_types/actions/governance/getUserStakingInfo.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/actions/governance/getDiscussions.ts +2 -2
- package/actions/governance/getStakingInfo.ts +4 -7
- package/actions/governance/getUserStakingInfo.ts +22 -11
- package/common/index.ts +1 -1
- package/errors/version.ts +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @moonwell-fi/moonwell-sdk
|
|
2
2
|
|
|
3
|
+
## 0.9.25
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#216](https://github.com/moonwell-fi/moonwell-sdk/pull/216) [`05618b60da5c3ce77c909389df0671c4157d9c68`](https://github.com/moonwell-fi/moonwell-sdk/commit/05618b60da5c3ce77c909389df0671c4157d9c68) Thanks [@bprofiro](https://github.com/bprofiro)! - Fix governance token price logic
|
|
8
|
+
|
|
3
9
|
## 0.9.24
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
|
@@ -51,7 +51,7 @@ async function getDiscussions(_client) {
|
|
|
51
51
|
views: topic.views,
|
|
52
52
|
replies: topic.posts_count - 1,
|
|
53
53
|
createdAt: new Date(topic.created_at).getTime(),
|
|
54
|
-
tags: topic.tags,
|
|
54
|
+
tags: topic.tags.map((tag) => tag.name),
|
|
55
55
|
link: `https://forum.moonwell.fi/t/${topic.id}`,
|
|
56
56
|
};
|
|
57
57
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDiscussions.js","sourceRoot":"","sources":["../../../actions/governance/getDiscussions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBA,wCAgEC;AAtFD,kDAA0B;AAC1B,oDAA4B;AAE5B,oDAAyD;AACzD,gEAAkD;AAGlD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,gBAAM,CAAC;AAe9B,KAAK,UAAU,cAAc,CAClC,OAAuB;IAiBvB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CACxB,gBAAgB,EAChB,gCAAgC,CACjC,CAAC;IAEF,MAAM,uBAAuB,GAAG,MAAM,eAAK,CAAC,GAAG,CAC7C,sFAAsF,CACvF,CAAC;IAEF,IAAI,uBAAuB,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC;QAC5E,MAAM,IAAI,2BAAgB,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,wBAAwB,GAAG,MAAM,eAAK,CAAC,GAAG,CAC9C,2EAA2E,CAC5E,CAAC;IAEF,IACE,wBAAwB,CAAC,MAAM,KAAK,GAAG;QACvC,CAAC,wBAAwB,CAAC,IAAI,EAC9B,CAAC;QACD,MAAM,IAAI,2BAAgB,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAElB,MAAM,MAAM,GAAG,CAAC,IAA+B,EAAE,EAAE;QACjD,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1C,MAAM,MAAM,GAAe;gBACzB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,OAAO,EAAE,KAAK,CAAC,WAAW,GAAG,CAAC;gBAC9B,SAAS,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;gBAC/C,IAAI,EAAE,KAAK,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"getDiscussions.js","sourceRoot":"","sources":["../../../actions/governance/getDiscussions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBA,wCAgEC;AAtFD,kDAA0B;AAC1B,oDAA4B;AAE5B,oDAAyD;AACzD,gEAAkD;AAGlD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,gBAAM,CAAC;AAe9B,KAAK,UAAU,cAAc,CAClC,OAAuB;IAiBvB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CACxB,gBAAgB,EAChB,gCAAgC,CACjC,CAAC;IAEF,MAAM,uBAAuB,GAAG,MAAM,eAAK,CAAC,GAAG,CAC7C,sFAAsF,CACvF,CAAC;IAEF,IAAI,uBAAuB,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC;QAC5E,MAAM,IAAI,2BAAgB,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,wBAAwB,GAAG,MAAM,eAAK,CAAC,GAAG,CAC9C,2EAA2E,CAC5E,CAAC;IAEF,IACE,wBAAwB,CAAC,MAAM,KAAK,GAAG;QACvC,CAAC,wBAAwB,CAAC,IAAI,EAC9B,CAAC;QACD,MAAM,IAAI,2BAAgB,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAElB,MAAM,MAAM,GAAG,CAAC,IAA+B,EAAE,EAAE;QACjD,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1C,MAAM,MAAM,GAAe;gBACzB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,OAAO,EAAE,KAAK,CAAC,WAAW,GAAG,CAAC;gBAC9B,SAAS,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;gBAC/C,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;gBACvC,IAAI,EAAE,+BAA+B,KAAK,CAAC,EAAE,EAAE;aAChD,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,MAAM,GAAiB;QAC3B,GAAG,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC;QACvC,GAAG,MAAM,CAAC,wBAAwB,CAAC,IAAI,CAAC;KACzC,CAAC;IAEF,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC;AAC7E,CAAC"}
|
|
@@ -11,7 +11,7 @@ async function getStakingInfo(client, args) {
|
|
|
11
11
|
const envStakingInfoSettlements = await Promise.allSettled(envsWithStaking.map(async (environment) => {
|
|
12
12
|
const homeEnvironment = Object.values(index_js_2.publicEnvironments).find((e) => e.custom?.governance?.chainIds?.includes(environment.chainId)) || environment;
|
|
13
13
|
const isBase = environment.chainId === chains_1.base.id;
|
|
14
|
-
const
|
|
14
|
+
const settlements = await Promise.allSettled([
|
|
15
15
|
environment.contracts.views?.read.getStakingInfo(),
|
|
16
16
|
homeEnvironment.contracts.views?.read.getGovernanceTokenPrice(),
|
|
17
17
|
...(isBase
|
|
@@ -21,8 +21,7 @@ async function getStakingInfo(client, args) {
|
|
|
21
21
|
}),
|
|
22
22
|
]
|
|
23
23
|
: []),
|
|
24
|
-
];
|
|
25
|
-
const settlements = await Promise.allSettled(promises);
|
|
24
|
+
]);
|
|
26
25
|
return settlements.map((s) => s.status === "fulfilled" ? s.value : undefined);
|
|
27
26
|
}));
|
|
28
27
|
const envStakingInfo = envStakingInfoSettlements
|
|
@@ -38,13 +37,11 @@ async function getStakingInfo(client, args) {
|
|
|
38
37
|
const envStakingInfoDataAfterX28Proposal = envStakingInfo[index][2];
|
|
39
38
|
const isBase = curr.chainId === chains_1.base.id;
|
|
40
39
|
if (!envStakingInfoData ||
|
|
41
|
-
!envGovernanceTokenPriceData ||
|
|
42
40
|
(isBase && !envStakingInfoDataAfterX28Proposal)) {
|
|
43
41
|
return [];
|
|
44
42
|
}
|
|
45
43
|
const { cooldown, distributionEnd, emissionPerSecond: emissionPerSecondRaw, totalSupply: totalSupplyRaw, unstakeWindow, } = envStakingInfoData;
|
|
46
|
-
const
|
|
47
|
-
const governanceTokenPrice = new index_js_1.Amount(governanceTokenPriceRaw, 18);
|
|
44
|
+
const governanceTokenPrice = new index_js_1.Amount((envGovernanceTokenPriceData ?? 0n), 18);
|
|
48
45
|
const totalSupply = new index_js_1.Amount(totalSupplyRaw, 18);
|
|
49
46
|
const emissionPerSecond = new index_js_1.Amount(emissionPerSecondRaw, 18);
|
|
50
47
|
const emissionPerYear = emissionPerSecond.value * index_js_1.SECONDS_PER_DAY * index_js_1.DAYS_PER_YEAR;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getStakingInfo.js","sourceRoot":"","sources":["../../../actions/governance/getStakingInfo.ts"],"names":[],"mappings":";;AAyBA,
|
|
1
|
+
{"version":3,"file":"getStakingInfo.js","sourceRoot":"","sources":["../../../actions/governance/getStakingInfo.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,9 @@ async function getUserStakingInfo(client, args) {
|
|
|
31
31
|
const result = envsWithStaking.flatMap((curr, index) => {
|
|
32
32
|
const token = curr.config.tokens[curr.config.contracts.governanceToken];
|
|
33
33
|
const stakingToken = curr.config.tokens[curr.config.contracts.stakingToken];
|
|
34
|
-
const userStakingInfoData = envStakingInfo[index][0];
|
|
34
|
+
const userStakingInfoData = envStakingInfo[index]?.[0];
|
|
35
|
+
if (!userStakingInfoData)
|
|
36
|
+
return [];
|
|
35
37
|
const { cooldown, pendingRewards, totalStaked } = userStakingInfoData;
|
|
36
38
|
const isBase = curr.chainId === chains_1.base.id;
|
|
37
39
|
const merklReward = merklRewards.reduce((acc, r) => {
|
|
@@ -41,9 +43,12 @@ async function getUserStakingInfo(client, args) {
|
|
|
41
43
|
return acc;
|
|
42
44
|
}, 0n);
|
|
43
45
|
const merklPendingRewards = isBase ? merklReward : 0n;
|
|
44
|
-
const tokenBalance = envStakingInfo[index][1];
|
|
45
|
-
const governanceTokenPriceRaw = envStakingInfo[index]?.[2]
|
|
46
|
+
const tokenBalance = (envStakingInfo[index]?.[1] ?? 0n);
|
|
47
|
+
const governanceTokenPriceRaw = (envStakingInfo[index]?.[2] ??
|
|
48
|
+
0n);
|
|
46
49
|
const stakingInfoData = envStakingInfo[index]?.[3];
|
|
50
|
+
if (!stakingInfoData)
|
|
51
|
+
return [];
|
|
47
52
|
const { cooldown: cooldownSeconds, unstakeWindow } = stakingInfoData;
|
|
48
53
|
const cooldownEnding = cooldown > 0n ? cooldown + cooldownSeconds : 0n;
|
|
49
54
|
const unstakingEnding = cooldown > 0n ? cooldown + cooldownSeconds + unstakeWindow : 0n;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUserStakingInfo.js","sourceRoot":"","sources":["../../../actions/governance/getUserStakingInfo.ts"],"names":[],"mappings":";;AAuBA,
|
|
1
|
+
{"version":3,"file":"getUserStakingInfo.js","sourceRoot":"","sources":["../../../actions/governance/getUserStakingInfo.ts"],"names":[],"mappings":"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"}
|
package/_cjs/common/index.js
CHANGED
|
@@ -41,7 +41,7 @@ const getEnvironmentsFromArgs = (client, args, onlyWithDeployment) => {
|
|
|
41
41
|
const onlyEnvironmentsWithDeployment = onlyWithDeployment !== undefined ? onlyWithDeployment : true;
|
|
42
42
|
if (args) {
|
|
43
43
|
const { chainId, network } = args;
|
|
44
|
-
if (chainId) {
|
|
44
|
+
if (Number.isInteger(chainId)) {
|
|
45
45
|
return [
|
|
46
46
|
Object.values(client.environments).find((env) => env.chainId === chainId),
|
|
47
47
|
];
|
package/_cjs/common/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../common/index.ts"],"names":[],"mappings":";;;;;;AAaA,oCAMC;AAnBD,kDAA0B;AAG1B,yCAAqC;AAA5B,mGAAA,MAAM,OAAA;AACf,uCAAyD;AAAhD,qGAAA,SAAS,OAAA;AAAE,4GAAA,gBAAgB,OAAA;AAIvB,QAAA,eAAe,GAAG,KAAK,CAAC;AACxB,QAAA,aAAa,GAAG,GAAG,CAAC;AAE1B,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,uBAAe,CAAC;AAApD,QAAA,MAAM,UAA8C;AAEjE,SAAgB,YAAY,CAAC,SAAiB;IAC5C,MAAM,UAAU,GAAG,eAAK;SACrB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;SACrB,OAAO,CAAC,KAAK,CAAC;SACd,IAAI,EAAE,CAAC;IACV,OAAO,UAAU,KAAK,SAAS,CAAC;AAClC,CAAC;AAEM,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE,CAC5C,CAAC,CAAC,KAAK,GAAG,uBAAe,GAAG,CAAC,CAAC,IAAI,qBAAa,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;AADhD,QAAA,YAAY,gBACoC;AAEtD,MAAM,sBAAsB,GAAG,CACpC,MAAsB,EACtB,IAA0C,EAC1C,EAAE;IACF,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAG5B,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAC5C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,KAAK,OAAO,CAClB,CAAC;QACnB,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC,YAAY,CAAC,OAAO,CAAgB,CAAC;QACrD,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAtBW,QAAA,sBAAsB,0BAsBjC;AAEK,MAAM,uBAAuB,GAAG,CACrC,MAAsB,EACtB,IAA0C,EAC1C,kBAA4B,EACb,EAAE;IACjB,MAAM,8BAA8B,GAClC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/D,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAG5B,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../common/index.ts"],"names":[],"mappings":";;;;;;AAaA,oCAMC;AAnBD,kDAA0B;AAG1B,yCAAqC;AAA5B,mGAAA,MAAM,OAAA;AACf,uCAAyD;AAAhD,qGAAA,SAAS,OAAA;AAAE,4GAAA,gBAAgB,OAAA;AAIvB,QAAA,eAAe,GAAG,KAAK,CAAC;AACxB,QAAA,aAAa,GAAG,GAAG,CAAC;AAE1B,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,uBAAe,CAAC;AAApD,QAAA,MAAM,UAA8C;AAEjE,SAAgB,YAAY,CAAC,SAAiB;IAC5C,MAAM,UAAU,GAAG,eAAK;SACrB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;SACrB,OAAO,CAAC,KAAK,CAAC;SACd,IAAI,EAAE,CAAC;IACV,OAAO,UAAU,KAAK,SAAS,CAAC;AAClC,CAAC;AAEM,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE,CAC5C,CAAC,CAAC,KAAK,GAAG,uBAAe,GAAG,CAAC,CAAC,IAAI,qBAAa,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;AADhD,QAAA,YAAY,gBACoC;AAEtD,MAAM,sBAAsB,GAAG,CACpC,MAAsB,EACtB,IAA0C,EAC1C,EAAE;IACF,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAG5B,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAC5C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,KAAK,OAAO,CAClB,CAAC;QACnB,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC,YAAY,CAAC,OAAO,CAAgB,CAAC;QACrD,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAtBW,QAAA,sBAAsB,0BAsBjC;AAEK,MAAM,uBAAuB,GAAG,CACrC,MAAsB,EACtB,IAA0C,EAC1C,kBAA4B,EACb,EAAE;IACjB,MAAM,8BAA8B,GAClC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/D,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAG5B,CAAC;QAEF,IAAI,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,OAAO;gBACL,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CACrC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,KAAK,OAAO,CACjC;aACe,CAAC;QACrB,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAkB,CAAC;QACzD,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAA6B,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACtE,8BAA8B,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CACxE,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,uBAAuB,2BA4BlC"}
|
package/_cjs/errors/version.js
CHANGED
|
@@ -31,7 +31,7 @@ export async function getDiscussions(_client) {
|
|
|
31
31
|
views: topic.views,
|
|
32
32
|
replies: topic.posts_count - 1,
|
|
33
33
|
createdAt: new Date(topic.created_at).getTime(),
|
|
34
|
-
tags: topic.tags,
|
|
34
|
+
tags: topic.tags.map((tag) => tag.name),
|
|
35
35
|
link: `https://forum.moonwell.fi/t/${topic.id}`,
|
|
36
36
|
};
|
|
37
37
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDiscussions.js","sourceRoot":"","sources":["../../../actions/governance/getDiscussions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAC;AAGlD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;AAMrC;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAuB;IAiBvB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CACxB,gBAAgB,EAChB,gCAAgC,CACjC,CAAC;IAEF,MAAM,uBAAuB,GAAG,MAAM,KAAK,CAAC,GAAG,CAC7C,sFAAsF,CACvF,CAAC;IAEF,IAAI,uBAAuB,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC;QAC5E,MAAM,IAAI,gBAAgB,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,wBAAwB,GAAG,MAAM,KAAK,CAAC,GAAG,CAC9C,2EAA2E,CAC5E,CAAC;IAEF,IACE,wBAAwB,CAAC,MAAM,KAAK,GAAG;QACvC,CAAC,wBAAwB,CAAC,IAAI,EAC9B,CAAC;QACD,MAAM,IAAI,gBAAgB,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAElB,MAAM,MAAM,GAAG,CAAC,IAA+B,EAAE,EAAE;QACjD,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1C,MAAM,MAAM,GAAe;gBACzB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,OAAO,EAAE,KAAK,CAAC,WAAW,GAAG,CAAC;gBAC9B,SAAS,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;gBAC/C,IAAI,EAAE,KAAK,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"getDiscussions.js","sourceRoot":"","sources":["../../../actions/governance/getDiscussions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAC;AAGlD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;AAMrC;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAuB;IAiBvB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CACxB,gBAAgB,EAChB,gCAAgC,CACjC,CAAC;IAEF,MAAM,uBAAuB,GAAG,MAAM,KAAK,CAAC,GAAG,CAC7C,sFAAsF,CACvF,CAAC;IAEF,IAAI,uBAAuB,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC;QAC5E,MAAM,IAAI,gBAAgB,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,wBAAwB,GAAG,MAAM,KAAK,CAAC,GAAG,CAC9C,2EAA2E,CAC5E,CAAC;IAEF,IACE,wBAAwB,CAAC,MAAM,KAAK,GAAG;QACvC,CAAC,wBAAwB,CAAC,IAAI,EAC9B,CAAC;QACD,MAAM,IAAI,gBAAgB,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAElB,MAAM,MAAM,GAAG,CAAC,IAA+B,EAAE,EAAE;QACjD,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1C,MAAM,MAAM,GAAe;gBACzB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,OAAO,EAAE,KAAK,CAAC,WAAW,GAAG,CAAC;gBAC9B,SAAS,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;gBAC/C,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;gBACvC,IAAI,EAAE,+BAA+B,KAAK,CAAC,EAAE,EAAE;aAChD,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,MAAM,GAAiB;QAC3B,GAAG,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC;QACvC,GAAG,MAAM,CAAC,wBAAwB,CAAC,IAAI,CAAC;KACzC,CAAC;IAEF,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC;AAC7E,CAAC"}
|
|
@@ -8,7 +8,7 @@ export async function getStakingInfo(client, args) {
|
|
|
8
8
|
const envStakingInfoSettlements = await Promise.allSettled(envsWithStaking.map(async (environment) => {
|
|
9
9
|
const homeEnvironment = Object.values(publicEnvironments).find((e) => e.custom?.governance?.chainIds?.includes(environment.chainId)) || environment;
|
|
10
10
|
const isBase = environment.chainId === base.id;
|
|
11
|
-
const
|
|
11
|
+
const settlements = await Promise.allSettled([
|
|
12
12
|
environment.contracts.views?.read.getStakingInfo(),
|
|
13
13
|
homeEnvironment.contracts.views?.read.getGovernanceTokenPrice(),
|
|
14
14
|
...(isBase
|
|
@@ -18,8 +18,7 @@ export async function getStakingInfo(client, args) {
|
|
|
18
18
|
}),
|
|
19
19
|
]
|
|
20
20
|
: []),
|
|
21
|
-
];
|
|
22
|
-
const settlements = await Promise.allSettled(promises);
|
|
21
|
+
]);
|
|
23
22
|
return settlements.map((s) => s.status === "fulfilled" ? s.value : undefined);
|
|
24
23
|
}));
|
|
25
24
|
const envStakingInfo = envStakingInfoSettlements
|
|
@@ -35,14 +34,12 @@ export async function getStakingInfo(client, args) {
|
|
|
35
34
|
const envStakingInfoDataAfterX28Proposal = envStakingInfo[index][2];
|
|
36
35
|
const isBase = curr.chainId === base.id;
|
|
37
36
|
if (!envStakingInfoData ||
|
|
38
|
-
!envGovernanceTokenPriceData ||
|
|
39
37
|
(isBase && !envStakingInfoDataAfterX28Proposal)) {
|
|
40
38
|
return [];
|
|
41
39
|
}
|
|
42
40
|
const { cooldown, distributionEnd, emissionPerSecond: emissionPerSecondRaw, totalSupply: totalSupplyRaw, unstakeWindow, } = envStakingInfoData;
|
|
43
41
|
//Quick workaround to get governance token price from some other environment
|
|
44
|
-
const
|
|
45
|
-
const governanceTokenPrice = new Amount(governanceTokenPriceRaw, 18);
|
|
42
|
+
const governanceTokenPrice = new Amount((envGovernanceTokenPriceData ?? 0n), 18);
|
|
46
43
|
const totalSupply = new Amount(totalSupplyRaw, 18);
|
|
47
44
|
const emissionPerSecond = new Amount(emissionPerSecondRaw, 18);
|
|
48
45
|
const emissionPerYear = emissionPerSecond.value * SECONDS_PER_DAY * DAYS_PER_YEAR;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getStakingInfo.js","sourceRoot":"","sources":["../../../actions/governance/getStakingInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,OAAO,EACL,MAAM,EACN,aAAa,EACb,eAAe,EACf,uBAAuB,GACxB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAIL,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AASjD,MAAM,CAAC,KAAK,UAAU,cAAc,CAIlC,MAAsB,EACtB,IAAsD;IAEtD,MAAM,YAAY,GAAG,uBAAuB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAE3D,MAAM,eAAe,GAAG,YAAY,CAAC,MAAM,CACzC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAC3C,CAAC;IAEF,MAAM,yBAAyB,GAAG,MAAM,OAAO,CAAC,UAAU,CACxD,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;QACxC,MAAM,eAAe,GAClB,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9D,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAC9D,IAAI,WAAW,CAAC;QAEnB,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,KAAK,IAAI,CAAC,EAAE,CAAC;QAE/C,MAAM,
|
|
1
|
+
{"version":3,"file":"getStakingInfo.js","sourceRoot":"","sources":["../../../actions/governance/getStakingInfo.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,9 @@ export async function getUserStakingInfo(client, args) {
|
|
|
29
29
|
const result = envsWithStaking.flatMap((curr, index) => {
|
|
30
30
|
const token = curr.config.tokens[curr.config.contracts.governanceToken];
|
|
31
31
|
const stakingToken = curr.config.tokens[curr.config.contracts.stakingToken];
|
|
32
|
-
const userStakingInfoData = envStakingInfo[index][0];
|
|
32
|
+
const userStakingInfoData = envStakingInfo[index]?.[0];
|
|
33
|
+
if (!userStakingInfoData)
|
|
34
|
+
return [];
|
|
33
35
|
const { cooldown, pendingRewards, totalStaked } = userStakingInfoData;
|
|
34
36
|
// merkl rewards (only for base)
|
|
35
37
|
const isBase = curr.chainId === base.id;
|
|
@@ -40,9 +42,12 @@ export async function getUserStakingInfo(client, args) {
|
|
|
40
42
|
return acc;
|
|
41
43
|
}, 0n);
|
|
42
44
|
const merklPendingRewards = isBase ? merklReward : 0n;
|
|
43
|
-
const tokenBalance = envStakingInfo[index][1];
|
|
44
|
-
const governanceTokenPriceRaw = envStakingInfo[index]?.[2]
|
|
45
|
+
const tokenBalance = (envStakingInfo[index]?.[1] ?? 0n);
|
|
46
|
+
const governanceTokenPriceRaw = (envStakingInfo[index]?.[2] ??
|
|
47
|
+
0n);
|
|
45
48
|
const stakingInfoData = envStakingInfo[index]?.[3];
|
|
49
|
+
if (!stakingInfoData)
|
|
50
|
+
return [];
|
|
46
51
|
const { cooldown: cooldownSeconds, unstakeWindow } = stakingInfoData;
|
|
47
52
|
const cooldownEnding = cooldown > 0n ? cooldown + cooldownSeconds : 0n;
|
|
48
53
|
const unstakingEnding = cooldown > 0n ? cooldown + cooldownSeconds + unstakeWindow : 0n;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUserStakingInfo.js","sourceRoot":"","sources":["../../../actions/governance/getUserStakingInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAExE,OAAO,EAGL,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAYlD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAItC,MAAsB,EACtB,IAAyD;IAEzD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAE7B,MAAM,YAAY,GAAG,uBAAuB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAE3D,MAAM,eAAe,GAAG,YAAY,CAAC,MAAM,CACzC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CACpC,CAAC;IACF,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CACtC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;QACxC,MAAM,eAAe,GAClB,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9D,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAC9D,IAAI,WAAW,CAAC;QAEnB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC;YACvC,WAAW,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,WAAW,CAAC,CAAC;YACnE,WAAW,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC;YACpE,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,uBAAuB,EAAE;YAC/D,WAAW,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE;SACnD,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACvB,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAC/C,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,8BAA8B;IAC9B,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAC5C;QACE,oEAAoE;QACpE,oEAAoE;QACpE,oEAAoE;QACpE,oEAAoE;QACpE,oEAAoE;QACpE,oEAAoE;QACpE,oEAAoE;KACrE,EACD,IAAI,CAAC,EAAE,EACP,WAAW,CACZ,CAAC;IAEF,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACrD,MAAM,KAAK,GACT,IAAI,CAAC,MAAM,CAAC,MAAM,CAChB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,eAAgD,CACtE,CAAC;QACL,MAAM,YAAY,GAChB,IAAI,CAAC,MAAM,CAAC,MAAM,CAChB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,YAA6C,CACnE,CAAC;QAEL,MAAM,mBAAmB,GAAG,cAAc,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"getUserStakingInfo.js","sourceRoot":"","sources":["../../../actions/governance/getUserStakingInfo.ts"],"names":[],"mappings":"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"}
|
package/_esm/common/index.js
CHANGED
|
@@ -28,7 +28,7 @@ export const getEnvironmentsFromArgs = (client, args, onlyWithDeployment) => {
|
|
|
28
28
|
const onlyEnvironmentsWithDeployment = onlyWithDeployment !== undefined ? onlyWithDeployment : true;
|
|
29
29
|
if (args) {
|
|
30
30
|
const { chainId, network } = args;
|
|
31
|
-
if (chainId) {
|
|
31
|
+
if (Number.isInteger(chainId)) {
|
|
32
32
|
return [
|
|
33
33
|
Object.values(client.environments).find((env) => env.chainId === chainId),
|
|
34
34
|
];
|
package/_esm/common/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../common/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAIzD,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC;AACrC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC;AAEjC,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,eAAe,CAAC;AAEjE,MAAM,UAAU,YAAY,CAAC,SAAiB;IAC5C,MAAM,UAAU,GAAG,KAAK;SACrB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;SACrB,OAAO,CAAC,KAAK,CAAC;SACd,IAAI,EAAE,CAAC;IACV,OAAO,UAAU,KAAK,SAAS,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE,CAC5C,CAAC,CAAC,KAAK,GAAG,eAAe,GAAG,CAAC,CAAC,IAAI,aAAa,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;AAE7D,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,MAAsB,EACtB,IAA0C,EAC1C,EAAE;IACF,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAG5B,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAC5C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,KAAK,OAAO,CAClB,CAAC;QACnB,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC,YAAY,CAAC,OAAO,CAAgB,CAAC;QACrD,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,MAAsB,EACtB,IAA0C,EAC1C,kBAA4B,EACb,EAAE;IACjB,MAAM,8BAA8B,GAClC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/D,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAG5B,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../common/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAIzD,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC;AACrC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC;AAEjC,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,eAAe,CAAC;AAEjE,MAAM,UAAU,YAAY,CAAC,SAAiB;IAC5C,MAAM,UAAU,GAAG,KAAK;SACrB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;SACrB,OAAO,CAAC,KAAK,CAAC;SACd,IAAI,EAAE,CAAC;IACV,OAAO,UAAU,KAAK,SAAS,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE,CAC5C,CAAC,CAAC,KAAK,GAAG,eAAe,GAAG,CAAC,CAAC,IAAI,aAAa,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;AAE7D,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,MAAsB,EACtB,IAA0C,EAC1C,EAAE;IACF,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAG5B,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAC5C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,KAAK,OAAO,CAClB,CAAC;QACnB,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC,YAAY,CAAC,OAAO,CAAgB,CAAC;QACrD,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,MAAsB,EACtB,IAA0C,EAC1C,kBAA4B,EACb,EAAE;IACjB,MAAM,8BAA8B,GAClC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/D,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAG5B,CAAC;QAEF,IAAI,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,OAAO;gBACL,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CACrC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,KAAK,OAAO,CACjC;aACe,CAAC;QACrB,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAkB,CAAC;QACzD,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAA6B,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACtE,8BAA8B,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CACxE,CAAC;AACJ,CAAC,CAAC"}
|
package/_esm/errors/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = '0.9.
|
|
1
|
+
export const version = '0.9.25';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getStakingInfo.d.ts","sourceRoot":"","sources":["../../../actions/governance/getStakingInfo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAO3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,KAAK,KAAK,EAIX,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,MAAM,MAAM,wBAAwB,CAClC,YAAY,EACZ,OAAO,SAAS,KAAK,GAAG,SAAS,IAC/B,oBAAoB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;AAEhD,MAAM,MAAM,wBAAwB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;AAE9D,wBAAsB,cAAc,CAClC,YAAY,EACZ,OAAO,SAAS,KAAK,GAAG,SAAS,EAEjC,MAAM,EAAE,cAAc,EACtB,IAAI,CAAC,EAAE,wBAAwB,CAAC,YAAY,EAAE,OAAO,CAAC,GACrD,wBAAwB,
|
|
1
|
+
{"version":3,"file":"getStakingInfo.d.ts","sourceRoot":"","sources":["../../../actions/governance/getStakingInfo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAO3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,KAAK,KAAK,EAIX,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,MAAM,MAAM,wBAAwB,CAClC,YAAY,EACZ,OAAO,SAAS,KAAK,GAAG,SAAS,IAC/B,oBAAoB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;AAEhD,MAAM,MAAM,wBAAwB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;AAE9D,wBAAsB,cAAc,CAClC,YAAY,EACZ,OAAO,SAAS,KAAK,GAAG,SAAS,EAEjC,MAAM,EAAE,cAAc,EACtB,IAAI,CAAC,EAAE,wBAAwB,CAAC,YAAY,EAAE,OAAO,CAAC,GACrD,wBAAwB,CAkI1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUserStakingInfo.d.ts","sourceRoot":"","sources":["../../../actions/governance/getUserStakingInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAE3E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAM1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,MAAM,MAAM,4BAA4B,CACtC,YAAY,EACZ,OAAO,SAAS,KAAK,GAAG,SAAS,IAC/B,4BAA4B,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG;IACxD,kBAAkB;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;AAEtE,wBAAsB,kBAAkB,CACtC,YAAY,EACZ,OAAO,SAAS,KAAK,GAAG,SAAS,EAEjC,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,4BAA4B,CAAC,YAAY,EAAE,OAAO,CAAC,GACxD,4BAA4B,
|
|
1
|
+
{"version":3,"file":"getUserStakingInfo.d.ts","sourceRoot":"","sources":["../../../actions/governance/getUserStakingInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAE3E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAM1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,MAAM,MAAM,4BAA4B,CACtC,YAAY,EACZ,OAAO,SAAS,KAAK,GAAG,SAAS,IAC/B,4BAA4B,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG;IACxD,kBAAkB;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;AAEtE,wBAAsB,kBAAkB,CACtC,YAAY,EACZ,OAAO,SAAS,KAAK,GAAG,SAAS,EAEjC,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,4BAA4B,CAAC,YAAY,EAAE,OAAO,CAAC,GACxD,4BAA4B,CAsH9B"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "0.9.
|
|
1
|
+
export declare const version = "0.9.25";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -33,7 +33,7 @@ export async function getDiscussions(
|
|
|
33
33
|
posts_count: number;
|
|
34
34
|
created_at: string;
|
|
35
35
|
featured_link: string;
|
|
36
|
-
tags: string
|
|
36
|
+
tags: Array<{ id: number; name: string; slug: string }>;
|
|
37
37
|
}[];
|
|
38
38
|
};
|
|
39
39
|
};
|
|
@@ -71,7 +71,7 @@ export async function getDiscussions(
|
|
|
71
71
|
views: topic.views,
|
|
72
72
|
replies: topic.posts_count - 1,
|
|
73
73
|
createdAt: new Date(topic.created_at).getTime(),
|
|
74
|
-
tags: topic.tags,
|
|
74
|
+
tags: topic.tags.map((tag) => tag.name),
|
|
75
75
|
link: `https://forum.moonwell.fi/t/${topic.id}`,
|
|
76
76
|
};
|
|
77
77
|
return result;
|
|
@@ -45,7 +45,7 @@ export async function getStakingInfo<
|
|
|
45
45
|
|
|
46
46
|
const isBase = environment.chainId === base.id;
|
|
47
47
|
|
|
48
|
-
const
|
|
48
|
+
const settlements = await Promise.allSettled([
|
|
49
49
|
environment.contracts.views?.read.getStakingInfo(),
|
|
50
50
|
homeEnvironment.contracts.views?.read.getGovernanceTokenPrice(),
|
|
51
51
|
...(isBase
|
|
@@ -55,9 +55,8 @@ export async function getStakingInfo<
|
|
|
55
55
|
}),
|
|
56
56
|
]
|
|
57
57
|
: []),
|
|
58
|
-
];
|
|
58
|
+
]);
|
|
59
59
|
|
|
60
|
-
const settlements = await Promise.allSettled(promises);
|
|
61
60
|
return settlements.map((s) =>
|
|
62
61
|
s.status === "fulfilled" ? s.value : undefined,
|
|
63
62
|
);
|
|
@@ -103,13 +102,12 @@ export async function getStakingInfo<
|
|
|
103
102
|
]!;
|
|
104
103
|
|
|
105
104
|
const envStakingInfoData = envStakingInfo[index]![0]!;
|
|
106
|
-
const envGovernanceTokenPriceData = envStakingInfo[index]![1]
|
|
105
|
+
const envGovernanceTokenPriceData = envStakingInfo[index]![1];
|
|
107
106
|
const envStakingInfoDataAfterX28Proposal = envStakingInfo[index]![2]!;
|
|
108
107
|
const isBase = curr.chainId === base.id;
|
|
109
108
|
|
|
110
109
|
if (
|
|
111
110
|
!envStakingInfoData ||
|
|
112
|
-
!envGovernanceTokenPriceData ||
|
|
113
111
|
(isBase && !envStakingInfoDataAfterX28Proposal)
|
|
114
112
|
) {
|
|
115
113
|
return [];
|
|
@@ -130,9 +128,8 @@ export async function getStakingInfo<
|
|
|
130
128
|
};
|
|
131
129
|
|
|
132
130
|
//Quick workaround to get governance token price from some other environment
|
|
133
|
-
const governanceTokenPriceRaw = envGovernanceTokenPriceData;
|
|
134
131
|
const governanceTokenPrice = new Amount(
|
|
135
|
-
|
|
132
|
+
(envGovernanceTokenPriceData ?? 0n) as bigint,
|
|
136
133
|
18,
|
|
137
134
|
);
|
|
138
135
|
|
|
@@ -80,11 +80,16 @@ export async function getUserStakingInfo<
|
|
|
80
80
|
curr.config.contracts.stakingToken as keyof TokensType<typeof curr>
|
|
81
81
|
]!;
|
|
82
82
|
|
|
83
|
-
const userStakingInfoData = envStakingInfo[index]
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
83
|
+
const userStakingInfoData = envStakingInfo[index]?.[0] as
|
|
84
|
+
| {
|
|
85
|
+
cooldown: bigint;
|
|
86
|
+
pendingRewards: bigint;
|
|
87
|
+
totalStaked: bigint;
|
|
88
|
+
}
|
|
89
|
+
| undefined;
|
|
90
|
+
|
|
91
|
+
if (!userStakingInfoData) return [];
|
|
92
|
+
|
|
88
93
|
const { cooldown, pendingRewards, totalStaked } = userStakingInfoData;
|
|
89
94
|
|
|
90
95
|
// merkl rewards (only for base)
|
|
@@ -97,14 +102,20 @@ export async function getUserStakingInfo<
|
|
|
97
102
|
}, 0n);
|
|
98
103
|
const merklPendingRewards = isBase ? merklReward : 0n;
|
|
99
104
|
|
|
100
|
-
const tokenBalance = envStakingInfo[index]
|
|
105
|
+
const tokenBalance = (envStakingInfo[index]?.[1] ?? 0n) as bigint;
|
|
101
106
|
|
|
102
|
-
const governanceTokenPriceRaw = envStakingInfo[index]?.[2]
|
|
107
|
+
const governanceTokenPriceRaw = (envStakingInfo[index]?.[2] ??
|
|
108
|
+
0n) as bigint;
|
|
109
|
+
|
|
110
|
+
const stakingInfoData = envStakingInfo[index]?.[3] as
|
|
111
|
+
| {
|
|
112
|
+
cooldown: bigint;
|
|
113
|
+
unstakeWindow: bigint;
|
|
114
|
+
}
|
|
115
|
+
| undefined;
|
|
116
|
+
|
|
117
|
+
if (!stakingInfoData) return [];
|
|
103
118
|
|
|
104
|
-
const stakingInfoData = envStakingInfo[index]?.[3] as {
|
|
105
|
-
cooldown: bigint;
|
|
106
|
-
unstakeWindow: bigint;
|
|
107
|
-
};
|
|
108
119
|
const { cooldown: cooldownSeconds, unstakeWindow } = stakingInfoData;
|
|
109
120
|
|
|
110
121
|
const cooldownEnding = cooldown > 0n ? cooldown + cooldownSeconds : 0n;
|
package/common/index.ts
CHANGED
package/errors/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = '0.9.
|
|
1
|
+
export const version = '0.9.25'
|