Test a new api

packages/light.js/example/src/index.js

@@ -3,15 +3,33 @@
 //
 // SPDX-License-Identifier: MIT
 
+import Api from '@parity/api';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import 'symbol-observable'; // TODO Remove this once https://github.com/acdlite/recompose/pull/660 is merged
 
-import App from './App';
+// import App from './App';
 import light, { balanceOf$, frequency } from './light.js';
-import provider from './provider';
+import provider, { localProvider } from './provider';
+
+const api = new Api(localProvider);
 
 light.setProvider(provider);
-balanceOf$.setFrequency([frequency.onEvery2Seconds$]);
+const a = balanceOf$('0x73e41c8efb30c2d18a21df05dacb8ed91d3e0bbe');
+const b = balanceOf$('0x73e41c8efb30c2d18a21df05dacb8ed91d3e0bbe');
+const c = balanceOf$(
+  '0x73e41c8efb30c2d18a21df05dacb8ed91d3e0bbe',
+  localProvider
+);
+const d = balanceOf$(
+  '0x73e41c8efb30c2d18a21df05dacb8ed91d3e0bbe',
+  localProvider
+);
+
+// a.subscribe(console.log);
+c.subscribe(console.log);
+d.subscribe(console.log);
+
+console.log('a === b', a === b, 'a === c', a === c, 'c === d', c === d);
 
-ReactDOM.render(<App />, document.getElementById('root'));
+// ReactDOM.render(<App />, document.getElementById('root'));

packages/light.js/example/src/provider.js

@@ -5,10 +5,9 @@
 
 import Api from '@parity/api';
 
-const provider =
-  // new Api.Provider.Ws('ws://127.0.0.1:8546', 'VrS2FTt3oWz5CJbe') // Force to use local secure Api
-  window.web3
-    ? window.web3.currentProvider
-    : new Api.Provider.Ws('ws://127.0.0.1:8546'); // Can add PARITY_TOKEN as 2nd argument to access secure API, e.g. switch default account
+export const currentProvider = window.web3 && window.web3.currentProvider;
+export const localProvider = new Api.Provider.Ws('ws://127.0.0.1:8546');
+
+const provider = currentProvider || localProvider;
 
 export default provider;

packages/light.js/src/index.ts

@@ -5,12 +5,14 @@
 
 import { setApi, setProvider } from './api';
 import * as frequency from './frequency';
+import { memoizeAll } from './rpc/utils/addMemoize';
+import * as rpc from './rpc';
 import './overview';
 
-export * from './rpc';
 export * from './utils/isLoading';
 export * from './types';
 export { withoutLoading } from './utils/operators/withoutLoading';
 
 export { frequency };
+export const { balanceOf$ } = memoizeAll(rpc);
 export default { setApi, setProvider };

packages/light.js/src/rpc/eth/eth.ts

@@ -19,79 +19,89 @@ import {
 } from '../../frequency';
 import { switchMapPromise } from '../../utils/operators';
 
-/**
- * Observable which contains the array of all addresses managed by the light
- * client.
- *
- * Calls eth_accounts.
- *
- * @return - An Observable containing the list of public addresses.
- */
-export const accounts$ = createRpc$<Address[], Address[]>({
-  frequency: [onAccountsChanged$],
-  name: 'accounts$'
-});
+// /**
+//  * Observable which contains the array of all addresses managed by the light
+//  * client.
+//  *
+//  * Calls eth_accounts.
+//  *
+//  * @return - An Observable containing the list of public addresses.
+//  */
+// export const accounts$ = (api?: any) =>
+//   createRpc$<Address[], Address[]>(
+//     {
+//       frequency: [onAccountsChanged$],
+//       name: 'accounts$'
+//     },
+//     api
+//   );
 
 /**
  * Get the balance of a given account. Calls `eth_getBalance`.
  *
  * @param address - The account address to query the balance.
  * @return - An Observable containing the balance.
  */
