Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use para id in specs instead of flag #157

Merged
merged 12 commits into from
Dec 13, 2021
Merged

Use para id in specs instead of flag #157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
71714f6
Updates polkadot dependency
Aug 22, 2021
5926d4f
sync with master
joelamouche Sep 15, 2021
7320947
sync with paritytech
joelamouche Oct 11, 2021
98e4503
sync with master
joelamouche Oct 12, 2021
76d3f2a
Merge remote-tracking branch 'paritytech/master'
joelamouche Nov 17, 2021
8577039
Merge remote-tracking branch 'paritytech/master'
joelamouche Dec 2, 2021
d028fb2
add log
joelamouche Dec 3, 2021
eaf830b
Merge remote-tracking branch 'paritytech/master'
joelamouche Dec 3, 2021
dfe36f2
Merge branch 'master' into jlm-use-para-id-in-specs
joelamouche Dec 3, 2021
bb0c82b
remove parachain id flag and chain flag
joelamouche Dec 6, 2021
c257f2a
cleanup
joelamouche Dec 6, 2021
c0bd23c
apply feedback
joelamouche Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
sync with paritytech
  • Loading branch information
@joelamouche
joelamouche committed Oct 11, 2021
commit 7320947ed6eb304a00cefff07f6f3215273479e4
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"lint:write": "prettier --write ."
},
"dependencies": {
"@polkadot/api": "^5.5.2",
"@polkadot/util": "^7.2.1",
"@polkadot/util-crypto": "^7.2.1",
"@polkadot/api": "^6.3.1",
"@polkadot/util": "^7.4.1",
"@polkadot/util-crypto": "^7.4.1",
"filter-console": "^0.1.1",
"yargs": "^15.4.1"
},
Expand Down
185 changes: 185 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
dependencies:
regenerator-runtime "^0.13.4"

<<<<<<< HEAD
"@polkadot/api-derive@5.9.1":
version "5.9.1"
resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-5.9.1.tgz#5937069920ded1439e6672b9d6be1072421b256b"
Expand Down Expand Up @@ -110,6 +111,109 @@
"@polkadot/util" "7.3.1"
"@polkadot/wasm-crypto" "^4.2.1"
"@polkadot/x-randomvalues" "7.3.1"
=======
"@polkadot/api-derive@6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-6.3.1.tgz#88618243e15f82368256c7f8d068a4539f9327a3"
integrity sha512-SjE/ntziGzTcC/q+rx8HOGrCPFXGCLO9ZjoNrc+otEq9jikrMtY3pDbIyCCnnutHmx7se46e/thPungjV/wccg==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/api" "6.3.1"
"@polkadot/rpc-core" "6.3.1"
"@polkadot/types" "6.3.1"
"@polkadot/util" "^7.4.1"
"@polkadot/util-crypto" "^7.4.1"
rxjs "^7.4.0"

"@polkadot/api@6.3.1", "@polkadot/api@^6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-6.3.1.tgz#18859dec2cdd30b54e6c04bc23a9d906b485c5e8"
integrity sha512-4WbQNXIzPsmwktjR6VFQupU2uKl7Mkbch1ZsMc68a2TrGmeJTlhsTas2iL89VeM0Js3P7qp36ZiiKtMZ/IjWHQ==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/api-derive" "6.3.1"
"@polkadot/keyring" "^7.4.1"
"@polkadot/rpc-core" "6.3.1"
"@polkadot/rpc-provider" "6.3.1"
"@polkadot/types" "6.3.1"
"@polkadot/types-known" "6.3.1"
"@polkadot/util" "^7.4.1"
"@polkadot/util-crypto" "^7.4.1"
eventemitter3 "^4.0.7"
rxjs "^7.4.0"

