feat: TokenReject

Co-authored-by: Ryan Leckey <[email protected]>

Author: RickyLB

Cargo.lock

@@ -25,3 +25,5 @@ version = "0.11.0"
 [build-dependencies]
 anyhow = "1.0.55"
 tonic-build = "0.11.0"
+regex = "1.10.6"
+fs_extra = "1.3.0"

protobufs/Cargo.toml

@@ -26,6 +26,8 @@ use std::fs::{
 };
 use std::path::Path;
 
+use regex::RegexBuilder;
+
 const DERIVE_EQ_HASH: &str = "#[derive(Eq, Hash)]";
 const DERIVE_EQ_HASH_COPY: &str = "#[derive(Copy, Eq, Hash)]";
 const SERVICES_FOLDER: &str = "./protobufs/services";
@@ -40,14 +42,45 @@ fn main() -> anyhow::Result<()> {
         anyhow::bail!("Folder {SERVICES_FOLDER} does not exist; do you need to `git submodule update --init`?");
     }
 
-    let services: Vec<_> = read_dir(services_path)?
+    let out_dir = env::var("OUT_DIR")?;
+    let out_path = Path::new(&out_dir);
+    let services_tmp_path = out_path.join("services_src");
+
+    // ensure we start fresh
+    let _ = fs::remove_dir_all(&services_tmp_path);
+
+    create_dir_all(&services_tmp_path)?;
+
+    // copy over services into our tmp path so we can edit
+    fs_extra::copy_items(
+        &[services_path],
+        &out_path,
+        &fs_extra::dir::CopyOptions::new().overwrite(true).copy_inside(false),
+    )?;
+    fs::rename(out_path.join("services"), &services_tmp_path)?;
+
+    let services: Vec<_> = read_dir(&services_tmp_path)?
         .filter_map(|entry| {
             let entry = entry.ok()?;
             entry.file_type().ok()?.is_file().then(|| entry.path())
         })
         .collect();
 
-    let mut cfg = tonic_build::configure().build_server(cfg!(feature = "server"));
+    // iterate through each file
+    let re_package = RegexBuilder::new(r"^package (.*);$").multi_line(true).build()?;
+    for service in &services {
+        let contents = fs::read_to_string(service)?;
+
+        // ensure that every `package _` entry is `package proto;`
+        let contents = re_package.replace(&contents, "package proto;");
+
+        // remove com.hedera.hapi.node.addressbook. prefix
+        let contents = contents.replace("com.hedera.hapi.node.addressbook.", "");
+
+        fs::write(service, &*contents)?;
+    }
+
+    let mut cfg = tonic_build::configure();
 
     // most of the protobufs in "basic types" should be Eq + Hash + Copy
     // any protobufs that would typically be used as parameter, that meet the requirements of those
@@ -98,7 +131,7 @@ fn main() -> anyhow::Result<()> {
      "]"#,
     );
 
-    cfg.compile(&services, &["./protobufs/services/"])?;
+    cfg.compile(&services, &[services_tmp_path])?;
 
     // NOTE: prost generates rust doc comments and fails to remove the leading * line
     remove_useless_comments(&Path::new(&env::var("OUT_DIR")?).join("proto.rs"))?;

protobufs/build.rs

@@ -42,8 +42,7 @@ pub struct AccountBalance {
     pub hbars: Hbar,
 
     /// Token balances for the referenced account.
-    #[deprecated = "use a mirror query"]
-    #[allow(deprecated)]
+    // #[deprecated = "use a mirror query"]
     pub tokens: HashMap<TokenId, u64>,
 
     /// Token decimals for the referenced account.

protobufs/protobufs

@@ -409,6 +409,18 @@ pub enum RequestType {
 
     /// Update the metadata of one or more NFT's of a specific token type.
     TokenUpdateNfts,
+
+    /// Create a new node.
+    NodeCreate,
+
+    /// Update an existing node.
+    NodeUpdate,
+
+    /// Delete a node.
+    NodeDelete,
+
+    /// Reject tokens.
+    TokenReject,
 }
 
 impl FromProtobuf<services::HederaFunctionality> for RequestType {
@@ -490,6 +502,10 @@ impl FromProtobuf<services::HederaFunctionality> for RequestType {
             HederaFunctionality::UtilPrng => Self::UtilPrng,
             HederaFunctionality::TransactionGetFastRecord => Self::TransactionGetFastRecord,
             HederaFunctionality::TokenUpdateNfts => Self::TokenUpdateNfts,
+            HederaFunctionality::NodeCreate => Self::NodeCreate,
+            HederaFunctionality::NodeUpdate => Self::NodeUpdate,
+            HederaFunctionality::NodeDelete => Self::NodeDelete,
+            HederaFunctionality::TokenReject => Self::TokenReject,
         };
 
         Ok(value)
@@ -577,6 +593,10 @@ impl ToProtobuf for RequestType {
             Self::UtilPrng => HederaFunctionality::UtilPrng,
             Self::TransactionGetFastRecord => HederaFunctionality::TransactionGetFastRecord,
             Self::TokenUpdateNfts => HederaFunctionality::TokenUpdateNfts,
+            Self::NodeCreate => HederaFunctionality::NodeCreate,
+            Self::NodeUpdate => HederaFunctionality::NodeUpdate,
+            Self::NodeDelete => HederaFunctionality::NodeDelete,
+            Self::TokenReject => HederaFunctionality::TokenReject,
         }
     }
 }

src/account/account_balance.rs

