Add PostPersist()

src/neo/Ledger/Blockchain.cs

@@ -54,7 +54,7 @@ public class RelayResult { public IInventory Inventory; public VerifyResult Resu
  Transactions = new[] { DeployNativeContracts() }
  };
 
- private readonly static Script onPersistNativeContractScript;
+ private readonly static Script onPersistScript, postPersistScript;
  private const int MaxTxToReverifyPerIdle = 10;
  private static readonly object lockObj = new object();
  private readonly NeoSystem system;
@@ -87,16 +87,23 @@ static Blockchain()
  {
  GenesisBlock.RebuildMerkleRoot();
 
- NativeContract[] contracts = { NativeContract.GAS, NativeContract.NEO };
  using (ScriptBuilder sb = new ScriptBuilder())
  {
- foreach (NativeContract contract in contracts)
+ foreach (NativeContract contract in new NativeContract[] { NativeContract.GAS, NativeContract.NEO })
  {
  sb.EmitAppCall(contract.Hash, "onPersist");
  sb.Emit(OpCode.DROP);
  }
-
- onPersistNativeContractScript = sb.ToArray();
+ onPersistScript = sb.ToArray();
+ }
+ using (ScriptBuilder sb = new ScriptBuilder())
+ {
+ foreach (NativeContract contract in new NativeContract[] { NativeContract.Oracle })
+ {
+ sb.EmitAppCall(contract.Hash, "postPersist");
+ sb.Emit(OpCode.DROP);
+ }
+ postPersistScript = sb.ToArray();
  }
  }
 
@@ -404,14 +411,12 @@ private void Persist(Block block)
  snapshot.PersistingBlock = block;
  if (block.Index > 0)
  {
- using (ApplicationEngine engine = new ApplicationEngine(TriggerType.System, null, snapshot, 0, true))
- {
- engine.LoadScript(onPersistNativeContractScript);
- if (engine.Execute() != VMState.HALT) throw new InvalidOperationException();
- ApplicationExecuted application_executed = new ApplicationExecuted(engine);
- Context.System.EventStream.Publish(application_executed);
- all_application_executed.Add(application_executed);
- }
+ using ApplicationEngine engine = new ApplicationEngine(TriggerType.System, null, snapshot, 0, true);
+ engine.LoadScript(onPersistScript);
+ if (engine.Execute() != VMState.HALT) throw new InvalidOperationException();
+ ApplicationExecuted application_executed = new ApplicationExecuted(engine);
+ Context.System.EventStream.Publish(application_executed);
+ all_application_executed.Add(application_executed);
  }
  snapshot.Blocks.Add(block.Hash, block.Trim());
  StoreView clonedSnapshot = snapshot.Clone();
@@ -445,6 +450,15 @@ private void Persist(Block block)
  }
  }
  snapshot.BlockHashIndex.GetAndChange().Set(block);
+ if (block.Index > 0)
+ {
+ using ApplicationEngine engine = new ApplicationEngine(TriggerType.System, null, snapshot, 0, true);
+ engine.LoadScript(postPersistScript);
+ if (engine.Execute() != VMState.HALT) throw new InvalidOperationException();
+ ApplicationExecuted application_executed = new ApplicationExecuted(engine);
+ Context.System.EventStream.Publish(application_executed);
+ all_application_executed.Add(application_executed);
+ }
  foreach (IPersistencePlugin plugin in Plugin.PersistencePlugins)
  plugin.OnPersist(snapshot, all_application_executed);
  snapshot.Commit();

src/neo/SmartContract/Native/NativeContract.cs

@@ -143,6 +143,13 @@ protected virtual void OnPersist(ApplicationEngine engine)
  throw new InvalidOperationException();
  }
 
+ [ContractMethod(0, CallFlags.AllowModifyStates)]
+ protected virtual void PostPersist(ApplicationEngine engine)
+ {
+ if (engine.Trigger != TriggerType.System)
+ throw new InvalidOperationException();
+ }
+
  public ApplicationEngine TestCall(string operation, params object[] args)
  {
  using (ScriptBuilder sb = new ScriptBuilder())

src/neo/SmartContract/Native/Oracle/OracleContract.cs

@@ -42,12 +42,6 @@ private void Finish(ApplicationEngine engine)
  OracleResponse response = tx.Attributes.OfType<OracleResponse>().First();
  StorageKey key = CreateStorageKey(Prefix_Request).Add(response.Id);
  OracleRequest request = engine.Snapshot.Storages[key].GetInteroperable<OracleRequest>();
- engine.Snapshot.Storages.Delete(key);
- key = CreateStorageKey(Prefix_IdList).Add(GetUrlHash(request.Url));
- IdList list = engine.Snapshot.Storages.GetAndChange(key).GetInteroperable<IdList>();
- if (!list.Remove(response.Id)) throw new InvalidOperationException();
- if (list.Count == 0) engine.Snapshot.Storages.Delete(key);
- MintGasForOracleNode(engine, response.Id);
  StackItem userData = BinarySerializer.Deserialize(request.UserData, engine.MaxStackSize, engine.MaxItemSize, engine.ReferenceCounter);
  engine.CallFromNativeContract(null, request.CallbackContract, request.CallbackMethod, request.Url, userData, response.Success, response.Result);
  }
@@ -95,6 +89,24 @@ private void MintGasForOracleNode(ApplicationEngine engine, ulong id)
  GAS.Mint(engine, account, OracleRequestPrice);
  }
 
+ protected override void PostPersist(ApplicationEngine engine)
+ {
+ base.PostPersist(engine);
+ foreach (Transaction tx in engine.Snapshot.PersistingBlock.Transactions)
+ {
+ OracleResponse response = tx.Attributes.OfType<OracleResponse>().FirstOrDefault();
+ if (response is null) continue;
+ StorageKey key = CreateStorageKey(Prefix_Request).Add(response.Id);
+ OracleRequest request = engine.Snapshot.Storages[key].GetInteroperable<OracleRequest>();
+ engine.Snapshot.Storages.Delete(key);
+ key = CreateStorageKey(Prefix_IdList).Add(GetUrlHash(request.Url));
+ IdList list = engine.Snapshot.Storages.GetAndChange(key).GetInteroperable<IdList>();
+ if (!list.Remove(response.Id)) throw new InvalidOperationException();
+ if (list.Count == 0) engine.Snapshot.Storages.Delete(key);
+ MintGasForOracleNode(engine, response.Id);
+ }
+ }
+
  [ContractMethod(OracleRequestPrice, CallFlags.AllowModifyStates)]
  private void Request(ApplicationEngine engine, string url, string filter, string callback, StackItem userData)
  {