"@polkadot/keyring@^7.4.1":
version "7.4.1"
resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-7.4.1.tgz#cda3f371cc2a9bf4b8847bad41c4c14edfb05745"
integrity sha512-3QCfhiv8O2vpbQ4qThn7aQSEZ3EJm0WMJ1TxklKdzaZ+5K6kVFXOGbS3ntRXXjjtoOPSPuyjOiOq2YEi+69s4A==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/util" "7.4.1"
"@polkadot/util-crypto" "7.4.1"

"@polkadot/networks@7.4.1", "@polkadot/networks@^7.4.1":
version "7.4.1"
resolved "https://registry.yarnpkg.com/@polkadot/networks/-/networks-7.4.1.tgz#02b4a1a159e64b90a08d0f3a0206858b64846a3b"
integrity sha512-V+IagmVtaoDwR6zA+8R4JeihuTVJlheeYbDJyYCIyS9WtYImb5c7j/83XzoGicx+2auc+rwK2dH8hxHboi8Quw==
dependencies:
"@babel/runtime" "^7.15.4"

"@polkadot/rpc-core@6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-6.3.1.tgz#96eebcea74c1334b128b34a341406ac6ade34e2d"
integrity sha512-JClQ2Gfr4g9cU+S1NADc9GH+YfwjniZXA1vYub0/94Oung7GGwp6zeICQow90NfOtYi4cpp/iPOD0H7HtDIRYA==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/rpc-provider" "6.3.1"
"@polkadot/types" "6.3.1"
"@polkadot/util" "^7.4.1"
rxjs "^7.4.0"

"@polkadot/rpc-provider@6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-6.3.1.tgz#8a9d11a0ad40783228e56f642bc0fe418227528c"
integrity sha512-hf1wIfQZWsq/OLrszsGTRx/bBjDqLOKj/e7Ly5O7t9ai3ItUsYewgjXo6AiCD80jttHm3h8wg+twnh7DJxJfHQ==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/types" "6.3.1"
"@polkadot/util" "^7.4.1"
"@polkadot/util-crypto" "^7.4.1"
"@polkadot/x-fetch" "^7.4.1"
"@polkadot/x-global" "^7.4.1"
"@polkadot/x-ws" "^7.4.1"
eventemitter3 "^4.0.7"

"@polkadot/types-known@6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-6.3.1.tgz#dae6d8532272d8fc3c4ea53181a18d7d117b7113"
integrity sha512-zeFA2c/8irg0L5OQDfMAxBnODTbsibaa0q8bk+bsqK0sVgJ/l3Sz9XtONWL72s7FEi/zzXIOQLd+ffEVWmAN7A==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/networks" "^7.4.1"
"@polkadot/types" "6.3.1"
"@polkadot/util" "^7.4.1"

"@polkadot/types@6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-6.3.1.tgz#98f14278806b68b784113b6aac361a9e4bd1b005"
integrity sha512-ZZHwohZlyBgTAXmvISWY/lkpOfi6IvX4QAxXUNG+fH2ZB8uLB+ZPKeztPIleOqApj3HzczOCpH9QXK3he2IzHQ==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/util" "^7.4.1"
"@polkadot/util-crypto" "^7.4.1"
rxjs "^7.4.0"

"@polkadot/util-crypto@7.4.1", "@polkadot/util-crypto@^7.4.1":
version "7.4.1"
resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-7.4.1.tgz#76760df995e9feb7deef69d85cab6c13e9ceb977"
integrity sha512-ragnHzqROJl6mlWDIgcHHMM42XA/v7BlnATbVEkKuKOV8xHmdpNHDdtTsqwWzJ+F+oV1jeITaIUZqPuEDWloiw==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/networks" "7.4.1"
"@polkadot/util" "7.4.1"
"@polkadot/wasm-crypto" "^4.2.1"
"@polkadot/x-randomvalues" "7.4.1"
>>>>>>> paritytech/master
base-x "^3.0.8"
base64-js "^1.5.1"
blakejs "^1.1.1"
Expand All @@ -123,6 +227,7 @@
tweetnacl "^1.0.3"
xxhashjs "^0.2.2"

