Specify the currency for the execution fee #461

imstar15 · 2023-11-02T15:32:46Z

We have implemented the functionality to specify different currencies as the execution fee.

Based on whether the currency is native or foreign, we have employed different processing flows and XCM instructions.

pallets/automation-time/src/fees.rs

…structions.

…ken of the recipient chain

pallets/automation-time/src/lib.rs

chrisli30

The code is now much cleaner, making it easier for me to read and understand. 👍

pallets/automation-time/src/fees.rs

pallets/automation-time/src/lib.rs

pallets/xcmp-handler/src/lib.rs

chrisli30 · 2023-11-16T17:34:31Z

pallets/automation-time/src/fees.rs

+		new_test_ext(0).execute_with(|| {
+			let destination = MultiLocation::new(1, X1(Parachain(PARA_ID)));
+			let alice = AccountId32::new(ALICE);
+			let mut spy = 0;


What does the variable spy mean?

let’s call it has_callback_run and set it initially false.

chrisli30 · 2023-11-17T00:58:21Z

pallets/automation-time/src/fees.rs

+	}
+
+	#[test]
+	fn call_pay_checked_fees_for_with_alternate_flow_and_no_execution_fee_success() {


Is will_fail case for alternate flow not needed?

execution_fee in alternate flow is not deducted on our side but after XCM, so there’s no insufficient_execution_fee case.

pallets/automation-time/src/fees.rs

chrisli30 · 2023-11-17T01:11:03Z

pallets/automation-time/src/fees.rs

+		new_test_ext(0).execute_with(|| {
+			let destination = MultiLocation::new(1, X1(Parachain(PARA_ID)));
+			let alice = AccountId32::new(ALICE);
+			let mut spy = 0;


let’s call it has_callback_run and set it initially false.

chrisli30 · 2023-11-17T01:12:47Z

pallets/automation-time/src/fees.rs

+	}
+
+	#[test]
+	fn call_pay_checked_fees_for_with_alternate_flow_and_no_execution_fee_success() {


execution_fee in alternate flow is not deducted on our side but after XCM, so there’s no insufficient_execution_fee case.

pallets/automation-time/src/fees.rs

chrisli30

The comments are all addressed.

chrisli30 · 2023-11-17T05:51:53Z

pallets/automation-time/src/fees.rs

@@ -19,6 +19,7 @@
 use crate::{AccountOf, Action, ActionOf, Config, Error, MultiBalanceOf, Pallet};

 use frame_support::traits::Get;
+use frame_system::RawOrigin;


Why is the addition of this line? Is it necessary?

Yes.
During testing, we require Root permissions to deposit funds into the test account.

imstar15 added 3 commits November 2, 2023 23:31

Specify the currency for the execution fee

7bdc7ae

Remove UnspportedFeePayment error

b30e2b5

Merge branch 'master' into specify-currency-for-execution-fee

9c7e873

chrisli30 reviewed Nov 7, 2023

View reviewed changes

pallets/automation-time/src/fees.rs Outdated Show resolved Hide resolved

pallets/automation-time/src/fees.rs Outdated Show resolved Hide resolved

pallets/automation-time/src/fees.rs Outdated Show resolved Hide resolved

imstar15 added 4 commits November 7, 2023 23:13

Deducting foreign tokens as an execution fee

1be03c5

In the normal flow, different asset types should use different XCM in…

f5a3d21

…structions.

Make sure that the execution fee is the token of this chain or the to…

f5bddd9

…ken of the recipient chain

Optimize the logic of can_pay_fee function

28c77e1

imstar15 force-pushed the specify-currency-for-execution-fee branch from 15bc38d to 28c77e1 Compare November 9, 2023 12:37

fixup: auto format Rust code

c2260c4

chrisli30 reviewed Nov 9, 2023

View reviewed changes

pallets/automation-time/src/lib.rs Show resolved Hide resolved

imstar15 force-pushed the specify-currency-for-execution-fee branch from d3538ae to b6392d5 Compare November 10, 2023 12:23

imstar15 added 2 commits November 10, 2023 20:32

Change the type of schedule_fee to FeePayment

5f9d150

Fix ensure_supported_execution_fee_location function

2d8387c

imstar15 force-pushed the specify-currency-for-execution-fee branch from b6392d5 to 2d8387c Compare November 10, 2023 12:37

imstar15 and others added 3 commits November 12, 2023 11:26

Replace unwrap with ok_or

bab747c

fixup: auto format Rust code

86da244

Modify the code to pass the old test cases

3f0ebc1

imstar15 force-pushed the specify-currency-for-execution-fee branch from 484439e to 93c9877 Compare November 14, 2023 14:56

Fix tests

955fd18

imstar15 force-pushed the specify-currency-for-execution-fee branch from 93c9877 to 955fd18 Compare November 14, 2023 15:02

Add tests for scheduling xcmp task with multi currency

0ad89ef

imstar15 force-pushed the specify-currency-for-execution-fee branch from 13a6dab to 0ad89ef Compare November 14, 2023 15:19

chrisli30 reviewed Nov 14, 2023

View reviewed changes

pallets/automation-time/src/fees.rs Show resolved Hide resolved

pallets/automation-time/src/fees.rs Show resolved Hide resolved

pallets/automation-time/src/fees.rs Show resolved Hide resolved

pallets/automation-time/src/lib.rs Show resolved Hide resolved

imstar15 added 2 commits November 15, 2023 09:33

Fix can_pay_fee function

8a42d8b

Modify local_xcm in get_local_currency_instructions

27f51dd

imstar15 force-pushed the specify-currency-for-execution-fee branch from b7ebf10 to 27f51dd Compare November 15, 2023 15:57

fixup: auto format Rust code

3e63eda

chrisli30 requested changes Nov 15, 2023

View reviewed changes

pallets/xcmp-handler/src/lib.rs Show resolved Hide resolved

Fix transact_in_local_chain_works test

cea3072

imstar15 added 2 commits November 16, 2023 14:10

Add comment for ensure_supported_execution_fee_location

a6fa680

Restructure get_local_currency_instructions function

7c2f3e2

imstar15 force-pushed the specify-currency-for-execution-fee branch from 9d183cc to 7c2f3e2 Compare November 16, 2023 07:19

Add tests

3769dc7

imstar15 marked this pull request as ready for review November 16, 2023 11:02

imstar15 requested review from v9n and chrisli30 November 16, 2023 11:03

chrisli30 reviewed Nov 17, 2023

View reviewed changes

imstar15 added 3 commits November 17, 2023 09:36

Add comments for withdrawing schedule_fee and exeuction_fee

6c82be9

Rename spy to has_callback_run

91bb6b5

Add pay_checked_fees_for test for foreign schedule fee

6e7f5c3

imstar15 force-pushed the specify-currency-for-execution-fee branch from 3581e1a to 6e7f5c3 Compare November 17, 2023 03:21

imstar15 requested a review from chrisli30 November 17, 2023 03:23

chrisli30 approved these changes Nov 17, 2023

View reviewed changes

chrisli30 merged commit b0f9b92 into master Nov 20, 2023

chrisli30 deleted the specify-currency-for-execution-fee branch November 20, 2023 01:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Specify the currency for the execution fee #461

Specify the currency for the execution fee #461

imstar15 commented Nov 2, 2023 •

edited

Loading

chrisli30 left a comment

chrisli30 Nov 16, 2023

chrisli30 Nov 17, 2023

imstar15 Nov 17, 2023

chrisli30 Nov 17, 2023

chrisli30 Nov 17, 2023

chrisli30 Nov 17, 2023

chrisli30 Nov 17, 2023

chrisli30 left a comment

chrisli30 Nov 17, 2023

imstar15 Nov 17, 2023

Specify the currency for the execution fee #461

Specify the currency for the execution fee #461

Conversation

imstar15 commented Nov 2, 2023 • edited Loading

chrisli30 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chrisli30 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

imstar15 commented Nov 2, 2023 •

edited

Loading