Initial branch with api-types replaced in types

jest/initApiRx.js

@@ -1,7 +1,7 @@
 import {WsProvider} from '@polkadot/api';
 import config from '../config';
 import {ApiRx} from '../packages/api/src/ApiRx';
-import { TypeRegistry } from '@cennznet/types';
+import { TypeRegistry } from '@polkadot/types';
 
 const initApiRx = async () => {
   const providerUrl = config.wsProvider[`${process.env.TEST_TYPE}`] || 'ws://localhost:9944';

package.json

@@ -54,7 +54,7 @@
   },
   "resolutions": {
     "babel-core": "^7.0.0-bridge.0",
-    "typescript": "^3.7.2",
+    "typescript": "^4.0.2",
     "braces": "^2.3.2",
     "fstream": "^1.0.12",
     "handlebars": "^4.5.3",

packages/api/package.json

@@ -20,11 +20,11 @@
   },
   "dependencies": {
     "@cennznet/types": "^1.2.1",
-    "@polkadot/api": "^1.1.1",
-    "@polkadot/metadata": "1.1.1",
-    "@polkadot/rpc-core": "^1.1.1",
-    "@polkadot/rpc-provider": "^1.1.1",
-    "@polkadot/types": "^1.1.1",
+    "@polkadot/api": "2.1.2-2",
+    "@polkadot/metadata": "2.1.2-2",
+    "@polkadot/rpc-core": "2.1.2-2",
+    "@polkadot/rpc-provider": "2.1.2-2",
+    "@polkadot/types": "2.1.2-2",
     "eventemitter3": "^4.0.0"
   },
   "resolution": {

packages/api/src/Api.ts

@@ -12,14 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Types from '@cennznet/types/injects';
+// import Types from '@cennznet/types/injects';
+import Types from '@cennznet/types/interfaces/injects';
 import { ApiPromise } from '@polkadot/api';
-import { ApiOptions as ApiOptionsBase } from '@polkadot/api/types';
+import { ApiOptions as ApiOptionsBase, ApiTypes, SubmittableExtrinsics } from '@polkadot/api/types';
 
-import derives from './derives';
-import rpc from './rpc';
+// import derives from './derives';
+// import rpc from './rpc';
 import staticMetadata from './staticMetadata';
-import { ApiOptions, Derives, SubmittableExtrinsics } from './types';
+// import { ApiOptions, Derives, SubmittableExtrinsics } from './types';
+import { ApiOptions } from './types';
 import { mergeDeriveOptions } from './util/derives';
 import { getProvider } from './util/getProvider';
 import { getTimeout } from './util/getTimeout';
@@ -40,11 +42,11 @@ export class Api extends ApiPromise {
 
         api.isReady.then(res => {
           //  Remove error listener if API initialization success.
-          (api as any)._eventemitter.removeListener('error', rejectError);
+          //   (api as any).emitter.removeListener('error', rejectError);
           resolve((res as unknown) as Api);
         }, reject);
 
-        api.once('error', rejectError);
+        // api.once('error', rejectError);
       }),
       getTimeout(options)
     );
@@ -54,9 +56,9 @@ export class Api extends ApiPromise {
     return super.tx as SubmittableExtrinsics<'promise'>;
   }
 
-  get derive(): Derives<'promise'> {
-    return super.derive as Derives<'promise'>;
-  }
+  // get derive(): Derives<'promise'> {
+  //   return super.derive as Derives<'promise'>;
+  // }
 
   constructor(_options: ApiOptions = {}) {
     const options = { ..._options };
@@ -66,8 +68,8 @@ export class Api extends ApiPromise {
     }
     options.metadata = Object.assign(staticMetadata, options.metadata);
     options.types = { ...options.types, ...Types };
-    options.derives = mergeDeriveOptions(derives, options.derives);
-    options.rpc = { ...(rpc as any), ...options.rpc };
+    // options.derives = mergeDeriveOptions(derives, options.derives);
+    //  options.rpc = { ...(rpc as any), ...options.rpc };
 
     super(options as ApiOptionsBase);
   }

packages/api/src/ApiRx.ts

@@ -13,17 +13,19 @@
 // limitations under the License.
 
 import { mergeDeriveOptions } from '@cennznet/api/util/derives';
-import Types from '@cennznet/types/injects';
+// import Types from '@cennznet/types/injects';
+import Types from '@cennznet/types/interfaces/injects';
 import { ApiRx as ApiRxBase } from '@polkadot/api';
-import { ApiOptions as ApiOptionsBase } from '@polkadot/api/types';
+import { ApiOptions as ApiOptionsBase, SubmittableExtrinsics } from '@polkadot/api/types';
 import { fromEvent, Observable, race, throwError } from 'rxjs';
 import { switchMap, timeout } from 'rxjs/operators';
 
-import rpc from '@cennznet/api/rpc';
+// import rpc from '@cennznet/api/rpc';
 import { DEFAULT_TIMEOUT } from './Api';
-import derives from './derives';
+// import derives from './derives';
 import staticMetadata from './staticMetadata';
-import { ApiOptions, Derives, SubmittableExtrinsics } from './types';
+// import { ApiOptions, Derives, SubmittableExtrinsics } from './types';
+import { ApiOptions } from './types';
 import { getProvider } from './util/getProvider';
 import { getTimeout } from './util/getTimeout';
 
@@ -53,9 +55,9 @@ export class ApiRx extends ApiRxBase {
     return super.tx as SubmittableExtrinsics<'rxjs'>;
   }
 
-  get derive(): Derives<'rxjs'> {
-    return super.derive as Derives<'rxjs'>;
-  }
+  // get derive(): Derives<'rxjs'> {
+  //   return super.derive as Derives<'rxjs'>;
+  // }
 
   constructor(_options: ApiOptions = {}) {
     const options = { ..._options };
@@ -64,8 +66,8 @@ export class ApiRx extends ApiRxBase {
     }
     options.metadata = Object.assign(staticMetadata, options.metadata);
     options.types = { ...options.types, ...Types };
-    options.derives = mergeDeriveOptions(derives as any, options.derives);
-    options.rpc = { ...(rpc as any), ...options.rpc };
+    // options.derives = mergeDeriveOptions(derives as any, options.derives);
+    //  options.rpc = { ...(rpc as any), ...options.rpc };
 
     super(options as ApiOptionsBase);
   }