fix the execution order of scheduled messages within the enclave

Author: cboh4

app/keepers/keepers.go

@@ -552,12 +552,6 @@ func (ak *SecretAppKeepers) InitCustomKeepers(
 	ak.ComputeKeeper = &computeKeeper
 	wasmHooks.ContractKeeper = ak.ComputeKeeper
 
-	// wasmMsgServer := compute.NewMsgServerImpl(*ak.ComputeKeeper)
-	// fmt.Printf("wasmMsgServer: %+v\n", wasmMsgServer)
-	// ak.CronKeeper.WasmMsgServer = compute.NewCronWasmMsgServerAdapter(wasmMsgServer)
-	// ak.ComputeKeeper.SetCronKeeper(*ak.CronKeeper)
-	// fmt.Printf("ak.CronKeeper.WasmMsgServer: %+v\n", ak.CronKeeper.WasmMsgServer)
-
 	// Compute receive: Switch -> Fee -> Packet Forward -> WASM Hooks
 	var computeStack porttypes.IBCModule
 	computeStack = compute.NewIBCHandler(ak.ComputeKeeper, ak.IbcKeeper.ChannelKeeper, ak.IbcFeeKeeper)

cosmwasm/enclaves/shared/block-verifier/src/submit_block_signatures.rs

@@ -122,17 +122,6 @@ pub unsafe fn submit_block_signatures_impl(
         message_verifier.clear();
     }
 
-    for tx in txs.iter() {
-        // doing this a different way makes the code unreadable or requires creating a copy of
-
-        let parsed_tx = unwrap_or_return!(tx_from_bytes(tx.as_slice()).map_err(|_| {
-            error!("Unable to parse tx bytes from proto");
-            sgx_status_t::SGX_ERROR_INVALID_PARAMETER
-        }));
-
-        message_verifier.append_msg_from_tx(parsed_tx);
-    }
-
     let mut hasher = Sha256::new();
     hasher.update(cron_msgs_slice);
     let hash_result = hasher.finalize();
@@ -152,12 +141,21 @@ pub unsafe fn submit_block_signatures_impl(
                 sgx_status_t::SGX_ERROR_INVALID_PARAMETER
             }));
 
-            dbg!(&parsed_cron_msg);
-
             message_verifier.append_msg_from_tx(parsed_cron_msg);
         }
     }
 
+    for tx in txs.iter() {
+        // doing this a different way makes the code unreadable or requires creating a copy of
+
+        let parsed_tx = unwrap_or_return!(tx_from_bytes(tx.as_slice()).map_err(|_| {
+            error!("Unable to parse tx bytes from proto");
+            sgx_status_t::SGX_ERROR_INVALID_PARAMETER
+        }));
+
+        message_verifier.append_msg_from_tx(parsed_tx);
+    }
+
     message_verifier.set_block_info(
         header.header.height.value(),
         header.header.time.unix_timestamp_nanos(),

x/compute/module.go

@@ -158,9 +158,6 @@ func (am AppModule) BeginBlock(c context.Context) error {
 		ctx.Logger().Error("Failed to get scheduled cron msgs")
 		return err
 	}
-	// hash := sha256.Sum256([]byte("random"))
-	// block_header.ImplicitHash = hash[:]
-	// block_header.AppHash = hash[:]
 
 	cron_msgs := tm_type.Data{Txs: bytesCronMsgs}
 	cron_data, err := cron_msgs.Marshal()
@@ -198,17 +195,13 @@ func (am AppModule) BeginBlock(c context.Context) error {
 		}
 
 		for idx, msg := range execCronMsgs {
-			fmt.Printf("idx, msg: %+v %+v\n", idx, msg)
 			ctx = ctx.WithTxBytes(bytesCronMsgs[idx])
 			_, err := am.keeper.Execute(ctx, msg.Contract, msg.Sender, msg.Msg, msg.SentFunds, msg.CallbackSig, wasmtypes.HandleTypeExecute)
 			if err != nil {
 				ctx.Logger().Error("Failed to execute cron message", "error", err)
-				// return err
 			}
 		}
 
-		fmt.Printf("setRandomSeed\n")
-
 		am.keeper.SetRandomSeed(ctx, random, validator_set_evidence)
 	} else {
 		ctx.Logger().Debug("Non-encrypted block", "Block_hash", block_header.LastBlockId.Hash, "Height", ctx.BlockHeight(), "Txs", len(x2_data))