Pass through WeightV2 as-is (contracts) (#5336)
* Pass through WeightV2 as-is (contracts) * Adjust convertWeight * Adjust
This commit is contained in:
@@ -142,9 +142,10 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
|
||||
origin,
|
||||
this.address,
|
||||
value,
|
||||
this._isOldWeight
|
||||
// jiggle v1 weights, metadata points to latest
|
||||
? this.#getGas(gasLimit, true).v1Weight as unknown as WeightAll['v2Weight']
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore jiggle v1 weights, metadata points to latest
|
||||
this._isWeightV1
|
||||
? this.#getGas(gasLimit, true).v1Weight
|
||||
: this.#getGas(gasLimit, true).v2Weight,
|
||||
storageDepositLimit,
|
||||
message.toU8a(params)
|
||||
@@ -152,7 +153,7 @@ export class Contract<ApiType extends ApiTypes> extends Base<ApiType> {
|
||||
map(({ debugMessage, gasConsumed, gasRequired, result, storageDeposit }): ContractCallOutcome => ({
|
||||
debugMessage,
|
||||
gasConsumed,
|
||||
gasRequired: gasRequired && !gasRequired.isZero()
|
||||
gasRequired: gasRequired && !convertWeight(gasRequired).v1Weight.isZero()
|
||||
? gasRequired
|
||||
: gasConsumed,
|
||||
output: result.isOk && message.returnType
|
||||
|
||||
@@ -40,13 +40,17 @@ export function encodeSalt (salt: Uint8Array | string | null = randomAsU8a()): U
|
||||
: EMPTY_SALT;
|
||||
}
|
||||
|
||||
export function convertWeight (orig: WeightV1 | WeightV2 | bigint | string | number | BN): WeightAll {
|
||||
const refTime = (orig as WeightV2).proofSize
|
||||
? (orig as WeightV2).refTime.toBn()
|
||||
: bnToBn(orig as BN);
|
||||
export function convertWeight (weight: WeightV1 | WeightV2 | bigint | string | number | BN): WeightAll {
|
||||
const [refTime, proofSize] = isWeightV2(weight)
|
||||
? [weight.refTime.toBn(), weight.proofSize.toBn()]
|
||||
: [bnToBn(weight), undefined];
|
||||
|
||||
return {
|
||||
v1Weight: refTime,
|
||||
v2Weight: { refTime }
|
||||
v2Weight: { proofSize, refTime }
|
||||
};
|
||||
}
|
||||
|
||||
export function isWeightV2 (weight: WeightV1 | WeightV2 | bigint | string | number | BN): weight is WeightV2 {
|
||||
return !!(weight as WeightV2).proofSize;
|
||||
}
|
||||
|
||||
@@ -86,5 +86,6 @@ export interface WeightAll {
|
||||
v1Weight: BN;
|
||||
v2Weight: {
|
||||
refTime: BN;
|
||||
proofSize?: BN;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user