Skip to content

Commit

Permalink
Sign PoA transactions from wasm env (paritytech#155)
Browse files Browse the repository at this point in the history 
* sign PoA transactions from wasm env

* cargo fmt --all
  • Loading branch information
@svyatonik @serban300
svyatonik authored and serban300 committed Apr 8, 2024
1 parent 135a852 commit 977af5f
Show file tree
Hide file tree
Showing 4 changed files with 208 additions and 68 deletions.
9 changes: 6 additions & 3 deletions bridges/bin/node/runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ repository = "https://github.com/paritytech/parity-bridges-common/"
[dependencies]
hex-literal = "0.2"

[dev-dependencies]
ethereum-tx-sign = "3.0"

[dependencies.codec]
package = "parity-scale-codec"
version = "1.0.0"
Expand Down Expand Up @@ -202,6 +199,12 @@ default-features = false
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"

[dev-dependencies.sp-bridge-eth-poa]
version = "0.1.0"
default-features = false
features = ["test-helpers"]
path = "../../../primitives/ethereum-poa"

[build-dependencies.wasm-builder-runner]
version = "1.0.5"
package = "substrate-wasm-builder-runner"
Expand Down
43 changes: 25 additions & 18 deletions bridges/bin/node/runtime/src/exchange.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use codec::{Decode, Encode};
use frame_support::RuntimeDebug;
use hex_literal::hex;
use pallet_bridge_currency_exchange::Blockchain;
use sp_bridge_eth_poa::transaction_decode;
use sp_bridge_eth_poa::{transaction_decode, RawTransaction};
use sp_currency_exchange::{
Error as ExchangeError, LockFundsTransaction, MaybeLockFundsTransaction, Result as ExchangeResult,
};
Expand All @@ -48,7 +48,7 @@ pub struct EthereumTransactionInclusionProof {
/// Index of the transaction within the block.
pub index: u64,
/// The proof itself (right now it is all RLP-encoded transactions of the block).
pub proof: Vec<Vec<u8>>,
pub proof: Vec<RawTransaction>,
}

/// We uniquely identify transfer by the pair (sender, nonce).
Expand All @@ -69,7 +69,7 @@ pub struct EthereumTransactionTag {
pub struct EthBlockchain;

impl Blockchain for EthBlockchain {
type Transaction = Vec<u8>;
type Transaction = RawTransaction;
type TransactionInclusionProof = EthereumTransactionInclusionProof;

fn verify_transaction_inclusion_proof(proof: &Self::TransactionInclusionProof) -> Option<Self::Transaction> {
Expand All @@ -88,7 +88,7 @@ impl Blockchain for EthBlockchain {
pub struct EthTransaction;

impl MaybeLockFundsTransaction for EthTransaction {
type Transaction = Vec<u8>;
type Transaction = RawTransaction;
type Id = EthereumTransactionTag;
type Recipient = crate::AccountId;
type Amount = crate::Balance;
Expand All @@ -99,19 +99,19 @@ impl MaybeLockFundsTransaction for EthTransaction {
let tx = transaction_decode(raw_tx).map_err(|_| ExchangeError::InvalidTransaction)?;

// we only accept transactions sending funds directly to the pre-configured address
if tx.to != Some(LOCK_FUNDS_ADDRESS.into()) {
if tx.unsigned.to != Some(LOCK_FUNDS_ADDRESS.into()) {
frame_support::debug::error!(
target: "runtime",
"Failed to parse fund locks transaction. Invalid peer recipient: {:?}",
tx.to,
tx.unsigned.to,
);

return Err(ExchangeError::InvalidTransaction);
}

let mut recipient_raw = sp_core::H256::default();
match tx.payload.len() {
32 => recipient_raw.as_fixed_bytes_mut().copy_from_slice(&tx.payload),
match tx.unsigned.payload.len() {
32 => recipient_raw.as_fixed_bytes_mut().copy_from_slice(&tx.unsigned.payload),
len => {
frame_support::debug::error!(
target: "runtime",
Expand All @@ -122,13 +122,13 @@ impl MaybeLockFundsTransaction for EthTransaction {
return Err(ExchangeError::InvalidRecipient);
}
}
let amount = tx.value.low_u128();
let amount = tx.unsigned.value.low_u128();

if tx.value != amount.into() {
if tx.unsigned.value != amount.into() {
frame_support::debug::error!(
target: "runtime",
"Failed to parse fund locks transaction. Invalid amount: {}",
tx.value,
tx.unsigned.value,
);

return Err(ExchangeError::InvalidAmount);
Expand All @@ -137,7 +137,7 @@ impl MaybeLockFundsTransaction for EthTransaction {
Ok(LockFundsTransaction {
id: EthereumTransactionTag {
account: *tx.sender.as_fixed_bytes(),
nonce: tx.nonce,
nonce: tx.unsigned.nonce,
},
recipient: crate::AccountId::from(*recipient_raw.as_fixed_bytes()),
amount,
Expand All @@ -149,29 +149,36 @@ impl MaybeLockFundsTransaction for EthTransaction {
mod tests {
use super::*;
use hex_literal::hex;
use sp_bridge_eth_poa::{
signatures::{SecretKey, SignTransaction},
UnsignedTransaction,
};

fn ferdie() -> crate::AccountId {
hex!("1cbd2d43530a44705ad088af313e18f80b53ef16b36177cd4b77b846f2a5f07c").into()
}

fn prepare_ethereum_transaction(editor: impl Fn(&mut ethereum_tx_sign::RawTransaction)) -> Vec<u8> {
fn prepare_ethereum_transaction(editor: impl Fn(&mut UnsignedTransaction)) -> Vec<u8> {
// prepare tx for OpenEthereum private dev chain:
// chain id is 0x11
// sender secret is 0x4d5db4107d237df6a3d58ee5f70ae63d73d7658d4026f2eefd2f204c81682cb7
let chain_id = 0x11_u64;
let signer = hex!("4d5db4107d237df6a3d58ee5f70ae63d73d7658d4026f2eefd2f204c81682cb7");
let signer = SecretKey::parse(&hex!(
"4d5db4107d237df6a3d58ee5f70ae63d73d7658d4026f2eefd2f204c81682cb7"
))
.unwrap();
let ferdie_id = ferdie();
let ferdie_raw: &[u8; 32] = ferdie_id.as_ref();
let mut eth_tx = ethereum_tx_sign::RawTransaction {
let mut eth_tx = UnsignedTransaction {
nonce: 0.into(),
to: Some(LOCK_FUNDS_ADDRESS.into()),
value: 100.into(),
gas: 100_000.into(),
gas_price: 100_000.into(),
data: ferdie_raw.to_vec(),
payload: ferdie_raw.to_vec(),
};
editor(&mut eth_tx);
eth_tx.sign(&signer.into(), &chain_id)
eth_tx.sign_by(&signer, Some(chain_id))
}

#[test]
Expand Down Expand Up @@ -211,7 +218,7 @@ mod tests {
fn transaction_with_invalid_recipient_rejected() {
assert_eq!(
EthTransaction::parse(&prepare_ethereum_transaction(|tx| {
tx.data.clear();
tx.payload.clear();
})),
Err(ExchangeError::InvalidRecipient),
);
Expand Down
143 changes: 98 additions & 45 deletions bridges/primitives/ethereum-poa/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,24 @@ pub struct Header {
}

/// Parsed ethereum transaction.
#[derive(Debug, PartialEq)]
#[derive(PartialEq, RuntimeDebug)]
pub struct Transaction {
/// Sender address.
pub sender: Address,
/// Unsigned portion of ethereum transaction.
pub unsigned: UnsignedTransaction,
}

/// Unsigned portion of ethereum transaction.
#[derive(PartialEq, RuntimeDebug)]
#[cfg_attr(test, derive(Clone))]
pub struct UnsignedTransaction {
/// Sender nonce.
pub nonce: U256,
/// Gas price.
pub gas_price: U256,
/// Gas limit.
pub gas: U256,
/// Transaction destination address. None if it is contract creation transaction.
pub to: Option<Address>,
/// Transaction value.
Expand Down Expand Up @@ -259,6 +271,55 @@ impl Header {
}
}

impl UnsignedTransaction {
/// Decode unsigned portion of raw transaction RLP.
pub fn decode(raw_tx: &[u8]) -> Result<Self, DecoderError> {
let tx_rlp = Rlp::new(raw_tx);
let to = tx_rlp.at(3)?;
Ok(UnsignedTransaction {
nonce: tx_rlp.val_at(0)?,
gas_price: tx_rlp.val_at(1)?,
gas: tx_rlp.val_at(2)?,
to: match to.is_empty() {
false => Some(to.as_val()?),
true => None,
},
value: tx_rlp.val_at(4)?,
payload: tx_rlp.val_at(5)?,
})
}

/// Returns message that has to be signed to sign this transaction.
pub fn message(&self, chain_id: Option<u64>) -> H256 {
keccak_256(&self.rlp(chain_id)).into()
}

/// Returns unsigned transaction RLP.
pub fn rlp(&self, chain_id: Option<u64>) -> Bytes {
let mut stream = RlpStream::new_list(if chain_id.is_some() { 9 } else { 6 });
self.rlp_to(chain_id, &mut stream);
stream.out()
}

/// Encode to given rlp stream.
pub fn rlp_to(&self, chain_id: Option<u64>, stream: &mut RlpStream) {
stream.append(&self.nonce);
stream.append(&self.gas_price);
stream.append(&self.gas);
match self.to {
Some(to) => stream.append(&to),
None => stream.append(&""),
};
stream.append(&self.value);
stream.append(&self.payload);
if let Some(chain_id) = chain_id {
stream.append(&chain_id);
stream.append(&0u8);
stream.append(&0u8);
}
}
}

impl Receipt {
/// Returns receipt RLP.
fn rlp(&self) -> Bytes {
Expand Down Expand Up @@ -373,17 +434,8 @@ impl std::fmt::Debug for Bloom {
/// Decode Ethereum transaction.
pub fn transaction_decode(raw_tx: &[u8]) -> Result<Transaction, rlp::DecoderError> {
// parse transaction fields
let unsigned = UnsignedTransaction::decode(raw_tx)?;
let tx_rlp = Rlp::new(raw_tx);
let nonce: U256 = tx_rlp.val_at(0)?;
let gas_price = tx_rlp.at(1)?;
let gas = tx_rlp.at(2)?;
let action = tx_rlp.at(3)?;
let to = match action.is_empty() {
false => Some(action.as_val()?),
true => None,
};
let value: U256 = tx_rlp.val_at(4)?;
let payload: Bytes = tx_rlp.val_at(5)?;
let v: u64 = tx_rlp.val_at(6)?;
let r: U256 = tx_rlp.val_at(7)?;
let s: U256 = tx_rlp.val_at(8)?;
Expand All @@ -401,31 +453,16 @@ pub fn transaction_decode(raw_tx: &[u8]) -> Result<Transaction, rlp::DecoderErro
signature[64] = v;

// reconstruct message that has been signed
let mut message = RlpStream::new_list(if chain_id.is_some() { 9 } else { 6 });
message.append(&nonce);
message.append_raw(gas_price.as_raw(), 1);
message.append_raw(gas.as_raw(), 1);
message.append_raw(action.as_raw(), 1);
message.append(&value);
message.append(&payload);
if let Some(chain_id) = chain_id {
message.append(&chain_id);
message.append(&0u8);
message.append(&0u8);
}
let message = keccak_256(&message.out());
let message = unsigned.message(chain_id);

// recover tx sender
let sender_public = sp_io::crypto::secp256k1_ecdsa_recover(&signature, &message)
let sender_public = sp_io::crypto::secp256k1_ecdsa_recover(&signature, &message.as_fixed_bytes())
.map_err(|_| rlp::DecoderError::Custom("Failed to recover transaction sender"))?;
let sender_address = public_to_address(&sender_public);

Ok(Transaction {
sender: sender_address,
nonce,
to,
value,
payload,
unsigned,
})
}

Expand Down Expand Up @@ -494,10 +531,14 @@ mod tests {
transaction_decode(&raw_tx),
Ok(Transaction {
sender: hex!("67835910d32600471f388a137bbff3eb07993c04").into(),
nonce: 10.into(),
to: Some(hex!("d1310c1e038bc12865d3d3997275b3e4737c6302").into()),
value: 815217380000000000_u64.into(),
payload: Default::default(),
unsigned: UnsignedTransaction {
nonce: 10.into(),
gas_price: 19000000000u64.into(),
gas: 93674.into(),
to: Some(hex!("d1310c1e038bc12865d3d3997275b3e4737c6302").into()),
value: 815217380000000000_u64.into(),
payload: Default::default(),
}
}),
);

Expand All @@ -509,10 +550,14 @@ mod tests {
transaction_decode(&raw_tx),
Ok(Transaction {
sender: hex!("faadface3fbd81ce37b0e19c0b65ff4234148132").into(),
nonce: 10262.into(),
to: Some(hex!("70c1ccde719d6f477084f07e4137ab0e55f8369f").into()),
value: 900379597077600000000_u128.into(),
payload: Default::default(),
unsigned: UnsignedTransaction {
nonce: 10262.into(),
gas_price: 0.into(),
gas: 21000.into(),
to: Some(hex!("70c1ccde719d6f477084f07e4137ab0e55f8369f").into()),
value: 900379597077600000000_u128.into(),
payload: Default::default(),
},
}),
);
}
Expand All @@ -527,10 +572,14 @@ mod tests {
transaction_decode(&raw_tx),
Ok(Transaction {
sender: hex!("2b9a4d37bdeecdf994c4c9ad7f3cf8dc632f7d70").into(),
nonce: 118.into(),
to: Some(hex!("dac17f958d2ee523a2206206994597c13d831ec7").into()),
value: 0.into(),
payload: hex!("a9059cbb000000000000000000000000e08f35f66867a454835b25118f1e490e7f9e9a7400000000000000000000000000000000000000000000000000000000004c4b40").to_vec().into(),
unsigned: UnsignedTransaction {
nonce: 118.into(),
gas_price: 18000000000u64.into(),
gas: 86016.into(),
to: Some(hex!("dac17f958d2ee523a2206206994597c13d831ec7").into()),
value: 0.into(),
payload: hex!("a9059cbb000000000000000000000000e08f35f66867a454835b25118f1e490e7f9e9a7400000000000000000000000000000000000000000000000000000000004c4b40").to_vec().into(),
},
}),
);

Expand All @@ -542,10 +591,14 @@ mod tests {
transaction_decode(&raw_tx),
Ok(Transaction {
sender: hex!("617da121abf03d4c1af572f5a4e313e26bef7bdc").into(),
nonce: 139275.into(),
to: Some(hex!("84dd11eb2a29615303d18149c0dbfa24167f8966").into()),
value: 0.into(),
payload: hex!("a9059cbb00000000000000000000000001503dfc5ad81bf630d83697e98601871bb211b60000000000000000000000000000000000000000000000000000000000002710").to_vec().into(),
unsigned: UnsignedTransaction {
nonce: 139275.into(),
gas_price: 1000000000.into(),
gas: 160000.into(),
to: Some(hex!("84dd11eb2a29615303d18149c0dbfa24167f8966").into()),
value: 0.into(),
payload: hex!("a9059cbb00000000000000000000000001503dfc5ad81bf630d83697e98601871bb211b60000000000000000000000000000000000000000000000000000000000002710").to_vec().into(),
},
}),
);
}
Expand Down
Loading

0 comments on commit 977af5f

Please sign in to comment.