feat: add sender to instructions (#4234)

Adds sender to DAN instructions NOTE: I also created new schema.rs and config file for generating the global db with diesel. See dan_layer/storage_sqlite/README.md
tari-project · Jun 28, 2022 · 6c116ac · 6c116ac
1 parent a41d0c9
commit 6c116ac
Show file tree

Hide file tree

Showing 31 changed files with 236 additions and 46 deletions.
diff --git a/applications/tari_app_grpc/proto/validator_node.proto b/applications/tari_app_grpc/proto/validator_node.proto
@@ -101,6 +101,7 @@ message InvokeReadMethodRequest{
     uint32 template_id = 2;
     string method = 3;
      bytes args = 4;
+     bytes sender = 5;
 }
 
 message InvokeReadMethodResponse {
@@ -119,6 +120,7 @@ message InvokeMethodRequest{
     uint32 template_id = 2;
     string method = 3;
     bytes args = 4;
+    bytes sender = 5;
 }
 
 message InvokeMethodResponse {

diff --git a/applications/tari_collectibles/src-tauri/src/clients/validator_node_client.rs b/applications/tari_collectibles/src-tauri/src/clients/validator_node_client.rs
@@ -61,6 +61,7 @@ impl GrpcValidatorNodeClient {
       template_id,
       method,
       args,
+      sender: PublicKey::default().to_vec(),
     };
     debug!(target: LOG_TARGET, "req {:?}", req);
     let response = self
@@ -93,6 +94,7 @@ impl GrpcValidatorNodeClient {
       template_id,
       method,
       args,
+      sender: PublicKey::default().to_vec(),
     };
     debug!(target: LOG_TARGET, "req {:?}", req);
     let response = self

diff --git a/applications/tari_validator_node/proto/dan/common.proto b/applications/tari_validator_node/proto/dan/common.proto
@@ -21,8 +21,7 @@ message Instruction {
   uint32 template_id = 1;
   string method = 2;
   bytes args = 3;
-  //    bytes token_id = 5;
-  //    bytes signature = 6;
+  bytes sender = 4;
 }
 
 message InstructionSet{

diff --git a/applications/tari_validator_node/proto/dan/validator_node.proto b/applications/tari_validator_node/proto/dan/validator_node.proto
@@ -49,6 +49,7 @@ message InvokeReadMethodRequest{
   uint32 template_id = 2;
   string method = 3;
   bytes args = 4;
+  bytes sender = 5;
 }
 
 message InvokeReadMethodResponse {
@@ -61,6 +62,7 @@ message InvokeMethodRequest{
   uint32 template_id = 2;
   string method = 3;
   bytes args = 4;
+  bytes sender = 5;
 }
 
 message InvokeMethodResponse {

diff --git a/applications/tari_validator_node/src/contract_worker_manager.rs b/applications/tari_validator_node/src/contract_worker_manager.rs
@@ -55,7 +55,7 @@ use tari_dan_core::{
     workers::ConsensusWorker,
     DigitalAssetError,
 };
-use tari_dan_storage_sqlite::{SqliteDbFactory, SqliteGlobalDbBackendAdapter, SqliteStorageService};
+use tari_dan_storage_sqlite::{global::SqliteGlobalDbBackendAdapter, SqliteDbFactory, SqliteStorageService};
 use tari_p2p::{comms_connector::SubscriptionFactory, tari_message::TariMessageType};
 use tari_service_framework::ServiceHandles;
 use tari_shutdown::ShutdownSignal;

diff --git a/applications/tari_validator_node/src/dan_node.rs b/applications/tari_validator_node/src/dan_node.rs
@@ -25,7 +25,7 @@ use std::sync::Arc;
 use tari_common::exit_codes::{ExitCode, ExitError};
 use tari_comms::NodeIdentity;
 use tari_dan_core::{services::MempoolServiceHandle, storage::global::GlobalDb};
-use tari_dan_storage_sqlite::{SqliteDbFactory, SqliteGlobalDbBackendAdapter};
+use tari_dan_storage_sqlite::{global::SqliteGlobalDbBackendAdapter, SqliteDbFactory};
 use tari_p2p::comms_connector::SubscriptionFactory;
 use tari_service_framework::ServiceHandles;
 use tari_shutdown::ShutdownSignal;

diff --git a/applications/tari_validator_node/src/default_service_specification.rs b/applications/tari_validator_node/src/default_service_specification.rs
@@ -37,9 +37,9 @@ use tari_dan_core::{
     },
 };
 use tari_dan_storage_sqlite::{
+    global::SqliteGlobalDbBackendAdapter,
     SqliteChainBackendAdapter,
     SqliteDbFactory,
-    SqliteGlobalDbBackendAdapter,
     SqliteStateDbBackendAdapter,
     SqliteStorageService,
 };

diff --git a/applications/tari_validator_node/src/grpc/validator_node_grpc_server.rs b/applications/tari_validator_node/src/grpc/validator_node_grpc_server.rs
@@ -26,7 +26,7 @@ use std::{
 
 use futures::channel::mpsc;
 use tari_app_grpc::tari_rpc::{self as rpc, TransactionOutput};
-use tari_common_types::types::{FixedHash, Signature};
+use tari_common_types::types::{FixedHash, PublicKey, Signature};
 use tari_comms::NodeIdentity;
 use tari_crypto::tari_utilities::ByteArray;
 use tari_dan_core::{
@@ -188,6 +188,7 @@ impl<TServiceSpecification: ServiceSpecification + 'static> rpc::validator_node_
                     .map_err(|_| Status::invalid_argument("invalid template_id"))?,
                 request.method.clone(),
                 request.args.clone(),
+                PublicKey::from_bytes(&request.sender).map_err(|_| Status::invalid_argument("invalid sender"))?,
             )
             .await
         {
@@ -238,7 +239,12 @@ impl<TServiceSpecification: ServiceSpecification + 'static> rpc::validator_node_
             .map_err(|e| Status::internal(format!("Could not create state db: {}", e)))?
         {
             let state_db_reader = state.reader();
-            let instruction = Instruction::new(template_id, request.method, request.args);
+            let instruction = Instruction::new(
+                template_id,
+                request.method,
+                request.args,
+                PublicKey::from_bytes(&request.sender).map_err(|_| Status::invalid_argument("invalid sender"))?,
+            );
             let response_bytes = self
                 .asset_processor
                 .invoke_read_method(&instruction, &state_db_reader)
@@ -255,7 +261,13 @@ impl<TServiceSpecification: ServiceSpecification + 'static> rpc::validator_node_
             // Forward to proxy
             let response_bytes = self
                 .asset_proxy
-                .invoke_read_method(&contract_id, template_id, request.method, request.args)
+                .invoke_read_method(
+                    &contract_id,
+                    template_id,
+                    request.method,
+                    request.args,
+                    PublicKey::from_bytes(&request.sender).map_err(|_| Status::invalid_argument("invalid sender"))?,
+                )
                 .await
                 .map_err(|err| Status::internal(format!("Error calling proxied method:{}", err)))?;
             // TODO: Populate authority

diff --git a/applications/tari_validator_node/src/main.rs b/applications/tari_validator_node/src/main.rs
@@ -54,7 +54,7 @@ use tari_dan_core::{
     services::{ConcreteAssetProcessor, ConcreteAssetProxy, MempoolServiceHandle, ServiceSpecification},
     storage::{global::GlobalDb, DbFactory},
 };
-use tari_dan_storage_sqlite::{SqliteDbFactory, SqliteGlobalDbBackendAdapter};
+use tari_dan_storage_sqlite::{global::SqliteGlobalDbBackendAdapter, SqliteDbFactory};
 use tari_p2p::comms_connector::SubscriptionFactory;
 use tari_service_framework::ServiceHandles;
 use tari_shutdown::{Shutdown, ShutdownSignal};

diff --git a/applications/tari_validator_node/src/p2p/proto/conversions.rs b/applications/tari_validator_node/src/p2p/proto/conversions.rs
@@ -22,6 +22,7 @@
 
 use std::convert::{TryFrom, TryInto};
 
+use tari_common_types::types::PublicKey;
 use tari_crypto::tari_utilities::ByteArray;
 use tari_dan_core::{
     models::{
@@ -117,6 +118,7 @@ impl From<&Instruction> for proto::common::Instruction {
             template_id: source.template_id() as u32,
             method: source.method().to_string(),
             args: Vec::from(source.args()),
+            sender: source.sender().to_vec(),
         }
     }
 }
@@ -217,7 +219,12 @@ impl TryFrom<proto::common::Instruction> for Instruction {
 
     fn try_from(value: proto::common::Instruction) -> Result<Self, Self::Error> {
         let template_id = TemplateId::try_from(value.template_id).map_err(|err| err.to_string())?;
-        Ok(Self::new(template_id, value.method, value.args))
+        Ok(Self::new(
+            template_id,
+            value.method,
+            value.args,
+            PublicKey::from_bytes(&value.sender).map_err(|e| format!("Invalid public key:{}", e))?,
+        ))
     }
 }
 

diff --git a/applications/tari_validator_node/src/p2p/rpc/service_impl.rs b/applications/tari_validator_node/src/p2p/rpc/service_impl.rs
@@ -36,6 +36,9 @@ use tokio::{sync::mpsc, task};
 
 const LOG_TARGET: &str = "vn::p2p::rpc";
 
+use tari_common_types::types::PublicKey;
+use tari_crypto::tari_utilities::ByteArray;
+
 use crate::p2p::{proto::validator_node as proto, rpc::ValidatorNodeRpcService};
 
 pub struct ValidatorNodeRpcServiceImpl<TMempoolService, TDbFactory: DbFactory, TAssetProcessor> {
@@ -100,6 +103,8 @@ where
                 .map_err(|_| RpcStatus::bad_request("Invalid template_id"))?,
             request.method,
             request.args,
+            PublicKey::from_bytes(&request.sender)
+                .map_err(|_| RpcStatus::bad_request("Invalid public key for sender"))?,
         );
         let response_bytes = self
             .asset_processor
@@ -124,11 +129,11 @@ where
                 .map_err(|_| RpcStatus::bad_request("Invalid template_id"))?,
             request.method.clone(),
             request.args.clone(),
-            // TokenId(request.token_id.clone()),
-            // TODO: put signature in here
-            // ComSig::default()
-            // create_com_sig_from_bytes(&request.signature)
-            //     .map_err(|err| Status::invalid_argument("signature was not a valid comsig"))?,
+            PublicKey::from_bytes(&request.sender).map_err(|_| RpcStatus::bad_request("invalid sender"))?, /* TokenId(request.token_id.clone()),
+                                                                                                            * TODO: put signature in here
+                                                                                                            * ComSig::default()
+                                                                                                            * create_com_sig_from_bytes(&request.signature)
+                                                                                                            *     .map_err(|err| Status::invalid_argument("signature was not a valid comsig"))?, */
         );
         debug!(target: LOG_TARGET, "Submitting instruction {} to mempool", instruction);
         let mut mempool_service = self.mempool_service.clone();

diff --git a/applications/tari_validator_node/src/p2p/services/rpc_client.rs b/applications/tari_validator_node/src/p2p/services/rpc_client.rs
@@ -58,6 +58,7 @@ impl ValidatorNodeRpcClient for TariCommsValidatorNodeRpcClient {
         template_id: TemplateId,
         method: String,
         args: Vec<u8>,
+        sender: PublicKey,
     ) -> Result<Option<Vec<u8>>, ValidatorNodeClientError> {
         debug!(
             target: LOG_TARGET,
@@ -70,6 +71,7 @@ impl ValidatorNodeRpcClient for TariCommsValidatorNodeRpcClient {
             template_id: template_id as u32,
             method,
             args,
+            sender: sender.to_vec(),
         };
         let response = client.invoke_read_method(request).await?;
 
@@ -86,6 +88,7 @@ impl ValidatorNodeRpcClient for TariCommsValidatorNodeRpcClient {
         template_id: TemplateId,
         method: String,
         args: Vec<u8>,
+        sender: PublicKey,
     ) -> Result<Option<Vec<u8>>, ValidatorNodeClientError> {
         debug!(
             target: LOG_TARGET,
@@ -98,6 +101,7 @@ impl ValidatorNodeRpcClient for TariCommsValidatorNodeRpcClient {
             template_id: template_id as u32,
             method,
             args,
+            sender: sender.to_vec(),
         };
         let response = client.invoke_method(request).await?;
 

diff --git a/dan_layer/core/src/models/instruction.rs b/dan_layer/core/src/models/instruction.rs
@@ -23,7 +23,7 @@
 use std::fmt::{Display, Formatter};
 
 use digest::Digest;
-use tari_common_types::types::FixedHash;
+use tari_common_types::types::{FixedHash, PublicKey};
 use tari_crypto::common::Blake256;
 use tari_utilities::hex::Hex;
 
@@ -34,6 +34,7 @@ pub struct Instruction {
     template_id: TemplateId,
     method: String,
     args: Vec<u8>,
+    sender: PublicKey,
     // from: TokenId,
     // signature: ComSig,
     hash: FixedHash,
@@ -50,13 +51,15 @@ impl Instruction {
         template_id: TemplateId,
         method: String,
         args: Vec<u8>,
+        sender: PublicKey,
         // from: TokenId,
         // _signature: ComSig,
     ) -> Self {
         let mut s = Self {
             template_id,
             method,
             args,
+            sender,
             // from,
             // TODO: this is obviously wrong
             // signature: ComSig::default(),
@@ -78,6 +81,10 @@ impl Instruction {
         &self.args
     }
 
+    pub fn sender(&self) -> PublicKey {
+        self.sender.clone()
+    }
+
     // // TODO: rename to avoid use of from
     // pub fn from_owner(&self) -> &TokenId {
     //     &self.from