<<<<<<< HEAD
"@polkadot/util@7.3.1", "@polkadot/util@^7.2.1", "@polkadot/util@^7.3.1":
version "7.3.1"
resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-7.3.1.tgz#1a33a8d4ef2dcbc3e14a9a919f30bb16360a6fae"
Expand All @@ -131,6 +236,16 @@
"@babel/runtime" "^7.15.3"
"@polkadot/x-textdecoder" "7.3.1"
"@polkadot/x-textencoder" "7.3.1"
=======
"@polkadot/util@7.4.1", "@polkadot/util@^7.4.1":
version "7.4.1"
resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-7.4.1.tgz#f5aa9b60e5ca5c5b8f0d188beb7cbd47dd6c4041"
integrity sha512-HHsVVh8XpeIZZEHJDMZ8tCBnS2UfVuiZ4+79IuQln437HxL1uVfuTyv0mx0qsv6KsOyifMpxrUBfeAlna5jrWA==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/x-textdecoder" "7.4.1"
"@polkadot/x-textencoder" "7.4.1"
>>>>>>> paritytech/master
"@types/bn.js" "^4.11.6"
bn.js "^4.12.0"
camelcase "^6.2.0"
Expand Down Expand Up @@ -159,16 +274,27 @@
"@polkadot/wasm-crypto-asmjs" "^4.2.1"
"@polkadot/wasm-crypto-wasm" "^4.2.1"

<<<<<<< HEAD
"@polkadot/x-fetch@^7.3.1":
version "7.3.1"
resolved "https://registry.yarnpkg.com/@polkadot/x-fetch/-/x-fetch-7.3.1.tgz#d6a63d3bdebd3e058deb4507d6dbae782a44c8bf"
integrity sha512-QnwP2RxWEUtnHE+1Iy2T49D4s5F8XH4bCyGqhbpZZdMym+cc+9zifBRQ+B5BIpTqICFFFbbhUvnvBSC9nS8bvg==
dependencies:
"@babel/runtime" "^7.15.3"
"@polkadot/x-global" "7.3.1"
=======
"@polkadot/x-fetch@^7.4.1":
version "7.4.1"
resolved "https://registry.yarnpkg.com/@polkadot/x-fetch/-/x-fetch-7.4.1.tgz#70dc3f648981f24b32afbcfb5b59e2000c72f4b2"
integrity sha512-ot7VcBVVSnrh+Kt0I+p/YISsenRFpmFl6sBGk4qz90JlPbrmuc93iTTwyImi1QaT6wYBEGGcM56wyfTxkzGG4g==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/x-global" "7.4.1"
>>>>>>> paritytech/master
"@types/node-fetch" "^2.5.12"
node-fetch "^2.6.2"

<<<<<<< HEAD
"@polkadot/x-global@7.3.1", "@polkadot/x-global@^7.3.1":
version "7.3.1"
resolved "https://registry.yarnpkg.com/@polkadot/x-global/-/x-global-7.3.1.tgz#6e6f9d3347748bd885754c7367f08441a6b7dc6d"
Expand Down Expand Up @@ -207,6 +333,46 @@
dependencies:
"@babel/runtime" "^7.15.3"
"@polkadot/x-global" "7.3.1"
=======
"@polkadot/x-global@7.4.1", "@polkadot/x-global@^7.4.1":
version "7.4.1"
resolved "https://registry.yarnpkg.com/@polkadot/x-global/-/x-global-7.4.1.tgz#66f7f8a5d0208832773a4606c56d10e7927552fc"
integrity sha512-am24TT18b3H028ERjOtfrMt1MBIU4PN17n7+tpDmnS09HA+6ebfLlVTSU5gDWNu9p0EjzE0gOMTJIUw62mzkkg==
dependencies:
"@babel/runtime" "^7.15.4"

