Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Metadata upgrade #579

Merged
merged 13 commits into from
Jan 4, 2024
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@

## Unreleased

- added: `EdgeCurrencyCodeOptions.tokenId`. This upgrades `getBalance`, `getNumTransactions`, and `getReceiveAddress`.
- added: `EdgeCurrencyEngineCallbacks.onTokenBalanceChanged`, which is thew new balance-update callback.
- added: `EdgeCurrencyWallet.balanceMap`, which reports balances by tokenId.
- added: `EdgeParsedUri.tokenId`
- added: `EdgeTokenId` type definition.
- added: `EdgeTransaction.tokenId`.
- added: Allow deleting metadata fields by passing `null` to `saveTxMetadata`.
- deprecated: `EdgeCurrencyEngineCallbacks.onBalanceChanged`. Use `onTokenBalanceChanged` instead.
- deprecated: `EdgeParsedUri.currencyCode`. Use `tokenId` instead.
- deprecated: `EdgeTransaction.currencyCode`. Use `tokenId` instead.

## 1.13.1 (2023-12-06)

- added: Extra cors servers to distribute load
Expand Down
5 changes: 3 additions & 2 deletions src/core/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
EdgeRateHint,
EdgeStakingStatus,
EdgeToken,
EdgeTokenId,
EdgeTokenMap,
EdgeTransaction,
EdgeWalletInfo,
Expand Down Expand Up @@ -155,7 +156,7 @@ export type RootAction =
type: 'CURRENCY_ENGINE_CHANGED_BALANCE'
payload: {
balance: string
currencyCode: string
tokenId: EdgeTokenId
walletId: string
}
}
Expand Down Expand Up @@ -213,7 +214,7 @@ export type RootAction =
type: 'CURRENCY_ENGINE_GOT_TXS'
payload: {
walletId: string
currencyCode: string
tokenId: EdgeTokenId
}
}
| {
Expand Down
28 changes: 6 additions & 22 deletions src/core/currency/currency-selectors.ts
Original file line number Diff line number Diff line change
@@ -1,46 +1,30 @@
import {
EdgeCurrencyPlugin,
EdgeCurrencyInfo,
EdgeCurrencyWallet,
EdgeTokenMap
} from '../../types/types'
import { ApiInput, RootProps } from '../root-pixie'

const getFromTokenMap = (
tokenMap: EdgeTokenMap,
currencyCode: string
): string | undefined => {
for (const tokenId of Object.keys(tokenMap)) {
const token = tokenMap[tokenId]
for (const denomination of token.denominations) {
if (denomination.name === currencyCode) {
return denomination.multiplier
}
}
}
}

export function getCurrencyMultiplier(
plugin: EdgeCurrencyPlugin,
allTokens: EdgeTokenMap = {},
currencyInfo: EdgeCurrencyInfo,
allTokens: EdgeTokenMap,
currencyCode: string
): string {
const info = plugin.currencyInfo
for (const denomination of info.denominations) {
for (const denomination of currencyInfo.denominations) {
if (denomination.name === currencyCode) {
return denomination.multiplier
}
}

for (const token of info.metaTokens) {
for (const tokenId of Object.keys(allTokens)) {
const token = allTokens[tokenId]
for (const denomination of token.denominations) {
if (denomination.name === currencyCode) {
return denomination.multiplier
}
}
}

const multiplier = getFromTokenMap(allTokens, currencyCode)
if (multiplier != null) return multiplier
return '1'
}

Expand Down
Loading
Loading