@subwallet/extension-base 1.1.28-beta.2 → 1.1.28-beta.3
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/background/KoniTypes.d.ts +6 -6
- package/cjs/services/earning-service/handlers/base.js +1 -1
- package/cjs/services/earning-service/handlers/nomination-pool/index.js +1 -1
- package/cjs/services/transaction-service/index.js +9 -4
- package/package.json +1 -1
- package/services/earning-service/handlers/base.js +1 -1
- package/services/earning-service/handlers/nomination-pool/index.js +1 -1
- package/services/earning-service/handlers/special.d.ts +1 -1
- package/services/transaction-service/index.js +9 -4
|
@@ -399,12 +399,12 @@ export interface ExtrinsicDataTypeMap {
|
|
|
399
399
|
[ExtrinsicType.STAKING_CANCEL_UNSTAKE]: RequestStakeCancelWithdrawal;
|
|
400
400
|
[ExtrinsicType.STAKING_POOL_WITHDRAW]: any;
|
|
401
401
|
[ExtrinsicType.JOIN_YIELD_POOL]: RequestYieldStepSubmit;
|
|
402
|
-
[ExtrinsicType.MINT_VDOT]:
|
|
403
|
-
[ExtrinsicType.MINT_LDOT]:
|
|
404
|
-
[ExtrinsicType.MINT_SDOT]:
|
|
405
|
-
[ExtrinsicType.MINT_QDOT]:
|
|
406
|
-
[ExtrinsicType.MINT_STDOT]:
|
|
407
|
-
[ExtrinsicType.MINT_STDOT]:
|
|
402
|
+
[ExtrinsicType.MINT_VDOT]: SubmitYieldStepData;
|
|
403
|
+
[ExtrinsicType.MINT_LDOT]: SubmitYieldStepData;
|
|
404
|
+
[ExtrinsicType.MINT_SDOT]: SubmitYieldStepData;
|
|
405
|
+
[ExtrinsicType.MINT_QDOT]: SubmitYieldStepData;
|
|
406
|
+
[ExtrinsicType.MINT_STDOT]: SubmitYieldStepData;
|
|
407
|
+
[ExtrinsicType.MINT_STDOT]: SubmitYieldStepData;
|
|
408
408
|
[ExtrinsicType.REDEEM_VDOT]: RequestYieldLeave;
|
|
409
409
|
[ExtrinsicType.REDEEM_QDOT]: RequestYieldLeave;
|
|
410
410
|
[ExtrinsicType.REDEEM_LDOT]: RequestYieldLeave;
|
|
@@ -162,7 +162,7 @@ class BasePoolHandler {
|
|
|
162
162
|
try {
|
|
163
163
|
const stepFunctions = [this.getTokenApproveStep, this.getXcmStep, this.getSubmitStep];
|
|
164
164
|
for (const stepFunction of stepFunctions) {
|
|
165
|
-
const step = await stepFunction(params);
|
|
165
|
+
const step = await stepFunction.bind(this, params)();
|
|
166
166
|
if (step) {
|
|
167
167
|
const [info, fee] = step;
|
|
168
168
|
result.steps.push({
|
|
@@ -422,7 +422,7 @@ class NominationPoolHandler extends _base.default {
|
|
|
422
422
|
selectedPool
|
|
423
423
|
} = data;
|
|
424
424
|
const positionInfo = await this.getPoolPosition(address);
|
|
425
|
-
const [extrinsic] = await this.createJoinExtrinsic(data);
|
|
425
|
+
const [extrinsic] = await this.createJoinExtrinsic(data, positionInfo);
|
|
426
426
|
const joinPoolData = {
|
|
427
427
|
poolPosition: positionInfo,
|
|
428
428
|
slug: this.slug,
|
|
@@ -513,8 +513,7 @@ class TransactionService {
|
|
|
513
513
|
// eslint-disable-next-line no-fallthrough
|
|
514
514
|
case _KoniTypes.ExtrinsicType.MINT_VDOT:
|
|
515
515
|
{
|
|
516
|
-
const
|
|
517
|
-
const params = data.data;
|
|
516
|
+
const params = (0, _utils2.parseTransactionData)(transaction.data);
|
|
518
517
|
const inputTokenInfo = this.state.chainService.getAssetBySlug(params.inputTokenSlug);
|
|
519
518
|
const isFeePaidWithInputAsset = params.feeTokenSlug === params.inputTokenSlug;
|
|
520
519
|
historyItem.amount = {
|
|
@@ -1061,8 +1060,14 @@ class TransactionService {
|
|
|
1061
1060
|
}
|
|
1062
1061
|
handlePostEarningTransaction(id) {
|
|
1063
1062
|
const transaction = this.getTransaction(id);
|
|
1064
|
-
|
|
1065
|
-
|
|
1063
|
+
let slug;
|
|
1064
|
+
|
|
1065
|
+
// TODO
|
|
1066
|
+
if ('data' in transaction.data) {
|
|
1067
|
+
slug = transaction.data.data.slug;
|
|
1068
|
+
} else {
|
|
1069
|
+
slug = transaction.data.slug;
|
|
1070
|
+
}
|
|
1066
1071
|
const poolHandler = this.state.earningService.getPoolHandler(slug);
|
|
1067
1072
|
if (poolHandler) {
|
|
1068
1073
|
const type = poolHandler.type;
|
package/package.json
CHANGED
|
@@ -156,7 +156,7 @@ export default class BasePoolHandler {
|
|
|
156
156
|
try {
|
|
157
157
|
const stepFunctions = [this.getTokenApproveStep, this.getXcmStep, this.getSubmitStep];
|
|
158
158
|
for (const stepFunction of stepFunctions) {
|
|
159
|
-
const step = await stepFunction(params);
|
|
159
|
+
const step = await stepFunction.bind(this, params)();
|
|
160
160
|
if (step) {
|
|
161
161
|
const [info, fee] = step;
|
|
162
162
|
result.steps.push({
|
|
@@ -413,7 +413,7 @@ export default class NominationPoolHandler extends BasePoolHandler {
|
|
|
413
413
|
selectedPool
|
|
414
414
|
} = data;
|
|
415
415
|
const positionInfo = await this.getPoolPosition(address);
|
|
416
|
-
const [extrinsic] = await this.createJoinExtrinsic(data);
|
|
416
|
+
const [extrinsic] = await this.createJoinExtrinsic(data, positionInfo);
|
|
417
417
|
const joinPoolData = {
|
|
418
418
|
poolPosition: positionInfo,
|
|
419
419
|
slug: this.slug,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
|
|
2
2
|
import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
|
|
3
|
-
import { BaseYieldStepDetail, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams,
|
|
3
|
+
import { BaseYieldStepDetail, HandleYieldStepData, OptimalYieldPath, OptimalYieldPathParams, SpecialYieldPoolInfo, SpecialYieldPoolMetadata, SubmitYieldJoinData, TransactionData, UnstakingInfo, YieldPoolInfo, YieldPoolTarget, YieldPoolType, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';
|
|
4
4
|
import BN from 'bn.js';
|
|
5
5
|
import BasePoolHandler from './base';
|
|
6
6
|
export default abstract class BaseSpecialStakingPoolHandler extends BasePoolHandler {
|
|
@@ -506,8 +506,7 @@ export default class TransactionService {
|
|
|
506
506
|
// eslint-disable-next-line no-fallthrough
|
|
507
507
|
case ExtrinsicType.MINT_VDOT:
|
|
508
508
|
{
|
|
509
|
-
const
|
|
510
|
-
const params = data.data;
|
|
509
|
+
const params = parseTransactionData(transaction.data);
|
|
511
510
|
const inputTokenInfo = this.state.chainService.getAssetBySlug(params.inputTokenSlug);
|
|
512
511
|
const isFeePaidWithInputAsset = params.feeTokenSlug === params.inputTokenSlug;
|
|
513
512
|
historyItem.amount = {
|
|
@@ -1041,8 +1040,14 @@ export default class TransactionService {
|
|
|
1041
1040
|
}
|
|
1042
1041
|
handlePostEarningTransaction(id) {
|
|
1043
1042
|
const transaction = this.getTransaction(id);
|
|
1044
|
-
|
|
1045
|
-
|
|
1043
|
+
let slug;
|
|
1044
|
+
|
|
1045
|
+
// TODO
|
|
1046
|
+
if ('data' in transaction.data) {
|
|
1047
|
+
slug = transaction.data.data.slug;
|
|
1048
|
+
} else {
|
|
1049
|
+
slug = transaction.data.slug;
|
|
1050
|
+
}
|
|
1046
1051
|
const poolHandler = this.state.earningService.getPoolHandler(slug);
|
|
1047
1052
|
if (poolHandler) {
|
|
1048
1053
|
const type = poolHandler.type;
|