Skip to content

disable with_fee_paid_by #2187

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

Merged
xlc merged 3 commits into from
Jun 8, 2022
Merged

disable with_fee_paid_by #2187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a87451d
disable with_fee_paid_by
xlc Jun 8, 2022
52b7549
fix clippy
zqhxuyuan Jun 8, 2022
4206bb0
fix clippy
zqhxuyuan Jun 8, 2022
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
32 changes: 17 additions & 15 deletions runtime/acala/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ use sp_runtime::{
create_runtime_str, generic, impl_opaque_keys,
traits::{
AccountIdConversion, AccountIdLookup, BadOrigin, BlakeTwo256, Block as BlockT, Convert, SaturatedConversion,
StaticLookup, Verify,
StaticLookup,
},
transaction_validity::{TransactionSource, TransactionValidity},
ApplyExtrinsicResult, DispatchResult, FixedPointNumber, Perbill, Percent, Permill, Perquintill,
Expand Down Expand Up @@ -2178,23 +2178,25 @@ impl Convert<(Call, SignedExtra), Result<(EthereumTransactionMessage, SignedExtr
pub struct PayerSignatureVerification;

impl Convert<(Call, SignedExtra), Result<(), InvalidTransaction>> for PayerSignatureVerification {
fn convert((call, extra): (Call, SignedExtra)) -> Result<(), InvalidTransaction> {
fn convert((call, _extra): (Call, SignedExtra)) -> Result<(), InvalidTransaction> {
if let Call::TransactionPayment(module_transaction_payment::Call::with_fee_paid_by {
call,
payer_addr,
payer_sig,
call: _,
payer_addr: _,
payer_sig: _,
}) = call
{
let payer_account: [u8; 32] = payer_addr
.encode()
.as_slice()
.try_into()
.map_err(|_| InvalidTransaction::BadSigner)?;
// payer signature is aim at inner call of `with_fee_paid_by` call.
let raw_payload = SignedPayload::new(*call, extra).map_err(|_| InvalidTransaction::BadSigner)?;
if !raw_payload.using_encoded(|payload| payer_sig.verify(payload, &payer_account.into())) {
return Err(InvalidTransaction::BadProof);
}
// Disabled for now
return Err(InvalidTransaction::BadProof);
// let payer_account: [u8; 32] = payer_addr
// .encode()
// .as_slice()
// .try_into()
// .map_err(|_| InvalidTransaction::BadSigner)?;
// // payer signature is aim at inner call of `with_fee_paid_by` call.
// let raw_payload = SignedPayload::new(*call, extra).map_err(|_|
// InvalidTransaction::BadSigner)?; if !raw_payload.using_encoded(|payload|
// payer_sig.verify(payload, &payer_account.into())) { return Err(InvalidTransaction::
// BadProof); }
}
Ok(())
}
Expand Down
32 changes: 17 additions & 15 deletions runtime/karura/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ use sp_runtime::{
create_runtime_str, generic, impl_opaque_keys,
traits::{
AccountIdConversion, AccountIdLookup, BadOrigin, BlakeTwo256, Block as BlockT, Convert, SaturatedConversion,
StaticLookup, Verify,
StaticLookup,
},
transaction_validity::{TransactionSource, TransactionValidity},
ApplyExtrinsicResult, DispatchResult, FixedPointNumber, Perbill, Percent, Permill, Perquintill,
Expand Down Expand Up @@ -2220,23 +2220,25 @@ impl Convert<(Call, SignedExtra), Result<(EthereumTransactionMessage, SignedExtr
pub struct PayerSignatureVerification;

impl Convert<(Call, SignedExtra), Result<(), InvalidTransaction>> for PayerSignatureVerification {
fn convert((call, extra): (Call, SignedExtra)) -> Result<(), InvalidTransaction> {
fn convert((call, _extra): (Call, SignedExtra)) -> Result<(), InvalidTransaction> {
if let Call::TransactionPayment(module_transaction_payment::Call::with_fee_paid_by {
call,
payer_addr,
payer_sig,
call: _,
payer_addr: _,
payer_sig: _,
}) = call
{
let payer_account: [u8; 32] = payer_addr
.encode()
.as_slice()
.try_into()
.map_err(|_| InvalidTransaction::BadSigner)?;
// payer signature is aim at inner call of `with_fee_paid_by` call.
let raw_payload = SignedPayload::new(*call, extra).map_err(|_| InvalidTransaction::BadSigner)?;
if !raw_payload.using_encoded(|payload| payer_sig.verify(payload, &payer_account.into())) {
return Err(InvalidTransaction::BadProof);
}
// Disabled for now
return Err(InvalidTransaction::BadProof);
// let payer_account: [u8; 32] = payer_addr
// .encode()
// .as_slice()
// .try_into()
// .map_err(|_| InvalidTransaction::BadSigner)?;
// // payer signature is aim at inner call of `with_fee_paid_by` call.
// let raw_payload = SignedPayload::new(*call, extra).map_err(|_|
// InvalidTransaction::BadSigner)?; if !raw_payload.using_encoded(|payload|
// payer_sig.verify(payload, &payer_account.into())) { return Err(InvalidTransaction::
// BadProof); }
}
Ok(())
}
Expand Down