api, api-{augment, base, contract, derive}, rpc-{augment, core, provider}, types, types-{augment, codec, create, known} 12.0.1

Author: github-actions[bot]

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## master
 
+- api, api-{augment, base, contract, derive}, rpc-{augment, core, provider}, types, types-{augment, codec, create, known} 12.0.1
 - phishing 0.22.9
 - api, api-{augment, base, contract, derive}, rpc-{augment, core, provider}, types, types-{augment, codec, create, known} 11.3.1
 - api, api-{augment, base, contract, derive}, rpc-{augment, core, provider}, types, types-{augment, codec, create, known} 11.2.1

api-augment/packageInfo.ts

@@ -1,3 +1,3 @@
 
 
-export const packageInfo = { name: '@polkadot/api-augment', path: new URL(import.meta.url).pathname, type: 'deno', version: '11.3.1' };
+export const packageInfo = { name: '@polkadot/api-augment', path: new URL(import.meta.url).pathname, type: 'deno', version: '12.0.1' };

api-base/packageInfo.ts

@@ -1,3 +1,3 @@
 
 
-export const packageInfo = { name: '@polkadot/api-base', path: new URL(import.meta.url).pathname, type: 'deno', version: '11.3.1' };
+export const packageInfo = { name: '@polkadot/api-base', path: new URL(import.meta.url).pathname, type: 'deno', version: '12.0.1' };

api-base/types/submittable.ts

@@ -66,6 +66,16 @@ export interface SubmittableExtrinsic<ApiType extends ApiTypes, R extends ISubmi
 
   signAsync (account: AddressOrPair, _options?: Partial<SignerOptions>): PromiseOrObs<ApiType, this>;
 
+  /**
+   * @description Sign and broadcast the constructued transaction.
+   *
+   * Note for injected signers:
+   * As of v12.0.1 and up the `SignerResult` return type for `signPayload` allows for the `signedTransaction` field.
+   * This allows the signer to input a signed transaction that will be directly broadcasted. This
+   * bypasses the api adding the signature to the payload. The api will ensure that the Call Data is not changed before it broadcasts the
+   * transaction. This allows for the signer to modify the payload to add things like `mode`, and `metadataHash` for
+   * signedExtensions such as `CheckMetadataHash`.
+   */
   signAndSend (account: AddressOrPair, options?: Partial<SignerOptions>): SubmittableResultResult<ApiType, R>;
 
   signAndSend (account: AddressOrPair, statusCb: Callback<R>): SubmittableResultSubscription<ApiType>;

api-contract/packageInfo.ts

@@ -1,3 +1,3 @@
 
 
-export const packageInfo = { name: '@polkadot/api-contract', path: new URL(import.meta.url).pathname, type: 'deno', version: '11.3.1' };
+export const packageInfo = { name: '@polkadot/api-contract', path: new URL(import.meta.url).pathname, type: 'deno', version: '12.0.1' };

api-derive/packageInfo.ts

@@ -1,3 +1,3 @@
 
 
-export const packageInfo = { name: '@polkadot/api-derive', path: new URL(import.meta.url).pathname, type: 'deno', version: '11.3.1' };
+export const packageInfo = { name: '@polkadot/api-derive', path: new URL(import.meta.url).pathname, type: 'deno', version: '12.0.1' };

api-derive/staking/stakerRewards.ts

