Skip to content

Commit 7727abe

Browse files
xlczqhxuyuan
andauthored
disable with_fee_paid_by (#2187)
* disable with_fee_paid_by * fix clippy * fix clippy Co-authored-by: zqh <[email protected]>
1 parent 92daa48 commit 7727abe

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

runtime/acala/src/lib.rs

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use sp_runtime::{
3939
create_runtime_str, generic, impl_opaque_keys,
4040
traits::{
4141
AccountIdConversion, AccountIdLookup, BadOrigin, BlakeTwo256, Block as BlockT, Convert, SaturatedConversion,
42-
StaticLookup, Verify,
42+
StaticLookup,
4343
},
4444
transaction_validity::{TransactionSource, TransactionValidity},
4545
ApplyExtrinsicResult, DispatchResult, FixedPointNumber, Perbill, Percent, Permill, Perquintill,
@@ -2179,23 +2179,25 @@ impl Convert<(Call, SignedExtra), Result<(EthereumTransactionMessage, SignedExtr
21792179
pub struct PayerSignatureVerification;
21802180

21812181
impl Convert<(Call, SignedExtra), Result<(), InvalidTransaction>> for PayerSignatureVerification {
2182-
fn convert((call, extra): (Call, SignedExtra)) -> Result<(), InvalidTransaction> {
2182+
fn convert((call, _extra): (Call, SignedExtra)) -> Result<(), InvalidTransaction> {
21832183
if let Call::TransactionPayment(module_transaction_payment::Call::with_fee_paid_by {
2184-
call,
2185-
payer_addr,
2186-
payer_sig,
2184+
call: _,
2185+
payer_addr: _,
2186+
payer_sig: _,
21872187
}) = call
21882188
{
2189-
let payer_account: [u8; 32] = payer_addr
2190-
.encode()
2191-
.as_slice()
2192-
.try_into()
2193-
.map_err(|_| InvalidTransaction::BadSigner)?;
2194-
// payer signature is aim at inner call of `with_fee_paid_by` call.
2195-
let raw_payload = SignedPayload::new(*call, extra).map_err(|_| InvalidTransaction::BadSigner)?;
2196-
if !raw_payload.using_encoded(|payload| payer_sig.verify(payload, &payer_account.into())) {
2197-
return Err(InvalidTransaction::BadProof);
2198-
}
2189+
// Disabled for now
2190+
return Err(InvalidTransaction::BadProof);
2191+
// let payer_account: [u8; 32] = payer_addr
2192+
// .encode()
2193+
// .as_slice()
2194+
// .try_into()
2195+
// .map_err(|_| InvalidTransaction::BadSigner)?;
2196+
// // payer signature is aim at inner call of `with_fee_paid_by` call.
2197+
// let raw_payload = SignedPayload::new(*call, extra).map_err(|_|
2198+
// InvalidTransaction::BadSigner)?; if !raw_payload.using_encoded(|payload|
2199+
// payer_sig.verify(payload, &payer_account.into())) { return Err(InvalidTransaction::
2200+
// BadProof); }
21992201
}
22002202
Ok(())
22012203
}

runtime/karura/src/lib.rs

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use sp_runtime::{
3939
create_runtime_str, generic, impl_opaque_keys,
4040
traits::{
4141
AccountIdConversion, AccountIdLookup, BadOrigin, BlakeTwo256, Block as BlockT, Convert, SaturatedConversion,
42-
StaticLookup, Verify,
42+
StaticLookup,
4343
},
4444
transaction_validity::{TransactionSource, TransactionValidity},
4545
ApplyExtrinsicResult, DispatchResult, FixedPointNumber, Perbill, Percent, Permill, Perquintill,
@@ -2221,23 +2221,25 @@ impl Convert<(Call, SignedExtra), Result<(EthereumTransactionMessage, SignedExtr
22212221
pub struct PayerSignatureVerification;
22222222

22232223
impl Convert<(Call, SignedExtra), Result<(), InvalidTransaction>> for PayerSignatureVerification {
2224-
fn convert((call, extra): (Call, SignedExtra)) -> Result<(), InvalidTransaction> {
2224+
fn convert((call, _extra): (Call, SignedExtra)) -> Result<(), InvalidTransaction> {
22252225
if let Call::TransactionPayment(module_transaction_payment::Call::with_fee_paid_by {
2226-
call,
2227-
payer_addr,
2228-
payer_sig,
2226+
call: _,
2227+
payer_addr: _,
2228+
payer_sig: _,
22292229
}) = call
22302230
{
2231-
let payer_account: [u8; 32] = payer_addr
2232-
.encode()
2233-
.as_slice()
2234-
.try_into()
2235-
.map_err(|_| InvalidTransaction::BadSigner)?;
2236-
// payer signature is aim at inner call of `with_fee_paid_by` call.
2237-
let raw_payload = SignedPayload::new(*call, extra).map_err(|_| InvalidTransaction::BadSigner)?;
2238-
if !raw_payload.using_encoded(|payload| payer_sig.verify(payload, &payer_account.into())) {
2239-
return Err(InvalidTransaction::BadProof);
2240-
}
2231+
// Disabled for now
2232+
return Err(InvalidTransaction::BadProof);
2233+
// let payer_account: [u8; 32] = payer_addr
2234+
// .encode()
2235+
// .as_slice()
2236+
// .try_into()
2237+
// .map_err(|_| InvalidTransaction::BadSigner)?;
2238+
// // payer signature is aim at inner call of `with_fee_paid_by` call.
2239+
// let raw_payload = SignedPayload::new(*call, extra).map_err(|_|
2240+
// InvalidTransaction::BadSigner)?; if !raw_payload.using_encoded(|payload|
2241+
// payer_sig.verify(payload, &payer_account.into())) { return Err(InvalidTransaction::
2242+
// BadProof); }
22412243
}
22422244
Ok(())
22432245
}

0 commit comments

Comments
 (0)