fix(Capacity): remove targeted-fee-adjustment (#1722)

Remove targeted fee adjustment from the calculation for computing fees for Capacity transactions. Capacity transactions are stable and do not consider network congestion when calculating the fee. Therefore, the targeted fee adjustment is set to one. Closes #1709 Co-authored-by: Enddy Dumbrique <[email protected]>
frequency-chain · Oct 18, 2023 · 744fb89 · 744fb89
1 parent ab1807e
commit 744fb89
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/e2e/capacity/transactions.test.ts b/e2e/capacity/transactions.test.ts
@@ -766,19 +766,25 @@ describe("Capacity Transactions", function () {
       const addProviderPayload = await generateDelegationPayload({ ...defaultPayload });
       const addProviderData = ExtrinsicHelper.api.registry.createType("PalletMsaAddProvider", addProviderPayload);
       let delegatorKeys = createKeys("delegatorKeys");
-      const tx = ExtrinsicHelper.api.tx.msa.createSponsoredAccountWithDelegation(
+      const call = ExtrinsicHelper.api.tx.msa.createSponsoredAccountWithDelegation(
         delegatorKeys.publicKey,
         signPayloadSr25519(delegatorKeys, addProviderData),
         addProviderPayload
       );
-      const feeDetails: FeeDetails = await firstValueFrom(ExtrinsicHelper.api.rpc.frequencyTxPayment.computeCapacityFeeDetails(tx.toHex(), null));
+
+      // Actual weights and fee
+      const { weight: { refTime, proofSize }, } = await firstValueFrom(ExtrinsicHelper.api.call.transactionPaymentApi.queryInfo(call.toHex(), 0));
+      const weightFee = await firstValueFrom(ExtrinsicHelper.api.call.transactionPaymentApi.queryWeightToFee({refTime, proofSize}));
+
+      const feeDetails: FeeDetails = await firstValueFrom(ExtrinsicHelper.api.rpc.frequencyTxPayment.computeCapacityFeeDetails(call.toHex(), null));
       assert.notEqual(feeDetails, undefined, "should have returned a feeDetails");
       assert.notEqual(feeDetails.inclusionFee, undefined, "should have returned a partialFee");
       assert(feeDetails.inclusionFee.isSome, "should have returned a partialFee");
       const { baseFee, lenFee, adjustedWeightFee } = feeDetails.inclusionFee.toJSON() as any;
       assert(Math.abs(baseFee - 106382) < 10_000, "The base fee appears to be wrong or have changed more than expected");
       assert(Math.abs(lenFee - 1170000) < 100, "The len fee appears to be wrong or have changed more than expected");
-      assert(Math.abs(adjustedWeightFee - 2359035) < 100_000, "The adjusted weight fee appears to be wrong or have changed more than expected");
+      // This is comparing stable weight, which has no impact from targeted_fee_adjustment, with actual weights.
+      assert(Math.abs(adjustedWeightFee - weightFee.toNumber()) < 10_000, "The adjusted weight fee appears to be wrong or have changed more than expected");
     });
 
     it("Returns `FeeDetails` when requesting capacity cost of a transaction when wrapped in payWithCapacity", async function () {

diff --git a/pallets/frequency-tx-payment/src/lib.rs b/pallets/frequency-tx-payment/src/lib.rs
@@ -299,11 +299,13 @@ impl<T: Config> Pallet<T> {
 				let len_fee = Self::length_to_fee(len);
 				let base_fee = Self::weight_to_fee(CAPACITY_EXTRINSIC_BASE_WEIGHT);
 
-				let adjusted_weight_fee =
-					base_fee.saturating_add(weight_fee).saturating_add(len_fee);
 				let tip = Zero::zero();
 				fees = FeeDetails {
-					inclusion_fee: Some(InclusionFee { base_fee, len_fee, adjusted_weight_fee }),
+					inclusion_fee: Some(InclusionFee {
+						base_fee,
+						len_fee,
+						adjusted_weight_fee: weight_fee,
+					}),
 					tip,
 				};
 			}