-export const balanceOf$ = createRpc$<any, BigNumber>({
-  calls: ['eth_getBalance'],
-  frequency: [onEveryBlock$, onStartup$],
-  name: 'balanceOf$',
-  pipes: (address: Address) => [
-    switchMapPromise(() => api().eth.getBalance(address))
-  ]
-});
+export const balanceOf$ = (address: Address, provider?: any) =>
+  createRpc$<any, BigNumber>(
+    {
+      calls: ['eth_getBalance'],
+      frequency: [onEveryBlock$, onStartup$],
+      name: 'balanceOf$',
+      pipes: api => [switchMapPromise(() => api.eth.getBalance(address))]
+    },
+    provider
+  )(address);
 
-/**
- * Get the default account managed by the light client.
- *
- * @return - An Observable containing the public address
- * of the default account.
- */
-export const defaultAccount$ = createRpc$<Address[], Address>({
-  dependsOn: accounts$,
-  name: 'defaultAccount$',
-  pipes: () => [map(accounts => accounts[0])]
-});
+// /**
+//  * Get the default account managed by the light client.
+//  *
+//  * @return - An Observable containing the public address
+//  * of the default account.
+//  */
+// export const defaultAccount$ = (api?: any) =>
+//   createRpc$<Address[], Address>(
+//     {
+//       dependsOn: accounts$,
+//       name: 'defaultAccount$',
+//       pipes: [map(accounts => accounts[0])]
+//     },
+//     any
+//   );
 
-/**
- * Get the current block number.
- *
- * @return {Observable<Number>} - An Observable containing the block height.
- */
-export const blockNumber$ = createRpc$<BigNumber, BigNumber>({
-  frequency: [onEveryBlock$],
-  name: 'blockNumber$'
-});
+// /**
+//  * Get the current block number.
+//  *
+//  * @return {Observable<Number>} - An Observable containing the block height.
+//  */
+// export const blockNumber$ = createRpc$<BigNumber, BigNumber>({
+//   frequency: [onEveryBlock$],
+//   name: 'blockNumber$'
+// });
 
-/**
- * Shorthand for fetching the current account's balance.
- */
-export const myBalance$ = createRpc$<Address, BigNumber>({
-  calls: [`eth_getBalance`],
-  dependsOn: defaultAccount$,
-  name: 'myBalance$',
-  pipes: () => [
-    switchMap(
-      defaultAccount =>
-        isNullOrLoading(defaultAccount)
-          ? of(RPC_LOADING)
-          : balanceOf$(defaultAccount)
-    )
-  ]
-});
+// /**
+//  * Shorthand for fetching the current account's balance.
+//  */
+// export const myBalance$ = createRpc$<Address, BigNumber>({
+//   calls: [`eth_getBalance`],
+//   dependsOn: defaultAccount$,
+//   name: 'myBalance$',
+//   pipes: () => [
+//     switchMap(
+//       defaultAccount =>
+//         isNullOrLoading(defaultAccount)
+//           ? of(RPC_LOADING)
+//           : balanceOf$(defaultAccount)
+//     )
+//   ]
+// });
 
-/**
- * Get the syncStatus state.
- *
- * @return - An Observable containing the syncing state object, or false.
- */
-export const syncStatus$ = createRpc$<object | boolean, object | boolean>({
-  frequency: [onSyncingChanged$],
-  name: 'syncStatus$'
-});
+// /**
+//  * Get the syncStatus state.
+//  *
+//  * @return - An Observable containing the syncing state object, or false.
+//  */
+// export const syncStatus$ = createRpc$<object | boolean, object | boolean>({
+//   frequency: [onSyncingChanged$],
+//   name: 'syncStatus$'
+// });

packages/light.js/src/rpc/index.ts

@@ -4,6 +4,6 @@
 // SPDX-License-Identifier: MIT
 
 export * from './eth';
-export * from './net';
-export * from './other';
-export * from './parity';
+// export * from './net';
+// export * from './other';
+// export * from './parity';

packages/light.js/src/rpc/utils/addMemoize.ts

@@ -0,0 +1,23 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import * as memoizee from 'memoizee';
+
+import { RpcKey, RpcMap } from '../../types';
+
+/**
+ * Given an {@link RpcMap} of {@link RpcObservables}, memoize all the RpcObservables.
+ *
+ * @ignore
+ * @param rpcMap - The input RpcMap to memoize.
+ */
+export const memoizeAll = (rpcMap: RpcMap) =>
+  Object.keys(rpcMap).reduce(
+    (result, key) => {
+      (result as RpcMap)[key as RpcKey] = memoizee(rpcMap[key as RpcKey]);
+      return result;
+    },
+    {} as RpcMap
+  );

