Adjust multi to infer return types (#4002)

* Adjust multi to infer return types

* some linting

* Additional

* Dedupe

packages/types/src/augment/lookup/kusama.ts

@@ -138,12 +138,9 @@ export default {
         xcm: 'XcmV2Xcm',
       },
       Transact: {
-        _alias: {
-          call_: 'call',
-        },
         originType: 'XcmV0OriginKind',
         requireWeightAtMost: 'Compact<u64>',
-        call_: 'XcmDoubleEncoded',
+        call: 'XcmDoubleEncoded',
       },
       HrmpNewChannelOpenRequest: {
         sender: 'Compact<u32>',
@@ -501,12 +498,9 @@ export default {
         effects: 'Vec<XcmV0Order>',
       },
       Transact: {
-        _alias: {
-          call_: 'call',
-        },
         originType: 'XcmV0OriginKind',
         requireWeightAtMost: 'u64',
-        call_: 'XcmDoubleEncoded',
+        call: 'XcmDoubleEncoded',
       },
       HrmpNewChannelOpenRequest: {
         sender: 'Compact<u32>',
@@ -609,12 +603,9 @@ export default {
         effects: 'Vec<XcmV1Order>',
       },
       Transact: {
-        _alias: {
-          call_: 'call',
-        },
         originType: 'XcmV0OriginKind',
         requireWeightAtMost: 'u64',
-        call_: 'XcmDoubleEncoded',
+        call: 'XcmDoubleEncoded',
       },
       HrmpNewChannelOpenRequest: {
         sender: 'Compact<u32>',

packages/types/src/augment/lookup/substrate.ts

@@ -965,8 +965,7 @@ export default {
    **/
   PalletContractsScheduleInstructionWeights: {
     _alias: {
-      r_if: 'r#if',
-      call_: 'call'
+      r_if: 'r#if'
     },
     version: 'u32',
     i64Const: 'u32',
@@ -978,7 +977,7 @@ export default {
     brIf: 'u32',
     brTable: 'u32',
     brTablePerEntry: 'u32',
-    call_: 'u32',
+    call: 'u32',
     callIndirect: 'u32',
     callIndirectPerParam: 'u32',
     localGet: 'u32',
@@ -1026,8 +1025,7 @@ export default {
    **/
   PalletContractsScheduleHostFnWeights: {
     _alias: {
-      r_return: 'r#return',
-      call_: 'call'
+      r_return: 'r#return'
     },
     caller: 'u64',
     address: 'u64',
@@ -1056,7 +1054,7 @@ export default {
     getStorage: 'u64',
     getStoragePerByte: 'u64',
     transfer: 'u64',
-    call_: 'u64',
+    call: 'u64',
     callTransferSurcharge: 'u64',
     callPerInputByte: 'u64',
     callPerOutputByte: 'u64',
@@ -1160,12 +1158,9 @@ export default {
    * Lookup454: pallet_scheduler::ScheduledV2<node_runtime::Call, BlockNumber, node_runtime::OriginCaller, sp_core::crypto::AccountId32>
    **/
   PalletSchedulerScheduledV2: {
-    _alias: {
-      call_: 'call'
-    },
     maybeId: 'Option<Bytes>',
     priority: 'u8',
-    call_: 'Call',
+    call: 'Call',
     maybePeriodic: 'Option<(u32,u32)>',
     origin: 'NodeRuntimeOriginCaller'
   },

packages/types/src/augment/lookup/types-kusama.ts

@@ -156,7 +156,7 @@ declare module '@polkadot/types/lookup' {
     readonly asTransact: {
       readonly originType: XcmV0OriginKind;
       readonly requireWeightAtMost: Compact<u64>;
-      readonly call_: XcmDoubleEncoded;
+      readonly call: XcmDoubleEncoded;
     } & Struct;
     readonly isHrmpNewChannelOpenRequest: boolean;
     readonly asHrmpNewChannelOpenRequest: {
@@ -539,7 +539,7 @@ declare module '@polkadot/types/lookup' {
     readonly asTransact: {
       readonly originType: XcmV0OriginKind;
       readonly requireWeightAtMost: u64;
-      readonly call_: XcmDoubleEncoded;
+      readonly call: XcmDoubleEncoded;
     } & Struct;
     readonly isHrmpNewChannelOpenRequest: boolean;
     readonly asHrmpNewChannelOpenRequest: {
@@ -654,7 +654,7 @@ declare module '@polkadot/types/lookup' {
     readonly asTransact: {
       readonly originType: XcmV0OriginKind;
       readonly requireWeightAtMost: u64;
-      readonly call_: XcmDoubleEncoded;
+      readonly call: XcmDoubleEncoded;
     } & Struct;
     readonly isHrmpNewChannelOpenRequest: boolean;
     readonly asHrmpNewChannelOpenRequest: {

packages/types/src/augment/lookup/types-substrate.ts

@@ -1029,7 +1029,7 @@ declare module '@polkadot/types/lookup' {
     readonly brIf: u32;
     readonly brTable: u32;
     readonly brTablePerEntry: u32;
-    readonly call_: u32;
+    readonly call: u32;
     readonly callIndirect: u32;
     readonly callIndirectPerParam: u32;
     readonly localGet: u32;
@@ -1102,7 +1102,7 @@ declare module '@polkadot/types/lookup' {
     readonly getStorage: u64;
     readonly getStoragePerByte: u64;
     readonly transfer: u64;
-    readonly call_: u64;
+    readonly call: u64;
     readonly callTransferSurcharge: u64;
     readonly callPerInputByte: u64;
     readonly callPerOutputByte: u64;
@@ -1200,7 +1200,7 @@ declare module '@polkadot/types/lookup' {
   export interface PalletSchedulerScheduledV2 extends Struct {
     readonly maybeId: Option<Bytes>;
     readonly priority: u8;
-    readonly call_: Call;
+    readonly call: Call;
     readonly maybePeriodic: Option<ITuple<[u32, u32]>>;
     readonly origin: NodeRuntimeOriginCaller;
   }

packages/types/src/generic/PortableRegistry/PortableRegistry.ts

@@ -50,8 +50,8 @@ const SETS = [
 // These we never use these as top-level names, they are wrappers
 const WRAPPERS = ['BoundedBTreeMap', 'BoundedVec', 'Box', 'BTreeMap', 'Cow', 'Result', 'Option', 'WeakBoundedVec', 'WrapperOpaque'];
 
-// These are reserved and/or conflicts with built-in Codec definitions
-const RESERVED = ['call', 'entries', 'hash', 'keys', 'new', 'size'];
+// These are reserved and/or conflicts with built-in Codec or JS definitions
+const RESERVED = ['entries', 'hash', 'keys', 'new', 'size'];
 
 function matchParts (first: string[], second: (string | Text)[]): boolean {
   return first.length === second.length && first.every((a, index) => {

packages/types/src/interfaces/elections/definitions.ts

@@ -33,9 +33,9 @@ export default {
     },
     VoteThreshold: {
       _enum: [
-        'Super majority approval',
-        'Super majority rejection',
-        'Simple majority'
+        'Super Majority Approve',
+        'Super Majority Against',
+        'Simple Majority'
       ]
     }
   }

packages/types/src/interfaces/elections/types.ts

@@ -41,9 +41,9 @@ export interface VoterInfo extends Struct {
 
 /** @name VoteThreshold */
 export interface VoteThreshold extends Enum {
-  readonly isSupermajorityapproval: boolean;
-  readonly isSupermajorityrejection: boolean;
-  readonly isSimplemajority: boolean;
+  readonly isSuperMajorityApprove: boolean;
+  readonly isSuperMajorityAgainst: boolean;
+  readonly isSimpleMajority: boolean;
 }
 
 export type PHANTOM_ELECTIONS = 'elections';