Merge #2137

2137: repair SCE ledger updates r=damip a=damip



Co-authored-by: Damir Vodenicarevic <damipator@gmail.com>

Author: bors[bot]

massa-execution/src/interface_impl.rs

@@ -100,7 +100,9 @@ impl Interface for InterfaceImpl {
         }
         let address = Address(massa_hash::hash::Hash::compute_from(&data));
         let res = address.to_bs58_check();
-        context.ledger_step.set_module(address, module.clone());
+        context
+            .ledger_step
+            .set_module(address, Some(module.clone()));
         context.owned_addresses.insert(address);
         context.created_addr_index += 1;
         Ok(res)

massa-execution/src/sce_ledger.rs

@@ -32,7 +32,9 @@ impl SCELedgerEntry {
         }
 
         // module
-        self.opt_module = update.update_opt_module.clone();
+        if let Some(opt_module) = &update.update_opt_module {
+            self.opt_module = opt_module.clone();
+        }
 
         // data
         for (data_key, data_update) in update.update_data.iter() {
@@ -198,7 +200,7 @@ impl DeserializeCompact for SCELedgerEntry {
 #[derive(Debug, Clone, Default)]
 pub struct SCELedgerEntryUpdate {
     pub update_balance: Option<Amount>,
-    pub update_opt_module: Option<Bytecode>,
+    pub update_opt_module: Option<Option<Bytecode>>,
     pub update_data: HHashMap<Hash, Option<Vec<u8>>>, // None for row deletion
 }
 
@@ -503,7 +505,11 @@ impl SCELedgerStep {
             match changes.0.get(addr) {
                 Some(SCELedgerChange::Delete) => return None,
                 Some(SCELedgerChange::Set(new_entry)) => return new_entry.opt_module.clone(),
-                Some(SCELedgerChange::Update(update)) => return update.update_opt_module.clone(),
+                Some(SCELedgerChange::Update(update)) => {
+                    if let Some(updates_opt_module) = &update.update_opt_module {
+                        return updates_opt_module.clone();
+                    }
+                }
                 None => {}
             }
         }
@@ -550,9 +556,9 @@ impl SCELedgerStep {
             .apply_change(addr, &SCELedgerChange::Update(update));
     }
 
-    pub fn set_module(&mut self, addr: Address, module: Vec<u8>) {
+    pub fn set_module(&mut self, addr: Address, opt_module: Option<Vec<u8>>) {
         let update = SCELedgerEntryUpdate {
-            update_opt_module: Some(module),
+            update_opt_module: Some(opt_module),
             ..Default::default()
         };
         self.caused_changes