Merge pull request #186 from OffchainLabs/allow-receive-return-err

Allow Receive Fn to Return Error

stylus-proc/src/macros/public/types.rs

@@ -117,7 +117,7 @@ impl PublicImpl {
                 }
 
                 #[inline(always)]
-                fn receive(storage: &mut S) -> Option<()> {
+                fn receive(storage: &mut S) -> Option<Result<(), Vec<u8>>> {
                     #receive
                 }
             }

stylus-sdk/src/abi/mod.rs

@@ -64,7 +64,7 @@ where
     /// Receive functions are always payable, take in no inputs, and return no outputs.
     /// If defined, they will always be called when a transaction does not send any
     /// calldata, regardless of the transaction having a value attached.
-    fn receive(storage: &mut S) -> Option<()>;
+    fn receive(storage: &mut S) -> Option<Result<(), Vec<u8>>>;
 
     /// Called when no receive function is defined.
     /// If no #[fallback] function is defined in the contract, then any transactions that do not
@@ -105,8 +105,8 @@ where
 
     if input.is_empty() {
         console!("no calldata provided");
-        if R::receive(&mut storage).is_some() {
-            return Ok(Vec::new());
+        if let Some(res) = R::receive(&mut storage) {
+            return res.map(|_| Vec::new());
         }
         // Try fallback function with no inputs if defined.
         if let Some(res) = R::fallback(&mut storage, &[]) {