Expose callId on extrinsics (lookups)

polkadot-js · Oct 5, 2018 · 3419a2f · 3419a2f
1 parent d483722
commit 3419a2f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "test": "jest --coverage"
   },
   "devDependencies": {
-    "@polkadot/dev": "^0.20.21",
+    "@polkadot/dev": "^0.20.24",
     "@polkadot/ts": "^0.1.30"
   },
   "dependencies": {

diff --git a/packages/type-extrinsics/src/types.d.ts b/packages/type-extrinsics/src/types.d.ts
@@ -7,6 +7,7 @@ import { FunctionMetadata } from '@polkadot/types/Metadata';
 
 export interface ExtrinsicFunction {
   (...args: any[]): UncheckedMortalExtrinsic,
+  callId: Uint8Array,
   meta: FunctionMetadata,
   method: string;
   section: string;

diff --git a/packages/type-extrinsics/src/utils/createUnchecked.ts b/packages/type-extrinsics/src/utils/createUnchecked.ts
@@ -19,6 +19,7 @@ export default function createDescriptor (
   index: number,
   meta: FunctionMetadata
 ): ExtrinsicFunction {
+  const callId = new Uint8Array([index, meta.id.toNumber()]);
   let extrinsicFn: any;
 
   // If the extrinsic function has an argument of type `Origin`, we ignore it
@@ -32,15 +33,12 @@ export default function createDescriptor (
       throw new Error(`Extrinsic ${section}.${method} expects ${expectedArgs.length.valueOf()} arguments, got ${args.length}.`);
     }
 
-    const call = new Call(
-      new Uint8Array([index, meta.id.toNumber()]),
-      meta,
-      args
-    );
+    const call = new Call(callId, meta, args);
 
     return new UncheckedMortalExtrinsic(call);
   };
 
+  extrinsicFn.callId = callId;
   extrinsicFn.meta = meta;
   extrinsicFn.method = method;
   extrinsicFn.section = section;

diff --git a/packages/types/src/UncheckedMortalExtrinsic.ts b/packages/types/src/UncheckedMortalExtrinsic.ts
@@ -55,6 +55,14 @@ export default class UncheckedMortalExtrinsic extends Extrinsic {
     return this._signature;
   }
 
+  get methodIndex (): number {
+    return this._call.methodIndex;
+  }
+
+  get sectionIndex (): number {
+    return this._call.sectionIndex;
+  }
+
   sign (signerPair: KeyringPair, nonce: AnyNumber, blockHash: AnyU8a): UncheckedMortalExtrinsic {
     const signature = this.createSignature(this._call, signerPair, nonce, blockHash);
 

diff --git a/yarn.lock b/yarn.lock
@@ -1170,9 +1170,9 @@
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz#50c1e2260ac0ed9439a181de3725a0168d59c48a"
 
-"@polkadot/dev@^0.20.21":
-  version "0.20.21"
-  resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.20.21.tgz#81d707d5aeb4b32e22fea1e1653ab238c77eefeb"
+"@polkadot/dev@^0.20.24":
+  version "0.20.24"
+  resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.20.24.tgz#e88af950aa4e0e1a549d0a4860b2b3f8d63ce723"
   dependencies:
     "@babel/cli" "^7.0.0"
     "@babel/core" "^7.0.0"