Flatten types,m codecs & builders (#152)

README.md

@@ -30,15 +30,12 @@ Type definitions for interfaces as exposed by Polkadot & Substrate clients -
 - [@polkadot/extrinsics](packages/type-extrinsics/) Base extrinsic definitions
 - [@polkadot/jsonrpc](packages/type-jsonrpc/) Definitions for JSONRPC endpoints
 - [@polkadot/params](packages/type-params/) Input/output parameter formatting
-- [@polkadot/primitives](packages/type-primitives/) Primitive type definitions
+- [@polkadot/primitives](packages/type-primitives/) Primitive type definitions, builder & codecs
 - [@polkadot/storage](packages/type-storage/) Definitions for storage entries
 
 Codecs for types (possibly to be combined with types) -
 
 - [@polkadot/extrinsics-codec](packages/code-extrinsics/) Encoders for extrinsics
-- [@polkadot/primitives-codec](packages/code-primitives/) Primitive encoding/decoding
-- [@polkadot/primitives-builder](packages/code-primitives-builder/) Primitive creator
-- [@polkadot/primitives-json](packages/code-primitives-json/) Primitive json encoding/decoding
 
 ## Contributing
 

jest.config.js

@@ -2,10 +2,6 @@ const config = require('@polkadot/dev/config/jest');
 
 module.exports = Object.assign({}, config, {
   moduleNameMapper: {
-    '@polkadot/extrinsics-codec(.*)$': '<rootDir>/packages/code-extrinsics/src/$1',
-    '@polkadot/primitives-codec(.*)$': '<rootDir>/packages/code-primitives/src/$1',
-    '@polkadot/primitives-(builder|json)(.*)$': '<rootDir>/packages/code-primitives-$1/src/$2',
-
     '@polkadot/extrinsics(.*)$': '<rootDir>/packages/type-extrinsics/src/$1',
     '@polkadot/jsonrpc(.*)$': '<rootDir>/packages/type-jsonrpc/src/$1',
     '@polkadot/params(.*)$': '<rootDir>/packages/type-params/src/$1',

lerna.json

@@ -10,5 +10,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.25.3"
+  "version": "0.26.0"
 }

packages/code-extrinsics/LICENSE

@@ -1,15 +0,0 @@
-ISC License (ISC)
-
-Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.

packages/code-extrinsics/README.md

@@ -1 +0,0 @@
-# @polkadot/extrinsics-codec

packages/code-extrinsics/package.json

@@ -1,25 +0,0 @@
-{
-  "name": "@polkadot/extrinsics-codec",
-  "version": "0.25.3",
-  "main": "index.js",
-  "repository": "https://github.com/polkadot-js/apps.git",
-  "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [
-    "Jaco Greeff <jacogr@gmail.com>"
-  ],
-  "contributors": [],
-  "license": "ISC",
-  "scripts": {
-    "build": "polkadot-dev-build-babel",
-    "check": "stylelint 'src/**/*.css' && eslint src && flow check",
-    "test": "jest --coverage"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.51",
-    "@polkadot/extrinsics": "^0.25.3",
-    "@polkadot/params": "^0.25.3",
-    "@polkadot/util": "^0.25.3",
-    "@polkadot/util-keyring": "^0.25.3",
-    "bn.js": "^4.11.8"
-  }
-}

packages/code-primitives-builder/LICENSE

@@ -1,15 +0,0 @@
-ISC License (ISC)
-
-Copyright 2017-2018 @polkadot/primitives-builder authors & contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.

packages/code-primitives-builder/README.md

@@ -1,13 +0,0 @@
-[![polkadotjs](https://img.shields.io/badge/polkadot-js-orange.svg?style=flat-square)](https://polkadot.js.org)
-![isc](https://img.shields.io/badge/license-ISC-lightgrey.svg?style=flat-square)
-[![style](https://img.shields.io/badge/code%20style-semistandard-lightgrey.svg?style=flat-square)](https://github.com/Flet/semistandard)
-[![npm](https://img.shields.io/npm/v/@polkadot/primitives-builder.svg?style=flat-square)](https://www.npmjs.com/package/@polkadot/primitives-builder)
-[![travis](https://img.shields.io/travis/polkadot-js/types.svg?style=flat-square)](https://travis-ci.org/polkadot-js/types)
-[![maintainability](https://img.shields.io/codeclimate/maintainability/polkadot-js/types.svg?style=flat-square)](https://codeclimate.com/github/polkadot-js/types/maintainability)
-[![coverage](https://img.shields.io/coveralls/polkadot-js/types.svg?style=flat-square)](https://coveralls.io/github/polkadot-js/types?branch=master)
-[![dependency](https://david-dm.org/polkadot-js/types.svg?style=flat-square&path=packages/primitives-builder)](https://david-dm.org/polkadot-js/types?path=packages/primitives-builder)
-[![devDependency](https://david-dm.org/polkadot-js/types/dev-status.svg?style=flat-square&path=packages/primitives-builder)](https://david-dm.org/polkadot-js/types?path=packages/primitives-builder#info=devDependencies)
-
-# @polkadot/primitives-builder
-
-Creating of primitive types.

packages/code-primitives-builder/package.json

@@ -1,47 +0,0 @@
-{
-  "name": "@polkadot/primitives-builder",
-  "version": "0.25.3",
-  "description": "Builder for primitives for Polkadot",
-  "main": "index.js",
-  "engines": {
-    "node": ">=6.4"
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/polkadot-js/types.git"
-  },
-  "keywords": [
-    "Polkadot"
-  ],
-  "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [
-    "Jaco Greeff <jacogr@gmail.com>"
-  ],
-  "contributors": [],
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/polkadot-js/types/issues"
-  },
-  "homepage": "https://github.com/polkadot-js/types/tree/master/packages/primitives-builder#readme",
-  "scripts": {
-    "build": "polkadot-dev-build-babel",
-    "check": "eslint src && flow check",
-    "test": "echo \"Tests only available from root wrapper\""
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.51",
-    "@polkadot/extrinsics-codec": "^0.25.3",
-    "@polkadot/primitives": "^0.25.3",
-    "@polkadot/primitives-codec": "^0.25.3",
-    "@polkadot/trie-hash": "^0.25.3",
-    "@polkadot/util": "^0.25.3",
-    "@polkadot/util-crypto": "^0.25.3"
-  },
-  "devDependencies": {
-    "@polkadot/util-keyring": "^0.25.3"
-  }
-}

packages/code-primitives-json/LICENSE

@@ -1,15 +0,0 @@
-ISC License (ISC)
-
-Copyright 2017-2018 @polkadot/primitives-json authors & contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.

packages/code-primitives-json/README.md

@@ -1,33 +0,0 @@
-[![polkadotjs](https://img.shields.io/badge/polkadot-js-orange.svg?style=flat-square)](https://polkadot.js.org)
-![isc](https://img.shields.io/badge/license-ISC-lightgrey.svg?style=flat-square)
-[![style](https://img.shields.io/badge/code%20style-semistandard-lightgrey.svg?style=flat-square)](https://github.com/Flet/semistandard)
-[![npm](https://img.shields.io/npm/v/@polkadot/primitives-json.svg?style=flat-square)](https://www.npmjs.com/package/@polkadot/primitives-json)
-[![travis](https://img.shields.io/travis/polkadot-js/types.svg?style=flat-square)](https://travis-ci.org/polkadot-js/types)
-[![maintainability](https://img.shields.io/codeclimate/maintainability/polkadot-js/types.svg?style=flat-square)](https://codeclimate.com/github/polkadot-js/types/maintainability)
-[![coverage](https://img.shields.io/coveralls/polkadot-js/types.svg?style=flat-square)](https://coveralls.io/github/polkadot-js/types?branch=master)
-[![dependency](https://david-dm.org/polkadot-js/types.svg?style=flat-square&path=packages/primitives-json)](https://david-dm.org/polkadot-js/types?path=packages/primitives-json)
-[![devDependency](https://david-dm.org/polkadot-js/types/dev-status.svg?style=flat-square&path=packages/primitives-json)](https://david-dm.org/polkadot-js/types?path=packages/primitives-json#info=devDependencies)
-
-# @polkadot/primitives-json
-
-Conversion of Polkadot types to and from a structure with Json-only primitives, ready for serialisation. As such, it does not stringify itself, rather converts from complex classes to the correct Json reprsentation.
-
-## Usage
-
-Installation -
-
-```
-npm install --save @polkadot/primitives-json
-```
-
-Usage -
-
-```js
-const { parachainIdDecode, parachainIdEncode } from '@polkadot/primitives-json');
-
-parachainIdDecode(     // step 3 - BN `0x123456`
-  parachainIdEncode(   // step 1 -  string `'0x123456'`
-    new BN('0x123456') // step 0 - BN `0x123456`
-  )
-);
-```

packages/code-primitives-json/package.json

@@ -1,41 +0,0 @@
-{
-  "name": "@polkadot/primitives-json",
-  "version": "0.25.3",
-  "description": "Conversion utilities for primitives for JSON representation",
-  "main": "index.js",
-  "engines": {
-    "node": ">=6.4"
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/polkadot-js/types.git"
-  },
-  "keywords": [
-    "Polkadot"
-  ],
-  "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [
-    "Jaco Greeff <jacogr@gmail.com>"
-  ],
-  "contributors": [],
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/polkadot-js/types/issues"
-  },
-  "homepage": "https://github.com/polkadot-js/types/tree/master/packages/primitives-json#readme",
-  "scripts": {
-    "build": "polkadot-dev-build-babel",
-    "check": "eslint src && flow check",
-    "test": "echo \"Tests only available from root wrapper\""
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.51",
-    "@polkadot/primitives": "^0.25.3",
-    "@polkadot/primitives-builder": "^0.25.3",
-    "@polkadot/util": "^0.25.3"
-  }
-}

packages/code-primitives/LICENSE

@@ -1,15 +0,0 @@
-ISC License (ISC)
-
-Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.

packages/code-primitives/README.md

@@ -1,13 +0,0 @@
-[![polkadotjs](https://img.shields.io/badge/polkadot-js-orange.svg?style=flat-square)](https://polkadot.js.org)
-![isc](https://img.shields.io/badge/license-ISC-lightgrey.svg?style=flat-square)
-[![style](https://img.shields.io/badge/code%20style-semistandard-lightgrey.svg?style=flat-square)](https://github.com/Flet/semistandard)
-[![npm](https://img.shields.io/npm/v/@polkadot/primitives-codec.svg?style=flat-square)](https://www.npmjs.com/package/@polkadot/primitives-codec)
-[![travis](https://img.shields.io/travis/polkadot-js/types.svg?style=flat-square)](https://travis-ci.org/polkadot-js/types)
-[![maintainability](https://img.shields.io/codeclimate/maintainability/polkadot-js/types.svg?style=flat-square)](https://codeclimate.com/github/polkadot-js/types/maintainability)
-[![coverage](https://img.shields.io/coveralls/polkadot-js/types.svg?style=flat-square)](https://coveralls.io/github/polkadot-js/types?branch=master)
-[![dependency](https://david-dm.org/polkadot-js/types.svg?style=flat-square&path=packages/primitives-codec)](https://david-dm.org/polkadot-js/types?path=packages/primitives-codec)
-[![devDependency](https://david-dm.org/polkadot-js/types/dev-status.svg?style=flat-square&path=packages/primitives-codec)](https://david-dm.org/polkadot-js/types?path=packages/primitives-codec#info=devDependencies)
-
-# @polkadot/primitives-codec
-
-Conversion of Polkadot types into `Uint8Array` values ready for inputs into the runtime.

packages/code-primitives/package.json

@@ -1,43 +0,0 @@
-{
-  "name": "@polkadot/primitives-codec",
-  "version": "0.25.3",
-  "description": "Encoding for primitives as runtime execution inputs",
-  "main": "index.js",
-  "engines": {
-    "node": ">=6.4"
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/polkadot-js/types.git"
-  },
-  "keywords": [
-    "Polkadot"
-  ],
-  "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [
-    "Jaco Greeff <jacogr@gmail.com>"
-  ],
-  "contributors": [],
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/polkadot-js/types/issues"
-  },
-  "homepage": "https://github.com/polkadot-js/types/tree/master/packages/primitives-codec#readme",
-  "scripts": {
-    "build": "polkadot-dev-build-babel",
-    "check": "eslint src && flow check",
-    "test": "echo \"Tests only available from root wrapper\""
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.51",
-    "@polkadot/primitives": "^0.25.3",
-    "@polkadot/primitives-builder": "^0.25.3",
-    "@polkadot/util": "^0.25.3",
-    "@polkadot/util-crypto": "^0.25.3",
-    "@polkadot/util-keyring": "^0.25.3"
-  }
-}

packages/trie-db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/trie-db",
-  "version": "0.25.3",
+  "version": "0.26.0",
   "description": "This is an implementation of the modified merkle patricia tree as speficed in Ethereum's yellow paper, adpated for Polkadot.",
   "main": "index.js",
   "scripts": {},
@@ -27,10 +27,10 @@
   "license": "MPL-2.0",
   "dependencies": {
     "@babel/runtime": "^7.0.0-beta.51",
-    "@polkadot/trie-hash": "^0.25.3",
-    "@polkadot/util": "^0.25.3",
-    "@polkadot/util-crypto": "^0.25.3",
-    "@polkadot/util-rlp": "^0.25.3",
+    "@polkadot/trie-hash": "^0.26.0",
+    "@polkadot/util": "^0.26.0",
+    "@polkadot/util-crypto": "^0.26.0",
+    "@polkadot/util-rlp": "^0.26.0",
     "@types/async": "^2.0.49",
     "@types/semaphore": "^1.1.0",
     "async": "^1.4.2",

packages/trie-hash/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/trie-hash",
-  "version": "0.25.3",
+  "version": "0.26.0",
   "description": "Creation of triehash values",
   "main": "index.js",
   "keywords": [
@@ -34,8 +34,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0-beta.51",
-    "@polkadot/util": "^0.25.3",
-    "@polkadot/util-crypto": "^0.25.3",
-    "@polkadot/util-rlp": "^0.25.3"
+    "@polkadot/util": "^0.26.0",
+    "@polkadot/util-crypto": "^0.26.0",
+    "@polkadot/util-rlp": "^0.26.0"
   }
 }

packages/type-extrinsics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/extrinsics",
-  "version": "0.25.3",
+  "version": "0.26.0",
   "main": "index.js",
   "repository": "https://github.com/polkadot-js/apps.git",
   "author": "Jaco Greeff <jacogr@gmail.com>",
@@ -16,8 +16,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0-beta.51",
-    "@polkadot/params": "^0.25.3",
-    "@polkadot/primitives": "^0.25.3",
-    "@polkadot/util": "^0.25.3"
+    "@polkadot/params": "^0.26.0",
+    "@polkadot/primitives": "^0.26.0",
+    "@polkadot/util": "^0.26.0"
   }
 }

packages/type-extrinsics/src/codec/decode/length.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
+// Copyright 2017-2018 @polkadot/extrinsics authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-extrinsics/src/codec/encode/call.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
+// Copyright 2017-2018 @polkadot/extrinsics authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 // @flow

packages/type-extrinsics/src/codec/encode/call.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
+// Copyright 2017-2018 @polkadot/extrinsics authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-extrinsics/src/codec/encode/extrinsic.spec.js

@@ -1,9 +1,9 @@
-// Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
+// Copyright 2017-2018 @polkadot/extrinsics authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 // @flow
 
-import extrinsics from '@polkadot/extrinsics';
+import extrinsics from '../../index';
 
 import extrinsic from './extrinsic';
 

packages/type-extrinsics/src/codec/encode/extrinsic.ts

@@ -1,9 +1,9 @@
-// Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
+// Copyright 2017-2018 @polkadot/extrinsics authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Extrinsics } from '@polkadot/extrinsics/types';
 import { EncodingVersions, SectionItem } from '@polkadot/params/types';
+import { Extrinsics } from '../../types';
 import { ExtrinsicWithIndex } from '../types';
 
 import encodeParams from '@polkadot/params/encode';

packages/type-extrinsics/src/codec/encode/index.spec.js

@@ -1,11 +1,11 @@
-// Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
+// Copyright 2017-2018 @polkadot/extrinsics authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 // @flow
 
-import extrinsics from '@polkadot/extrinsics';
 import testingPairs from '@polkadot/util-keyring/testingPairs';
 
+import extrinsics from '../../index';
 import encode from './index';
 
 const keyring = testingPairs();

packages/type-extrinsics/src/codec/encode/index.ts

@@ -1,10 +1,10 @@
-// Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
+// Copyright 2017-2018 @polkadot/extrinsics authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
 import BN from 'bn.js';
-import { Extrinsics } from '@polkadot/extrinsics/types';
 import { EncodingVersions, SectionItem } from '@polkadot/params/types';
+import { Extrinsics } from '../../types';
 import { ExtrinsicWithAccount } from '../types';
 
 import encodeCall from './call';

packages/type-extrinsics/src/codec/encode/length.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
+// Copyright 2017-2018 @polkadot/extrinsics authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-extrinsics/src/codec/encode/prefixes.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
+// Copyright 2017-2018 @polkadot/extrinsics authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-extrinsics/src/codec/encode/unchecked.spec.js

@@ -1,9 +1,9 @@
-// Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
+// Copyright 2017-2018 @polkadot/extrinsics authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 // @flow
 
-import extrinsics from '@polkadot/extrinsics';
+import extrinsics from '../../index';
 import hexToU8a from '@polkadot/util/hex/toU8a';
 import testingPairs from '@polkadot/util-keyring/testingPairs';
 

packages/type-extrinsics/src/codec/encode/unchecked.ts

@@ -1,12 +1,12 @@
-// Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
+// Copyright 2017-2018 @polkadot/extrinsics authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
 import BN from 'bn.js';
-import { Extrinsics } from '@polkadot/extrinsics/types';
 import { EncodingVersions, SectionItem } from '@polkadot/params/types';
 import { UncheckedRaw } from '@polkadot/primitives/extrinsic';
 import { KeyringPair } from '@polkadot/util-keyring/types';
+import { Extrinsics } from '../../types';
 
 import u8aConcat from '@polkadot/util/u8a/concat';
 

packages/type-extrinsics/src/codec/types.d.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/extrinsics-codec authors & contributors
+// Copyright 2017-2018 @polkadot/extrinsics authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-jsonrpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/jsonrpc",
-  "version": "0.25.3",
+  "version": "0.26.0",
   "description": "Method definitions for the Polkadot RPC layer",
   "main": "index.js",
   "engines": {
@@ -34,7 +34,7 @@
     "test": "echo \"Tests only available from root wrapper\""
   },
   "dependencies": {
-    "@polkadot/params": "^0.25.3",
+    "@polkadot/params": "^0.26.0",
     "babel-runtime": "^6.26.0"
   }
 }

packages/type-params/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/params",
-  "version": "0.25.3",
+  "version": "0.26.0",
   "description": "Type defintions for parameters as passed in calls",
   "main": "index.js",
   "engines": {
@@ -34,9 +34,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0-beta.51",
-    "@polkadot/extrinsics": "^0.25.3",
-    "@polkadot/extrinsics-codec": "^0.25.3",
-    "@polkadot/primitives": "^0.25.3",
-    "@polkadot/util": "^0.25.3"
+    "@polkadot/extrinsics": "^0.26.0",
+    "@polkadot/primitives": "^0.26.0",
+    "@polkadot/util": "^0.26.0"
   }
 }

packages/type-params/src/decode/value/header.ts

@@ -4,7 +4,7 @@
 
 import { Param$Decoded } from '../../types';
 
-import decodeHeader from '@polkadot/primitives-codec/header/decode';
+import decodeHeader from '@polkadot/primitives/codec/header/decode';
 
 export default function header (input: Uint8Array): Param$Decoded {
   // FIXME We don't have a way to determine the length atm

packages/type-params/src/encode/type/index.ts

@@ -4,7 +4,7 @@
 
 import { EncodingVersions, Param$Type } from '../../types';
 
-import addrPrefixes from '@polkadot/extrinsics-codec/encode/prefixes';
+import addrPrefixes from '@polkadot/extrinsics/codec/encode/prefixes';
 import bnToU8a from '@polkadot/util/bn/toU8a';
 import u8aConcat from '@polkadot/util/u8a/concat';
 import u8aFromString from '@polkadot/util/u8a/fromString';

packages/type-primitives/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/primitives",
-  "version": "0.25.3",
+  "version": "0.26.0",
   "description": "Type defintions for the Polkadot network",
   "main": "index.js",
   "engines": {
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0-beta.51",
-    "@polkadot/util": "^0.25.3"
+    "@polkadot/util": "^0.26.0"
   },
   "devDependencies": {
     "bn.js": "^4.11.8"

packages/type-primitives/src/codec/block/decodeRaw.spec.js

@@ -1,9 +1,9 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
 import extrinsics from '@polkadot/extrinsics';
-import encodeUnchecked from '@polkadot/extrinsics-codec/encode/unchecked';
+import encodeUnchecked from '@polkadot/extrinsics/codec/encode/unchecked';
 import hexToU8a from '@polkadot/util/hex/toU8a';
 import testingPairs from '@polkadot/util-keyring/testingPairs';
 

packages/type-primitives/src/codec/block/decodeRaw.ts

@@ -1,10 +1,10 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
 import BN from 'bn.js';
 
-import decodeExtrinsic from '@polkadot/extrinsics-codec/decode/length';
+import decodeExtrinsic from '@polkadot/extrinsics/codec/decode/length';
 import u8aToBn from '@polkadot/util/u8a/toBn';
 
 import decodeHeader from '../header/decodeRaw';

packages/type-primitives/src/codec/block/encode.spec.js

@@ -1,13 +1,13 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
 import extrinsics from '@polkadot/extrinsics';
-import encodeUnchecked from '@polkadot/extrinsics-codec/encode/unchecked';
-import blockBuilder from '@polkadot/primitives-builder/block';
+import encodeUnchecked from '@polkadot/extrinsics/codec/encode/unchecked';
 import hexToU8a from '@polkadot/util/hex/toU8a';
 import testingPairs from '@polkadot/util-keyring/testingPairs';
 
+import blockBuilder from '../../create/block';
 import { encodeBlock } from './index';
 
 const keyring = testingPairs();

packages/type-primitives/src/codec/block/encode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Block } from '@polkadot/primitives/block';
+import { Block } from '../../block';
 
 import headerEncode from '../header/encode';
 import encodeRaw from './encodeRaw';

packages/type-primitives/src/codec/block/encodeRaw.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/block/encodeRaw.ts

@@ -1,10 +1,10 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { UncheckedRaw } from '@polkadot/primitives/extrinsic';
+import { UncheckedRaw } from '../../extrinsic';
 
-import uncheckedLength from '@polkadot/extrinsics-codec/encode/length';
+import uncheckedLength from '@polkadot/extrinsics/codec/encode/length';
 import u8aConcat from '@polkadot/util/u8a/concat';
 
 import encodeArray from '../encoder/array';

packages/type-primitives/src/codec/block/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/decoder/array.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/decoder/array.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/decoder/u8a.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/decoder/u8a.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/encoder/array.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/encoder/array.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/encoder/u8a.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/encoder/u8a.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/header/decode.spec.js

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import createHeader from '@polkadot/primitives-builder/header';
+import createHeader from '../../create/header';
 
 import { decodeHeader } from './index';
 

packages/type-primitives/src/codec/header/decode.ts

@@ -1,10 +1,10 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Header } from '@polkadot/primitives/header';
+import { Header } from '../../header';
 
-import createHeader from '@polkadot/primitives-builder/header';
+import createHeader from '../../create/header';
 
 import decodeRaw from './decodeRaw';
 import { OFF_PARENT_HASH, OFF_STATE_ROOT, OFF_TX_ROOT } from './offsets';

packages/type-primitives/src/codec/header/decodeRaw.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/header/decodeRaw.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/header/encode.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/header/encode.ts

@@ -1,11 +1,11 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { UncheckedRaw } from '@polkadot/primitives/extrinsic';
-import { Header } from '@polkadot/primitives/header';
+import { UncheckedRaw } from '../../extrinsic';
+import { Header } from '../../header';
 
-import rootRaw from '@polkadot/primitives-builder/extrinsic/rootRaw';
+import rootRaw from '../../create/extrinsic/rootRaw';
 import bnToU8a from '@polkadot/util/bn/toU8a';
 import u8aConcat from '@polkadot/util/u8a/concat';
 import u8aToU8a from '@polkadot/util/u8a/toU8a';

packages/type-primitives/src/codec/header/hash.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Header } from '@polkadot/primitives/header';
+import { Header } from '../../header';
 
 import blake2Asu8a from '@polkadot/util-crypto/blake2/asU8a';
 

packages/type-primitives/src/codec/header/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/header/offsets.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/codec/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-codec authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/create/block.spec.js

@@ -1,10 +1,10 @@
-// Copyright 2017-2018 @polkadot/primitives-builder authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
 import BN from 'bn.js';
 import extrinsics from '@polkadot/extrinsics';
-import encodeUnchecked from '@polkadot/extrinsics-codec/encode/unchecked';
+import encodeUnchecked from '@polkadot/extrinsics/codec/encode/unchecked';
 import hexToU8a from '@polkadot/util/hex/toU8a';
 import testingPairs from '@polkadot/util-keyring/testingPairs';
 

packages/type-primitives/src/create/block.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-builder authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Block } from '@polkadot/primitives/block';
+import { Block } from '../block';
 import { BlockIncomplete } from './types';
 
 import headerBuilder from './header';

packages/type-primitives/src/create/extrinsic/rootRaw.spec.js

@@ -1,9 +1,9 @@
-// Copyright 2017-2018 @polkadot/primitives-builder authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
 import extrinsics from '@polkadot/extrinsics';
-import encodeUnchecked from '@polkadot/extrinsics-codec/encode/unchecked';
+import encodeUnchecked from '@polkadot/extrinsics/codec/encode/unchecked';
 import hexToU8a from '@polkadot/util/hex/toU8a';
 import testingPairs from '@polkadot/util-keyring/testingPairs';
 

packages/type-primitives/src/create/extrinsic/rootRaw.ts

@@ -1,10 +1,10 @@
-// Copyright 2017-2018 @polkadot/primitives-builder authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { UncheckedRaw } from '@polkadot/primitives/extrinsic';
+import { UncheckedRaw } from '../../extrinsic';
 
-import uncheckedLength from '@polkadot/extrinsics-codec/encode/length';
+import uncheckedLength from '@polkadot/extrinsics/codec/encode/length';
 import trieRootOrdered from '@polkadot/trie-hash/rootOrdered';
 
 export default function extrinsicsRootRaw (extrinsics: Array<UncheckedRaw> = []): Uint8Array {

packages/type-primitives/src/create/header.spec.js

@@ -1,10 +1,10 @@
-// Copyright 2017-2018 @polkadot/primitives-builder authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
 import txRoot from './extrinsic/rootRaw';
 import extrinsics from '@polkadot/extrinsics';
-import encodeUnchecked from '@polkadot/extrinsics-codec/encode/unchecked';
+import encodeUnchecked from '@polkadot/extrinsics/codec/encode/unchecked';
 import testingPairs from '@polkadot/util-keyring/testingPairs';
 
 import header from './header';

packages/type-primitives/src/create/header.ts

@@ -1,9 +1,9 @@
-// Copyright 2017-2018 @polkadot/primitives-builder authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Header } from '@polkadot/primitives/header';
-import { UncheckedRaw } from '@polkadot/primitives/extrinsic';
+import { Header } from '../header';
+import { UncheckedRaw } from '../extrinsic';
 import { HeaderIncomplete } from './types';
 
 import bnToBn from '@polkadot/util/bn/toBn';

packages/type-primitives/src/create/types.d.ts

@@ -1,10 +1,10 @@
-// Copyright 2017-2018 @polkadot/primitives-builder authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { BlockNumber, Hash, HeaderHash } from '@polkadot/primitives/base';
-import { Digest$Log } from '@polkadot/primitives/digest';
-import { UncheckedRaw } from '@polkadot/primitives/extrinsic';
+import { BlockNumber, Hash, HeaderHash } from '../base';
+import { Digest$Log } from '../digest';
+import { UncheckedRaw } from '../extrinsic';
 
 export type HeaderIncomplete = {
   digest?: {

packages/type-primitives/src/json/accountId/decode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { AccountId } from '@polkadot/primitives/base';
+import { AccountId } from '../../base';
 import { JsonAccountId } from '../types';
 
 import hashDecode from '../hash/decode';

packages/type-primitives/src/json/accountId/encode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { AccountId } from '@polkadot/primitives/base';
+import { AccountId } from '../../base';
 import { JsonAccountId } from '../types';
 
 import hashEncode from '../hash/encode';

packages/type-primitives/src/json/accountId/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/bn/decode.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/bn/decode.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/bn/encode.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/bn/encode.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/bn/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/bytes/decode.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/bytes/decode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Bytes } from '@polkadot/primitives/base';
+import { Bytes } from '../../base';
 import { JsonBytes } from '../types';
 
 import hexToU8a from '@polkadot/util/hex/toU8a';

packages/type-primitives/src/json/bytes/encode.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/bytes/encode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Bytes } from '@polkadot/primitives/base';
+import { Bytes } from '../../base';
 import { JsonBytes } from '../types';
 
 import u8aToHex from '@polkadot/util/u8a/toHex';

packages/type-primitives/src/json/bytes/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/hash/decode.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/hash/decode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Hash } from '@polkadot/primitives/base';
+import { Hash } from '../../base';
 import { JsonHash } from '../types';
 
 import hexToU8a from '@polkadot/util/hex/toU8a';

packages/type-primitives/src/json/hash/encode.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/hash/encode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Hash } from '@polkadot/primitives/base';
+import { Hash } from '../../base';
 import { JsonHash } from '../types';
 
 import u8aToHex from '@polkadot/util/u8a/toHex';

packages/type-primitives/src/json/hash/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/header/decode.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/header/decode.ts

@@ -1,11 +1,11 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Header } from '@polkadot/primitives/header';
+import { Header } from '../../header';
 import { JsonHeader } from '../types';
 
-import headerBuilder from '@polkadot/primitives-builder/header';
+import headerBuilder from '../../create/header';
 
 import hashDecode from '../hash/decode';
 import bnDecode from '../bn/decode';

packages/type-primitives/src/json/header/encode.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/header/encode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Header } from '@polkadot/primitives/header';
+import { Header } from '../../header';
 import { JsonHeader } from '../types';
 
 import bnEncode from '../bn/encode';

packages/type-primitives/src/json/header/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/objectId/decode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { ObjectId } from '@polkadot/primitives/base';
+import { ObjectId } from '../../base';
 import { JsonObjectId } from '../types';
 
 import bnDecode from '../bn/decode';

packages/type-primitives/src/json/objectId/encode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { ObjectId } from '@polkadot/primitives/base';
+import { ObjectId } from '../../base';
 import { JsonObjectId } from '../types';
 
 import bnEncode from '../bn/encode';

packages/type-primitives/src/json/objectId/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/parachainId/decode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { ParaChainId } from '@polkadot/primitives/base';
+import { ParaChainId } from '../../base';
 import { JsonParaChainId } from '../types';
 
 import bnDecode from '../bn/decode';

packages/type-primitives/src/json/parachainId/encode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { ParaChainId } from '@polkadot/primitives/base';
+import { ParaChainId } from '../../base';
 import { JsonParaChainId } from '../types';
 
 import bnEncode from '../bn/encode';

packages/type-primitives/src/json/parachainId/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 

packages/type-primitives/src/json/signature/decode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Signature } from '@polkadot/primitives/base';
+import { Signature } from '../../base';
 import { JsonSignature } from '../types';
 
 import hashDecode from '../hash/decode';

packages/type-primitives/src/json/signature/encode.ts

@@ -1,8 +1,8 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import { Signature } from '@polkadot/primitives/base';
+import { Signature } from '../../base';
 import { JsonSignature } from '../types';
 
 import hashEncode from '../hash/encode';

packages/type-primitives/src/json/signature/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 @polkadot/primitives-json authors & contributors
+// Copyright 2017-2018 @polkadot/primitives authors & contributors
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.