Adding serialization for types

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "omni-transaction-rs"
+name = "omni-transaction"
 version = "0.1.0"
 authors = ["Pagoda <[email protected]>"]
 edition = "2021"
@@ -20,8 +20,9 @@ overflow-checks = true
 [dependencies]
 rlp = "0.5.2"
 hex = "0.4.3"
-borsh = "1.0.0"
-near-crypto = "0.23.0"
-near-primitives = "0.23.0"
+borsh = { version = "1.0.0", features = ["derive"] }
+near-primitives = { version = "0.23" }
+near-crypto = { version = "0.23" }
+near-sdk = "5.2.0"
 
 [dev-dependencies]

src/lib.rs

@@ -2,5 +2,5 @@
 mod ethereum;
 mod near;
 
-mod transaction;
-mod types;
+pub mod transaction;
+pub mod types;

src/near.rs

@@ -1,13 +1,12 @@
 
-use borsh;
-
 use near_primitives::account::id::AccountId;
-use near_primitives::transaction::Transaction;
+use near_primitives::transaction::{Transaction, Action};
 use near_crypto::PublicKey;
 use near_primitives::hash::CryptoHash;
+use near_sdk::borsh;
+
 
-pub fn near_transaction(signer_id: String, public_key: [u8; 64], nonce: u64, receiver_id: String) -> Vec<u8> {
-    let actions = vec![];
+pub fn near_transaction(signer_id: String, public_key: [u8; 64], nonce: u64, receiver_id: String, actions: Vec<Action>) -> Vec<u8> {
     let tx = Transaction {
         signer_id: AccountId::new_unvalidated(signer_id),
         public_key: PublicKey::SECP256K1(public_key.into()),
@@ -17,4 +16,4 @@ pub fn near_transaction(signer_id: String, public_key: [u8; 64], nonce: u64, rec
         actions
     };
     borsh::to_vec(&tx).expect("failed to serialize NEAR transaction")
-}
+}

src/transaction.rs

@@ -84,6 +84,7 @@ impl TransactionBuilder {
                     self.signer_public_key.expect("Missing signer public key"),
                     self.nonce.unwrap_or(0),
                     self.receiver_id.unwrap_or("".to_string()),
+                    vec![]
                 )
             }
             ChainKind::EVM { chain_id } => {
@@ -92,8 +93,8 @@ impl TransactionBuilder {
                 ethereum_transaction(
                     chain_id,
                     self.nonce.unwrap_or(0).into(),
-                    self.gas_price.unwrap_or(1),
                     1,
+                    self.gas_price.unwrap_or(1),
                     self.gas_limit.unwrap_or(1),
                     Some(to),
                    // self.receiver_id.unwrap_or("".to_string()).parse().unwrap(),

src/types.rs

@@ -1,12 +1,18 @@
+use near_sdk::serde::{Serialize, Deserialize};
+use near_sdk::borsh::{BorshDeserialize, BorshSerialize};
 
+#[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize, Clone, PartialEq, Eq, PartialOrd, Hash)]
+#[serde(crate = "near_sdk::serde")]
 pub enum ChainKind {
     NEAR,
     EVM { chain_id: u64 },
     Solana,
     Cosmos { chain_id: String },
 }
 
+#[derive(Serialize, Deserialize, BorshDeserialize, BorshSerialize, PartialEq, Eq)]
+#[serde(crate = "near_sdk::serde")]
 pub struct OmniAddress {
-    chain_kind: ChainKind,
-    address: String,
+    pub chain_kind: ChainKind,
+    pub address: String,
 }