Update VM to last changes

neo/SmartContract/ApplicationEngine.cs

@@ -15,17 +15,16 @@ public partial class ApplicationEngine : ExecutionEngine
  public const long GasFree = 0;
  private readonly long gas_amount;
  private readonly bool testMode;
- private readonly RandomAccessStack<UInt160> hashes = new RandomAccessStack<UInt160>();
  private readonly List<NotifyEventArgs> notifications = new List<NotifyEventArgs>();
  private readonly List<IDisposable> disposables = new List<IDisposable>();
 
  public TriggerType Trigger { get; }
  public IVerifiable ScriptContainer { get; }
  public Snapshot Snapshot { get; }
  public long GasConsumed { get; private set; } = 0;
- public UInt160 CurrentScriptHash => hashes.Count > 0 ? hashes.Peek() : null;
- public UInt160 CallingScriptHash => hashes.Count > 1 ? hashes.Peek(1) : null;
- public UInt160 EntryScriptHash => hashes.Count > 0 ? hashes.Peek(hashes.Count - 1) : null;
+ public UInt160 CurrentScriptHash => CurrentContext?.GetState<ExecutionContextState>().ScriptHash;
+ public UInt160 CallingScriptHash => InvocationStack.Count > 1 ? InvocationStack.Peek(1).GetState<ExecutionContextState>().ScriptHash : null;
+ public UInt160 EntryScriptHash => EntryContext?.GetState<ExecutionContextState>().ScriptHash;
  public IReadOnlyList<NotifyEventArgs> Notifications => notifications;
  internal Dictionary<UInt160, int> InvocationCounter { get; } = new Dictionary<UInt160, int>();
 
@@ -36,8 +35,6 @@ public ApplicationEngine(TriggerType trigger, IVerifiable container, Snapshot sn
  this.Trigger = trigger;
  this.ScriptContainer = container;
  this.Snapshot = snapshot;
- ContextLoaded += ApplicationEngine_ContextLoaded;
- ContextUnloaded += ApplicationEngine_ContextUnloaded;
  }
 
  internal T AddDisposable<T>(T disposable) where T : IDisposable
@@ -52,14 +49,16 @@ private bool AddGas(long gas)
  return testMode || GasConsumed <= gas_amount;
  }
 
- private void ApplicationEngine_ContextLoaded(object sender, ExecutionContext e)
- {
- hashes.Push(((byte[])e.Script).ToScriptHash());
- }
-
- private void ApplicationEngine_ContextUnloaded(object sender, ExecutionContext e)
- {
- hashes.Pop();
+ protected override void LoadContext(ExecutionContext context)
+ {
+ // Set default execution context state
+
+ context.SetState(new ExecutionContextState()
+ {
+ ScriptHash = ((byte[])context.Script).ToScriptHash()
+ });
+
+ base.LoadContext(context);
  }
 
  public override void Dispose()

neo/SmartContract/ExecutionContextState.cs

@@ -0,0 +1,10 @@
+namespace Neo.SmartContract
+{
+ public class ExecutionContextState
+ {
+ /// <summary>
+ /// Script hash
+ /// </summary>
+ public UInt160 ScriptHash { get; set; }
+ }
+}

neo/neo.csproj

@@ -29,7 +29,7 @@
  <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.0" />
  <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-CI00030" />
+ <PackageReference Include="Neo.VM" Version="3.0.0-CI00033" />
  <PackageReference Include="System.Text.Encodings.Web" Version="4.5.0" />
  </ItemGroup>