stop using rpc when updating address balances

simpleledger · May 24, 2019 · 8114fcb · 8114fcb
1 parent 746fc8c
commit 8114fcb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ The services `SlpServe` and `SlpSockServer` return query results as a JSON objec
 * Node.js 8.15+
 * TypeScript 3+ (`npm install -g typescript`)
 * MongoDB 4.0+
-* BCHD (recommended with "fastsync"), BitcoinABC, BitcoinUnlimited or other Bitcoin Cash full node with:
+* BitcoinABC, BitcoinUnlimited or other Bitcoin Cash full node with:
   * RPC-JSON and 
   * ZeroMQ event notifications
 

diff --git a/SlpTokenGraph.ts b/SlpTokenGraph.ts
@@ -34,7 +34,7 @@ export class SlpTokenGraph implements TokenGraph {
     constructor(db: Db, manager: SlpGraphManager) {
         this._manager = manager;
         this._rpcClient = new RpcClient();
-        this._slpValidator = new LocalValidator(bitbox, async (txids) => [ <string>await this._rpcClient.getRawTransaction(txids[0]) ])
+        this._slpValidator = new LocalValidator(bitbox, async (txids) => [ <string>await this._rpcClient.getRawTransaction(txids[0]) ], console)
         this._db = db;
         this._graphUpdateQueue = new pQueue({ concurrency: 1 });
     }
@@ -283,29 +283,29 @@ export class SlpTokenGraph implements TokenGraph {
         await this.asyncForEach(Array.from(this._tokenUtxos), async (utxo: string) => {
             let txid = utxo.split(':')[0];
             let vout = parseInt(utxo.split(':')[1]);
-            let txout = <TxOutResult>(await this._rpcClient.getTxOut(txid, vout, true))
+            let txout = this._graphTxns.get(txid)!.outputs[vout-1]
             if(txout) {
                 if(!this._graphTxns.get(txid)) {
                     await this.updateTokenGraphFrom(txid)
                     if(!this._tokenUtxos.has(utxo))
                         return
                 }
                 let txnDetails = this._graphTxns.get(txid)!.details
-                let addr = Utils.toSlpAddress(txout.scriptPubKey.addresses[0])
+                let addr = Utils.toSlpAddress(txout.address)
                 let bal;
                 if(this._addresses.has(addr)) {
                     bal = this._addresses.get(addr)!
-                    bal.satoshis_balance+=txout.value*10**8
+                    bal.satoshis_balance+=txout.bchSatoshis
                     if(txnDetails.transactionType === SlpTransactionType.SEND)
                         bal.token_balance = bal.token_balance.plus(txnDetails.sendOutputs![vout])
                     else if(vout === 1)
                         bal.token_balance = bal.token_balance.plus(txnDetails.genesisOrMintQuantity!)
                 }
                 else {
                     if(txnDetails.transactionType === SlpTransactionType.SEND)
-                        bal = { satoshis_balance: txout.value*10**8, token_balance: txnDetails.sendOutputs![vout] }
+                        bal = { satoshis_balance: txout.bchSatoshis, token_balance: txnDetails.sendOutputs![vout] }
                     else if(vout === 1)
-                        bal = { satoshis_balance: txout.value*10**8, token_balance: txnDetails.genesisOrMintQuantity! }
+                        bal = { satoshis_balance: txout.bchSatoshis, token_balance: txnDetails.genesisOrMintQuantity! }
                 }
 
                 if(bal) {