feat(ethexe): zero program state; handle exec balances topups; handle unrecognised mirrors; refactor

ethexe/cli/src/service.rs

@@ -361,14 +361,9 @@ impl Service {
                 outcomes
                     .into_iter()
                     .map(|outcome| match outcome {
-                        LocalOutcome::CodeApproved(code_id) => Commitment::Code(CodeCommitment {
-                            id: code_id,
-                            valid: true,
-                        }),
-                        LocalOutcome::CodeRejected(code_id) => Commitment::Code(CodeCommitment {
-                            id: code_id,
-                            valid: false,
-                        }),
+                        LocalOutcome::CodeValidated { id, valid } => {
+                            Commitment::Code(CodeCommitment { id, valid })
+                        }
                         _ => unreachable!("Only code outcomes are expected here"),
                     })
                     .collect()

ethexe/cli/src/tests.rs

@@ -37,7 +37,7 @@ use ethexe_signer::Signer;
 use ethexe_validator::Validator;
 use futures::StreamExt;
 use gear_core::ids::prelude::*;
-use gprimitives::{ActorId, CodeId, MessageId, H256};
+use gprimitives::{ActorId, CodeId, MessageId, H160, H256};
 use std::{sync::Arc, time::Duration};
 use tokio::{
     sync::{
@@ -148,6 +148,7 @@ struct TestEnv {
     validator_private_key: ethexe_signer::PrivateKey,
     validator_public_key: ethexe_signer::PublicKey,
     router_address: ethexe_signer::Address,
+    sender_address: ActorId,
     block_time: Duration,
     running_service_handle: Option<JoinHandle<Result<()>>>,
 }
@@ -226,6 +227,7 @@ impl TestEnv {
             validator_private_key,
             validator_public_key,
             router_address,
+            sender_address: ActorId::from(H160::from(sender_address.0)),
             block_time,
             running_service_handle: None,
         };
@@ -327,6 +329,7 @@ impl Drop for TestEnv {
         }
     }
 }
+
 #[tokio::test(flavor = "multi_thread")]
 #[ntest::timeout(60_000)]
 async fn ping() {
@@ -414,9 +417,12 @@ async fn ping() {
                     if address == program_id {
                         match event {
                             MirrorEvent::MessageQueueingRequested {
-                                id, payload, value, ..
+                                id,
+                                source,
+                                payload,
+                                value,
                             } => {
-                                // TODO (breathx): assert source.
+                                assert_eq!(source, env.sender_address);
                                 assert_eq!(payload, b"PING");
                                 assert_eq!(value, 0);
                                 init_message_id = id;
@@ -583,9 +589,12 @@ async fn ping_reorg() {
                     if address == program_id {
                         match event {
                             MirrorEvent::MessageQueueingRequested {
-                                id, payload, value, ..
+                                id,
+                                source,
+                                payload,
+                                value,
                             } => {
-                                // TODO (breathx): assert source.
+                                assert_eq!(source, env.sender_address);
                                 assert_eq!(payload, b"PING");
                                 assert_eq!(value, 0);
                                 init_message_id = id;
@@ -829,9 +838,13 @@ async fn ping_deep_sync() {
                     if address == program_id {
                         match event {
                             MirrorEvent::MessageQueueingRequested {
-                                id, payload, value, ..
+                                id,
+                                source,
+                                payload,
+                                value,
+                                ..
                             } => {
-                                // TODO (breathx): assert source.
+                                assert_eq!(source, env.sender_address);
                                 assert_eq!(payload, b"PING");
                                 assert_eq!(value, 0);
                                 init_message_id = id;

ethexe/contracts/script/Deployment.s.sol

@@ -46,7 +46,6 @@ contract RouterScript is Script {
         mirror = new Mirror();
         mirrorProxy = new MirrorProxy(address(router));
 
-        // TODO (breathx): remove this approve.
         wrappedVara.approve(address(router), type(uint256).max);
 
         vm.stopBroadcast();

ethexe/contracts/src/IMirror.sol

@@ -61,7 +61,6 @@ interface IMirror {
     event Reply(bytes payload, uint128 value, bytes32 replyTo, bytes4 indexed replyCode);
 
     // TODO (breathx): should we deposit it? should we notify about successful reply sending?
-    // TODO (breathx): `value` could be removed from event.
     /**
      * @dev Emitted when a user succeed in claiming value request and receives balance.
      *

ethexe/db/src/database.rs

@@ -378,14 +378,23 @@ impl Database {
 // TODO: consider to change decode panics to Results.
 impl Storage for Database {
     fn read_state(&self, hash: H256) -> Option<ProgramState> {
+        if hash.is_zero() {
+            return Some(ProgramState::zero());
+        }
+
         let data = self.cas.read(&hash)?;
-        Some(
-            ProgramState::decode(&mut &data[..])
-                .expect("Failed to decode data into `ProgramState`"),
-        )
+
+        let state = ProgramState::decode(&mut &data[..])
+            .expect("Failed to decode data into `ProgramState`");
+
+        Some(state)
     }
 
     fn write_state(&self, state: ProgramState) -> H256 {
+        if state.is_zero() {
+            return H256::zero();
+        }
+
         self.cas.write(&state.encode())
     }
 

ethexe/observer/src/observer.rs

@@ -185,7 +185,6 @@ pub(crate) async fn read_block_events(
     provider: &ObserverProvider,
     router_address: AlloyAddress,
 ) -> Result<Vec<BlockEvent>> {
-    // TODO (breathx): discuss should we check validity of wvara address for router on some block.
     let router_query = RouterQuery::from_provider(router_address, Arc::new(provider.clone()));
     let wvara_address = router_query.wvara_address().await?;
 
@@ -265,7 +264,6 @@ pub(crate) async fn read_block_events_batch(
     provider: &ObserverProvider,
     router_address: AlloyAddress,
 ) -> Result<HashMap<H256, Vec<BlockEvent>>> {
-    // TODO (breathx): discuss should we check validity of wvara address for router on some block.
     let router_query = RouterQuery::from_provider(router_address, Arc::new(provider.clone()));
     let wvara_address = router_query.wvara_address().await?;
 

ethexe/processor/src/host/threads.rs

@@ -55,7 +55,7 @@ impl ThreadParams {
     pub fn pages(&mut self) -> &BTreeMap<GearPage, H256> {
         self.pages.get_or_insert_with(|| {
             let ProgramState {
-                state: Program::Active(ActiveProgram { pages_hash, .. }),
+                program: Program::Active(ActiveProgram { pages_hash, .. }),
                 ..
             } = self.db.read_state(self.state_hash).expect(UNKNOWN_STATE)
             else {