@cardano-sdk/wallet 0.44.15 → 0.44.17
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/dist/cjs/services/DelegationTracker/DelegationTracker.d.ts.map +1 -1
- package/dist/cjs/services/DelegationTracker/DelegationTracker.js +7 -1
- package/dist/cjs/services/DelegationTracker/DelegationTracker.js.map +1 -1
- package/dist/cjs/services/WalletUtil.d.ts +1 -0
- package/dist/cjs/services/WalletUtil.d.ts.map +1 -1
- package/dist/cjs/services/WalletUtil.js +5 -0
- package/dist/cjs/services/WalletUtil.js.map +1 -1
- package/dist/cjs/tsconfig.tsbuildinfo +1 -1
- package/dist/esm/services/DelegationTracker/DelegationTracker.d.ts.map +1 -1
- package/dist/esm/services/DelegationTracker/DelegationTracker.js +7 -1
- package/dist/esm/services/DelegationTracker/DelegationTracker.js.map +1 -1
- package/dist/esm/services/WalletUtil.d.ts +1 -0
- package/dist/esm/services/WalletUtil.d.ts.map +1 -1
- package/dist/esm/services/WalletUtil.js +5 -0
- package/dist/esm/services/WalletUtil.js.map +1 -1
- package/dist/esm/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DelegationTracker.d.ts","sourceRoot":"","sources":["../../../../src/services/DelegationTracker/DelegationTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,aAAa,EAAuB,MAAM,mBAAmB,CAAC;AAClH,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAA2B,MAAM,MAAM,CAAC;AAC3D,OAAO,EACL,yBAAyB,EACzB,2BAA2B,EAI5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAA6D,MAAM,kBAAkB,CAAC;AACrH,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAEtF,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,eAAO,MAAM,wBAAwB,yBAEX,oBAAoB,sBACtB,kBAAkB,0BACf,OAAO,KAAK,IAAI,wBAEnC,QAAQ,OAAO,EAAE,kCAKqC,CAAC;AAE/D,oBAAY,kBAAkB,GAAG,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE7E,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,sBAAsB,CAAC;IACvC,uBAAuB,EAAE,UAAU,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAC7D,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,aAAa,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;IACxC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC;IAC9C,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,CAAC,EAAE;QACV,uBAAuB,CAAC,EAAE,2BAA2B,CAAC;QACtD,eAAe,CAAC,EAAE,yBAAyB,CAAC;QAC5C,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;QAChD,cAAc,CAAC,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;KAC5C,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACzC;AAED,eAAO,MAAM,iCAAiC,wBACvB,mBAAmB,2BACf,WAAW,QAAQ,aAAa,EAAE,CAAC,kBAC5C,WAAW,aAAa,CAAC,oBACvB,QAAQ,eAAe,EAAE,KAC1C,WAAW,WAAW,EAAE,CAQxB,CAAC;AAQJ,eAAO,MAAM,gCAAgC,iBAAkB,WAAW,QAAQ,UAAU,EAAE,CAAC,wDAyB5F,CAAC;AAEJ,eAAO,MAAM,uBAAuB,gSA8BjC,sBAAsB,KAAG,iBAAiB,GAAG,
|
|
1
|
+
{"version":3,"file":"DelegationTracker.d.ts","sourceRoot":"","sources":["../../../../src/services/DelegationTracker/DelegationTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,aAAa,EAAuB,MAAM,mBAAmB,CAAC;AAClH,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAA2B,MAAM,MAAM,CAAC;AAC3D,OAAO,EACL,yBAAyB,EACzB,2BAA2B,EAI5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAA6D,MAAM,kBAAkB,CAAC;AACrH,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAEtF,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,eAAO,MAAM,wBAAwB,yBAEX,oBAAoB,sBACtB,kBAAkB,0BACf,OAAO,KAAK,IAAI,wBAEnC,QAAQ,OAAO,EAAE,kCAKqC,CAAC;AAE/D,oBAAY,kBAAkB,GAAG,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE7E,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,sBAAsB,CAAC;IACvC,uBAAuB,EAAE,UAAU,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAC7D,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,aAAa,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;IACxC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC;IAC9C,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,CAAC,EAAE;QACV,uBAAuB,CAAC,EAAE,2BAA2B,CAAC;QACtD,eAAe,CAAC,EAAE,yBAAyB,CAAC;QAC5C,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;QAChD,cAAc,CAAC,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;KAC5C,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACzC;AAED,eAAO,MAAM,iCAAiC,wBACvB,mBAAmB,2BACf,WAAW,QAAQ,aAAa,EAAE,CAAC,kBAC5C,WAAW,aAAa,CAAC,oBACvB,QAAQ,eAAe,EAAE,KAC1C,WAAW,WAAW,EAAE,CAQxB,CAAC;AAQJ,eAAO,MAAM,gCAAgC,iBAAkB,WAAW,QAAQ,UAAU,EAAE,CAAC,wDAyB5F,CAAC;AAEJ,eAAO,MAAM,uBAAuB,gSA8BjC,sBAAsB,KAAG,iBAAiB,GAAG,QAqD/C,CAAC"}
|
|
@@ -37,7 +37,13 @@ export const createDelegationPortfolioTracker = (transactions) => transactions.p
|
|
|
37
37
|
return result;
|
|
38
38
|
}));
|
|
39
39
|
export const createDelegationTracker = ({ rewardAccountAddresses$, epoch$, rewardsTracker, retryBackoffConfig, transactionsTracker, eraSummaries$, stakePoolProvider, knownAddresses$, utxoTracker, stores, logger, onFatalError, internals: { queryStakePoolsProvider = createQueryStakePoolsProvider(stakePoolProvider, stores.stakePools, retryBackoffConfig, onFatalError), rewardsHistoryProvider = createRewardsHistoryProvider(rewardsTracker, retryBackoffConfig), rewardsProvider = createRewardsProvider(epoch$, transactionsTracker.outgoing.onChain$, rewardsTracker, retryBackoffConfig, onFatalError), slotEpochCalc$ = eraSummaries$.pipe(map((eraSummaries) => createSlotEpochCalc(eraSummaries))) } = {} }) => {
|
|
40
|
-
const transactions$ = certificateTransactionsWithEpochs(transactionsTracker, rewardAccountAddresses$, slotEpochCalc$, [
|
|
40
|
+
const transactions$ = certificateTransactionsWithEpochs(transactionsTracker, rewardAccountAddresses$, slotEpochCalc$, [
|
|
41
|
+
...new Set([
|
|
42
|
+
...Cardano.RegAndDeregCertificateTypes,
|
|
43
|
+
...Cardano.StakeDelegationCertificateTypes,
|
|
44
|
+
...Cardano.VoteDelegationCredentialCertificateTypes
|
|
45
|
+
])
|
|
46
|
+
]).pipe(tap((transactionsWithEpochs) => logger.debug(`Found ${transactionsWithEpochs.length} staking transactions`)));
|
|
41
47
|
const rewardsHistory$ = new TrackerSubject(createRewardsHistoryTracker(transactions$, rewardAccountAddresses$, rewardsHistoryProvider, stores.rewardsHistory, contextLogger(logger, 'rewardsHistory$'), onFatalError));
|
|
42
48
|
const portfolio$ = new TrackerSubject(createDelegationPortfolioTracker(transactionsTracker.history$));
|
|
43
49
|
const rewardAccounts$ = new TrackerSubject(createRewardAccountsTracker({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DelegationTracker.js","sourceRoot":"","sources":["../../../../src/services/DelegationTracker/DelegationTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAmD,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAIlH,OAAO,EAAc,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAC3D,OAAO,EAGL,6BAA6B,EAC7B,2BAA2B,EAC3B,qBAAqB,EACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAA0B,4BAA4B,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AACrH,OAAO,EAAY,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAGhF,OAAO,EAAE,mCAAmC,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAEzE,MAAM,CAAC,MAAM,wBAAwB,GACnC,CACE,oBAA0C,EAC1C,kBAAsC,EACtC,YAAuC,EACvC,EAAE,CACJ,CAAC,GAAsB,EAAE,EAAE,CACzB,sBAAsB,CAAC;IACrB,YAAY;IACZ,QAAQ,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;IAC5D,kBAAkB;CACnB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAyB/D,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAC/C,mBAAwC,EACxC,uBAA4D,EAC5D,cAAyC,EACzC,gBAA2C,EAChB,EAAE,CAC7B,aAAa,CAAC;IACZ,4BAA4B,CAAC,mBAAmB,CAAC,QAAQ,EAAE,uBAAuB,EAAE,gBAAgB,CAAC;IACrG,cAAc;CACf,CAAC,CAAC,IAAI,CACL,GAAG,CAAC,CAAC,CAAC,YAAY,EAAE,aAAa,CAAC,EAAE,EAAE,CACpC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAC9E,CACF,CAAC;AAEJ,MAAM,iBAAiB,GAAG,CAAC,YAAoD,EAAW,EAAE,CAC1F,CAAC,CAAC,YAAY;IACd,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACzB,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,2BAA2B,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC,CAC/G,CAAC;AAEJ,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,YAA8C,EAAE,EAAE,CACjG,YAAY,CAAC,IAAI,CACf,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE;IAClB,MAAM,kBAAkB,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC;IAEtD,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,KAAK,MAAM,MAAM,IAAI,kBAAkB,EAAE;QACvC,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;QACnF,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE1E,IAAI,CAAC,SAAS,IAAI,CAAC,qBAAqB;YAAE,SAAS;QAEnD,IAAI,qBAAqB,IAAI,CAAC,SAAS,EAAE;YACvC,MAAM,GAAG,IAAI,CAAC;YACd,MAAM;SACP;QAED,IAAI,SAAS,EAAE;YACb,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC/C,MAAM;SACP;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC,CACH,CAAC;AAEJ,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,EACtC,uBAAuB,EACvB,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,WAAW,EACX,MAAM,EACN,MAAM,EACN,YAAY,EACZ,SAAS,EAAE,EACT,uBAAuB,GAAG,6BAA6B,CACrD,iBAAiB,EACjB,MAAM,CAAC,UAAU,EACjB,kBAAkB,EAClB,YAAY,CACb,EACD,sBAAsB,GAAG,4BAA4B,CAAC,cAAc,EAAE,kBAAkB,CAAC,EACzF,eAAe,GAAG,qBAAqB,CACrC,MAAM,EACN,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,EACrC,cAAc,EACd,kBAAkB,EAClB,YAAY,CACb,EACD,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAC,EAC9F,GAAG,EAAE,EACiB,EAAgC,EAAE;IACzD,MAAM,aAAa,GAAG,iCAAiC,CACrD,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACd,CAAC,GAAG,OAAO,CAAC,2BAA2B,
|
|
1
|
+
{"version":3,"file":"DelegationTracker.js","sourceRoot":"","sources":["../../../../src/services/DelegationTracker/DelegationTracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletUtil.d.ts","sourceRoot":"","sources":["../../../src/services/WalletUtil.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAA6C,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACrG,OAAO,EAAE,UAAU,EAAkB,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAkC,MAAM,UAAU,CAAC;AAC5E,OAAO,EAAE,2CAA2C,EAAyB,MAAM,8BAA8B,CAAC;AAIlH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE;QAEJ,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;KACxC,CAAC;IACF,YAAY,EAAE;QACZ,QAAQ,EAAE;YACR,OAAO,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;SACpC,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,4BAA4B;IAE3C,mBAAmB,EAAE,UAAU,CAAC,2CAA2C,CAAC,CAAC;CAC9E;AAED,oBAAY,iBAAiB,GAAG,4BAA4B,GAC1D,oBAAoB,GAAG;IAAE,oBAAoB,CAAC,EAAE,oBAAoB,CAAA;CAAE,CAAC;AAEzE,eAAO,MAAM,mBAAmB,2BAA4B,oBAAoB,KAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"WalletUtil.d.ts","sourceRoot":"","sources":["../../../src/services/WalletUtil.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAA6C,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACrG,OAAO,EAAE,UAAU,EAAkB,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAkC,MAAM,UAAU,CAAC;AAC5E,OAAO,EAAE,2CAA2C,EAAyB,MAAM,8BAA8B,CAAC;AAIlH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE;QAEJ,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;KACxC,CAAC;IACF,YAAY,EAAE;QACZ,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QAC3C,QAAQ,EAAE;YACR,OAAO,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;SACpC,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,4BAA4B;IAE3C,mBAAmB,EAAE,UAAU,CAAC,2CAA2C,CAAC,CAAC;CAC9E;AAED,oBAAY,iBAAiB,GAAG,4BAA4B,GAC1D,oBAAoB,GAAG;IAAE,oBAAoB,CAAC,EAAE,oBAAoB,CAAA;CAAE,CAAC;AAEzE,eAAO,MAAM,mBAAmB,2BAA4B,oBAAoB,KAAG,QAAQ,aA6CzF,CAAC;AAYH,eAAO,MAAM,0BAA0B,aAAc,oBAAoB,KAAG,QAAQ,aAgCnF,CAAC;AAOF,eAAO,MAAM,qBAAqB,iBAAkB,QAAQ,aAAa,EAAE,KAAG,QAAQ,aAQpF,CAAC;AAKH,eAAO,MAAM,gBAAgB,YAAa,iBAAiB;;;;;;CAKzD,CAAC;AAEH,oBAAY,UAAU,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAqI7D,eAAO,MAAM,yBAAyB,OAAc,QAAQ,EAAE,UAAU,gBAAgB,KAAG,QAAQ,OAAO,CA2CzG,CAAC"}
|
|
@@ -8,6 +8,7 @@ import { txInEquals } from './util/index.js';
|
|
|
8
8
|
import uniqBy from 'lodash/uniqBy.js';
|
|
9
9
|
export const createInputResolver = ({ utxo, transactions }) => ({
|
|
10
10
|
async resolveInput(input, options) {
|
|
11
|
+
const txHistory = await firstValueFrom(transactions.history$);
|
|
11
12
|
const utxoAvailable = await firstValueFrom(utxo.available$, { defaultValue: [] });
|
|
12
13
|
const signedTransactions = await firstValueFrom(transactions.outgoing.signed$, { defaultValue: [] });
|
|
13
14
|
const utxoFromSigned = signedTransactions.flatMap(({ tx: signedTx }, signedTxIndex) => signedTx.body.outputs
|
|
@@ -33,6 +34,10 @@ export const createInputResolver = ({ utxo, transactions }) => ({
|
|
|
33
34
|
return tx.body.outputs[input.index];
|
|
34
35
|
}
|
|
35
36
|
}
|
|
37
|
+
const historyTx = txHistory.findLast((entry) => entry.id === input.txId);
|
|
38
|
+
if (historyTx && historyTx.body.outputs.length > input.index) {
|
|
39
|
+
return historyTx.body.outputs[input.index];
|
|
40
|
+
}
|
|
36
41
|
return null;
|
|
37
42
|
}
|
|
38
43
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletUtil.js","sourceRoot":"","sources":["../../../src/services/WalletUtil.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAwB,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAkB,IAAI,IAAI,iBAAiB,EAAe,MAAM,6BAA6B,CAAC;AACrG,OAAO,EAAc,cAAc,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAmC,eAAe,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,EAA+C,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAClH,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,MAAM,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"WalletUtil.js","sourceRoot":"","sources":["../../../src/services/WalletUtil.ts"],"names":[],"mappings":"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"}
|