Allow transfers to SC

massalabs · Dec 12, 2024 · 79356e5 · 79356e5
1 parent 6102f0e
commit 79356e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/massa-execution-worker/src/context.rs b/massa-execution-worker/src/context.rs
@@ -701,24 +701,12 @@ impl ExecutionContext {
     ) -> Result<(), ExecutionError> {
         if let Some(from_addr) = &from_addr {
             // check access rights
-            if check_rights {
-                // ensure we can't spend from an address on which we have no write access
-                if !self.has_write_rights_on(from_addr) {
-                    return Err(ExecutionError::RuntimeError(format!(
-                        "spending from address {} is not allowed in this context",
-                        from_addr
-                    )));
-                }
-
-                // ensure we can't transfer towards SC addresses on which we have no write access
-                if let Some(to_addr) = &to_addr {
-                    if matches!(to_addr, Address::SC(..)) && !self.has_write_rights_on(to_addr) {
-                        return Err(ExecutionError::RuntimeError(format!(
-                            "crediting SC address {} is not allowed without write access to it",
-                            to_addr
-                        )));
-                    }
-                }
+            // ensure we can't spend from an address on which we have no write access
+            if check_rights && !self.has_write_rights_on(from_addr) {
+                return Err(ExecutionError::RuntimeError(format!(
+                    "spending from address {} is not allowed in this context",
+                    from_addr
+                )));
             }
         }
 

diff --git a/massa-execution-worker/src/speculative_ledger.rs b/massa-execution-worker/src/speculative_ledger.rs
@@ -177,6 +177,11 @@ impl SpeculativeLedger {
                     ))
                 })?;
                 changes.set_balance(to_addr, new_balance);
+            } else if matches!(to_addr, Address::SC(..)) {
+                return Err(ExecutionError::RuntimeError(format!(
+                    "cannot transfer coins to non-existing smart contract address {}",
+                    to_addr
+                )));
             } else if let Some(remaining_coins) =
                 amount.checked_sub(self.storage_costs_constants.ledger_entry_base_cost)
             {