pink: mq egress & discover ink instantiated contracts

Cargo.toml

@@ -7,6 +7,7 @@ exclude = [
 	"ring",
 	"native-nostd-hasher",
 	"standalone/pruntime",
+	"crates/pink/examples/mqproxy",
 ]
 
 members = [
@@ -30,6 +31,7 @@ members = [
 	"crates/phala-async-executor",
 	"crates/phala-allocator",
 	"crates/pink",
+	"crates/pink/pink-extension",
 	"pallets/phala",
 	"pallets/phala/mq-runtime-api",
 	"pallets/bridge",

crates/phactory/src/contracts/assets.rs

@@ -131,7 +131,7 @@ impl contracts::NativeContract for Assets {
                     self.assets.insert(id, accounts);
                     self.next_id += 1;
 
-                    Ok(())
+                    Ok(Default::default())
                 } else {
                     Err(TransactionError::SymbolExist)
                 }
@@ -144,7 +144,7 @@ impl contracts::NativeContract for Assets {
                         self.metadata.remove(&id);
                         self.assets.remove(&id);
 
-                        Ok(())
+                        Ok(Default::default())
                     } else {
                         Err(TransactionError::NotAssetOwner)
                     }
@@ -203,7 +203,7 @@ impl contracts::NativeContract for Assets {
                                 info!(" pushed history (dest)");
                             }
 
-                            Ok(())
+                            Ok(Default::default())
                         } else {
                             Err(TransactionError::InsufficientBalance)
                         }

crates/phactory/src/contracts/balances.rs

@@ -99,7 +99,7 @@ impl contracts::NativeContract for Balances {
                         info!("   src: {:>20} -> {:>20}", src0, src0 - value);
                         info!("  dest: {:>20} -> {:>20}", dest0, dest0 + value);
 
-                        Ok(())
+                        Ok(Default::default())
                     } else {
                         Err(TransactionError::InsufficientBalance)
                     }
@@ -127,7 +127,7 @@ impl contracts::NativeContract for Balances {
                             amount: value,
                         };
                         context.mq().push_message(&data);
-                        Ok(())
+                        Ok(Default::default())
                     } else {
                         Err(TransactionError::InsufficientBalance)
                     }
@@ -152,7 +152,7 @@ impl contracts::NativeContract for Balances {
                     info!("   value: {:>20} -> {:>20}", 0, amount);
                 }
                 self.total_issuance += amount;
-                Ok(())
+                Ok(Default::default())
             }
         }
     }

crates/phactory/src/contracts/btc_lottery.rs

@@ -443,7 +443,7 @@ impl BtcLottery {
                     };
                     round_utxo.insert(btc_address, utxo);
                 }
-                Ok(())
+                Ok(Default::default())
             }
             LotteryUserCommand::SetAdmin { new_admin } => {
                 // TODO: listen to some specific privileged account instead of ALICE
@@ -452,7 +452,7 @@ impl BtcLottery {
                     if self.admin == sender {
                         self.admin = new_admin;
                     }
-                    Ok(())
+                    Ok(Default::default())
                 } else {
                     Err(TransactionError::InvalidAccount)
                 }
@@ -483,6 +483,6 @@ impl BtcLottery {
                 btc_address,
             } => Self::open_lottery(self, context.mq(), round_id, token_id, btc_address),
         }
-        Ok(())
+        Ok(Default::default())
     }
 }

crates/phactory/src/contracts/data_plaza.rs

@@ -278,7 +278,7 @@ impl contracts::NativeContract for DataPlaza {
                     seller: address_hex,
                     details,
                 });
-                Ok(())
+                Ok(Default::default())
             }
             Command::OpenOrder(details) => {
                 self.orders.push(Order {
@@ -294,7 +294,7 @@ impl contracts::NativeContract for DataPlaza {
                         result_path: String::new(),
                     },
                 });
-                Ok(())
+                Ok(Default::default())
             }
         }
     }

crates/phactory/src/contracts/geolocation.rs

@@ -124,7 +124,7 @@ impl contracts::NativeContract for Geolocation {
                     );
                 };
 
-                Ok(())
+                Ok(Default::default())
             }
         }
     }

crates/phactory/src/contracts/mod.rs

