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 stack exception name #855

Merged
merged 8 commits into from
Dec 6, 2023
Merged

Fix stack exception name #855

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
527b885
Fix stack exception name
superboyiii Nov 30, 2023
e7e3e8f
fix stack
superboyiii Nov 30, 2023
2ced172
show all type and value of stack item
superboyiii Dec 1, 2023
78d62b3
fix for GetInvokeResult
superboyiii Dec 4, 2023
a6bf3a1
catch all exceptions
superboyiii Dec 4, 2023
b205496
fix-message
superboyiii Dec 5, 2023
7e761f6
Merge branch 'master' into fix-applicationlog-exception
superboyiii Dec 6, 2023
533a1e8
Merge branch 'master' into fix-applicationlog-exception
shargon Dec 6, 2023
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
33 changes: 21 additions & 12 deletions src/ApplicationLogs/LogReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,19 @@ public static JObject TxLogToJson(Blockchain.ApplicationExecuted appExec)
trigger["vmstate"] = appExec.VMState;
trigger["exception"] = GetExceptionMessage(appExec.Exception);
trigger["gasconsumed"] = appExec.GasConsumed.ToString();
try
var stack = new JArray();
foreach (var item in appExec.Stack)
{
trigger["stack"] = appExec.Stack.Select(q => q.ToJson(Settings.Default.MaxStackSize)).ToArray();
}
catch (Exception ex)
{
trigger["exception"] = ex.Message;
try
{
stack.Add(item.ToJson());
superboyiii marked this conversation as resolved.
Show resolved Hide resolved
}
catch (InvalidOperationException)
superboyiii marked this conversation as resolved.
Show resolved Hide resolved
{
stack.Add("error: invalid operation");
superboyiii marked this conversation as resolved.
Show resolved Hide resolved
}
}
trigger["stack"] = stack;
trigger["notifications"] = appExec.Notifications.Select(q =>
{
JObject notification = new JObject();
Expand Down Expand Up @@ -133,13 +138,17 @@ public static JObject BlockLogToJson(Block block, IReadOnlyList<Blockchain.Appli
trigger["trigger"] = appExec.Trigger;
trigger["vmstate"] = appExec.VMState;
trigger["gasconsumed"] = appExec.GasConsumed.ToString();
try
var stack = new JArray();
foreach (var item in appExec.Stack)
{
trigger["stack"] = appExec.Stack.Select(q => q.ToJson(Settings.Default.MaxStackSize)).ToArray();
}
catch (Exception ex)
{
trigger["exception"] = ex.Message;
try
{
stack.Add(item.ToJson());
}
catch (InvalidOperationException)
{
stack.Add("error: invalid operation");
}
}
trigger["notifications"] = appExec.Notifications.Select(q =>
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Update="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Update="MSTest.TestFramework" Version="3.1.1" />
</ItemGroup>
Expand Down