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.

Sign up for GitHub

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

Jump to bottom

fix balance not change for non-transfer tx #181

Merged
merged 18 commits into from
Mar 11, 2020
Merged

fix balance not change for non-transfer tx #181

Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
aa72181
fix balance not change for non-transfer tx
Jan 18, 2020
504598d
deal with gas burn seperately
Jan 19, 2020
46ddb29
remove conversion to null
Jan 21, 2020
a36b5f2
check stackitem null
Jan 22, 2020
fe19b2a
Fix IsNull
shargon Jan 22, 2020
bcfc86f
Remove nullable
shargon Jan 22, 2020
180ea13
Use constant
shargon Jan 22, 2020
3276781
Merge branch 'master' into fix-nep5tracker
shargon Jan 22, 2020
28898c6
PR correction
Jan 22, 2020
31c1275
Merge branch 'master' into fix-nep5tracker
Feb 25, 2020
976a197
modify check statement
Feb 26, 2020
ef4b506
modify check statement
Feb 26, 2020
0dce97c
bug ifix
Feb 26, 2020
c75c076
send stackitem.null
Feb 26, 2020
172d075
not tracker non-tx transfer history
Mar 9, 2020
5310efd
format
Mar 9, 2020
273a7cd
format
Mar 9, 2020
672f0a6
add check for invalid address
Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/RpcNep5Tracker/RpcNep5Tracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Neo.Network.P2P.Payloads;
using Neo.Persistence;
using Neo.SmartContract;
using Neo.SmartContract.Native;
using Neo.VM;
using Neo.Wallets;
using System;
Expand Down Expand Up @@ -107,6 +108,8 @@ private void RecordTransferHistory(StoreView snapshot, UInt160 scriptHash, UInt1
var eventName = stateItems[0].GetString();
if (eventName != "Transfer") return;
if (stateItems.Count < 4) return;
if (stateItems[1] is VM.Types.Null) stateItems[1] = null;
bettybao1209 marked this conversation as resolved.
Show resolved Hide resolved
if (stateItems[2] is VM.Types.Null) stateItems[2] = null;

if (!(stateItems[1] is null) && !(stateItems[1] is VM.Types.ByteArray))
return;
Expand All @@ -120,17 +123,19 @@ private void RecordTransferHistory(StoreView snapshot, UInt160 scriptHash, UInt1
byte[] toBytes = stateItems[2]?.GetSpan().ToArray();
if (toBytes?.Length != 20) toBytes = null;
Tommo-L marked this conversation as resolved.
Show resolved Hide resolved
if (fromBytes == null && toBytes == null) return;
shargon marked this conversation as resolved.
Show resolved Hide resolved
var from = new UInt160(fromBytes);
var to = new UInt160(toBytes);
var from = UInt160.Zero;
var to = UInt160.Zero;

if (fromBytes != null)
{
from = new UInt160(fromBytes);
var fromKey = new Nep5BalanceKey(from, scriptHash);
if (!nep5BalancesChanged.ContainsKey(fromKey)) nep5BalancesChanged.Add(fromKey, new Nep5Balance());
}

if (toBytes != null)
{
to = new UInt160(toBytes);
var toKey = new Nep5BalanceKey(to, scriptHash);
if (!nep5BalancesChanged.ContainsKey(toKey)) nep5BalancesChanged.Add(toKey, new Nep5Balance());
}
Expand All @@ -156,6 +161,12 @@ public void OnPersist(StoreView snapshot, IReadOnlyList<Blockchain.ApplicationEx
HandleNotification(snapshot, transaction, notifyEventArgs.ScriptHash, stateItems,
nep5BalancesChanged, ref transferIndex);
}

// Handle SystemFee and NetworkFee GAS burn for each transaction
if (!(appExecuted.Transaction is Transaction tx)) continue;
bettybao1209 marked this conversation as resolved.
Show resolved Hide resolved
HandleNotification(snapshot, appExecuted.Transaction, NativeContract.GAS.Hash,
new VM.Types.Array(new VM.Types.StackItem[] { "Transfer", appExecuted.Transaction.Sender.ToArray(), VM.Types.StackItem.Null, tx.SystemFee + tx.NetworkFee }),
nep5BalancesChanged, ref transferIndex);
}

foreach (var nep5BalancePair in nep5BalancesChanged)
Expand Down