packages/light.js/src/rpc/utils/createRpc.ts

@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-import * as memoizee from 'memoizee';
+import * as Api from '@parity/api';
 import { isFunction, isObject } from '@parity/api/lib/util/types';
 import { merge, ReplaySubject, Observable, OperatorFunction } from 'rxjs';
 import { multicast, refCount } from 'rxjs/operators';
@@ -50,7 +50,11 @@ const frequencyMixins = {
  * @param metadata - The metadata to add.
  * @return - The original RpcObservable with patched metadata.
  */
-const createRpc = <Source, Out>(metadata: Metadata<Source, Out>) => {
+const createRpc = <Source, Out>(
+  metadata: Metadata<Source, Out>,
+  provider: any
+) => {
+  const api = provider ? new Api(provider) : getApi();
   // rpc$ will hold the RpcObservable minus its metadata
   const rpc$: RpcObservableWithoutMetadata<Source, Out> = (...args: any[]) => {
     // The source Observable can either be another RpcObservable (in the
@@ -73,7 +77,7 @@ const createRpc = <Source, Out>(metadata: Metadata<Source, Out>) => {
     // The pipes to add
     const pipes: OperatorFunction<any, any>[] = [];
     if (metadata.pipes && isFunction(metadata.pipes)) {
-      pipes.push(...metadata.pipes(...args));
+      pipes.push(...metadata.pipes(api));
     }
     pipes.push(multicast(() => subject$), refCount());
     if (options.withoutLoading === true) {
@@ -92,17 +96,9 @@ const createRpc = <Source, Out>(metadata: Metadata<Source, Out>) => {
     return source$.pipe(...pipes);
   };
 
-  // We memoize only if the api has been already set by the user. The reason
-  // is: at startup the NullProvider is used. If we memoized, then this
-  // provider will be used all the time
-  const memoizedRpc$ =
-    getApi() instanceof NullProvider
-      ? rpc$
-      : memoizee(rpc$, { primitive: true, length: false });
+  Object.assign(rpc$, frequencyMixins, { metadata });
 
-  Object.assign(memoizedRpc$, frequencyMixins, { metadata });
-
-  return memoizedRpc$ as RpcObservable<Source, Out>;
+  return rpc$ as RpcObservable<Source, Out>;
 };
 
 export default createRpc;

packages/light.js/src/types.ts

@@ -6,6 +6,9 @@
 import BigNumber from 'bignumber.js';
 import { Observable, OperatorFunction, ReplaySubject } from 'rxjs';
 
+import * as frequency from './frequency';
+import * as rpc from './rpc';
+
 declare global {
   interface Window {
     parity: any;
@@ -34,17 +37,42 @@ export interface Metadata<Source, Out> {
   pipes?: (...args: any[]) => OperatorFunction<Source, Out>[];
 }
 
-export interface FrequencyObservable<T> {
-  (): Observable<T>;
-  metadata?: { calls?: string[]; name: string };
+export type FrequencyKey = keyof typeof frequency;
+
+export interface FrequencyObservableMetadata {
+  calls?: string[];
+  name: string;
 }
 
+export interface FrequencyObservable<T> extends Observable<T> {
+  metadata?: FrequencyObservableMetadata;
+}
+
+export type FrequencyMap = {
+  [index in FrequencyKey]: FrequencyObservable<any>
+};
+
+export interface MakeContract {
+  abi: any; // use types from @parity/abi
+  address: string;
+  readonly contractObject: any; // TODO from @parity/api
+  [index: string]: any | string | ((...args: any[]) => any); // use types from @parity/abi
+}
+
+export type RpcKey = keyof typeof rpc;
+
 export interface RpcObservable<Source, Out> {
   (...args: any[]): Observable<Out>;
   metadata?: Metadata<Source, Out>;
   setFrequency?(frequency: FrequencyObservable<Source>[]): void; // post$, makeContract... don't have setFrequency
 }
 
+export type RpcMap = { [index in RpcKey]: RpcObservable<any, any> };
+
+export interface RpcObservableOptions {
+  withoutLoading?: boolean;
+}
+
 // TODO This should be on @parity/api
 export type Tx = {
   from: Address;