@@ -326,6 +326,8 @@ pub use token::{
     TokenNftInfoQuery,
     TokenNftTransfer,
     TokenPauseTransaction,
+    TokenRejectFlow,
+    TokenRejectTransaction,
     TokenRevokeKycTransaction,
     TokenSupplyType,
     TokenType,

src/fee_schedules.rs

@@ -114,6 +114,7 @@ impl ToProtobuf for NodeAddress {
             .map(|it| services::ServiceEndpoint {
                 ip_address_v4: it.ip().octets().to_vec(),
                 port: i32::from(it.port()),
+                domain_name: "".to_owned(),
             })
             .collect();
 

src/lib.rs

@@ -46,6 +46,7 @@ mod data {
         TokenGrantKycTransactionData as TokenGrantKyc,
         TokenMintTransactionData as TokenMint,
         TokenPauseTransactionData as TokenPause,
+        TokenRejectTransactionData as TokenReject,
         TokenRevokeKycTransactionData as TokenRevokeKyc,
         TokenUnfreezeTransactionData as TokenUnfreeze,
         TokenUnpauseTransactionData as TokenUnpause,
@@ -133,11 +134,12 @@ pub(super) enum AnySchedulableTransactionData {
     TokenUnpause(data::TokenUnpause),
     TokenUpdate(data::TokenUpdate),
     TokenWipe(data::TokenWipe),
+    TokenUpdateNfts(data::TokenUpdateNfts),
+    TokenReject(data::TokenReject),
     SystemDelete(data::SystemDelete),
     SystemUndelete(data::SystemUndelete),
     Freeze(data::Freeze),
     ScheduleDelete(data::ScheduleDelete),
-    TokenUpdateNfts(data::TokenUpdateNfts),
 }
 
 impl AnySchedulableTransactionData {
@@ -185,6 +187,7 @@ impl AnySchedulableTransactionData {
             AnySchedulableTransactionData::TokenUnpause(it) => it.default_max_transaction_fee(),
             AnySchedulableTransactionData::TokenUpdate(it) => it.default_max_transaction_fee(),
             AnySchedulableTransactionData::TokenWipe(it) => it.default_max_transaction_fee(),
+            AnySchedulableTransactionData::TokenReject(it) => it.default_max_transaction_fee(),
             AnySchedulableTransactionData::SystemDelete(it) => it.default_max_transaction_fee(),
             AnySchedulableTransactionData::SystemUndelete(it) => it.default_max_transaction_fee(),
             AnySchedulableTransactionData::Freeze(it) => it.default_max_transaction_fee(),
@@ -280,13 +283,17 @@ impl FromProtobuf<services::schedulable_transaction_body::Data> for AnySchedulab
             Data::TokenUnpause(it) => {
                 Ok(Self::TokenUnpause(data::TokenUnpause::from_protobuf(it)?))
             }
+            Data::TokenReject(it) => Ok(Self::TokenReject(data::TokenReject::from_protobuf(it)?)),
             Data::ScheduleDelete(it) => {
                 Ok(Self::ScheduleDelete(data::ScheduleDelete::from_protobuf(it)?))
             }
             Data::UtilPrng(it) => Ok(Self::Prng(data::Prng::from_protobuf(it)?)),
             Data::TokenUpdateNfts(it) => {
                 Ok(Self::TokenUpdateNfts(data::TokenUpdateNfts::from_protobuf(it)?))
             }
+            Data::NodeCreate(_) => todo!(),
+            Data::NodeUpdate(_) => todo!(),
+            Data::NodeDelete(_) => todo!(),
         }
     }
 }
@@ -414,6 +421,9 @@ impl ToSchedulableTransactionDataProtobuf for AnySchedulableTransactionData {
             AnySchedulableTransactionData::TokenUpdateNfts(it) => {
                 it.to_schedulable_transaction_data_protobuf()
             }
+            AnySchedulableTransactionData::TokenReject(it) => {
+                it.to_schedulable_transaction_data_protobuf()
+            }
         }
     }
 }
@@ -458,6 +468,7 @@ impl TryFrom<AnyTransactionData> for AnySchedulableTransactionData {
             AnyTransactionData::TokenUnpause(it) => Ok(Self::TokenUnpause(it)),
             AnyTransactionData::TokenUpdate(it) => Ok(Self::TokenUpdate(it)),
             AnyTransactionData::TokenWipe(it) => Ok(Self::TokenWipe(it)),
+            AnyTransactionData::TokenReject(it) => Ok(Self::TokenReject(it)),
             AnyTransactionData::SystemDelete(it) => Ok(Self::SystemDelete(it)),
             AnyTransactionData::SystemUndelete(it) => Ok(Self::SystemUndelete(it)),
             AnyTransactionData::Freeze(it) => Ok(Self::Freeze(it)),
@@ -527,6 +538,7 @@ impl From<AnySchedulableTransactionData> for AnyTransactionData {
             AnySchedulableTransactionData::ScheduleDelete(it) => Self::ScheduleDelete(it),
             AnySchedulableTransactionData::Prng(it) => Self::Prng(it),
             AnySchedulableTransactionData::TokenUpdateNfts(it) => Self::TokenUpdateNfts(it),
+            AnySchedulableTransactionData::TokenReject(it) => Self::TokenReject(it),
         }
     }
 }

src/node_address.rs

@@ -103,6 +103,7 @@ TransactionRecord {
                 2,
                 3,
             ],
+            node_id: 1,
         },
     ),
     transaction_hash: [