Merge branch 'master' of github.com:entropyxyz/programs into oracle-e…

…xample
entropyxyz · Nov 14, 2024 · 930ca45 · 930ca45
2 parents 47220d5 + c689ad3
commit 930ca45
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/examples/barebones-with-auxilary/src/lib.rs b/examples/barebones-with-auxilary/src/lib.rs
@@ -31,7 +31,7 @@ impl Program for BarebonesWithAuxilary {
     fn evaluate(
         signature_request: SignatureRequest,
         _config: Option<Vec<u8>>,
-        _oracle_data: Option<Vec<u8>>,
+        _oracle_data: Option<Vec<Vec<u8>>>,
     ) -> Result<(), Error> {
         let SignatureRequest {
             message,

diff --git a/examples/barebones/src/lib.rs b/examples/barebones/src/lib.rs
@@ -29,7 +29,7 @@ impl Program for BarebonesProgram {
     fn evaluate(
         signature_request: SignatureRequest,
         _config: Option<Vec<u8>>,
-        _oracle_data: Option<Vec<u8>>,
+        _oracle_data: Option<Vec<Vec<u8>>>,
     ) -> Result<(), Error> {
         let message: Vec<u8> = signature_request.message;
 

diff --git a/examples/basic-transaction/src/lib.rs b/examples/basic-transaction/src/lib.rs
@@ -40,7 +40,7 @@ impl Program for BasicTransaction {
     fn evaluate(
         signature_request: SignatureRequest,
         config: Option<Vec<u8>>,
-        _oracle_data: Option<Vec<u8>>,
+        _oracle_data: Option<Vec<Vec<u8>>>,
     ) -> Result<(), CoreError> {
         // parse the raw tx into some type supported by the Acl check
         let parsed_tx = <Evm as Architecture>::TransactionRequest::try_parse(

diff --git a/examples/custom-hash/src/lib.rs b/examples/custom-hash/src/lib.rs
@@ -30,7 +30,7 @@ impl Program for CustomHashExample {
     fn evaluate(
         signature_request: SignatureRequest,
         _config: Option<Vec<u8>>,
-        _oracle_data: Option<Vec<u8>>,
+        _oracle_data: Option<Vec<Vec<u8>>>,
     ) -> Result<(), Error> {
         if signature_request.message.len() < 1 {
             return Err(Error::Evaluation(

diff --git a/examples/device-key-proxy/src/lib.rs b/examples/device-key-proxy/src/lib.rs
@@ -250,7 +250,7 @@ impl Program for DeviceKeyProxy {
     fn evaluate(
         signature_request: SignatureRequest,
         raw_config: Option<Vec<u8>>,
-        _oracle_data: Option<Vec<u8>>,
+        _oracle_data: Option<Vec<Vec<u8>>>,
     ) -> Result<(), Error> {
         let config_json = serde_json::from_slice::<UserConfig>(
             raw_config

diff --git a/examples/infinite-loop/src/lib.rs b/examples/infinite-loop/src/lib.rs
@@ -27,7 +27,7 @@ impl Program for InfiniteLoop {
     fn evaluate(
         _signature_request: SignatureRequest,
         _config: Option<Vec<u8>>,
-        _oracle_data: Option<Vec<u8>>,
+        _oracle_data: Option<Vec<Vec<u8>>>,
     ) -> Result<(), Error> {
         loop {}
         #[allow(unreachable_code)]

diff --git a/examples/private-acl/src/lib.rs b/examples/private-acl/src/lib.rs
@@ -38,7 +38,7 @@ impl Program for PrivateTransactionAcl {
     fn evaluate(
         signature_request: SignatureRequest,
         _config: Option<Vec<u8>>,
-        _oracle_data: Option<Vec<u8>>,
+        _oracle_data: Option<Vec<Vec<u8>>>,
     ) -> Result<(), CoreError> {
         // parse the raw tx into some type
         let parsed_tx = <Evm as Architecture>::TransactionRequest::try_parse(

diff --git a/examples/risczero-zkvm-verification/src/lib.rs b/examples/risczero-zkvm-verification/src/lib.rs
@@ -17,7 +17,7 @@ register_custom_getrandom!(always_fail);
 pub struct ZkVmVerificationProgram;
 
 impl Program for ZkVmVerificationProgram {
-    fn evaluate(signature_request: SignatureRequest, _config: Option<Vec<u8>>, _oracle_data: Option<Vec<u8>>) -> Result<(), Error> {
+    fn evaluate(signature_request: SignatureRequest, _config: Option<Vec<u8>>, _oracle_data: Option<Vec<Vec<u8>>>) -> Result<(), Error> {
         let image_id: [u32; 8] = bincode::deserialize(&signature_request.message)
             .map_err(|_| Error::InvalidSignatureRequest("Could not parse image_id".to_string()))?;
 

diff --git a/examples/siwe/src/lib.rs b/examples/siwe/src/lib.rs
@@ -38,7 +38,7 @@ impl Program for Siwe {
     fn evaluate(
         signature_request: SignatureRequest,
         _config: Option<Vec<u8>>,
-        _oracle_data: Option<Vec<u8>>,
+        _oracle_data: Option<Vec<Vec<u8>>>,
     ) -> Result<(), Error> {
         let string_message = String::from_utf8(signature_request.message)
             .map_err(|err| Error::Evaluation(err.to_string()))?;

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -85,7 +85,7 @@ impl Runtime {
         program: &[u8],
         signature_request: &SignatureRequest,
         config: Option<&[u8]>,
-        oracle_data: Option<&[u8]>,
+        oracle_data: Option<&[Vec<u8>]>,
     ) -> Result<(), RuntimeError> {
         if program.len() == 0 {
             return Err(RuntimeError::EmptyBytecode);

diff --git a/templates/basic-template/src/lib.rs b/templates/basic-template/src/lib.rs
@@ -33,7 +33,7 @@ impl Program for {{project-name | upper_camel_case}} {
     fn evaluate(
         signature_request: SignatureRequest,
         _config: Option<Vec<u8>>,
-        _oracle_data: Option<Vec<u8>>,
+        _oracle_data: Option<Vec<Vec<u8>>>,
     ) -> Result<(), Error> {
         if signature_request.message.is_empty() {
             return Err(Error::Evaluation(

diff --git a/wit/application.wit b/wit/application.wit
@@ -8,7 +8,7 @@ world program {
     evaluation(string)
   }
   /// Evaluates the program given the user's signature request and the program's configuration.
-  export evaluate: func(signature-request: signature-request, config: option<list<u8>>, oracle-data: option<list<u8>>) -> result<_, error>
+  export evaluate: func(signature-request: signature-request, config: option<list<u8>>, oracle-data: option<list<list<u8>>>) -> result<_, error>
 
   /// Programs that use custom hash functions can a custom 32-byte curve point to be signed.
   export custom-hash: func(data: list<u8>) -> option<list<u8>>