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

Notification limits #1100

Merged
merged 10 commits into from
Oct 18, 2019
Merged

Notification limits #1100

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9e279e1
Add limits to `System.Runtime.Notify` and `System.Runtime.Log`
erikzhang Sep 18, 2019
ee9b131
Change prices
erikzhang Sep 18, 2019
8935417
prevent ddos
erikzhang Sep 18, 2019
c026d49
Merge branch 'master' into notification-limits
shargon Sep 30, 2019
76a696a
Merge branch 'master' into notification-limits
shargon Oct 14, 2019
fc0db89
Add null type
shargon Oct 15, 2019
4e6132c
Update NeoVM
shargon Oct 15, 2019
88c5106
Add NULL prices
shargon Oct 15, 2019
2e91439
Merge branch 'master' into notification-limits
shargon Oct 16, 2019
c0f86b0
Merge branch 'master' into notification-limits
erikzhang Oct 18, 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
2 changes: 2 additions & 0 deletions neo/SmartContract/ApplicationEngine.OpCodePrices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ partial class ApplicationEngine
[OpCode.PUSHDATA2] = 13000,
[OpCode.PUSHDATA4] = 110000,
[OpCode.PUSHM1] = 30,
[OpCode.PUSHNULL] = 30,
[OpCode.PUSH1] = 30,
[OpCode.PUSH2] = 30,
[OpCode.PUSH3] = 30,
Expand Down Expand Up @@ -114,6 +115,7 @@ partial class ApplicationEngine
[OpCode.DUPFROMALTSTACK] = 60,
[OpCode.TOALTSTACK] = 60,
[OpCode.FROMALTSTACK] = 60,
[OpCode.ISNULL] = 60,
[OpCode.XDROP] = 400,
[OpCode.XSWAP] = 60,
[OpCode.XTUCK] = 400,
Expand Down
63 changes: 59 additions & 4 deletions neo/SmartContract/InteropService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
using System.Linq;
using System.Numerics;
using System.Text;
using Array = Neo.VM.Types.Array;
using Boolean = Neo.VM.Types.Boolean;

namespace Neo.SmartContract
{
Expand All @@ -22,6 +24,7 @@ public static partial class InteropService
public const long GasPerByte = 100000;
public const int MaxStorageKeySize = 64;
public const int MaxStorageValueSize = ushort.MaxValue;
public const int MaxNotificationSize = 1024;

private static readonly Dictionary<uint, InteropDescriptor> methods = new Dictionary<uint, InteropDescriptor>();

Expand All @@ -32,8 +35,8 @@ public static partial class InteropService
public static readonly uint System_Runtime_Platform = Register("System.Runtime.Platform", Runtime_Platform, 0_00000250, TriggerType.All);
public static readonly uint System_Runtime_GetTrigger = Register("System.Runtime.GetTrigger", Runtime_GetTrigger, 0_00000250, TriggerType.All);
public static readonly uint System_Runtime_CheckWitness = Register("System.Runtime.CheckWitness", Runtime_CheckWitness, 0_00030000, TriggerType.All);
public static readonly uint System_Runtime_Notify = Register("System.Runtime.Notify", Runtime_Notify, 0_00000250, TriggerType.All);
public static readonly uint System_Runtime_Log = Register("System.Runtime.Log", Runtime_Log, 0_00300000, TriggerType.All);
public static readonly uint System_Runtime_Notify = Register("System.Runtime.Notify", Runtime_Notify, 0_01000000, TriggerType.All);
public static readonly uint System_Runtime_Log = Register("System.Runtime.Log", Runtime_Log, 0_01000000, TriggerType.All);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is not very expensive?

public static readonly uint System_Runtime_GetTime = Register("System.Runtime.GetTime", Runtime_GetTime, 0_00000250, TriggerType.Application);
public static readonly uint System_Runtime_Serialize = Register("System.Runtime.Serialize", Runtime_Serialize, 0_00100000, TriggerType.All);
public static readonly uint System_Runtime_Deserialize = Register("System.Runtime.Deserialize", Runtime_Deserialize, 0_00500000, TriggerType.All);
Expand Down Expand Up @@ -64,6 +67,54 @@ public static partial class InteropService
public static readonly uint System_Storage_Delete = Register("System.Storage.Delete", Storage_Delete, 0_01000000, TriggerType.Application);
public static readonly uint System_StorageContext_AsReadOnly = Register("System.StorageContext.AsReadOnly", StorageContext_AsReadOnly, 0_00000400, TriggerType.Application);

private static bool CheckItemForNotification(StackItem state)
shargon marked this conversation as resolved.
Show resolved Hide resolved
{
int size = 0;
List<StackItem> items_checked = new List<StackItem>();
Queue<StackItem> items_unchecked = new Queue<StackItem>();
while (true)
{
switch (state)
{
case Struct array:
foreach (StackItem item in array)
items_unchecked.Enqueue(item);
break;
case Array array:
if (items_checked.All(p => !ReferenceEquals(p, array)))
{
items_checked.Add(array);
foreach (StackItem item in array)
items_unchecked.Enqueue(item);
}
break;
case Boolean _:
case ByteArray _:
case Integer _:
size += state.GetByteLength();
break;
case Null _:
break;
case InteropInterface _:
shargon marked this conversation as resolved.
Show resolved Hide resolved
return false;
case Map map:
shargon marked this conversation as resolved.
Show resolved Hide resolved
if (items_checked.All(p => !ReferenceEquals(p, map)))
{
items_checked.Add(map);
foreach (var pair in map)
{
size += pair.Key.GetByteLength();
items_unchecked.Enqueue(pair.Value);
}
}
break;
}
if (size > MaxNotificationSize) return false;
if (items_unchecked.Count == 0) return true;
shargon marked this conversation as resolved.
Show resolved Hide resolved
state = items_unchecked.Dequeue();
}
}

shargon marked this conversation as resolved.
Show resolved Hide resolved
private static bool CheckStorageContext(ApplicationEngine engine, StorageContext context)
{
ContractState contract = engine.Snapshot.Contracts.TryGet(context.ScriptHash);
Expand Down Expand Up @@ -200,13 +251,17 @@ private static bool Runtime_CheckWitness(ApplicationEngine engine)

private static bool Runtime_Notify(ApplicationEngine engine)
{
engine.SendNotification(engine.CurrentScriptHash, engine.CurrentContext.EvaluationStack.Pop());
StackItem state = engine.CurrentContext.EvaluationStack.Pop();
if (!CheckItemForNotification(state)) return false;
shargon marked this conversation as resolved.
Show resolved Hide resolved
engine.SendNotification(engine.CurrentScriptHash, state);
return true;
}

private static bool Runtime_Log(ApplicationEngine engine)
{
string message = Encoding.UTF8.GetString(engine.CurrentContext.EvaluationStack.Pop().GetByteArray());
byte[] state = engine.CurrentContext.EvaluationStack.Pop().GetByteArray();
if (state.Length > MaxNotificationSize) return false;
shargon marked this conversation as resolved.
Show resolved Hide resolved
string message = Encoding.UTF8.GetString(state);
engine.SendLog(engine.CurrentScriptHash, message);
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion neo/neo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!-- Check https://github.com/neo-project/neo/pull/535 before upgrade this package -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
<PackageReference Include="Neo.VM" Version="3.0.0-preview1" />
<PackageReference Include="Neo.VM" Version="3.0.0-CI00042" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.0" />
</ItemGroup>

Expand Down