@@ -31,6 +31,11 @@ fn account_id_from_hex(s: &str) -> Result<AccountId> {
 
 pub use support::*;
 mod support {
+    use phala_crypto::ecdh::EcdhPublicKey;
+    use phala_mq::traits::MessageChannel;
+    use ::pink::runtime::ExecSideEffects;
+    use runtime::BlockNumber;
+
     use super::pink::group::GroupKeeper;
     use super::*;
     use crate::types::BlockInfo;
@@ -42,13 +47,14 @@ mod support {
 
     pub struct NativeContext<'a> {
         pub block: &'a BlockInfo<'a>,
-        mq: &'a SignedMessageChannel,
-        #[allow(unused)] // TODO.kevin: remove this.
-        secret_mq: SecretMessageChannel<'a, SignedMessageChannel>,
+        pub mq: &'a SignedMessageChannel,
+        pub secret_mq: SecretMessageChannel<'a, SignedMessageChannel>,
         pub contract_groups: &'a mut GroupKeeper,
     }
 
     pub struct QueryContext<'a> {
+        pub block_number: BlockNumber,
+        pub now_ms: u64,
         pub contract_groups: &'a mut GroupKeeper,
     }
 
@@ -66,7 +72,16 @@ mod support {
             req: OpaqueQuery,
             context: &mut QueryContext,
         ) -> Result<OpaqueReply, OpaqueError>;
-        fn process_messages(&mut self, env: &mut ExecuteEnv);
+        fn group_id(&self) -> Option<phala_mq::ContractGroupId>;
+        fn process_next_message(&mut self, env: &mut ExecuteEnv) -> Option<TransactionResult>;
+        fn on_block_end(&mut self, env: &mut ExecuteEnv) -> TransactionResult;
+        fn push_message(&self, payload: Vec<u8>, topic: Vec<u8>);
+        fn push_osp_message(
+            &self,
+            payload: Vec<u8>,
+            topic: Vec<u8>,
+            remote_pubkey: Option<&EcdhPublicKey>,
+        );
     }
 
     pub trait NativeContract {
@@ -75,13 +90,16 @@ mod support {
         type QResp: Encode + Debug;
 
         fn id(&self) -> ContractId;
+        fn group_id(&self) -> Option<phala_mq::ContractGroupId> {
+            None
+        }
         fn handle_command(
             &mut self,
             _origin: MessageOrigin,
             _cmd: Self::Cmd,
             _context: &mut NativeContext,
         ) -> TransactionResult {
-            Ok(())
+            Ok(Default::default())
         }
         fn handle_query(
             &mut self,
@@ -148,45 +166,71 @@ mod support {
             self.contract.id()
         }
 
+        fn group_id(&self) -> Option<phala_mq::ContractGroupId> {
+            self.contract.group_id()
+        }
+
         fn handle_query(
             &mut self,
             origin: Option<&runtime::AccountId>,
             req: OpaqueQuery,
             context: &mut QueryContext,
         ) -> Result<OpaqueReply, OpaqueError> {
+            debug!(target: "contract", "Contract {:?} handling query", self.id());
             let response = self
                 .contract
                 .handle_query(origin, deopaque_query(req)?, context);
             Ok(response.encode())
         }
 
-        fn process_messages(&mut self, env: &mut ExecuteEnv) {
+        fn process_next_message(&mut self, env: &mut ExecuteEnv) -> Option<TransactionResult> {
             let secret_mq = SecretMessageChannel::new(&self.ecdh_key, &self.send_mq);
             let mut context = NativeContext {
                 block: env.block,
                 mq: &self.send_mq,
                 secret_mq,
                 contract_groups: &mut env.contract_groups,
             };
-            loop {
-                let ok = phala_mq::select! {
-                    next_cmd = self.cmd_rcv_mq => match next_cmd {
-                        Ok((_, cmd, origin)) => {
-                            let status = self.contract.handle_command(origin, cmd, &mut context);
-                            if let Err(err) = status {
-                                log::error!("Contract {:?} handle command error: {:?}", self.id(), err);
-                            }
-                        }
-                        Err(e) => {
-                            error!("Read command failed [{}]: {:?}", self.id(), e);
-                        }
-                    },
-                };
-                if ok.is_none() {
-                    break;
-                }
+
+            phala_mq::select! {
+                next_cmd = self.cmd_rcv_mq => match next_cmd {
+                    Ok((_, cmd, origin)) => {
+                        info!(target: "contract", "Contract {:?} handling command", self.id());
+                        self.contract.handle_command(origin, cmd, &mut context)
+                    }
+                    Err(e) => {
+                        Err(TransactionError::ChannelError)
+                    }
+                },
             }
-            self.contract.on_block_end(&mut context)
+        }
+
+        fn on_block_end(&mut self, env: &mut ExecuteEnv) -> TransactionResult {
+            let secret_mq = SecretMessageChannel::new(&self.ecdh_key, &self.send_mq);
+            let mut context = NativeContext {
+                block: env.block,
+                mq: &self.send_mq,
+                secret_mq,
+                contract_groups: &mut env.contract_groups,
+            };
+            self.contract.on_block_end(&mut context);
+            Ok(Default::default())
+        }
+
+        fn push_message(&self, payload: Vec<u8>, topic: Vec<u8>) {
+            self.send_mq.push_data(payload, topic)
+        }
+
+        fn push_osp_message(
+            &self,
+            payload: Vec<u8>,
+            topic: Vec<u8>,
+            remote_pubkey: Option<&EcdhPublicKey>,
+        ) {
+            let secret_mq = SecretMessageChannel::new(&self.ecdh_key, &self.send_mq);
+            secret_mq
+                .bind_remote_key(remote_pubkey)
+                .push_data(payload, topic)
         }
     }
 }