@ledgerhq/coin-solana 0.12.0 → 0.12.1-next.0
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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +7 -0
- package/lib/api/chain/index.js +15 -20
- package/lib/api/chain/index.js.map +1 -1
- package/lib/api/chain/program/parser.js +20 -5
- package/lib/api/chain/program/parser.js.map +1 -1
- package/lib/api/chain/stake-activation/rpc.js +40 -51
- package/lib/api/chain/stake-activation/rpc.js.map +1 -1
- package/lib/api/chain/web3.js +136 -211
- package/lib/api/chain/web3.js.map +1 -1
- package/lib/api/traced.js +1 -1
- package/lib/api/traced.js.map +1 -1
- package/lib/bridge/bridge.js +14 -24
- package/lib/bridge/bridge.js.map +1 -1
- package/lib/bridge/js.js +3 -3
- package/lib/bridge/js.js.map +1 -1
- package/lib/bridge.integration.test.js +133 -65
- package/lib/bridge.integration.test.js.map +1 -1
- package/lib/broadcast.js +3 -12
- package/lib/broadcast.js.map +1 -1
- package/lib/buildTransaction.js +33 -46
- package/lib/buildTransaction.js.map +1 -1
- package/lib/cli-transaction.js +50 -27
- package/lib/cli-transaction.js.map +1 -1
- package/lib/estimateMaxSpendable.js +11 -21
- package/lib/estimateMaxSpendable.js.map +1 -1
- package/lib/getTransactionStatus.js +2 -11
- package/lib/getTransactionStatus.js.map +1 -1
- package/lib/hw-getAddress.js +3 -12
- package/lib/hw-getAddress.js.map +1 -1
- package/lib/logic.js +3 -5
- package/lib/logic.js.map +1 -1
- package/lib/preload.js +20 -33
- package/lib/preload.js.map +1 -1
- package/lib/prepareTransaction.js +354 -382
- package/lib/prepareTransaction.js.map +1 -1
- package/lib/signOperation.js +98 -26
- package/lib/signOperation.js.map +1 -1
- package/lib/specs.js +11 -20
- package/lib/specs.js.map +1 -1
- package/lib/speculos-deviceActions.js +48 -72
- package/lib/speculos-deviceActions.js.map +1 -1
- package/lib/synchronization.js +66 -76
- package/lib/synchronization.js.map +1 -1
- package/lib/transaction.js +10 -2
- package/lib/transaction.js.map +1 -1
- package/lib/tx-fees.js +97 -76
- package/lib/tx-fees.js.map +1 -1
- package/lib/utils.js +16 -49
- package/lib/utils.js.map +1 -1
- package/lib/validator-app/index.js +26 -38
- package/lib/validator-app/index.js.map +1 -1
- package/lib-es/api/chain/index.js +15 -20
- package/lib-es/api/chain/index.js.map +1 -1
- package/lib-es/api/chain/program/parser.js +20 -5
- package/lib-es/api/chain/program/parser.js.map +1 -1
- package/lib-es/api/chain/stake-activation/rpc.js +40 -51
- package/lib-es/api/chain/stake-activation/rpc.js.map +1 -1
- package/lib-es/api/chain/web3.js +152 -227
- package/lib-es/api/chain/web3.js.map +1 -1
- package/lib-es/api/traced.js +1 -1
- package/lib-es/api/traced.js.map +1 -1
- package/lib-es/bridge/bridge.js +14 -24
- package/lib-es/bridge/bridge.js.map +1 -1
- package/lib-es/bridge/js.js +3 -3
- package/lib-es/bridge/js.js.map +1 -1
- package/lib-es/bridge.integration.test.js +133 -65
- package/lib-es/bridge.integration.test.js.map +1 -1
- package/lib-es/broadcast.js +3 -12
- package/lib-es/broadcast.js.map +1 -1
- package/lib-es/buildTransaction.js +33 -46
- package/lib-es/buildTransaction.js.map +1 -1
- package/lib-es/cli-transaction.js +50 -27
- package/lib-es/cli-transaction.js.map +1 -1
- package/lib-es/estimateMaxSpendable.js +11 -21
- package/lib-es/estimateMaxSpendable.js.map +1 -1
- package/lib-es/getTransactionStatus.js +2 -11
- package/lib-es/getTransactionStatus.js.map +1 -1
- package/lib-es/hw-getAddress.js +3 -12
- package/lib-es/hw-getAddress.js.map +1 -1
- package/lib-es/logic.js +3 -5
- package/lib-es/logic.js.map +1 -1
- package/lib-es/preload.js +20 -33
- package/lib-es/preload.js.map +1 -1
- package/lib-es/prepareTransaction.js +354 -382
- package/lib-es/prepareTransaction.js.map +1 -1
- package/lib-es/signOperation.js +98 -26
- package/lib-es/signOperation.js.map +1 -1
- package/lib-es/specs.js +11 -20
- package/lib-es/specs.js.map +1 -1
- package/lib-es/speculos-deviceActions.js +48 -72
- package/lib-es/speculos-deviceActions.js.map +1 -1
- package/lib-es/synchronization.js +66 -76
- package/lib-es/synchronization.js.map +1 -1
- package/lib-es/transaction.js +10 -2
- package/lib-es/transaction.js.map +1 -1
- package/lib-es/tx-fees.js +97 -76
- package/lib-es/tx-fees.js.map +1 -1
- package/lib-es/utils.js +16 -49
- package/lib-es/utils.js.map +1 -1
- package/lib-es/validator-app/index.js +26 -38
- package/lib-es/validator-app/index.js.map +1 -1
- package/package.json +3 -3
- package/tsconfig.json +3 -3
package/.turbo/turbo-build.log
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# @ledgerhq/coin-solana
|
|
2
2
|
|
|
3
|
+
## 0.12.1-next.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [[`5e18866`](https://github.com/LedgerHQ/ledger-live/commit/5e18866320b843632699659ee66f6c410c108c1e)]:
|
|
8
|
+
- @ledgerhq/coin-framework@1.0.0-next.0
|
|
9
|
+
|
|
3
10
|
## 0.12.0
|
|
4
11
|
|
|
5
12
|
### Minor Changes
|
package/lib/api/chain/index.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.getChainAPI = exports.LAST_VALID_BLOCK_HEIGHT_MOCK = exports.LATEST_BLOCKHASH_MOCK = void 0;
|
|
13
4
|
const spl_token_1 = require("@solana/spl-token");
|
|
@@ -20,7 +11,7 @@ exports.LATEST_BLOCKHASH_MOCK = "EEbZs6DmDyDjucyYbo3LwVJU7pQYuVopYcYTSEZXskW3";
|
|
|
20
11
|
exports.LAST_VALID_BLOCK_HEIGHT_MOCK = 280064048;
|
|
21
12
|
// Naive mode, allow us to filter in sentry all this error comming from Sol RPC node
|
|
22
13
|
const remapErrors = (e) => {
|
|
23
|
-
throw new errors_1.NetworkError(e
|
|
14
|
+
throw new errors_1.NetworkError(e?.message);
|
|
24
15
|
};
|
|
25
16
|
function getChainAPI(config, logger) {
|
|
26
17
|
const fetchMiddleware = logger === undefined
|
|
@@ -32,7 +23,11 @@ function getChainAPI(config, logger) {
|
|
|
32
23
|
let _connection;
|
|
33
24
|
const connection = () => {
|
|
34
25
|
if (!_connection) {
|
|
35
|
-
_connection = new web3_js_1.Connection(config.endpoint,
|
|
26
|
+
_connection = new web3_js_1.Connection(config.endpoint, {
|
|
27
|
+
...(fetchMiddleware ? { fetchMiddleware } : {}),
|
|
28
|
+
commitment: "finalized",
|
|
29
|
+
confirmTransactionInitialTimeout: (0, live_env_1.getEnv)("SOLANA_TX_CONFIRMATION_TIMEOUT") || 0,
|
|
30
|
+
});
|
|
36
31
|
}
|
|
37
32
|
return _connection;
|
|
38
33
|
};
|
|
@@ -89,16 +84,16 @@ function getChainAPI(config, logger) {
|
|
|
89
84
|
.then(r => r.value)
|
|
90
85
|
.catch(remapErrors),
|
|
91
86
|
sendRawTransaction: (buffer, recentBlockhash) => {
|
|
92
|
-
return (() =>
|
|
87
|
+
return (async () => {
|
|
93
88
|
const conn = connection();
|
|
94
89
|
const commitment = "confirmed";
|
|
95
|
-
const signature =
|
|
90
|
+
const signature = await conn.sendRawTransaction(buffer, {
|
|
96
91
|
preflightCommitment: commitment,
|
|
97
92
|
});
|
|
98
93
|
if (!recentBlockhash) {
|
|
99
|
-
recentBlockhash =
|
|
94
|
+
recentBlockhash = await conn.getLatestBlockhash(commitment);
|
|
100
95
|
}
|
|
101
|
-
const { value: status } =
|
|
96
|
+
const { value: status } = await conn.confirmTransaction({
|
|
102
97
|
blockhash: recentBlockhash.blockhash,
|
|
103
98
|
lastValidBlockHeight: recentBlockhash.lastValidBlockHeight,
|
|
104
99
|
signature,
|
|
@@ -114,7 +109,7 @@ function getChainAPI(config, logger) {
|
|
|
114
109
|
throw new Error(`Raw transaction ${signature} failed (${JSON.stringify(status)})`);
|
|
115
110
|
}
|
|
116
111
|
return signature;
|
|
117
|
-
})
|
|
112
|
+
})().catch(remapErrors);
|
|
118
113
|
},
|
|
119
114
|
findAssocTokenAccAddress: (owner, mint) => {
|
|
120
115
|
return (0, spl_token_1.getAssociatedTokenAddress)(new web3_js_1.PublicKey(mint), new web3_js_1.PublicKey(owner))
|
|
@@ -131,13 +126,13 @@ function getChainAPI(config, logger) {
|
|
|
131
126
|
})
|
|
132
127
|
.catch(remapErrors);
|
|
133
128
|
},
|
|
134
|
-
getSimulationComputeUnits: (instructions, payer) =>
|
|
129
|
+
getSimulationComputeUnits: async (instructions, payer) => {
|
|
135
130
|
// https://solana.com/developers/guides/advanced/how-to-request-optimal-compute
|
|
136
131
|
const testInstructions = [
|
|
137
132
|
// Set an arbitrarily high number in simulation
|
|
138
133
|
// so we can be sure the transaction will succeed
|
|
139
134
|
// and get the real compute units used
|
|
140
|
-
web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units:
|
|
135
|
+
web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 1_400_000 }),
|
|
141
136
|
...instructions,
|
|
142
137
|
];
|
|
143
138
|
const testTransaction = new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
|
|
@@ -147,12 +142,12 @@ function getChainAPI(config, logger) {
|
|
|
147
142
|
// since 'replaceRecentBlockhash' is set to 'true' below
|
|
148
143
|
recentBlockhash: web3_js_1.PublicKey.default.toString(),
|
|
149
144
|
}).compileToLegacyMessage());
|
|
150
|
-
const rpcResponse =
|
|
145
|
+
const rpcResponse = await connection().simulateTransaction(testTransaction, {
|
|
151
146
|
replaceRecentBlockhash: true,
|
|
152
147
|
sigVerify: false,
|
|
153
148
|
});
|
|
154
149
|
return rpcResponse.value.err ? null : rpcResponse.value.unitsConsumed || null;
|
|
155
|
-
}
|
|
150
|
+
},
|
|
156
151
|
config,
|
|
157
152
|
};
|
|
158
153
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/chain/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/chain/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,31 +14,46 @@ const parse = (ix) => {
|
|
|
14
14
|
return {
|
|
15
15
|
program,
|
|
16
16
|
title: "System",
|
|
17
|
-
instruction: (0, system_1.parseSystemInstruction)(
|
|
17
|
+
instruction: (0, system_1.parseSystemInstruction)({
|
|
18
|
+
...ix,
|
|
19
|
+
program,
|
|
20
|
+
}),
|
|
18
21
|
};
|
|
19
22
|
case "spl-associated-token-account":
|
|
20
23
|
return {
|
|
21
24
|
program,
|
|
22
25
|
title: "Associated Token Account",
|
|
23
|
-
instruction: (0, associated_token_account_1.parseAssociatedTokenAccountInstruction)(
|
|
26
|
+
instruction: (0, associated_token_account_1.parseAssociatedTokenAccountInstruction)({
|
|
27
|
+
...ix,
|
|
28
|
+
program,
|
|
29
|
+
}),
|
|
24
30
|
};
|
|
25
31
|
case "spl-memo":
|
|
26
32
|
return {
|
|
27
33
|
program,
|
|
28
34
|
title: "Memo",
|
|
29
|
-
instruction: (0, memo_1.parseSplMemoInstruction)(
|
|
35
|
+
instruction: (0, memo_1.parseSplMemoInstruction)({
|
|
36
|
+
...ix,
|
|
37
|
+
program,
|
|
38
|
+
}),
|
|
30
39
|
};
|
|
31
40
|
case "stake":
|
|
32
41
|
return {
|
|
33
42
|
program,
|
|
34
43
|
title: "Stake",
|
|
35
|
-
instruction: (0, stake_1.parseStakeInstruction)(
|
|
44
|
+
instruction: (0, stake_1.parseStakeInstruction)({
|
|
45
|
+
...ix,
|
|
46
|
+
program,
|
|
47
|
+
}),
|
|
36
48
|
};
|
|
37
49
|
case "spl-token":
|
|
38
50
|
return {
|
|
39
51
|
program,
|
|
40
52
|
title: "Token",
|
|
41
|
-
instruction: (0, token_1.parseSplTokenInstruction)(
|
|
53
|
+
instruction: (0, token_1.parseSplTokenInstruction)({
|
|
54
|
+
...ix,
|
|
55
|
+
program,
|
|
56
|
+
}),
|
|
42
57
|
};
|
|
43
58
|
default:
|
|
44
59
|
return unknown();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../../src/api/chain/program/parser.ts"],"names":[],"mappings":";;;AACA,gDAA4F;AAE5F,sFAGiD;AACjD,8CAAyF;AACzF,gDAAyF;AACzF,kDAA4F;AAkCrF,MAAM,KAAK,GAAG,CAAC,EAAmD,EAAiB,EAAE;IAC1F,IAAI,QAAQ,IAAI,EAAE,EAAE,CAAC;QACnB,MAAM,OAAO,GAA2D,EAAE,CAAC,OAAc,CAAC;QAE1F,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,QAAQ;gBACX,OAAO;oBACL,OAAO;oBACP,KAAK,EAAE,QAAQ;oBACf,WAAW,EAAE,IAAA,+BAAsB,
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../../src/api/chain/program/parser.ts"],"names":[],"mappings":";;;AACA,gDAA4F;AAE5F,sFAGiD;AACjD,8CAAyF;AACzF,gDAAyF;AACzF,kDAA4F;AAkCrF,MAAM,KAAK,GAAG,CAAC,EAAmD,EAAiB,EAAE;IAC1F,IAAI,QAAQ,IAAI,EAAE,EAAE,CAAC;QACnB,MAAM,OAAO,GAA2D,EAAE,CAAC,OAAc,CAAC;QAE1F,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,QAAQ;gBACX,OAAO;oBACL,OAAO;oBACP,KAAK,EAAE,QAAQ;oBACf,WAAW,EAAE,IAAA,+BAAsB,EAAC;wBAClC,GAAG,EAAE;wBACL,OAAO;qBACR,CAAC;iBACH,CAAC;YACJ,KAAK,8BAA8B;gBACjC,OAAO;oBACL,OAAO;oBACP,KAAK,EAAE,0BAA0B;oBACjC,WAAW,EAAE,IAAA,iEAAsC,EAAC;wBAClD,GAAG,EAAE;wBACL,OAAO;qBACR,CAAC;iBACH,CAAC;YACJ,KAAK,UAAU;gBACb,OAAO;oBACL,OAAO;oBACP,KAAK,EAAE,MAAM;oBACb,WAAW,EAAE,IAAA,8BAAuB,EAAC;wBACnC,GAAG,EAAE;wBACL,OAAO;qBACR,CAAC;iBACH,CAAC;YACJ,KAAK,OAAO;gBACV,OAAO;oBACL,OAAO;oBACP,KAAK,EAAE,OAAO;oBACd,WAAW,EAAE,IAAA,6BAAqB,EAAC;wBACjC,GAAG,EAAE;wBACL,OAAO;qBACR,CAAC;iBACH,CAAC;YACJ,KAAK,WAAW;gBACd,OAAO;oBACL,OAAO;oBACP,KAAK,EAAE,OAAO;oBACd,WAAW,EAAE,IAAA,gCAAwB,EAAC;wBACpC,GAAG,EAAE;wBACL,OAAO;qBACR,CAAC;iBACH,CAAC;YACJ;gBACE,OAAO,OAAO,EAAE,CAAC;QACrB,CAAC;IACH,CAAC;IAED,OAAO,OAAO,EAAE,CAAC;AACnB,CAAC,CAAC;AAxDW,QAAA,KAAK,SAwDhB;AAEK,MAAM,UAAU,GAAG,CAAC,EAAmD,EAAiB,EAAE;IAC/F,IAAI,CAAC;QACH,OAAO,IAAA,aAAK,EAAC,EAAE,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,OAAO,EAAE,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEF,SAAS,OAAO;IAKd,OAAO;QACL,OAAO,EAAE,SAAS;QAClB,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,SAAS;KACd,CAAC;AACb,CAAC"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.getStakeActivation = void 0;
|
|
13
4
|
const web3_js_1 = require("@solana/web3.js");
|
|
@@ -31,49 +22,47 @@ function getStakeActivationState({ activating, deactivating, effective, }) {
|
|
|
31
22
|
// Replacement for outdated connection.getStakeActivation rpc endpoint.
|
|
32
23
|
// Based on example from Solana team https://github.com/solana-developers/solana-rpc-get-stake-activation
|
|
33
24
|
// TODO: Install solana-rpc-get-stake-activation via npm package when it's published.
|
|
34
|
-
function getStakeActivation(connection, stakeAddress) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
return
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
:
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
deactivating: (0, bignumber_js_1.BigNumber)(0),
|
|
66
|
-
};
|
|
67
|
-
const state = getStakeActivationState({ effective, activating, deactivating });
|
|
68
|
-
const inactive = (0, bignumber_js_1.BigNumber)(stakeAccountLamports)
|
|
69
|
-
.minus(effective)
|
|
70
|
-
.minus((stakeAccountOrErr === null || stakeAccountOrErr === void 0 ? void 0 : stakeAccountOrErr.meta.rentExemptReserve) || 0);
|
|
71
|
-
return {
|
|
72
|
-
state,
|
|
73
|
-
active: effective.toNumber(),
|
|
74
|
-
inactive: inactive.toNumber(),
|
|
25
|
+
async function getStakeActivation(connection, stakeAddress) {
|
|
26
|
+
const [epochInfo, { stakeAccountOrErr, stakeAccountLamports }, stakeHistory] = await Promise.all([
|
|
27
|
+
connection.getEpochInfo(),
|
|
28
|
+
(async () => {
|
|
29
|
+
const stakeAccount = await connection.getParsedAccountInfo(stakeAddress);
|
|
30
|
+
if (stakeAccount === null || stakeAccount.value === null) {
|
|
31
|
+
throw new Error("Account not found");
|
|
32
|
+
}
|
|
33
|
+
const stakeAccountOrErr = "parsed" in stakeAccount.value.data
|
|
34
|
+
? (0, account_1.tryParseAsStakeAccount)(stakeAccount.value.data)
|
|
35
|
+
: undefined;
|
|
36
|
+
return { stakeAccountOrErr, stakeAccountLamports: stakeAccount.value.lamports };
|
|
37
|
+
})(),
|
|
38
|
+
(async () => {
|
|
39
|
+
const stakeHistoryAccount = await connection.getParsedAccountInfo(web3_js_1.SYSVAR_STAKE_HISTORY_PUBKEY);
|
|
40
|
+
if (stakeHistoryAccount.value === null || !("parsed" in stakeHistoryAccount.value.data)) {
|
|
41
|
+
throw new Error("StakeHistory not found");
|
|
42
|
+
}
|
|
43
|
+
return stakeHistoryAccount.value.data.parsed.info.map((entry) => {
|
|
44
|
+
return (0, account_1.parseStakeHistoryEntry)({ epoch: entry.epoch, ...entry.stakeHistory });
|
|
45
|
+
});
|
|
46
|
+
})(),
|
|
47
|
+
]);
|
|
48
|
+
if (stakeAccountOrErr instanceof Error)
|
|
49
|
+
throw stakeAccountOrErr;
|
|
50
|
+
const { effective, activating, deactivating } = stakeAccountOrErr?.stake
|
|
51
|
+
? (0, delegation_1.getStakeActivatingAndDeactivating)(stakeAccountOrErr.stake.delegation, (0, bignumber_js_1.BigNumber)(epochInfo.epoch), stakeHistory)
|
|
52
|
+
: {
|
|
53
|
+
effective: (0, bignumber_js_1.BigNumber)(0),
|
|
54
|
+
activating: (0, bignumber_js_1.BigNumber)(0),
|
|
55
|
+
deactivating: (0, bignumber_js_1.BigNumber)(0),
|
|
75
56
|
};
|
|
76
|
-
});
|
|
57
|
+
const state = getStakeActivationState({ effective, activating, deactivating });
|
|
58
|
+
const inactive = (0, bignumber_js_1.BigNumber)(stakeAccountLamports)
|
|
59
|
+
.minus(effective)
|
|
60
|
+
.minus(stakeAccountOrErr?.meta.rentExemptReserve || 0);
|
|
61
|
+
return {
|
|
62
|
+
state,
|
|
63
|
+
active: effective.toNumber(),
|
|
64
|
+
inactive: inactive.toNumber(),
|
|
65
|
+
};
|
|
77
66
|
}
|
|
78
67
|
exports.getStakeActivation = getStakeActivation;
|
|
79
68
|
//# sourceMappingURL=rpc.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../../src/api/chain/stake-activation/rpc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../../src/api/chain/stake-activation/rpc.ts"],"names":[],"mappings":";;;AAAA,6CAAqF;AACrF,+CAAyC;AACzC,6CAAiG;AACjG,wCAA4E;AAE5E,SAAS,uBAAuB,CAAC,EAC/B,UAAU,EACV,YAAY,EACZ,SAAS,GACsB;IAC/B,IAAI,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvB,OAAO,cAAc,CAAC;IACxB,CAAC;SAAM,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5B,OAAO,YAAY,CAAC;IACtB,CAAC;SAAM,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3B,OAAO,QAAQ,CAAC;IAClB,CAAC;SAAM,CAAC;QACN,OAAO,UAAU,CAAC;IACpB,CAAC;AACH,CAAC;AAUD,uEAAuE;AACvE,yGAAyG;AACzG,qFAAqF;AAC9E,KAAK,UAAU,kBAAkB,CACtC,UAAsB,EACtB,YAAuB;IAEvB,MAAM,CAAC,SAAS,EAAE,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC/F,UAAU,CAAC,YAAY,EAAE;QAEzB,CAAC,KAAK,IAAI,EAAE;YACV,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;YACzE,IAAI,YAAY,KAAK,IAAI,IAAI,YAAY,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBACzD,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACvC,CAAC;YACD,MAAM,iBAAiB,GACrB,QAAQ,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI;gBACjC,CAAC,CAAC,IAAA,gCAAsB,EAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC;gBACjD,CAAC,CAAC,SAAS,CAAC;YAEhB,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAClF,CAAC,CAAC,EAAE;QAEJ,CAAC,KAAK,IAAI,EAAE;YACV,MAAM,mBAAmB,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAC/D,qCAA2B,CAC5B,CAAC;YACF,IAAI,mBAAmB,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,IAAI,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxF,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAC5C,CAAC;YACD,OAAO,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE;gBACnE,OAAO,IAAA,gCAAsB,EAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;YAC/E,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,EAAE;KACL,CAAC,CAAC;IAEH,IAAI,iBAAiB,YAAY,KAAK;QAAE,MAAM,iBAAiB,CAAC;IAEhE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,iBAAiB,EAAE,KAAK;QACtE,CAAC,CAAC,IAAA,8CAAiC,EAC/B,iBAAiB,CAAC,KAAK,CAAC,UAAU,EAClC,IAAA,wBAAS,EAAC,SAAS,CAAC,KAAK,CAAC,EAC1B,YAAY,CACb;QACH,CAAC,CAAC;YACE,SAAS,EAAE,IAAA,wBAAS,EAAC,CAAC,CAAC;YACvB,UAAU,EAAE,IAAA,wBAAS,EAAC,CAAC,CAAC;YACxB,YAAY,EAAE,IAAA,wBAAS,EAAC,CAAC,CAAC;SAC3B,CAAC;IAEN,MAAM,KAAK,GAAG,uBAAuB,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;IAC/E,MAAM,QAAQ,GAAG,IAAA,wBAAS,EAAC,oBAAoB,CAAC;SAC7C,KAAK,CAAC,SAAS,CAAC;SAChB,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,IAAI,CAAC,CAAC,CAAC;IAEzD,OAAO;QACL,KAAK;QACL,MAAM,EAAE,SAAS,CAAC,QAAQ,EAAE;QAC5B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;KAC9B,CAAC;AACJ,CAAC;AAzDD,gDAyDC"}
|