fix: proofsize field is missing (#223)

subscan-explorer · Jun 20, 2023 · db1f22c · db1f22c
1 parent 41252fc
commit db1f22c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 34 deletions.
diff --git a/src/components/ExtrinsicLaunch.tsx b/src/components/ExtrinsicLaunch.tsx
@@ -104,9 +104,9 @@ export function ExtrinsicLaunch({ className, onTxSuccess }: Props): React.ReactE
       const args =
         // eslint-disable-next-line no-magic-numbers
         argsLength === 5
-          ? [...generalParams, ext.method.toHex(), weightAll.compatibleWeight]
+          ? [...generalParams, ext.method.toHex(), weightAll]
           : argsLength === ARG_LENGTH
-          ? [...generalParams, ext.method.toHex(), false, weightAll.compatibleWeight]
+          ? [...generalParams, ext.method.toHex(), false, weightAll]
           : [...generalParams, ext];
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore

diff --git a/src/components/modals/Transfer.tsx b/src/components/modals/Transfer.tsx
@@ -241,9 +241,9 @@ function Transfer({
       const args =
         // eslint-disable-next-line no-magic-numbers
         argsLength === 5
-          ? [...generalParams, ext.method.toHex(), weightAll.compatibleWeight]
+          ? [...generalParams, ext.method.toHex(), weightAll]
           : argsLength === ARG_LENGTH
-          ? [...generalParams, ext.method.toHex(), false, weightAll.compatibleWeight]
+          ? [...generalParams, ext.method.toHex(), false, weightAll]
           : [...generalParams, ext];
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore

diff --git a/src/hooks/multiApprove.ts b/src/hooks/multiApprove.ts
@@ -21,12 +21,12 @@ export function useMultiApprove() {
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const info = await api?.query.multisig.multisigs(multiRoot, data.callHash!);
       let callData = null;
-      let weight: CompatibleWeight = convertWeight(api, 0).compatibleWeight;
+      let weight: CompatibleWeight = convertWeight(api, 0);
 
       if (data.callData && api) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const payment = await api?.tx(data.callData as any).paymentInfo(ZERO_ACCOUNT);
-        weight = convertWeight(api, payment?.weight || 0).compatibleWeight;
+        weight = convertWeight(api, payment?.weight || 0);
         callData = api?.registry.createType('Call', data.callData);
       }
 

diff --git a/src/packages/react-signer/src/TxSigned.tsx b/src/packages/react-signer/src/TxSigned.tsx
@@ -158,19 +158,12 @@ async function wrapTx(
     tx = isMultiCall
       ? api.tx[multiModule].asMulti.meta.args.length === 6
         ? // We are doing toHex here since we have a Vec<u8> input
-          api.tx[multiModule].asMulti(
-            threshold,
-            others,
-            timepoint,
-            tx.method.toHex(),
-            false,
-            weightAll.compatibleWeight
-          )
+          api.tx[multiModule].asMulti(threshold, others, timepoint, tx.method.toHex(), false, weightAll)
         : // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-ignore
           api.tx[multiModule].asMulti(threshold, others, timepoint, tx.method)
       : api.tx[multiModule].approveAsMulti.meta.args.length === 5
-      ? api.tx[multiModule].approveAsMulti(threshold, others, timepoint, tx.method.hash, weightAll.compatibleWeight)
+      ? api.tx[multiModule].approveAsMulti(threshold, others, timepoint, tx.method.hash, weightAll)
       : // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         api.tx[multiModule].approveAsMulti(threshold, others, timepoint, tx.method.hash);

diff --git a/src/utils/helper/weight.ts b/src/utils/helper/weight.ts
@@ -10,36 +10,20 @@ export interface WeightV2 extends Struct {
   readonly proofSize: Compact<u64>;
 }
 
-export type CompatibleWeight =
-  | BN
-  | {
-      refTime: BN;
-    };
-export interface WeightAll {
-  v1Weight: BN;
-  v2Weight: {
-    refTime: BN;
-  };
-  compatibleWeight: CompatibleWeight;
-}
+export type CompatibleWeight = BN | WeightV2;
 
 export function convertWeight(
   api: ApiPromise | null,
   orig: WeightV1 | WeightV2 | bigint | string | number | BN
-): WeightAll {
+): CompatibleWeight {
   let isWeightV2 = false;
   try {
     api?.createType('WeightV2', { refTime: 0 });
     isWeightV2 = true;
   } catch (error) {
     isWeightV2 = false;
   }
-
   const refTime = (orig as WeightV2).proofSize ? (orig as WeightV2).refTime.toBn() : bnToBn(orig as BN);
 
-  return {
-    v1Weight: refTime,
-    v2Weight: { refTime },
-    compatibleWeight: isWeightV2 ? { refTime } : refTime,
-  };
+  return isWeightV2 ? (orig as WeightV2) : refTime;
 }