Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: trx from raw transaction type #72

Merged
merged 5 commits into from
Sep 17, 2024
Merged

fix: trx from raw transaction type #72

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
371d728
fix: trx from raw transaction type
pedrxlz Sep 11, 2024
d9b15eb
fix: adjust clippy error
pedrxlz Sep 11, 2024
fdb294e
Merge branch 'develop' into fix/trx-from-raw
brunocampos-ssa Sep 17, 2024
a91f04e
externalized extract address from contract type funcition
brunocampos-ssa Sep 17, 2024
05cb18e
well formated code
brunocampos-ssa Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 48 additions & 9 deletions packages/kos-sdk/src/chains/tron/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use kos_types::error::Error;
use kos_types::hash::Hash;
use kos_types::number::BigNumber;

use kos_proto::tron::transaction::contract::ContractType;
use wasm_bindgen::prelude::*;
use web3::{ethabi, types::U256};

Expand Down Expand Up @@ -415,10 +416,41 @@ impl TRX {
let raw_data: kos_proto::tron::transaction::Raw =
kos_proto::from_bytes(raw_data_bytes).unwrap();

let parameter: kos_proto::tron::TransferContract =
kos_proto::unpack_from_option_any(&raw_data.contract[0].parameter).ok_or(
Error::InvalidTransaction("Failed to unpack transfer contract".to_string()),
)?;
let contract = raw_data
.contract
.first()
.ok_or_else(|| Error::InvalidTransaction("Missing contract".to_string()))?;

let tx_type = ContractType::from_i32(contract.r#type)
.ok_or_else(|| Error::InvalidTransaction("Invalid contract type".to_string()))?;

let sender: String = match tx_type {
ContractType::TransferContract => {
let parameter: kos_proto::tron::TransferContract =
kos_proto::unpack_from_option_any(
&raw_data.contract.first().unwrap().parameter,
)
.unwrap();
address::Address::from_bytes(parameter.owner_address.as_slice()).to_string()
}
ContractType::TransferAssetContract => {
let parameter: kos_proto::tron::TransferAssetContract =
kos_proto::unpack_from_option_any(
&raw_data.contract.first().unwrap().parameter,
)
.unwrap();
address::Address::from_bytes(parameter.owner_address.as_slice()).to_string()
}
ContractType::TriggerSmartContract => {
let parameter: kos_proto::tron::TriggerSmartContract =
kos_proto::unpack_from_option_any(
&raw_data.contract.first().unwrap().parameter,
)
.unwrap();
address::Address::from_bytes(parameter.owner_address.as_slice()).to_string()
}
_ => "".to_string(),
};

let tx = kos_proto::tron::Transaction {
raw_data: Some(raw_data),
Expand All @@ -428,11 +460,7 @@ impl TRX {

let hash = Hash::from_vec(TRX::hash_transaction(&tx)?)?;

let sender = address::Address::from_bytes(parameter.owner_address.as_slice()).to_string();

let binding = tx.clone();
let sig = binding.signature.first();
let signature = sig.map(hex::encode);
let signature = tx.signature.first().map(hex::encode);

Ok(Transaction {
chain: chain::Chain::TRX,
Expand Down Expand Up @@ -680,5 +708,16 @@ mod tests {
t.hash.to_string(),
"3e6c463b2e88d78e912dee3aa31a14aa71c0e56bbdfbdbba012c8af4e45b8834"
);

let trigger_smart_contract_tx = "0a029af222085e42eee56c43056140d0c8aeec9d325ad402081f12cf020a31747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e54726967676572536d617274436f6e74726163741299020a15415ad61eb25c69f75711f059e106bc1ca1b338a814121541ff7155b5df8008fbf3834922b2d52430b27874f518c0843d22e4017ff36ab500000000000000000000000000000000000000000000099d6ced5f1867f3579900000000000000000000000000000000000000000000000000000000000000800000000000000000000000005ad61eb25c69f75711f059e106bc1ca1b338a8140000000000000000000000000000000000000000000000000000000066e0a6d40000000000000000000000000000000000000000000000000000000000000002000000000000000000000000891cdb91d149f23b1a45d9c5ca78a88d0cb44c18000000000000000000000000691a8e6e5b03bf79e133be5ac6cdc0986142e684708afdaaec9d3290018094ebdc03";
let result = TRX::tx_from_raw(trigger_smart_contract_tx);
assert!(result.is_ok());
let t = result.unwrap();
assert_eq!(t.chain, chain::Chain::TRX);
assert_eq!(t.sender, "TJFWKdqCxgqu4LngZrC6mRvrpT4fGAsznp");
assert_eq!(
t.hash.to_string(),
"066b49fab01944699516efc5c3d636f150c12d7e157e4867c155b29d94edb018"
);
}
}
Loading