Oracle: Tx comunication (neo-project#1540)

* Tx comunication * Some fixes
shargon · Apr 17, 2020 · 54239cb · 54239cb
1 parent aa46afa
commit 54239cb
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 16 deletions.
diff --git a/src/neo/Oracle/OracleService.cs b/src/neo/Oracle/OracleService.cs
@@ -241,7 +241,7 @@ private void ProcessTransaction(Transaction tx)
         /// <param name="oracle">Oracle</param>
         /// <param name="requestTx">Request Hash</param>
         /// <returns>Transaction</returns>
-        private Transaction CreateResponseTransaction(OracleExecutionCache oracle, Transaction requestTx)
+        public static Transaction CreateResponseTransaction(OracleExecutionCache oracle, Transaction requestTx)
         {
             using ScriptBuilder script = new ScriptBuilder();
 

diff --git a/src/neo/SmartContract/InteropService.Oracle.cs b/src/neo/SmartContract/InteropService.Oracle.cs
@@ -22,15 +22,25 @@ private static bool Oracle_Get(ApplicationEngine engine)
             {
                 if (engine.OracleCache == null)
                 {
+                    // We should enter here only during OnPersist with the OracleRequestTx
+
                     if (engine.ScriptContainer is Transaction tx)
                     {
-                        // Read Oracle Response, if exists
+                        // Read Oracle Response
 
-                        engine.OracleCache = NativeContract.Oracle.GetOracleResponse(engine.Snapshot, tx.Hash);
-                        return engine.OracleCache == null;
-                    }
+                        engine.OracleCache = NativeContract.Oracle.ConsumeOracleResponse(engine.Snapshot, tx.Hash);
+
+                        // If it doesn't exist, fault
 
-                    return false;
+                        if (engine.OracleCache == null)
+                        {
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        return false;
+                    }
                 }
                 if (!engine.TryPop(out string urlItem) || !Uri.TryCreate(urlItem, UriKind.Absolute, out var url)) return false;
                 if (!engine.TryPop(out StackItem filterContractItem)) return false;

diff --git a/src/neo/SmartContract/Native/Oracle/OracleContract.cs b/src/neo/SmartContract/Native/Oracle/OracleContract.cs
@@ -48,34 +48,41 @@ internal override bool Initialize(ApplicationEngine engine)
         }
 
         /// <summary>
-        /// Oracle Response Only
+        /// Set Oracle Response Only
         /// </summary>
         [ContractMethod(0_03000000, ContractParameterType.Boolean, ParameterTypes = new[] { ContractParameterType.ByteArray, ContractParameterType.ByteArray }, ParameterNames = new[] { "transactionHash", "oracleResponse" })]
         private StackItem SetOracleResponse(ApplicationEngine engine, Array args)
         {
-            // TODO: Check witness oracle contract
+            if (args.Count != 2) return false;
+
+            UInt160 account = GetOracleMultiSigAddress(engine.Snapshot);
+            if (!InteropService.Runtime.CheckWitnessInternal(engine, account)) return false;
+
             // This only can be called by the oracle's multi signature
 
             var txHash = args[0].GetSpan().AsSerializable<UInt256>();
             var response = args[1].GetSpan().AsSerializable<OracleExecutionCache>();
 
-            // TODO: Store or memory?
-
-            StorageItem storage = engine.Snapshot.Storages.GetAndChange(CreateStorageKey(Prefix_OracleResponse, txHash.ToArray()));
+            StorageItem storage = engine.Snapshot.Storages.GetAndChange(CreateStorageKey(Prefix_OracleResponse, txHash.ToArray()), () => new StorageItem());
             storage.Value = IO.Helper.ToArray(response);
-
             return false;
         }
 
         /// <summary>
-        /// Get Oracle Response
+        /// Consume Oracle Response
         /// </summary>
         /// <param name="snapshot">Snapshot</param>
         /// <param name="txHash">Transaction Hash</param>
-        public OracleExecutionCache GetOracleResponse(StoreView snapshot, UInt256 txHash)
+        public OracleExecutionCache ConsumeOracleResponse(StoreView snapshot, UInt256 txHash)
         {
-            StorageItem storage = snapshot.Storages.GetAndChange(CreateStorageKey(Prefix_OracleResponse, txHash.ToArray()));
-            return storage.Value.AsSerializable<OracleExecutionCache>();
+            StorageKey key = CreateStorageKey(Prefix_OracleResponse, txHash.ToArray());
+            StorageItem storage = snapshot.Storages.GetAndChange(key);
+            OracleExecutionCache ret = storage.Value.AsSerializable<OracleExecutionCache>();
+
+            // It should be cached by the ApplicationEngine so we can save space removing it
+
+            snapshot.Storages.Delete(key);
+            return ret;
         }
 
         /// <summary>