diff --git a/packages/api-contract/src/base/Contract.ts b/packages/api-contract/src/base/Contract.ts index 028b6769a3..f51b8e4bc9 100644 --- a/packages/api-contract/src/base/Contract.ts +++ b/packages/api-contract/src/base/Contract.ts @@ -58,7 +58,6 @@ export class Contract extends Base { public readonly address: AccountId; readonly #query: MapMessageQuery = {}; - readonly #tx: MapMessageTx = {}; constructor (api: ApiBase, abi: string | Record | Abi, address: string | AccountId, decorateMethod: DecorateMethod) { diff --git a/packages/api/src/base/Decorate.ts b/packages/api/src/base/Decorate.ts index a293aca77f..1993f980f5 100644 --- a/packages/api/src/base/Decorate.ts +++ b/packages/api/src/base/Decorate.ts @@ -60,65 +60,38 @@ function getAtQueryFn (api: ApiDecoration, { export abstract class Decorate extends Events { readonly #instanceId: string; - - #registry: Registry; - readonly #runtimeLog: Record = {}; + #registry: Registry; #storageGetQ: [Observable, [StorageEntry, unknown[]][]][] = []; - #storageSubQ: [Observable, [StorageEntry, unknown[]][]][] = []; // HACK Use BN import so decorateDerive works... yes, wtf. protected __phantom = new BN(0); + protected _type: ApiTypes; protected _call: QueryableCalls = {} as QueryableCalls; - protected _consts: QueryableConsts = {} as QueryableConsts; - protected _derive?: ReturnType['_decorateDerive']>; - protected _errors: DecoratedErrors = {} as DecoratedErrors; - protected _events: DecoratedEvents = {} as DecoratedEvents; - protected _extrinsics?: SubmittableExtrinsics; - protected _extrinsicType = GenericExtrinsic.LATEST_EXTRINSIC_VERSION; - protected _genesisHash?: Hash; - protected _isConnected: BehaviorSubject; - protected _isReady = false; + protected _query: QueryableStorage = {} as QueryableStorage; + protected _queryMulti?: QueryableStorageMulti; + protected _rpc?: DecoratedRpc; + protected _rpcCore: RpcCore & RpcInterface; + protected _runtimeMap: Record = {}; + protected _runtimeChain?: Text; + protected _runtimeMetadata?: Metadata; + protected _runtimeVersion?: RuntimeVersion; + protected _rx: ApiInterfaceRx = { call: {} as QueryableCalls<'rxjs'>, consts: {} as QueryableConsts<'rxjs'>, query: {} as QueryableStorage<'rxjs'>, tx: {} as SubmittableExtrinsics<'rxjs'> } as ApiInterfaceRx; protected readonly _options: ApiOptions; - protected _query: QueryableStorage = {} as QueryableStorage; - - protected _queryMulti?: QueryableStorageMulti; - - protected _rpc?: DecoratedRpc; - - protected _rpcCore: RpcCore & RpcInterface; - - protected _runtimeMap: Record = {}; - - protected _runtimeChain?: Text; - - protected _runtimeMetadata?: Metadata; - - protected _runtimeVersion?: RuntimeVersion; - - protected _rx: ApiInterfaceRx = { - call: {} as QueryableCalls<'rxjs'>, - consts: {} as QueryableConsts<'rxjs'>, - query: {} as QueryableStorage<'rxjs'>, - tx: {} as SubmittableExtrinsics<'rxjs'> - } as ApiInterfaceRx; - - protected _type: ApiTypes; - /** * This is the one and only method concrete children classes need to implement. * It's a higher-order function, which takes one argument diff --git a/packages/api/src/base/Init.ts b/packages/api/src/base/Init.ts index 533de7b521..fe2dd90385 100644 --- a/packages/api/src/base/Init.ts +++ b/packages/api/src/base/Init.ts @@ -31,13 +31,9 @@ function textToString (t: Text): string { export abstract class Init extends Decorate { #atLast: [string, ApiDecoration] | null = null; - #healthTimer: ReturnType | null = null; - #registries: VersionedRegistry[] = []; - #updateSub?: Subscription | null = null; - #waitingRegistries: Record>> = {}; constructor (options: ApiOptions, type: ApiTypes, decorateMethod: DecorateMethod) { diff --git a/packages/api/src/promise/Combinator.ts b/packages/api/src/promise/Combinator.ts index db9e62405c..aafbeee1dd 100644 --- a/packages/api/src/promise/Combinator.ts +++ b/packages/api/src/promise/Combinator.ts @@ -14,17 +14,11 @@ export interface CombinatorFunction { export class Combinator { #allHasFired = false; - #callback: CombinatorCallback; - #fired: boolean[] = []; - #fns: CombinatorFunction[] = []; - #isActive = true; - #results: unknown[] = []; - #subscriptions: UnsubscribePromise[] = []; constructor (fns: (CombinatorFunction | [CombinatorFunction, ...unknown[]])[], callback: CombinatorCallback) { diff --git a/packages/api/src/test/SingleAccountSigner.ts b/packages/api/src/test/SingleAccountSigner.ts index be9de3609a..b1fc3c20ac 100644 --- a/packages/api/src/test/SingleAccountSigner.ts +++ b/packages/api/src/test/SingleAccountSigner.ts @@ -11,9 +11,7 @@ let id = 0; export class SingleAccountSigner implements Signer { readonly #keyringPair: KeyringPair; - readonly #registry: Registry; - readonly #signDelay: number; constructor (registry: Registry, keyringPair: KeyringPair, signDelay = 0) { diff --git a/packages/rpc-core/src/bundle.ts b/packages/rpc-core/src/bundle.ts index 95f02c667f..cf97d56fe5 100644 --- a/packages/rpc-core/src/bundle.ts +++ b/packages/rpc-core/src/bundle.ts @@ -85,7 +85,6 @@ function isTreatAsHex (key: StorageKey): boolean { */ export class RpcCore { #instanceId: string; - #registryDefault: Registry; #getBlockRegistry?: (blockHash: Uint8Array) => Promise<{ registry: Registry }>; @@ -94,9 +93,7 @@ export class RpcCore { readonly #storageCache = new Map(); public readonly mapping = new Map(); - public readonly provider: ProviderInterface; - public readonly sections: string[] = []; /** diff --git a/packages/rpc-provider/src/http/index.ts b/packages/rpc-provider/src/http/index.ts index 9cb40fd1fb..608837ea0b 100644 --- a/packages/rpc-provider/src/http/index.ts +++ b/packages/rpc-provider/src/http/index.ts @@ -36,13 +36,9 @@ const l = logger('api-http'); */ export class HttpProvider implements ProviderInterface { readonly #callCache = new LRUCache(); - readonly #coder: RpcCoder; - readonly #endpoint: string; - readonly #headers: Record; - readonly #stats: ProviderStats; /** diff --git a/packages/rpc-provider/src/substrate-connect/index.ts b/packages/rpc-provider/src/substrate-connect/index.ts index 148c2b502f..2b2b65046e 100644 --- a/packages/rpc-provider/src/substrate-connect/index.ts +++ b/packages/rpc-provider/src/substrate-connect/index.ts @@ -60,6 +60,7 @@ export class ScProvider implements ProviderInterface { readonly #requests: Map = new Map(); readonly #wellKnownChains: Set; readonly #eventemitter: EventEmitter = new EventEmitter(); + #chain: Promise | null = null; #isChainReady = false; diff --git a/packages/rpc-provider/src/ws/index.ts b/packages/rpc-provider/src/ws/index.ts index 84738761df..dd83ef335d 100644 --- a/packages/rpc-provider/src/ws/index.ts +++ b/packages/rpc-provider/src/ws/index.ts @@ -81,35 +81,21 @@ function eraseRecord (record: Record, cb?: (item: T) => void): voi */ export class WsProvider implements ProviderInterface { readonly #callCache = new LRUCache(); - readonly #coder: RpcCoder; - readonly #endpoints: string[]; - readonly #headers: Record; - readonly #eventemitter: EventEmitter; - readonly #handlers: Record = {}; - readonly #isReadyPromise: Promise; - readonly #stats: ProviderStats; - readonly #waitingForId: Record = {}; #autoConnectMs: number; - #endpointIndex: number; - #isConnected = false; - #subscriptions: Record = {}; - #timeoutId?: ReturnType | null = null; - #websocket: WebSocket | null; - #timeout: number; /** diff --git a/packages/types-codec/src/native/Set.ts b/packages/types-codec/src/native/Set.ts index b44d54e92c..a84234db05 100644 --- a/packages/types-codec/src/native/Set.ts +++ b/packages/types-codec/src/native/Set.ts @@ -104,7 +104,6 @@ export class CodecSet extends Set implements ISet { public $isStorageFallback?: boolean; readonly #allowed: SetValues; - readonly #byteLength: number; constructor (registry: Registry, setValues: SetValues, value?: string[] | Set | Uint8Array | BN | number | string, bitLength = 8) { diff --git a/packages/types/src/generic/Event.ts b/packages/types/src/generic/Event.ts index b19074fd2c..2282150ef2 100644 --- a/packages/types/src/generic/Event.ts +++ b/packages/types/src/generic/Event.ts @@ -42,13 +42,9 @@ function decodeEvent (registry: Registry, value?: Uint8Array): Decoded { */ export class GenericEventData extends Tuple implements IEventData { readonly #meta: EventMetadataLatest; - readonly #method: string; - readonly #names: string[] | null = null; - readonly #section: string; - readonly #typeDef: TypeDef[]; constructor (registry: Registry, value: Uint8Array, meta: EventMetadataLatest, section = '', method = '') { diff --git a/packages/types/src/generic/Vote.ts b/packages/types/src/generic/Vote.ts index 47d64a6f3b..21a8abf984 100644 --- a/packages/types/src/generic/Vote.ts +++ b/packages/types/src/generic/Vote.ts @@ -69,7 +69,6 @@ function decodeVote (registry: Registry, value?: InputTypes): Uint8Array { */ export class GenericVote extends U8aFixed { #aye: boolean; - #conviction: Conviction; constructor (registry: Registry, value?: InputTypes) { diff --git a/packages/types/src/primitive/StorageKey.ts b/packages/types/src/primitive/StorageKey.ts index 4550759e82..ce507df8b6 100644 --- a/packages/types/src/primitive/StorageKey.ts +++ b/packages/types/src/primitive/StorageKey.ts @@ -172,13 +172,9 @@ export class StorageKey extends Bytes implements // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore This is assigned via this.decodeArgsFromMeta() #args: A; - #meta?: StorageEntryMetadataLatest; - #outputType: string; - #method?: string; - #section?: string; constructor (registry: Registry, value?: string | Uint8Array | StorageKey | StorageEntry | [StorageEntry, unknown[]?], override: Partial = {}) {