diff --git a/README.md b/README.md index d18f3fa85..4d4f372b9 100644 --- a/README.md +++ b/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 diff --git a/jest.config.js b/jest.config.js index dbdd9ee95..d484ce0ab 100644 --- a/jest.config.js +++ b/jest.config.js @@ -2,10 +2,6 @@ const config = require('@polkadot/dev/config/jest'); module.exports = Object.assign({}, config, { moduleNameMapper: { - '@polkadot/extrinsics-codec(.*)$': '/packages/code-extrinsics/src/$1', - '@polkadot/primitives-codec(.*)$': '/packages/code-primitives/src/$1', - '@polkadot/primitives-(builder|json)(.*)$': '/packages/code-primitives-$1/src/$2', - '@polkadot/extrinsics(.*)$': '/packages/type-extrinsics/src/$1', '@polkadot/jsonrpc(.*)$': '/packages/type-jsonrpc/src/$1', '@polkadot/params(.*)$': '/packages/type-params/src/$1', diff --git a/lerna.json b/lerna.json index 1365395be..594e4aa6c 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.25.3" + "version": "0.26.0" } diff --git a/packages/code-extrinsics/LICENSE b/packages/code-extrinsics/LICENSE deleted file mode 100644 index 017811582..000000000 --- a/packages/code-extrinsics/LICENSE +++ /dev/null @@ -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. diff --git a/packages/code-extrinsics/README.md b/packages/code-extrinsics/README.md deleted file mode 100644 index d48c42690..000000000 --- a/packages/code-extrinsics/README.md +++ /dev/null @@ -1 +0,0 @@ -# @polkadot/extrinsics-codec diff --git a/packages/code-extrinsics/package.json b/packages/code-extrinsics/package.json deleted file mode 100644 index e87f43b42..000000000 --- a/packages/code-extrinsics/package.json +++ /dev/null @@ -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 ", - "maintainers": [ - "Jaco Greeff " - ], - "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" - } -} diff --git a/packages/code-primitives-builder/LICENSE b/packages/code-primitives-builder/LICENSE deleted file mode 100644 index 9808dc309..000000000 --- a/packages/code-primitives-builder/LICENSE +++ /dev/null @@ -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. diff --git a/packages/code-primitives-builder/README.md b/packages/code-primitives-builder/README.md deleted file mode 100644 index 30cc45e09..000000000 --- a/packages/code-primitives-builder/README.md +++ /dev/null @@ -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. diff --git a/packages/code-primitives-builder/package.json b/packages/code-primitives-builder/package.json deleted file mode 100644 index d96681b63..000000000 --- a/packages/code-primitives-builder/package.json +++ /dev/null @@ -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 ", - "maintainers": [ - "Jaco Greeff " - ], - "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" - } -} diff --git a/packages/code-primitives-json/LICENSE b/packages/code-primitives-json/LICENSE deleted file mode 100644 index 751e34488..000000000 --- a/packages/code-primitives-json/LICENSE +++ /dev/null @@ -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. diff --git a/packages/code-primitives-json/README.md b/packages/code-primitives-json/README.md deleted file mode 100644 index 3e4a41620..000000000 --- a/packages/code-primitives-json/README.md +++ /dev/null @@ -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` - ) -); -``` diff --git a/packages/code-primitives-json/package.json b/packages/code-primitives-json/package.json deleted file mode 100644 index c71585a91..000000000 --- a/packages/code-primitives-json/package.json +++ /dev/null @@ -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 ", - "maintainers": [ - "Jaco Greeff " - ], - "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" - } -} diff --git a/packages/code-primitives/LICENSE b/packages/code-primitives/LICENSE deleted file mode 100644 index 5df1aa63b..000000000 --- a/packages/code-primitives/LICENSE +++ /dev/null @@ -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. diff --git a/packages/code-primitives/README.md b/packages/code-primitives/README.md deleted file mode 100644 index b2a337a4f..000000000 --- a/packages/code-primitives/README.md +++ /dev/null @@ -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. diff --git a/packages/code-primitives/package.json b/packages/code-primitives/package.json deleted file mode 100644 index ecb0d8546..000000000 --- a/packages/code-primitives/package.json +++ /dev/null @@ -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 ", - "maintainers": [ - "Jaco Greeff " - ], - "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" - } -} diff --git a/packages/trie-db/package.json b/packages/trie-db/package.json index d684c80fb..d397a90c0 100644 --- a/packages/trie-db/package.json +++ b/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", diff --git a/packages/trie-hash/package.json b/packages/trie-hash/package.json index ae655a6d2..20061398d 100644 --- a/packages/trie-hash/package.json +++ b/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" } } diff --git a/packages/type-extrinsics/package.json b/packages/type-extrinsics/package.json index bd1a6793d..a79dea982 100644 --- a/packages/type-extrinsics/package.json +++ b/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 ", @@ -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" } } diff --git a/packages/code-extrinsics/src/decode/length.ts b/packages/type-extrinsics/src/codec/decode/length.ts similarity index 85% rename from packages/code-extrinsics/src/decode/length.ts rename to packages/type-extrinsics/src/codec/decode/length.ts index 711d3bb64..0175df72b 100644 --- a/packages/code-extrinsics/src/decode/length.ts +++ b/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. diff --git a/packages/code-extrinsics/src/encode/call.spec.js b/packages/type-extrinsics/src/codec/encode/call.spec.js similarity index 94% rename from packages/code-extrinsics/src/encode/call.spec.js rename to packages/type-extrinsics/src/codec/encode/call.spec.js index a278020c6..262e22cca 100644 --- a/packages/code-extrinsics/src/encode/call.spec.js +++ b/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 diff --git a/packages/code-extrinsics/src/encode/call.ts b/packages/type-extrinsics/src/codec/encode/call.ts similarity index 90% rename from packages/code-extrinsics/src/encode/call.ts rename to packages/type-extrinsics/src/codec/encode/call.ts index 378c1e5bd..61d396f1e 100644 --- a/packages/code-extrinsics/src/encode/call.ts +++ b/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. diff --git a/packages/code-extrinsics/src/encode/extrinsic.spec.js b/packages/type-extrinsics/src/codec/encode/extrinsic.spec.js similarity index 80% rename from packages/code-extrinsics/src/encode/extrinsic.spec.js rename to packages/type-extrinsics/src/codec/encode/extrinsic.spec.js index 48804b44e..3994c5262 100644 --- a/packages/code-extrinsics/src/encode/extrinsic.spec.js +++ b/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'; diff --git a/packages/code-extrinsics/src/encode/extrinsic.ts b/packages/type-extrinsics/src/codec/encode/extrinsic.ts similarity index 82% rename from packages/code-extrinsics/src/encode/extrinsic.ts rename to packages/type-extrinsics/src/codec/encode/extrinsic.ts index 29a24466a..70cf6d90d 100644 --- a/packages/code-extrinsics/src/encode/extrinsic.ts +++ b/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'; diff --git a/packages/code-extrinsics/src/encode/index.spec.js b/packages/type-extrinsics/src/codec/encode/index.spec.js similarity index 87% rename from packages/code-extrinsics/src/encode/index.spec.js rename to packages/type-extrinsics/src/codec/encode/index.spec.js index a8aca17cf..b6e5fa8f0 100644 --- a/packages/code-extrinsics/src/encode/index.spec.js +++ b/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(); diff --git a/packages/code-extrinsics/src/encode/index.ts b/packages/type-extrinsics/src/codec/encode/index.ts similarity index 85% rename from packages/code-extrinsics/src/encode/index.ts rename to packages/type-extrinsics/src/codec/encode/index.ts index 17c7f63d8..58c477ae2 100644 --- a/packages/code-extrinsics/src/encode/index.ts +++ b/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'; diff --git a/packages/code-extrinsics/src/encode/length.ts b/packages/type-extrinsics/src/codec/encode/length.ts similarity index 85% rename from packages/code-extrinsics/src/encode/length.ts rename to packages/type-extrinsics/src/codec/encode/length.ts index 89db07329..7316aa1a3 100644 --- a/packages/code-extrinsics/src/encode/length.ts +++ b/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. diff --git a/packages/code-extrinsics/src/encode/prefixes.ts b/packages/type-extrinsics/src/codec/encode/prefixes.ts similarity index 90% rename from packages/code-extrinsics/src/encode/prefixes.ts rename to packages/type-extrinsics/src/codec/encode/prefixes.ts index 6621ebac5..b88dc5fbb 100644 --- a/packages/code-extrinsics/src/encode/prefixes.ts +++ b/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. diff --git a/packages/code-extrinsics/src/encode/unchecked.spec.js b/packages/type-extrinsics/src/codec/encode/unchecked.spec.js similarity index 97% rename from packages/code-extrinsics/src/encode/unchecked.spec.js rename to packages/type-extrinsics/src/codec/encode/unchecked.spec.js index 81049099f..24544b72e 100644 --- a/packages/code-extrinsics/src/encode/unchecked.spec.js +++ b/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'; diff --git a/packages/code-extrinsics/src/encode/unchecked.ts b/packages/type-extrinsics/src/codec/encode/unchecked.ts similarity index 89% rename from packages/code-extrinsics/src/encode/unchecked.ts rename to packages/type-extrinsics/src/codec/encode/unchecked.ts index 58d4fbad9..04948e500 100644 --- a/packages/code-extrinsics/src/encode/unchecked.ts +++ b/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'; diff --git a/packages/code-extrinsics/src/types.d.ts b/packages/type-extrinsics/src/codec/types.d.ts similarity index 78% rename from packages/code-extrinsics/src/types.d.ts rename to packages/type-extrinsics/src/codec/types.d.ts index 1f68885f1..c38aa8ef5 100644 --- a/packages/code-extrinsics/src/types.d.ts +++ b/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. diff --git a/packages/type-jsonrpc/package.json b/packages/type-jsonrpc/package.json index 7f17f3477..cac96eb02 100644 --- a/packages/type-jsonrpc/package.json +++ b/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" } } diff --git a/packages/type-params/package.json b/packages/type-params/package.json index 50d67ec2f..60c74eabd 100644 --- a/packages/type-params/package.json +++ b/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" } } diff --git a/packages/type-params/src/decode/value/header.ts b/packages/type-params/src/decode/value/header.ts index e76a33486..bd42b77fa 100644 --- a/packages/type-params/src/decode/value/header.ts +++ b/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 diff --git a/packages/type-params/src/encode/type/index.ts b/packages/type-params/src/encode/type/index.ts index d18a35639..d301e93b5 100644 --- a/packages/type-params/src/encode/type/index.ts +++ b/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'; diff --git a/packages/type-primitives/package.json b/packages/type-primitives/package.json index 4f32b3f61..e4eae7500 100644 --- a/packages/type-primitives/package.json +++ b/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" diff --git a/packages/code-primitives/src/block/decodeRaw.spec.js b/packages/type-primitives/src/codec/block/decodeRaw.spec.js similarity index 91% rename from packages/code-primitives/src/block/decodeRaw.spec.js rename to packages/type-primitives/src/codec/block/decodeRaw.spec.js index c1f131806..405a079e5 100644 --- a/packages/code-primitives/src/block/decodeRaw.spec.js +++ b/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'; diff --git a/packages/code-primitives/src/block/decodeRaw.ts b/packages/type-primitives/src/codec/block/decodeRaw.ts similarity index 86% rename from packages/code-primitives/src/block/decodeRaw.ts rename to packages/type-primitives/src/codec/block/decodeRaw.ts index 63d5a7e48..a310846f3 100644 --- a/packages/code-primitives/src/block/decodeRaw.ts +++ b/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'; diff --git a/packages/code-primitives/src/block/encode.spec.js b/packages/type-primitives/src/codec/block/encode.spec.js similarity index 93% rename from packages/code-primitives/src/block/encode.spec.js rename to packages/type-primitives/src/codec/block/encode.spec.js index 48b16631e..e0f304e04 100644 --- a/packages/code-primitives/src/block/encode.spec.js +++ b/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(); diff --git a/packages/code-primitives/src/block/encode.ts b/packages/type-primitives/src/codec/block/encode.ts similarity index 74% rename from packages/code-primitives/src/block/encode.ts rename to packages/type-primitives/src/codec/block/encode.ts index 1171fef99..245a70eef 100644 --- a/packages/code-primitives/src/block/encode.ts +++ b/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'; diff --git a/packages/code-primitives/src/block/encodeRaw.spec.js b/packages/type-primitives/src/codec/block/encodeRaw.spec.js similarity index 97% rename from packages/code-primitives/src/block/encodeRaw.spec.js rename to packages/type-primitives/src/codec/block/encodeRaw.spec.js index d133ea511..7a1e08843 100644 --- a/packages/code-primitives/src/block/encodeRaw.spec.js +++ b/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. diff --git a/packages/code-primitives/src/block/encodeRaw.ts b/packages/type-primitives/src/codec/block/encodeRaw.ts similarity index 68% rename from packages/code-primitives/src/block/encodeRaw.ts rename to packages/type-primitives/src/codec/block/encodeRaw.ts index 8018e1ff6..b8d8bbe8d 100644 --- a/packages/code-primitives/src/block/encodeRaw.ts +++ b/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'; diff --git a/packages/code-primitives/src/block/index.ts b/packages/type-primitives/src/codec/block/index.ts similarity index 71% rename from packages/code-primitives/src/block/index.ts rename to packages/type-primitives/src/codec/block/index.ts index eef941f1a..c2525b535 100644 --- a/packages/code-primitives/src/block/index.ts +++ b/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. diff --git a/packages/code-primitives/src/decoder/array.spec.js b/packages/type-primitives/src/codec/decoder/array.spec.js similarity index 91% rename from packages/code-primitives/src/decoder/array.spec.js rename to packages/type-primitives/src/codec/decoder/array.spec.js index dc628192d..8a4c913d4 100644 --- a/packages/code-primitives/src/decoder/array.spec.js +++ b/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. diff --git a/packages/code-primitives/src/decoder/array.ts b/packages/type-primitives/src/codec/decoder/array.ts similarity index 87% rename from packages/code-primitives/src/decoder/array.ts rename to packages/type-primitives/src/codec/decoder/array.ts index bbc41e32b..76365a9a6 100644 --- a/packages/code-primitives/src/decoder/array.ts +++ b/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. diff --git a/packages/code-primitives/src/decoder/u8a.spec.js b/packages/type-primitives/src/codec/decoder/u8a.spec.js similarity index 91% rename from packages/code-primitives/src/decoder/u8a.spec.js rename to packages/type-primitives/src/codec/decoder/u8a.spec.js index aa906e1c6..cd99895a5 100644 --- a/packages/code-primitives/src/decoder/u8a.spec.js +++ b/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. diff --git a/packages/code-primitives/src/decoder/u8a.ts b/packages/type-primitives/src/codec/decoder/u8a.ts similarity index 85% rename from packages/code-primitives/src/decoder/u8a.ts rename to packages/type-primitives/src/codec/decoder/u8a.ts index 43343436d..6b4c75d13 100644 --- a/packages/code-primitives/src/decoder/u8a.ts +++ b/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. diff --git a/packages/code-primitives/src/encoder/array.spec.js b/packages/type-primitives/src/codec/encoder/array.spec.js similarity index 86% rename from packages/code-primitives/src/encoder/array.spec.js rename to packages/type-primitives/src/codec/encoder/array.spec.js index 3fdb5e5b3..6d308cccb 100644 --- a/packages/code-primitives/src/encoder/array.spec.js +++ b/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. diff --git a/packages/code-primitives/src/encoder/array.ts b/packages/type-primitives/src/codec/encoder/array.ts similarity index 88% rename from packages/code-primitives/src/encoder/array.ts rename to packages/type-primitives/src/codec/encoder/array.ts index a1d9e3617..9682bcb96 100644 --- a/packages/code-primitives/src/encoder/array.ts +++ b/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. diff --git a/packages/code-primitives/src/encoder/u8a.spec.js b/packages/type-primitives/src/codec/encoder/u8a.spec.js similarity index 85% rename from packages/code-primitives/src/encoder/u8a.spec.js rename to packages/type-primitives/src/codec/encoder/u8a.spec.js index f806c3cca..35f0aee04 100644 --- a/packages/code-primitives/src/encoder/u8a.spec.js +++ b/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. diff --git a/packages/code-primitives/src/encoder/u8a.ts b/packages/type-primitives/src/codec/encoder/u8a.ts similarity index 82% rename from packages/code-primitives/src/encoder/u8a.ts rename to packages/type-primitives/src/codec/encoder/u8a.ts index 826387d8e..0a8085b6a 100644 --- a/packages/code-primitives/src/encoder/u8a.ts +++ b/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. diff --git a/packages/code-primitives/src/header/decode.spec.js b/packages/type-primitives/src/codec/header/decode.spec.js similarity index 92% rename from packages/code-primitives/src/header/decode.spec.js rename to packages/type-primitives/src/codec/header/decode.spec.js index 2b12c301c..33943aa9e 100644 --- a/packages/code-primitives/src/header/decode.spec.js +++ b/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'; diff --git a/packages/code-primitives/src/header/decode.ts b/packages/type-primitives/src/codec/header/decode.ts similarity index 77% rename from packages/code-primitives/src/header/decode.ts rename to packages/type-primitives/src/codec/header/decode.ts index d2470add6..b40c09006 100644 --- a/packages/code-primitives/src/header/decode.ts +++ b/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'; diff --git a/packages/code-primitives/src/header/decodeRaw.spec.js b/packages/type-primitives/src/codec/header/decodeRaw.spec.js similarity index 96% rename from packages/code-primitives/src/header/decodeRaw.spec.js rename to packages/type-primitives/src/codec/header/decodeRaw.spec.js index 2379af48a..414a2486f 100644 --- a/packages/code-primitives/src/header/decodeRaw.spec.js +++ b/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. diff --git a/packages/code-primitives/src/header/decodeRaw.ts b/packages/type-primitives/src/codec/header/decodeRaw.ts similarity index 92% rename from packages/code-primitives/src/header/decodeRaw.ts rename to packages/type-primitives/src/codec/header/decodeRaw.ts index 913711a1a..ed7aefc43 100644 --- a/packages/code-primitives/src/header/decodeRaw.ts +++ b/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. diff --git a/packages/code-primitives/src/header/encode.spec.js b/packages/type-primitives/src/codec/header/encode.spec.js similarity index 95% rename from packages/code-primitives/src/header/encode.spec.js rename to packages/type-primitives/src/codec/header/encode.spec.js index 0f4f580b0..758f683df 100644 --- a/packages/code-primitives/src/header/encode.spec.js +++ b/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. diff --git a/packages/code-primitives/src/header/encode.ts b/packages/type-primitives/src/codec/header/encode.ts similarity index 76% rename from packages/code-primitives/src/header/encode.ts rename to packages/type-primitives/src/codec/header/encode.ts index 021f2749d..9c2334bf4 100644 --- a/packages/code-primitives/src/header/encode.ts +++ b/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'; diff --git a/packages/code-primitives/src/header/hash.ts b/packages/type-primitives/src/codec/header/hash.ts similarity index 72% rename from packages/code-primitives/src/header/hash.ts rename to packages/type-primitives/src/codec/header/hash.ts index d40372b95..d5e42eb43 100644 --- a/packages/code-primitives/src/header/hash.ts +++ b/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'; diff --git a/packages/code-primitives/src/header/index.ts b/packages/type-primitives/src/codec/header/index.ts similarity index 76% rename from packages/code-primitives/src/header/index.ts rename to packages/type-primitives/src/codec/header/index.ts index 3945fdb14..24733e944 100644 --- a/packages/code-primitives/src/header/index.ts +++ b/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. diff --git a/packages/code-primitives/src/header/offsets.ts b/packages/type-primitives/src/codec/header/offsets.ts similarity index 84% rename from packages/code-primitives/src/header/offsets.ts rename to packages/type-primitives/src/codec/header/offsets.ts index 8a6ca8812..eca00c857 100644 --- a/packages/code-primitives/src/header/offsets.ts +++ b/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. diff --git a/packages/code-primitives/src/index.ts b/packages/type-primitives/src/codec/index.ts similarity index 70% rename from packages/code-primitives/src/index.ts rename to packages/type-primitives/src/codec/index.ts index f35f7d1e4..302cd5cdf 100644 --- a/packages/code-primitives/src/index.ts +++ b/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. diff --git a/packages/code-primitives-builder/src/block.spec.js b/packages/type-primitives/src/create/block.spec.js similarity index 94% rename from packages/code-primitives-builder/src/block.spec.js rename to packages/type-primitives/src/create/block.spec.js index 485ca0c8b..d68c735ff 100644 --- a/packages/code-primitives-builder/src/block.spec.js +++ b/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'; diff --git a/packages/code-primitives-builder/src/block.ts b/packages/type-primitives/src/create/block.ts similarity index 74% rename from packages/code-primitives-builder/src/block.ts rename to packages/type-primitives/src/create/block.ts index 0e91d8145..97144910e 100644 --- a/packages/code-primitives-builder/src/block.ts +++ b/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'; diff --git a/packages/code-primitives-builder/src/extrinsic/rootRaw.spec.js b/packages/type-primitives/src/create/extrinsic/rootRaw.spec.js similarity index 96% rename from packages/code-primitives-builder/src/extrinsic/rootRaw.spec.js rename to packages/type-primitives/src/create/extrinsic/rootRaw.spec.js index 82cefe368..ce238cf3d 100644 --- a/packages/code-primitives-builder/src/extrinsic/rootRaw.spec.js +++ b/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'; diff --git a/packages/code-primitives-builder/src/extrinsic/rootRaw.ts b/packages/type-primitives/src/create/extrinsic/rootRaw.ts similarity index 64% rename from packages/code-primitives-builder/src/extrinsic/rootRaw.ts rename to packages/type-primitives/src/create/extrinsic/rootRaw.ts index 0dc0dd728..fb5d235d7 100644 --- a/packages/code-primitives-builder/src/extrinsic/rootRaw.ts +++ b/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 = []): Uint8Array { diff --git a/packages/code-primitives-builder/src/header.spec.js b/packages/type-primitives/src/create/header.spec.js similarity index 87% rename from packages/code-primitives-builder/src/header.spec.js rename to packages/type-primitives/src/create/header.spec.js index ddaedbfc7..95179412b 100644 --- a/packages/code-primitives-builder/src/header.spec.js +++ b/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'; diff --git a/packages/code-primitives-builder/src/header.ts b/packages/type-primitives/src/create/header.ts similarity index 79% rename from packages/code-primitives-builder/src/header.ts rename to packages/type-primitives/src/create/header.ts index a229b1d95..cf843c379 100644 --- a/packages/code-primitives-builder/src/header.ts +++ b/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'; diff --git a/packages/code-primitives-builder/src/types.d.ts b/packages/type-primitives/src/create/types.d.ts similarity index 60% rename from packages/code-primitives-builder/src/types.d.ts rename to packages/type-primitives/src/create/types.d.ts index 9b85b8874..c0264bf1a 100644 --- a/packages/code-primitives-builder/src/types.d.ts +++ b/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?: { diff --git a/packages/code-primitives-json/src/accountId/decode.ts b/packages/type-primitives/src/json/accountId/decode.ts similarity index 71% rename from packages/code-primitives-json/src/accountId/decode.ts rename to packages/type-primitives/src/json/accountId/decode.ts index e4aa0f187..6237afe6e 100644 --- a/packages/code-primitives-json/src/accountId/decode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/accountId/encode.ts b/packages/type-primitives/src/json/accountId/encode.ts similarity index 71% rename from packages/code-primitives-json/src/accountId/encode.ts rename to packages/type-primitives/src/json/accountId/encode.ts index ebe0e3848..98cba9641 100644 --- a/packages/code-primitives-json/src/accountId/encode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/accountId/index.ts b/packages/type-primitives/src/json/accountId/index.ts similarity index 77% rename from packages/code-primitives-json/src/accountId/index.ts rename to packages/type-primitives/src/json/accountId/index.ts index ca8513429..6bb73f668 100644 --- a/packages/code-primitives-json/src/accountId/index.ts +++ b/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. diff --git a/packages/code-primitives-json/src/bn/decode.spec.js b/packages/type-primitives/src/json/bn/decode.spec.js similarity index 88% rename from packages/code-primitives-json/src/bn/decode.spec.js rename to packages/type-primitives/src/json/bn/decode.spec.js index 479276ec4..029f141e5 100644 --- a/packages/code-primitives-json/src/bn/decode.spec.js +++ b/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. diff --git a/packages/code-primitives-json/src/bn/decode.ts b/packages/type-primitives/src/json/bn/decode.ts similarity index 88% rename from packages/code-primitives-json/src/bn/decode.ts rename to packages/type-primitives/src/json/bn/decode.ts index 7322edf0d..d0f22fba8 100644 --- a/packages/code-primitives-json/src/bn/decode.ts +++ b/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. diff --git a/packages/code-primitives-json/src/bn/encode.spec.js b/packages/type-primitives/src/json/bn/encode.spec.js similarity index 86% rename from packages/code-primitives-json/src/bn/encode.spec.js rename to packages/type-primitives/src/json/bn/encode.spec.js index 7f44ef921..686e09c88 100644 --- a/packages/code-primitives-json/src/bn/encode.spec.js +++ b/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. diff --git a/packages/code-primitives-json/src/bn/encode.ts b/packages/type-primitives/src/json/bn/encode.ts similarity index 86% rename from packages/code-primitives-json/src/bn/encode.ts rename to packages/type-primitives/src/json/bn/encode.ts index b24a05901..230306768 100644 --- a/packages/code-primitives-json/src/bn/encode.ts +++ b/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. diff --git a/packages/code-primitives-json/src/bn/index.ts b/packages/type-primitives/src/json/bn/index.ts similarity index 75% rename from packages/code-primitives-json/src/bn/index.ts rename to packages/type-primitives/src/json/bn/index.ts index e77bbf496..c8673b313 100644 --- a/packages/code-primitives-json/src/bn/index.ts +++ b/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. diff --git a/packages/code-primitives-json/src/bytes/decode.spec.js b/packages/type-primitives/src/json/bytes/decode.spec.js similarity index 83% rename from packages/code-primitives-json/src/bytes/decode.spec.js rename to packages/type-primitives/src/json/bytes/decode.spec.js index fb98a427d..1d8e1ab20 100644 --- a/packages/code-primitives-json/src/bytes/decode.spec.js +++ b/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. diff --git a/packages/code-primitives-json/src/bytes/decode.ts b/packages/type-primitives/src/json/bytes/decode.ts similarity index 71% rename from packages/code-primitives-json/src/bytes/decode.ts rename to packages/type-primitives/src/json/bytes/decode.ts index 0b8e2a350..8db1ca943 100644 --- a/packages/code-primitives-json/src/bytes/decode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/bytes/encode.spec.js b/packages/type-primitives/src/json/bytes/encode.spec.js similarity index 83% rename from packages/code-primitives-json/src/bytes/encode.spec.js rename to packages/type-primitives/src/json/bytes/encode.spec.js index 7f4ab3273..401d07e4d 100644 --- a/packages/code-primitives-json/src/bytes/encode.spec.js +++ b/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. diff --git a/packages/code-primitives-json/src/bytes/encode.ts b/packages/type-primitives/src/json/bytes/encode.ts similarity index 71% rename from packages/code-primitives-json/src/bytes/encode.ts rename to packages/type-primitives/src/json/bytes/encode.ts index 7c8c3cc18..ceb7da3a4 100644 --- a/packages/code-primitives-json/src/bytes/encode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/bytes/index.ts b/packages/type-primitives/src/json/bytes/index.ts similarity index 76% rename from packages/code-primitives-json/src/bytes/index.ts rename to packages/type-primitives/src/json/bytes/index.ts index bac81b8b3..55d0ee365 100644 --- a/packages/code-primitives-json/src/bytes/index.ts +++ b/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. diff --git a/packages/code-primitives-json/src/hash/decode.spec.js b/packages/type-primitives/src/json/hash/decode.spec.js similarity index 89% rename from packages/code-primitives-json/src/hash/decode.spec.js rename to packages/type-primitives/src/json/hash/decode.spec.js index 716d5c306..5e7d02e45 100644 --- a/packages/code-primitives-json/src/hash/decode.spec.js +++ b/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. diff --git a/packages/code-primitives-json/src/hash/decode.ts b/packages/type-primitives/src/json/hash/decode.ts similarity index 73% rename from packages/code-primitives-json/src/hash/decode.ts rename to packages/type-primitives/src/json/hash/decode.ts index a9a908396..9b0c6eecb 100644 --- a/packages/code-primitives-json/src/hash/decode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/hash/encode.spec.js b/packages/type-primitives/src/json/hash/encode.spec.js similarity index 89% rename from packages/code-primitives-json/src/hash/encode.spec.js rename to packages/type-primitives/src/json/hash/encode.spec.js index 30650c74f..301a66193 100644 --- a/packages/code-primitives-json/src/hash/encode.spec.js +++ b/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. diff --git a/packages/code-primitives-json/src/hash/encode.ts b/packages/type-primitives/src/json/hash/encode.ts similarity index 72% rename from packages/code-primitives-json/src/hash/encode.ts rename to packages/type-primitives/src/json/hash/encode.ts index a18e8f6fe..8399ec88c 100644 --- a/packages/code-primitives-json/src/hash/encode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/hash/index.ts b/packages/type-primitives/src/json/hash/index.ts similarity index 76% rename from packages/code-primitives-json/src/hash/index.ts rename to packages/type-primitives/src/json/hash/index.ts index b5bd262d0..84cc032a4 100644 --- a/packages/code-primitives-json/src/hash/index.ts +++ b/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. diff --git a/packages/code-primitives-json/src/header/decode.spec.js b/packages/type-primitives/src/json/header/decode.spec.js similarity index 94% rename from packages/code-primitives-json/src/header/decode.spec.js rename to packages/type-primitives/src/json/header/decode.spec.js index 9f734ee53..d0d98c929 100644 --- a/packages/code-primitives-json/src/header/decode.spec.js +++ b/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. diff --git a/packages/code-primitives-json/src/header/decode.ts b/packages/type-primitives/src/json/header/decode.ts similarity index 78% rename from packages/code-primitives-json/src/header/decode.ts rename to packages/type-primitives/src/json/header/decode.ts index 4ccbc88c0..374b39714 100644 --- a/packages/code-primitives-json/src/header/decode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/header/encode.spec.js b/packages/type-primitives/src/json/header/encode.spec.js similarity index 92% rename from packages/code-primitives-json/src/header/encode.spec.js rename to packages/type-primitives/src/json/header/encode.spec.js index 8cfb44908..afd2f755f 100644 --- a/packages/code-primitives-json/src/header/encode.spec.js +++ b/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. diff --git a/packages/code-primitives-json/src/header/encode.ts b/packages/type-primitives/src/json/header/encode.ts similarity index 84% rename from packages/code-primitives-json/src/header/encode.ts rename to packages/type-primitives/src/json/header/encode.ts index 200ea9334..072d00e94 100644 --- a/packages/code-primitives-json/src/header/encode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/header/index.ts b/packages/type-primitives/src/json/header/index.ts similarity index 76% rename from packages/code-primitives-json/src/header/index.ts rename to packages/type-primitives/src/json/header/index.ts index 39391f341..b8d519372 100644 --- a/packages/code-primitives-json/src/header/index.ts +++ b/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. diff --git a/packages/code-primitives-json/src/index.ts b/packages/type-primitives/src/json/index.ts similarity index 82% rename from packages/code-primitives-json/src/index.ts rename to packages/type-primitives/src/json/index.ts index 0dfdd269e..c49f9f1ab 100644 --- a/packages/code-primitives-json/src/index.ts +++ b/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. diff --git a/packages/code-primitives-json/src/objectId/decode.ts b/packages/type-primitives/src/json/objectId/decode.ts similarity index 70% rename from packages/code-primitives-json/src/objectId/decode.ts rename to packages/type-primitives/src/json/objectId/decode.ts index d87eb8ed1..15fac371e 100644 --- a/packages/code-primitives-json/src/objectId/decode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/objectId/encode.ts b/packages/type-primitives/src/json/objectId/encode.ts similarity index 70% rename from packages/code-primitives-json/src/objectId/encode.ts rename to packages/type-primitives/src/json/objectId/encode.ts index e960c34a6..ce67b5ad9 100644 --- a/packages/code-primitives-json/src/objectId/encode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/objectId/index.ts b/packages/type-primitives/src/json/objectId/index.ts similarity index 77% rename from packages/code-primitives-json/src/objectId/index.ts rename to packages/type-primitives/src/json/objectId/index.ts index 3e8342757..c01d289a8 100644 --- a/packages/code-primitives-json/src/objectId/index.ts +++ b/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. diff --git a/packages/code-primitives-json/src/parachainId/decode.ts b/packages/type-primitives/src/json/parachainId/decode.ts similarity index 71% rename from packages/code-primitives-json/src/parachainId/decode.ts rename to packages/type-primitives/src/json/parachainId/decode.ts index ddd8386b3..869acad03 100644 --- a/packages/code-primitives-json/src/parachainId/decode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/parachainId/encode.ts b/packages/type-primitives/src/json/parachainId/encode.ts similarity index 71% rename from packages/code-primitives-json/src/parachainId/encode.ts rename to packages/type-primitives/src/json/parachainId/encode.ts index cc30a8483..106e406d5 100644 --- a/packages/code-primitives-json/src/parachainId/encode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/parachainId/index.ts b/packages/type-primitives/src/json/parachainId/index.ts similarity index 78% rename from packages/code-primitives-json/src/parachainId/index.ts rename to packages/type-primitives/src/json/parachainId/index.ts index 0924d2c4a..bd754ef6f 100644 --- a/packages/code-primitives-json/src/parachainId/index.ts +++ b/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. diff --git a/packages/code-primitives-json/src/signature/decode.ts b/packages/type-primitives/src/json/signature/decode.ts similarity index 71% rename from packages/code-primitives-json/src/signature/decode.ts rename to packages/type-primitives/src/json/signature/decode.ts index 8b715a84d..2337cac99 100644 --- a/packages/code-primitives-json/src/signature/decode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/signature/encode.ts b/packages/type-primitives/src/json/signature/encode.ts similarity index 71% rename from packages/code-primitives-json/src/signature/encode.ts rename to packages/type-primitives/src/json/signature/encode.ts index 3ba088f16..1425cc5b7 100644 --- a/packages/code-primitives-json/src/signature/encode.ts +++ b/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'; diff --git a/packages/code-primitives-json/src/signature/index.ts b/packages/type-primitives/src/json/signature/index.ts similarity index 77% rename from packages/code-primitives-json/src/signature/index.ts rename to packages/type-primitives/src/json/signature/index.ts index 980e03d7d..cc7a403d0 100644 --- a/packages/code-primitives-json/src/signature/index.ts +++ b/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. diff --git a/packages/code-primitives-json/src/types.d.ts b/packages/type-primitives/src/json/types.d.ts similarity index 94% rename from packages/code-primitives-json/src/types.d.ts rename to packages/type-primitives/src/json/types.d.ts index 264c20da6..86291b292 100644 --- a/packages/code-primitives-json/src/types.d.ts +++ b/packages/type-primitives/src/json/types.d.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. diff --git a/packages/type-storage/package.json b/packages/type-storage/package.json index 0b46506c1..7db72c3bd 100644 --- a/packages/type-storage/package.json +++ b/packages/type-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/storage", - "version": "0.25.3", + "version": "0.26.0", "description": "Generic wrapper wrapper around state storage", "main": "index.js", "engines": { @@ -35,10 +35,10 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.51", - "@polkadot/params": "^0.25.3", - "@polkadot/primitives": "^0.25.3", - "@polkadot/util": "^0.25.3", - "@polkadot/util-crypto": "^0.25.3", - "@polkadot/util-keyring": "^0.25.3" + "@polkadot/params": "^0.26.0", + "@polkadot/primitives": "^0.26.0", + "@polkadot/util": "^0.26.0", + "@polkadot/util-crypto": "^0.26.0", + "@polkadot/util-keyring": "^0.26.0" } } diff --git a/packages/util-crypto/package.json b/packages/util-crypto/package.json index 04231bdac..7b7c9da0a 100644 --- a/packages/util-crypto/package.json +++ b/packages/util-crypto/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/util-crypto", - "version": "0.25.3", + "version": "0.26.0", "description": "A collection of useful crypto utilities for @polkadot", "main": "index.js", "keywords": [ @@ -34,7 +34,7 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.51", - "@polkadot/util": "^0.25.3", + "@polkadot/util": "^0.26.0", "blakejs": "^1.1.0", "js-sha3": "^0.7.0", "tweetnacl": "^1.0.0", diff --git a/packages/util-keyring/package.json b/packages/util-keyring/package.json index fe5ffc944..9997d3682 100644 --- a/packages/util-keyring/package.json +++ b/packages/util-keyring/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/util-keyring", - "version": "0.25.3", + "version": "0.26.0", "description": "Keyring management", "main": "index.js", "engines": { @@ -36,8 +36,8 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.51", - "@polkadot/util": "^0.25.3", - "@polkadot/util-crypto": "^0.25.3", + "@polkadot/util": "^0.26.0", + "@polkadot/util-crypto": "^0.26.0", "@types/bs58": "^3.0.30", "bs58": "^4.0.1" } diff --git a/packages/util-rlp/package.json b/packages/util-rlp/package.json index 54f7df1c3..d9780d198 100644 --- a/packages/util-rlp/package.json +++ b/packages/util-rlp/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/util-rlp", - "version": "0.25.3", + "version": "0.26.0", "description": "RLP encoding and decoding", "main": "index.js", "keywords": [ @@ -36,7 +36,7 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.51", - "@polkadot/util": "^0.25.3" + "@polkadot/util": "^0.26.0" }, "devDependencies": { "ethereumjs-testing": "^1.0.4" diff --git a/packages/util-triedb/package.json b/packages/util-triedb/package.json index a09723619..5d170721d 100644 --- a/packages/util-triedb/package.json +++ b/packages/util-triedb/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/util-triedb", - "version": "0.25.3", + "version": "0.26.0", "description": "Creation of triehash values", "main": "index.js", "keywords": [ @@ -34,10 +34,10 @@ }, "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", "leveldown": "^4.0.1", "levelup": "^3.0.1", "memdown": "^3.0.0" diff --git a/packages/util/package.json b/packages/util/package.json index 00787389a..b85cd59a8 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/util", - "version": "0.25.3", + "version": "0.26.0", "description": "A collection of useful utilities for @polkadot", "main": "index.js", "keywords": [ diff --git a/tsconfig.json b/tsconfig.json index 827a02c9c..701914750 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,9 +4,6 @@ "baseUrl": ".", "paths": { "@polkadot/extrinsics-codec/*": [ "packages/code-extrinsics/src/*" ], - "@polkadot/primitives-builder/*": [ "packages/code-primitives-builder/src/*" ], - "@polkadot/primitives-codec/*": [ "packages/code-primitives/src/*" ], - "@polkadot/primitives-json/*": [ "packages/code-primitives-json/src/*" ], "@polkadot/extrinsics/*": [ "packages/type-extrinsics/src/*" ], "@polkadot/jsonrpc/*": [ "packages/type-jsonrpc/src/*" ],