Skip to content
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

Jump to bottom

fix: avoid use queryInfo rpc call #1169

Merged
merged 4 commits into from
Dec 20, 2022
Merged

fix: avoid use queryInfo rpc call #1169

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92ee496
avoid use queryInfo rpc call
xlc Dec 20, 2022
cb1bd91
fallback to rpc call
xlc Dec 20, 2022
367219b
minor improvement
xlc Dec 20, 2022
2175bc2
update fetchQueryFeeDetails
xlc Dec 20, 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
58 changes: 46 additions & 12 deletions src/services/blocks/BlocksService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { ApiPromise } from '@polkadot/api';
import { ApiDecoration } from '@polkadot/api/types';
import { extractAuthor } from '@polkadot/api-derive/type/util';
import { Compact, GenericCall, Option, Struct, Vec } from '@polkadot/types';
import { GenericExtrinsic } from '@polkadot/types/extrinsic';
import {
AccountId32,
Block,
Expand All @@ -27,6 +28,7 @@ import {
EventRecord,
Header,
InclusionFee,
RuntimeDispatchInfo,
Weight,
} from '@polkadot/types/interfaces';
import { AnyJson, Codec, Registry } from '@polkadot/types/types';
Expand Down Expand Up @@ -260,10 +262,7 @@ export class BlocksService extends AbstractService {
class: dispatchClass,
partialFee,
weight,
} = await api.rpc.payment.queryInfo(
block.extrinsics[idx].toHex(),
previousBlockHash
);
} = await this.fetchQueryInfo(block.extrinsics[idx], previousBlockHash);

const transactionPaidFeeEvent = xtEvents.find(
({ method }) =>
Expand All @@ -286,7 +285,7 @@ export class BlocksService extends AbstractService {
);
if (doesQueryFeeDetailsExist === 'available') {
finalPartialFee = await this.fetchQueryFeeDetails(
block.extrinsics[idx].toHex(),
block.extrinsics[idx],
previousBlockHash,
weightInfo.weight,
weight
Expand All @@ -296,7 +295,7 @@ export class BlocksService extends AbstractService {
} else if (doesQueryFeeDetailsExist === 'unknown') {
try {
finalPartialFee = await this.fetchQueryFeeDetails(
block.extrinsics[idx].toHex(),
block.extrinsics[idx],
previousBlockHash,
weightInfo.weight,
weight
Expand Down Expand Up @@ -343,22 +342,36 @@ export class BlocksService extends AbstractService {
/**
* Fetch `payment_queryFeeDetails`.
*
* @param extHex
* @param ext
* @param previousBlockHash
* @param extrinsicSuccessWeight
* @param estWeight
*/
private async fetchQueryFeeDetails(
extHex: `0x${string}`,
ext: GenericExtrinsic,
previousBlockHash: BlockHash,
extrinsicSuccessWeight: Weight,
estWeight: Weight
): Promise<string> {
const { api } = this;
const { inclusionFee } = await api.rpc.payment.queryFeeDetails(
extHex,
previousBlockHash
);
const apiAt = await api.at(previousBlockHash);

let inclusionFee;
if (apiAt.call.transactionPaymentApi.queryFeeDetails) {
const u8a = ext.toU8a();
const result = await apiAt.call.transactionPaymentApi.queryFeeDetails(
u8a,
u8a.length
);
inclusionFee = result.inclusionFee;
} else {
const result = await api.rpc.payment.queryFeeDetails(
ext.toHex(),
previousBlockHash
);
inclusionFee = result.inclusionFee;
}

const finalPartialFee = this.calcPartialFee(
extrinsicSuccessWeight,
estWeight,
Expand All @@ -368,6 +381,27 @@ export class BlocksService extends AbstractService {
return finalPartialFee;
}

/**
* Fetch `payment_queryInfo`.
*
* @param ext
* @param previousBlockHash
*/
private async fetchQueryInfo(
ext: GenericExtrinsic,
previousBlockHash: BlockHash
): Promise<RuntimeDispatchInfo> {
const { api } = this;
const apiAt = await api.at(previousBlockHash);
if (apiAt.call.transactionPaymentApi.queryInfo) {
const u8a = ext.toU8a();
return apiAt.call.transactionPaymentApi.queryInfo(u8a, u8a.length);
} else {
// fallback to rpc call
return api.rpc.payment.queryInfo(ext.toHex(), previousBlockHash);
}
}

/**
* Retrieve the blockHash for the previous block to the one getting queried.
* If the block is the geneisis hash it will return the same blockHash.
Expand Down