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.

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

Simplifying access to Transactions and Blocks in syscalls #1081

Merged
merged 46 commits into from
Oct 16, 2019
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
fad0a2d
Add Transaction.Sender and Transaction.Script
shargon Sep 1, 2019
d842daf
Allow to get the current Transaction
shargon Sep 1, 2019
4e5765f
Update unit test, refactor transactions methods
shargon Sep 2, 2019
1418b6b
UT
shargon Sep 2, 2019
008fb11
Summary TX object inside VM
shargon Sep 4, 2019
ff77103
Merge branch 'master' into add-tx-properties
shargon Sep 4, 2019
6002ce1
Revert some changes
shargon Sep 4, 2019
2886542
Merge remote-tracking branch 'shargon/add-tx-properties' into add-tx-…
shargon Sep 4, 2019
af6ccff
Refactor to new model and UT
shargon Sep 4, 2019
f094d53
Fix
shargon Sep 4, 2019
e7c31dd
Reduce conditional
shargon Sep 4, 2019
194bb99
Fix ut
shargon Sep 5, 2019
c3eb5f5
Fix ut
shargon Sep 5, 2019
e40c9fe
Change order
shargon Sep 10, 2019
32c1668
Block
shargon Sep 10, 2019
4ddf863
Some fixes
shargon Sep 11, 2019
c1da9f0
Merge branch 'master' into add-tx-properties
shargon Sep 11, 2019
2da33ac
Fix comment
shargon Sep 11, 2019
aeaf768
Merge remote-tracking branch 'shargon/add-tx-properties' into add-tx-…
shargon Sep 11, 2019
0210333
Fix comments
shargon Sep 11, 2019
de35932
Move hash to the top
shargon Sep 11, 2019
5a4ee76
Remove GetHeader
shargon Sep 11, 2019
661b80e
Remove GetHeader
shargon Sep 11, 2019
7fb7b91
Block with transactions count
shargon Sep 11, 2019
d9645f3
Migrate ContractState
shargon Sep 11, 2019
17ee593
Format
shargon Sep 11, 2019
442e901
Close https://github.com/neo-project/neo/issues/1096
shargon Sep 11, 2019
7aecf36
Update nulls
shargon Sep 12, 2019
d9d4cc2
Remove Neo.Account.IsStandard
shargon Sep 12, 2019
1836c98
Revert last change
shargon Sep 12, 2019
5bb58ca
Merge branch 'master' into add-tx-properties
shargon Sep 16, 2019
238bc06
Fix Unit tests
shargon Sep 19, 2019
d199914
Remove unused var
shargon Sep 19, 2019
ece0081
Merge branch 'master' into add-tx-properties
shargon Sep 23, 2019
944484f
TrimmedBlock
shargon Sep 26, 2019
3a9f0bf
Change fee
shargon Sep 26, 2019
c08dd55
Merge branch 'master' into add-tx-properties
shargon Oct 1, 2019
4320dac
Merge branch 'master' into add-tx-properties
erikzhang Oct 3, 2019
ec00054
Neo.VM v3.0.0-CI00041
erikzhang Oct 3, 2019
a7ab656
Neo.VM v3.0.0-CI00042
erikzhang Oct 14, 2019
6dc2893
Rename
erikzhang Oct 14, 2019
97d2bda
ContractNullParameter
shargon Oct 15, 2019
3c3cbdf
Clean using
shargon Oct 15, 2019
6e35d8a
Revert Null in ContractParameterType
shargon Oct 15, 2019
55ef8ef
Merge branch 'master' into add-tx-properties
shargon Oct 15, 2019
3175c32
Merge branch 'master' into add-tx-properties
shargon Oct 15, 2019
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
12 changes: 10 additions & 2 deletions neo/SmartContract/InteropService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,16 @@ private static bool Blockchain_GetBlock(ApplicationEngine engine)
private static bool Blockchain_GetTransaction(ApplicationEngine engine)
{
byte[] hash = engine.CurrentContext.EvaluationStack.Pop().GetByteArray();
Transaction tx = engine.Snapshot.GetTransaction(new UInt256(hash));
engine.CurrentContext.EvaluationStack.Push(StackItem.FromInterface(tx));
if (hash.Length == 0)
{
if (!(engine.ScriptContainer is Transaction tx)) return false;
engine.CurrentContext.EvaluationStack.Push(StackItem.FromInterface(tx));
shargon marked this conversation as resolved.
Show resolved Hide resolved
}
else
{
Transaction tx = engine.Snapshot.GetTransaction(new UInt256(hash));
engine.CurrentContext.EvaluationStack.Push(StackItem.FromInterface(tx));
}
return true;
}

Expand Down