Skip to content

Commit

Permalink
fixing tx timestamp
Browse files Browse the repository at this point in the history
  • Loading branch information
@surinder83singh
surinder83singh committed Nov 24, 2022
1 parent 1810efb commit a19c4e1
Show file tree
Hide file tree
Showing 2 changed files with 181 additions and 7 deletions.
185 changes: 179 additions & 6 deletions wallet/tx-store.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ import {Wallet} from './wallet';
import {iDB} from './indexed-db';
import {Api} from 'custom-types';

const API_BASE = "https://kaspa.herokuapp.com/";

interface APITx{
block_time:number,
transaction_id:string
}

export interface TXStoreItem{
in:boolean;
ts:number;
Expand All @@ -13,7 +20,8 @@ export interface TXStoreItem{
tx?:any,
myAddress?:boolean,
isCoinbase:boolean,
isMoved?:boolean
isMoved?:boolean,
version?:number
}

export const internalNames = {
Expand All @@ -32,6 +40,7 @@ export class TXStore{
wallet:Wallet;
store:Map<string, TXStoreItem> = new Map();
txToEmitList:TXStoreItem[] = [];
updatedTxToEmitList:TXStoreItem[] = [];
idb:iDB|undefined;

constructor(wallet:Wallet){
Expand Down Expand Up @@ -77,10 +86,47 @@ export class TXStore{
}
this.emitTx(dbItem);
}
addAddressUTXOs(address:string, utxos:Api.Utxo[], ts?:number){
fetchTransactions(txIds:string[]):Promise<APITx[]> {
return fetch(`${API_BASE}transactions/search?fields=transaction_id%2Cblock_time`, {
headers: {
'Access-Control-Allow-Origin': '*',
'content-type': 'application/json'
},
method: "POST",
body: JSON.stringify({ "transactionIds": txIds })
})
.catch(err=>{

})
.then((response:void|Response) => response && response.json())
.then(data => {
if (Array.isArray(data))
return data
return [];
});
}
async fetchTxTime(txIds:string[]):Promise<Record<string, number>>{
let txs = await this.fetchTransactions(txIds);
//this.wallet.logger.info("fetchTransactions: result", txs);
let txid2time:Record<string, number> = {};
if (Array.isArray(txs)){
txs.forEach(tx=>{
txid2time[tx.transaction_id] = tx.block_time;
});
}

return txid2time;
}
async addAddressUTXOs(address:string, utxos:Api.Utxo[], ts?:number){
if(!utxos.length || this.wallet.addressManager.isOurChange(address))
return
let ids = utxos.map(utxo=>utxo.transactionId);
//ids.push("xxx");
let txid2time = await this.fetchTxTime(ids);
//this.wallet.logger.info("fetchTxTime: result", ids, txid2time);

utxos.forEach(utxo=>{
let ts = txid2time[utxo.transactionId];
let item = {
in: true,
ts: ts||Date.now(),
Expand All @@ -89,7 +135,8 @@ export class TXStore{
address,
blueScore:utxo.blockDaaScore,
isCoinbase:utxo.isCoinbase,
tx:false//TODO
tx:false,//TODO
version:ts?2:1
};
this.add(item);
})
Expand Down Expand Up @@ -117,16 +164,135 @@ export class TXStore{
return;
}

this.txToEmitList.push(tx)
if (this.emitTxTimeoutId){
clearTimeout(this.emitTxTimeoutId);
}

this.txToEmitList.push(tx);
if(this.txToEmitList.length > 500){
this.emitTxs();
}else{
this.emitTxTimeoutId = setTimeout(()=>{
this.emitTxs();
}, 3000);
}
}
emitTxs(){
let list = this.txToEmitList;
this.txToEmitList = [];
this.wallet.emit("transactions", list);
}

emitTxTimeoutId:NodeJS.Timeout|null = null;
emitUpdateTxTimeoutId:NodeJS.Timeout|null = null;
emitUpdateTx(tx:TXStoreItem){
this.updatedTxToEmitList.push(tx);
if (this.emitUpdateTxTimeoutId){
clearTimeout(this.emitUpdateTxTimeoutId);
}

if(this.updatedTxToEmitList.length > 500){
this.emitUpdateTxImpl();
}else{
this.emitUpdateTxTimeoutId = setTimeout(()=>{
this.emitUpdateTxImpl();
}, 3000);
}
}

emitUpdateTxImpl(){
let list = this.updatedTxToEmitList;
this.updatedTxToEmitList = [];
this.wallet.emit("update-transactions", list);
}

async startFetchingTxTime(ids:string[]){
//this.wallet.logger.info("startFetchingTxTime:", ids);
const CHUNK_SIZE = 500;
let chunks:string[][] = [];

let txIds:string[] = [];
let txId2Id:Record<string, string[]> = {};

ids.map(id=>{
let txId = id.split(":")[0];
if (!txId2Id[txId]){
txId2Id[txId] = [];
txIds.push(txId);
if (txIds.length == CHUNK_SIZE){
chunks.push(txIds);
txIds = [];
}
}
txId2Id[txId].push(id);
})

if (txIds.length){
chunks.push(txIds);
}

const updateTx = async (id:string, ts:number=0)=>{
let tx = null;
if (this.idb){
let txStr = await this.idb.get(id);
try{
tx = JSON.parse(txStr);
}catch(e){
tx = {};
}
}
tx = tx||{};

if (ts){
tx.ts = ts;
tx.version = 2;
}else{
tx.version = 1;
}

if (tx.id == id && this.idb){
this.idb.set(id, JSON.stringify(tx))
}

tx.id = id;

this.emitUpdateTx(tx);
//this.wallet.logger.info("startFetchingTxTime: tx updated", id, ts);
}

let fetch_txs = async()=>{
let txIds = chunks.shift();
//this.wallet.logger.info("startFetchingTxTime: fetch_txs", txIds);
if (!txIds)
return

let txId2time = await this.fetchTxTime(txIds);
//this.wallet.logger.info("startFetchingTxTime: txId2time", txId2time);
Object.keys(txId2time).forEach(txId=>{
let ts = txId2time[txId];
let index = (txIds as string[]).indexOf(txId);
if (index > -1){
(txIds as string[]).splice(index, 1);
}

txId2Id[txId].forEach(async(id)=>{
await updateTx(id, ts);
})
});

//txs which failed to fetch
if (this.idb){
txIds.map(txId=>{
txId2Id[txId].forEach(async(id)=>{
await updateTx(id);
})
})
}

setTimeout(fetch_txs, 2000)
};
setTimeout(fetch_txs, 2000)
}
async restore(){
if(this.idb){
let entries = await this.idb.entries().catch((err)=>{
Expand All @@ -135,17 +301,24 @@ export class TXStore{
let length = entries.length;
console.log("tx-entries length:", length)
let list:TXStoreItem[] = [];
let ids = [];
for (let i=0; i<length;i++){
let [key, txStr] = entries[i]
if(!txStr)
continue;
try{
let tx = JSON.parse(txStr)
list.push(tx)
let tx = JSON.parse(txStr);
if (tx.version === undefined){
ids.push(tx.id);
}
list.push(tx);
}catch(e){
this.wallet.logger.error("LS-TX parse error - 104:", txStr, e)
}
}
if (ids.length > 0){
this.startFetchingTxTime(ids);
}

list.sort((a, b)=>{
return a.ts-b.ts;
Expand Down
3 changes: 2 additions & 1 deletion wallet/wallet.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,8 @@ class Wallet extends EventTargetImpl {
blueScore: this.blueScore,
tx:rpcTX.transaction,
myAddress: this.addressManager.isOur(toAddr),
isCoinbase: false
isCoinbase: false,
version:2
})
this.updateDebugInfo();
this.emitCache()
Expand Down

0 comments on commit a19c4e1

Please sign in to comment.