@@ -165,11 +165,15 @@ export function _stakerRewardsEras (instanceId: string, api: DeriveApi): (eras:
 }
 
 export function _stakerRewards (instanceId: string, api: DeriveApi): (accountIds: (Uint8Array | string)[], eras: EraIndex[], withActive?: boolean) => Observable<DeriveStakerReward[][]> {
-  return memo(instanceId, (accountIds: (Uint8Array | string)[], eras: EraIndex[], withActive = false): Observable<DeriveStakerReward[][]> =>
-    combineLatest([
+  return memo(instanceId, (accountIds: (Uint8Array | string)[], eras: EraIndex[], withActive = false): Observable<DeriveStakerReward[][]> => {
+    // Ensures that when number or string types are passed in they are sanitized
+    // Ref: https://github.com/polkadot-js/api/issues/5910
+    const sanitizedEras: EraIndex[] = eras.map((e) => typeof e === 'number' || typeof e === 'string' ? api.registry.createType('u32', e) : e);
+
+    return combineLatest([
       api.derive.staking.queryMulti(accountIds, { withClaimedRewardsEras: true, withLedger: true }),
-      api.derive.staking._stakerExposures(accountIds, eras, withActive),
-      api.derive.staking._stakerRewardsEras(eras, withActive)
+      api.derive.staking._stakerExposures(accountIds, sanitizedEras, withActive),
+      api.derive.staking._stakerRewardsEras(sanitizedEras, withActive)
     ]).pipe(
       switchMap(([queries, exposures, erasResult]): Observable<DeriveStakerReward[][]> => {
         const allRewards = queries.map(({ claimedRewardsEras, stakingLedger, stashId }, index): DeriveStakerReward[] =>
@@ -205,7 +209,8 @@ export function _stakerRewards (instanceId: string, api: DeriveApi): (accountIds
           )
         );
       })
-    )
+    );
+  }
   );
 }
 

api-derive/tx/signingInfo.ts

@@ -27,9 +27,13 @@ function latestNonce (api: DeriveApi, address: string): Observable<Index> {
 }
 
 function nextNonce (api: DeriveApi, address: string): Observable<Index> {
-  return api.rpc.system?.accountNextIndex
-    ? api.rpc.system.accountNextIndex(address)
-    : latestNonce(api, address);
+  if (api.call.accountNonceApi) {
+    return api.call.accountNonceApi.accountNonce(address);
+  } else {
+    return api.rpc.system?.accountNextIndex
+      ? api.rpc.system.accountNextIndex(address)
+      : latestNonce(api, address);
+  }
 }
 
 function signingHeader (api: DeriveApi): Observable<Header> {

api/packageInfo.ts

@@ -1,3 +1,3 @@
 
 
-export const packageInfo = { name: '@polkadot/api', path: new URL(import.meta.url).pathname, type: 'deno', version: '11.3.1' };
+export const packageInfo = { name: '@polkadot/api', path: new URL(import.meta.url).pathname, type: 'deno', version: '12.0.1' };

api/submittable/createClass.ts

@@ -5,6 +5,7 @@ import type { Observable } from 'https://esm.sh/rxjs@7.8.1';
 import type { Address, ApplyExtrinsicResult, Call, Extrinsic, ExtrinsicEra, ExtrinsicStatus, Hash, Header, Index, RuntimeDispatchInfo, SignerPayload } from 'https://deno.land/x/polkadot/types/interfaces/index.ts';
 import type { Callback, Codec, CodecClass, ISubmittableResult, SignatureOptions } from 'https://deno.land/x/polkadot/types/types/index.ts';
 import type { Registry } from 'https://deno.land/x/polkadot/types-codec/types/index.ts';
+import type { HexString } from 'https://deno.land/x/polkadot/util/types.ts';
 import type { ApiBase } from '../base/index.ts';
 import type { ApiInterfaceRx, ApiTypes, PromiseOrObs, SignerResult } from '../types/index.ts';
 import type { AddressOrPair, SignerOptions, SubmittableDryRunResult, SubmittableExtrinsic, SubmittablePaymentResult, SubmittableResultResult, SubmittableResultSubscription } from './types.ts';
@@ -26,6 +27,12 @@ interface SubmittableOptions<ApiType extends ApiTypes> {
 interface UpdateInfo {
   options: SignatureOptions;
   updateId: number;
+  signedTransaction: HexString | Uint8Array | null;
+}
+
+interface SignerInfo {
+  id: number;
+  signedTransaction?: HexString | Uint8Array;
 }
 
 function makeEraOptions (api: ApiInterfaceRx, registry: Registry, partialOptions: Partial<SignerOptions>, { header, mortalLength, nonce }: { header: Header | null; mortalLength: number; nonce: Index }): SignatureOptions {
@@ -244,14 +251,21 @@ export function createClass <ApiType extends ApiTypes> ({ api, apiType, blockHas
         mergeMap(async (signingInfo): Promise<UpdateInfo> => {
           const eraOptions = makeEraOptions(api, this.registry, options, signingInfo);
           let updateId = -1;
+          let signedTx = null;
 
           if (isKeyringPair(account)) {
             this.sign(account, eraOptions);
           } else {
-            updateId = await this.#signViaSigner(address, eraOptions, signingInfo.header);
+            const result = await this.#signViaSigner(address, eraOptions, signingInfo.header);
+
+            updateId = result.id;
+
+            if (result.signedTransaction) {
+              signedTx = result.signedTransaction;
+            }
           }
 
-          return { options: eraOptions, updateId };
+          return { options: eraOptions, signedTransaction: signedTx, updateId };
         })
       );
     };
@@ -286,18 +300,18 @@ export function createClass <ApiType extends ApiTypes> ({ api, apiType, blockHas
       );
     };
 
-    #observeSend = (info: UpdateInfo): Observable<Hash> => {
-      return api.rpc.author.submitExtrinsic(this).pipe(
+    #observeSend = (info?: UpdateInfo): Observable<Hash> => {
+      return api.rpc.author.submitExtrinsic(info?.signedTransaction || this).pipe(
         tap((hash): void => {
           this.#updateSigner(hash, info);
         })
       );
     };
 
-    #observeSubscribe = (info: UpdateInfo): Observable<ISubmittableResult> => {
+    #observeSubscribe = (info?: UpdateInfo): Observable<ISubmittableResult> => {
       const txHash = this.hash;
 
-      return api.rpc.author.submitAndWatchExtrinsic(this).pipe(
+      return api.rpc.author.submitAndWatchExtrinsic(info?.signedTransaction || this).pipe(
         switchMap((status): Observable<ISubmittableResult> =>
           this.#observeStatus(txHash, status)
         ),
@@ -307,7 +321,7 @@ export function createClass <ApiType extends ApiTypes> ({ api, apiType, blockHas
       );
     };
 
-    #signViaSigner = async (address: Address | string | Uint8Array, options: SignatureOptions, header: Header | null): Promise<number> => {
+    #signViaSigner = async (address: Address | string | Uint8Array, options: SignatureOptions, header: Header | null): Promise<SignerInfo> => {
       const signer = options.signer || api.signer;
 
       if (!signer) {
@@ -323,6 +337,20 @@ export function createClass <ApiType extends ApiTypes> ({ api, apiType, blockHas
 
       if (isFunction(signer.signPayload)) {
         result = await signer.signPayload(payload.toPayload());
+
+        // When the signedTransaction is included by the signer, we no longer add
+        // the signature to the parent class, but instead broadcast the signed transaction directly.
+        if (result.signedTransaction) {
+          const ext = this.registry.createTypeUnsafe<Extrinsic>('Extrinsic', [result.signedTransaction]);
+
+          if (!ext.isSigned) {
+            throw new Error(`When using the signedTransaction field, the transaction must be signed. Recieved isSigned: ${ext.isSigned}`);
+          }
+
+          this.#validateSignedTransaction(payload, ext);
+
+          return { id: result.id, signedTransaction: result.signedTransaction };
+        }
       } else if (isFunction(signer.signRaw)) {
         result = await signer.signRaw(payload.toRaw());
       } else {
@@ -334,7 +362,7 @@ export function createClass <ApiType extends ApiTypes> ({ api, apiType, blockHas
       // payload data is not modified from our inputs, but the signer
       super.addSignature(address, result.signature, payload.toPayload());
 
-      return result.id;
+      return { id: result.id };
     };
 
     #updateSigner = (status: Hash | ISubmittableResult, info?: UpdateInfo): void => {
@@ -347,6 +375,20 @@ export function createClass <ApiType extends ApiTypes> ({ api, apiType, blockHas
         }
       }
     };
+
+    /**
+     * When a signer includes `signedTransaction` within the SignerResult this will validate
+     * specific fields within the signed extrinsic against the original payload that was passed
+     * to the signer.
+     */
+    #validateSignedTransaction = (signerPayload: SignerPayload, signedExt: Extrinsic): void => {
+      const payload = signerPayload.toPayload();
+      const errMsg = (field: string) => `signAndSend: ${field} does not match the original payload`;
+
+      if (payload.method !== signedExt.method.toHex()) {
+        throw new Error(errMsg('call data'));
+      }
+    };
   }
 
   return Submittable;