status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Query token id for transactions (#3851)

This commit is contained in:
Cuteivist 2023-08-04 13:40:36 +02:00 committed by GitHub
parent 06c4eb5df9
commit 1f510eae70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
services/wallet/activity/activity.go
View File

@ -392,6 +392,7 @@ const (
1 AS agg_count, 1 AS agg_count,
transfers.token_address AS token_address, transfers.token_address AS token_address,
transfers.token_id AS token_id,
NULL AS token_code, NULL AS token_code,
NULL AS from_token_code, NULL AS from_token_code,
NULL AS to_token_code, NULL AS to_token_code,
@ -468,6 +469,7 @@ const (
1 AS agg_count, 1 AS agg_count,
NULL AS token_address, NULL AS token_address,
NULL AS token_id,
pending_transactions.symbol AS token_code, pending_transactions.symbol AS token_code,
NULL AS from_token_code, NULL AS from_token_code,
NULL AS to_token_code, NULL AS to_token_code,
@ -522,6 +524,7 @@ const (
COALESCE(tr_status.count, 0) + COALESCE(pending_status.count, 0) AS agg_count, COALESCE(tr_status.count, 0) + COALESCE(pending_status.count, 0) AS agg_count,
NULL AS token_address, NULL AS token_address,
NULL AS token_id,
NULL AS token_code, NULL AS token_code,
multi_transactions.from_asset AS from_token_code, multi_transactions.from_asset AS from_token_code,
multi_transactions.to_asset AS to_token_code, multi_transactions.to_asset AS to_token_code,
@ -677,7 +680,7 @@ func getActivityEntries(ctx context.Context, deps FilterDependencies, addresses
var timestamp int64 var timestamp int64
var dbMtType, dbTrType sql.NullByte var dbMtType, dbTrType sql.NullByte
var toAddress, fromAddress eth.Address var toAddress, fromAddress eth.Address
var toAddressDB, ownerAddressDB, contractAddressDB sql.RawBytes var toAddressDB, ownerAddressDB, contractAddressDB, dbTokenID sql.RawBytes
var tokenAddress, contractAddress *eth.Address var tokenAddress, contractAddress *eth.Address
var aggregatedStatus int var aggregatedStatus int
var dbTrAmount sql.NullString var dbTrAmount sql.NullString
@ -686,7 +689,7 @@ func getActivityEntries(ctx context.Context, deps FilterDependencies, addresses
var transferType *TransferType var transferType *TransferType
err := rows.Scan(&transferHash, &pendingHash, &chainID, &multiTxID, &timestamp, &dbMtType, &dbTrType, &fromAddress, err := rows.Scan(&transferHash, &pendingHash, &chainID, &multiTxID, &timestamp, &dbMtType, &dbTrType, &fromAddress,
&toAddressDB, &ownerAddressDB, &dbTrAmount, &dbMtFromAmount, &dbMtToAmount, &aggregatedStatus, &aggregatedCount, &toAddressDB, &ownerAddressDB, &dbTrAmount, &dbMtFromAmount, &dbMtToAmount, &aggregatedStatus, &aggregatedCount,
&tokenAddress, &tokenCode, &fromTokenCode, &toTokenCode, &outChainIDDB, &inChainIDDB, &contractType, &contractAddressDB) &tokenAddress, &dbTokenID, &tokenCode, &fromTokenCode, &toTokenCode, &outChainIDDB, &inChainIDDB, &contractType, &contractAddressDB)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -726,6 +729,11 @@ func getActivityEntries(ctx context.Context, deps FilterDependencies, addresses
var tokenOut, tokenIn *Token var tokenOut, tokenIn *Token
var outChainID, inChainID *common.ChainID var outChainID, inChainID *common.ChainID
var entry Entry var entry Entry
var tokenID TokenID
if len(dbTokenID) > 0 {
t := new(big.Int).SetBytes(dbTokenID)
tokenID = (*hexutil.Big)(t)
}
if transferHash != nil && chainID.Valid { if transferHash != nil && chainID.Valid {
// Extract activity type: SendAT/ReceiveAT // Extract activity type: SendAT/ReceiveAT
@ -737,9 +745,9 @@ func getActivityEntries(ctx context.Context, deps FilterDependencies, addresses
// Extract tokens and chains // Extract tokens and chains
var involvedToken *Token var involvedToken *Token
if tokenAddress != nil && *tokenAddress != ZeroAddress { if tokenAddress != nil && *tokenAddress != ZeroAddress {
involvedToken = &Token{TokenType: Erc20, ChainID: common.ChainID(chainID.Int64), Address: *tokenAddress} involvedToken = &Token{TokenType: Erc20, ChainID: common.ChainID(chainID.Int64), TokenID: tokenID, Address: *tokenAddress}
} else { } else {
involvedToken = &Token{TokenType: Native, ChainID: common.ChainID(chainID.Int64)} involvedToken = &Token{TokenType: Native, ChainID: common.ChainID(chainID.Int64), TokenID: tokenID}
} }
if activityType == SendAT { if activityType == SendAT {