"@polkadot/x-randomvalues@7.4.1":
version "7.4.1"
resolved "https://registry.yarnpkg.com/@polkadot/x-randomvalues/-/x-randomvalues-7.4.1.tgz#e48d6c7fa869f5f871b2d18aa8b864c9802e9aeb"
integrity sha512-7XRXcII5zoGXXpRInR61DZsWW3XWqkOWctbrWSgT5psrw9rGmHs2iyRa8lsqtGUAFCiFM0FcRwSJ/hbRodgLKQ==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/x-global" "7.4.1"

"@polkadot/x-textdecoder@7.4.1":
version "7.4.1"
resolved "https://registry.yarnpkg.com/@polkadot/x-textdecoder/-/x-textdecoder-7.4.1.tgz#e0e0bc375d5aa7fad8929a7ea1c279884c57ad26"
integrity sha512-7tbwF8u1SJGS/AUWee3ZukcyW6o03ZVbgvXYcPtd+Xfx8WXUuUih0bJVeF7B0HevenBpqCWjsdcAQIJOcHOBpg==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/x-global" "7.4.1"

"@polkadot/x-textencoder@7.4.1":
version "7.4.1"
resolved "https://registry.yarnpkg.com/@polkadot/x-textencoder/-/x-textencoder-7.4.1.tgz#0411213c6ab3f6f80af074f49ed12174c3e28775"
integrity sha512-QYdSQ8mGj3LXGSWQOUKh/3ZlmDgSaHA+nKmIWwgdzXStfy77ErQbIo+AVQsDSdbr+bDAteugWPO+AoSBAqBkHg==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/x-global" "7.4.1"

"@polkadot/x-ws@^7.4.1":
version "7.4.1"
resolved "https://registry.yarnpkg.com/@polkadot/x-ws/-/x-ws-7.4.1.tgz#94b310e3385dabf550adba99a2a06cbf03a737cb"
integrity sha512-OLM61XX8Ut8NiCqKjraDr+t8WNFGZEuhOOzyPiFfUYqSML12U0/xrdbkS2AQTrtey4Cxv7iJB9GWCjn0amM4LQ==
dependencies:
"@babel/runtime" "^7.15.4"
"@polkadot/x-global" "7.4.1"
>>>>>>> paritytech/master
"@types/websocket" "^1.0.4"
websocket "^1.0.34"

Expand Down Expand Up @@ -564,10 +730,19 @@ next-tick@~1.0.0:
resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=

<<<<<<< HEAD
node-fetch@^2.6.1:
version "2.6.2"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.2.tgz#986996818b73785e47b1965cc34eb093a1d464d0"
integrity sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==
=======
node-fetch@^2.6.2:
version "2.6.5"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd"
integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==
dependencies:
whatwg-url "^5.0.0"
>>>>>>> paritytech/master

node-gyp-build@^4.2.0:
version "4.3.0"
Expand Down Expand Up @@ -635,10 +810,17 @@ ripemd160@^2.0.1:
hash-base "^3.0.0"
inherits "^2.0.1"

<<<<<<< HEAD
rxjs@^7.3.0:
version "7.3.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.3.0.tgz#39fe4f3461dc1e50be1475b2b85a0a88c1e938c6"
integrity sha512-p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw==
=======
rxjs@^7.4.0:
version "7.4.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68"
integrity sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==
>>>>>>> paritytech/master
dependencies:
tslib "~2.1.0"

Expand Down Expand Up @@ -817,8 +999,11 @@ yargs@^15.4.1:
which-module "^2.0.0"
y18n "^4.0.0"
yargs-parser "^18.1.2"
<<<<<<< HEAD

yarn@^1.22.10:
version "1.22.11"
resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.11.tgz#d0104043e7349046e0e2aec977c24be106925ed6"
integrity sha512-AWje4bzqO9RUn3sdnM5N8n4ZJ0BqCc/kqFJvpOI5/EVkINXui0yuvU7NDCEF//+WaxHuNay2uOHxA4+tq1P3cg==
=======
>>>>>>> paritytech/master
You are viewing a condensed version of this merge commit. You can view the full changes here.