Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
mvaivre committed Nov 20, 2023
1 parent 58ae694 commit 24ae50c
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 7 deletions.
13 changes: 10 additions & 3 deletions apps/desktop-wallet/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ const App = () => {
const isSyncingAddressData = useAppSelector((s) => s.addresses.syncingAddressData)
const isTokensMetadataUninitialized = useAppSelector(selectIsTokensMetadataUninitialized)
const isLoadingTokensMetadata = useAppSelector((s) => s.assetsInfo.loading)
const isLoadingTokens = useAppSelector((s) => s.addresses.loadingTokens)

const selectAddressesUnknownTokens = useMemo(makeSelectAddressesUnknownTokens, [])
const unknownTokens = useAppSelector(selectAddressesUnknownTokens)
Expand Down Expand Up @@ -188,11 +189,16 @@ const App = () => {

restorePendingTransactions(mempoolTxHashes, storedPendingTxs)
})
dispatch(syncAddressesHistoricBalances())
}
} else if (addressesStatus === 'initialized') {
if (!isTokensMetadataUninitialized && !isLoadingTokensMetadata && newUnknownTokens.length > 0) {
dispatch(syncUnknownTokensInfo(newUnknownTokens))
if (!isTokensMetadataUninitialized && !isLoadingTokensMetadata) {
if (newUnknownTokens.length > 0) {
dispatch(syncUnknownTokensInfo(newUnknownTokens))
}

if (!isLoadingTokens) {
dispatch(syncAddressesHistoricBalances())
}
}
}
}
Expand All @@ -202,6 +208,7 @@ const App = () => {
assetsInfo.status,
dispatch,
isSyncingAddressData,
isLoadingTokens,
isLoadingTokensMetadata,
isTokensMetadataUninitialized,
network.status,
Expand Down
16 changes: 13 additions & 3 deletions apps/desktop-wallet/src/storage/addresses/addressesActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ import {
} from '@/api/addresses'
import client from '@/api/client'
import i18n from '@/i18n'
import { selectAddressByHash, selectAllAddresses } from '@/storage/addresses/addressesSelectors'
import {
makeSelectAddressesKnownFungibleTokens,
selectAddressByHash,
selectAllAddresses
} from '@/storage/addresses/addressesSelectors'
import { RootState } from '@/storage/store'
import { extractNewTransactionHashes, getTransactionsOfAddress } from '@/storage/transactions/transactionsUtils'
import {
Expand Down Expand Up @@ -176,16 +180,22 @@ export const syncAddressesHistoricBalances = createAsyncThunk(

const addresses = payload ?? (state.addresses.ids as AddressHash[])

const knownFungibleTokens = makeSelectAddressesKnownFungibleTokens()(state, addresses)

for (const addressHash of addresses) {
const balances = []
const data = await client.explorer.addresses.getAddressesAddressAmountHistory(
const alphHistoryData = await client.explorer.addresses.getAddressesAddressAmountHistory(
addressHash,
{ fromTs: oneYearAgo, toTs: thisMoment, 'interval-type': explorer.IntervalType.Daily },
{ format: 'text' }
)

console.log(knownFungibleTokens)

// Get history of known tokens

try {
const { amountHistory } = JSON.parse(data)
const { amountHistory } = JSON.parse(alphHistoryData)

for (const [timestamp, balance] of amountHistory) {
balances.push({
Expand Down
Binary file modified bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"dependencies": {
"@alephium/token-list": "^0.0.12",
"@alephium/web3": "0.22.0"
"@alephium/web3": "/Users/mika/Documents/Projects/Alephium/alephium-web3/packages/web3/alephium-web3-0.14.2.tgz"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^6.10.0",
Expand Down

0 comments on commit 24ae50c

Please sign in to comment.