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.

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

Integrate substrate connect with Apps #5644

Merged
merged 67 commits into from Jul 12, 2021
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
7c6cc5e
integrate apps with smoldot init
wirednkod May 31, 2021
1a47f44
Add a new category for substrate connect light clients to be grouped …
wirednkod Jun 1, 2021
b418363
remove supportedLightClient array that was introduced. SubstrateConne…
wirednkod Jun 1, 2021
0e327a0
rollback 'hacky' changes in order to proceed with better implementation
wirednkod Jun 1, 2021
9ec926b
alter configuration of testing and production networks in order to in…
wirednkod Jun 3, 2021
322003b
upgrade substrate connect to 0.3.7
wirednkod Jun 10, 2021
92c5cbc
implementation for integrating substrate-connect
wirednkod Jun 19, 2021
2f3c482
merge from latest master
wirednkod Jun 19, 2021
dff740e
merge from latest master
wirednkod Jun 19, 2021
223590c
Add substrate/connect version to 0.3.10
wirednkod Jun 21, 2021
eb266c7
fix merge conflicts
wirednkod Jun 21, 2021
c01dec8
introduce function for correctly creating the provider URLs and updat…
wirednkod Jun 21, 2021
4fad0d4
Fix mistaken typos
wirednkod Jun 21, 2021
dad6da0
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jun 21, 2021
5d557ea
fix linter issue about rpc-provider@npm:^4.10.1 missing
wirednkod Jun 21, 2021
c10afae
move substrate-connect for react-api to dependencies
wirednkod Jun 21, 2021
2b54a74
Fix lint issues
wirednkod Jun 21, 2021
06a6796
Add tests for substrate-connect light clients urls and fix for ws
wirednkod Jun 21, 2021
e0770b7
Update packages/react-api/src/Api.tsx
wirednkod Jun 21, 2021
5a655f3
Remove duplicated code
wirednkod Jun 21, 2021
db9a98d
merge
wirednkod Jun 21, 2021
1183693
add exceptions in jest config (transformIgnorePatterns)
wirednkod Jun 21, 2021
92e27ed
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jun 21, 2021
c5dbb6e
minor fixes
wirednkod Jun 21, 2021
7aa6d18
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jun 22, 2021
dbe27b7
fix typo errors
wirednkod Jun 22, 2021
75961b9
minor yarn update
wirednkod Jun 22, 2021
07190d6
Alter urls to string | union type (revert urls for json-rpc)
wirednkod Jun 22, 2021
1e14155
fix erroneously changed url
wirednkod Jun 22, 2021
55d4d5a
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jun 22, 2021
ab1e746
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jun 25, 2021
7efc68a
merge conflicts
wirednkod Jun 25, 2021
64397ea
merge conflicts
wirednkod Jun 25, 2021
95f2581
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jun 25, 2021
9dba797
fix yarn.lock
wirednkod Jun 25, 2021
cc97ed0
Stub mock for tests of substrate connect
wirednkod Jun 26, 2021
3927bf1
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jun 26, 2021
1b99b51
fix yarn
wirednkod Jun 26, 2021
cdc9e7e
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jun 27, 2021
bcac17c
Update yarn.lock
wirednkod Jun 27, 2021
526f18f
Update yarn.lock
wirednkod Jun 27, 2021
6781d41
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jun 30, 2021
490879f
Update packages/apps/src/Endpoints/index.tsx
wirednkod Jun 30, 2021
eb513c1
Update packages/apps-config/src/endpoints/util.ts
wirednkod Jun 30, 2021
d142836
Fix Pr comments
wirednkod Jun 30, 2021
e8b5d4c
Fix conflicts
wirednkod Jun 30, 2021
0aad0d4
Fix function that was recreated in every rerender
wirednkod Jun 30, 2021
b5f2d2e
Update packages/apps/src/Endpoints/index.tsx
wirednkod Jun 30, 2021
8a1a7e2
Fix 2nd bundle of PR comments
wirednkod Jun 30, 2021
c654d81
Fix function on PR comment
wirednkod Jun 30, 2021
2013dcf
filter light clients out of auto-selected sidebar networks
wirednkod Jun 30, 2021
06debb4
Update package.json
wirednkod Jul 1, 2021
ff624cc
Update packages/react-api/package.json
wirednkod Jul 1, 2021
fa5825a
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jul 1, 2021
accf612
run install
wirednkod Jul 1, 2021
e9eb6ee
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jul 2, 2021
8b67a13
update yarn.lock from master
wirednkod Jul 2, 2021
f51d0e7
update yarn.lock from master
wirednkod Jul 2, 2021
a4b3900
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jul 2, 2021
6b01a99
sync yarn.lock from master
wirednkod Jul 3, 2021
6b87d0f
Merge branch 'nik-integrate-w-substrate-connect' of github.com:wiredn…
wirednkod Jul 3, 2021
286ae08
sync yarn.lock from master
wirednkod Jul 3, 2021
e8fa23d
Alter implementation to avoid white screen and make sure that API ret…
wirednkod Jul 9, 2021
0aab8f9
Merge branch 'master' into nik-integrate-w-substrate-connect
wirednkod Jul 9, 2021
f6ad764
Merge branch 'master' into nik-integrate-w-substrate-connect
jacogr Jul 12, 2021
b0d8aee
Update packages/page-accounts/src/CreateAccount.slow.spec.tsx
jacogr Jul 12, 2021
b3484d1
Update packages/page-bounties/src/Bounties.slow.spec.tsx
jacogr Jul 12, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -74,6 +74,7 @@
"@pinata/sdk": "^1.1.23",
"@polkadot/dev": "^0.62.42",
"@polkadot/ts": "^0.3.90",
"@substrate/connect": "0.3.10",
wirednkod marked this conversation as resolved.
Show resolved Hide resolved
"@types/bn.js": "^4.11.6",
"@types/chart.js": "^2.9.32",
"@types/file-saver": "^2.0.2",
Expand Down
68 changes: 34 additions & 34 deletions packages/apps-config/src/endpoints/production.ts
Expand Up @@ -4,7 +4,7 @@
import type { TFunction } from 'i18next';
import type { LinkOption } from './types';

import { expandEndpoints } from './util';
import { expandEndpoints, createProviderUrl } from './util';

/* eslint-disable sort-keys */

Expand All @@ -22,157 +22,157 @@ export function createProduction (t: TFunction, firstOnly?: boolean): LinkOption
info: 'centrifuge',
text: t('rpc.prod.centrifuge', 'Centrifuge', { ns: 'apps-config' }),
providers: {
Centrifuge: 'wss://fullnode.centrifuge.io'
Centrifuge: createProviderUrl('wss://fullnode.centrifuge.io')
}
},
{
info: 'chainx',
text: t('rpc.prod.chainx', 'ChainX', { ns: 'apps-config' }),
providers: {
// ChainX: 'wss://mainnet.chainx.org/ws', // https://github.com/polkadot-js/apps/issues/5547
'Patract Elara': 'wss://chainx.elara.patract.io'
// ChainX: createProviderUrl('wss://mainnet.chainx.org/ws'), // https://github.com/polkadot-js/apps/issues/5547
'Patract Elara': createProviderUrl('wss://chainx.elara.patract.io')
}
},
{
info: 'darwinia',
text: t('rpc.prod.darwinia', 'Darwinia', { ns: 'apps-config' }),
providers: {
'Darwinia Network': 'wss://rpc.darwinia.network',
'Patract Elara': 'wss://darwinia.elara.patract.io'
'Darwinia Network': createProviderUrl('wss://rpc.darwinia.network'),
'Patract Elara': createProviderUrl('wss://darwinia.elara.patract.io')
}
},
{
info: 'crab',
text: t('rpc.prod.crab', 'Darwinia Crab', { ns: 'apps-config' }),
providers: {
'Darwinia Network': 'wss://crab-rpc.darwinia.network'
'Darwinia Network': createProviderUrl('wss://crab-rpc.darwinia.network')
}
},
{
info: 'dock-mainnet',
text: t('rpc.prod.dock-mainnet', 'Dock', { ns: 'apps-config' }),
providers: {
'Dock Association': 'wss://mainnet-node.dock.io',
'Patract Elara': 'wss://dock.elara.patract.io'
'Dock Association': createProviderUrl('wss://mainnet-node.dock.io'),
'Patract Elara': createProviderUrl('wss://dock.elara.patract.io')
}
},
{
dnslink: 'edgeware',
info: 'edgeware',
text: t('rpc.prod.edgeware', 'Edgeware', { ns: 'apps-config' }),
providers: {
'Commonwealth Labs': 'wss://mainnet1.edgewa.re',
'Patract Elara': 'wss://edgeware.elara.patract.io',
OnFinality: 'wss://edgeware.api.onfinality.io/public-ws'
'Commonwealth Labs': createProviderUrl('wss://mainnet1.edgewa.re'),
'Patract Elara': createProviderUrl('wss://edgeware.elara.patract.io'),
OnFinality: createProviderUrl('wss://edgeware.api.onfinality.io/public-ws')
}
},
{
info: 'equilibrium',
text: t('rpc.prod.equilibrium', 'Equilibrium', { ns: 'apps-config' }),
providers: {
Equilibrium: 'wss://node.equilibrium.io'
Equilibrium: createProviderUrl('wss://node.equilibrium.io')
}
},
{
info: 'hanonycash',
isUnreachable: true, // https://github.com/polkadot-js/apps/runs/2755409009?check_suite_focus=true
text: t('rpc.prod.hanonycash', 'Hanonycash', { ns: 'apps-config' }),
providers: {
Hanonycash: 'wss://rpc.hanonycash.com'
Hanonycash: createProviderUrl('wss://rpc.hanonycash.com')
}
},
{
info: 'snakenet',
text: t('rpc.prod.hydra', 'HydraDX', { ns: 'apps-config' }),
providers: {
HydraDX: 'wss://rpc-01.snakenet.hydradx.io',
'Galactic Council': 'wss://rpc-02.snakenet.hydradx.io',
Archives: 'wss://archive.snakenet.hydradx.io'
HydraDX: createProviderUrl('wss://rpc-01.snakenet.hydradx.io'),
'Galactic Council': createProviderUrl('wss://rpc-02.snakenet.hydradx.io'),
Archives: createProviderUrl('wss://archive.snakenet.hydradx.io')
}
},
{
dnslink: 'kulupu',
info: 'kulupu',
text: t('rpc.prod.kulupu', 'Kulupu', { ns: 'apps-config' }),
providers: {
Kulupu: 'wss://rpc.kulupu.corepaper.org/ws',
'Patract Elara': 'wss://kulupu.elara.patract.io'
Kulupu: createProviderUrl('wss://rpc.kulupu.corepaper.org/ws'),
'Patract Elara': createProviderUrl('wss://kulupu.elara.patract.io')
}
},
{
info: 'neatcoin',
text: t('rpc.prod.neatcoin', 'Neatcoin', { ns: 'apps-config' }),
providers: {
Neatcoin: 'wss://rpc.neatcoin.org/ws'
Neatcoin: createProviderUrl('wss://rpc.neatcoin.org/ws')
}
},
{
info: 'nodle',
text: t('rpc.prod.nodle-main', 'Nodle', { ns: 'apps-config' }),
providers: {
Nodle: 'wss://main3.nodleprotocol.io',
'Patract Elara': 'wss://nodle.elara.patract.io'
Nodle: createProviderUrl('wss://main3.nodleprotocol.io'),
'Patract Elara': createProviderUrl('wss://nodle.elara.patract.io')
}
},
{
info: 'plasm',
text: t('rpc.prod.plasm', 'Plasm', { ns: 'apps-config' }),
providers: {
'Stake Technologies': 'wss://rpc.plasmnet.io/',
'Patract Elara': 'wss://plasm.elara.patract.io'
'Stake Technologies': createProviderUrl('wss://rpc.plasmnet.io/'),
'Patract Elara': createProviderUrl('wss://plasm.elara.patract.io')
}
},
{
info: 'riochain',
text: t('rpc.prod.riochain', 'RioChain', { ns: 'apps-config' }),
providers: {
RioChain: 'wss://node.v1.riochain.io'
RioChain: createProviderUrl('wss://node.v1.riochain.io')
}
},
{
info: 'sora-substrate',
text: t('rpc.prod.sora-substrate', 'SORA', { ns: 'apps-config' }),
providers: {
Soramitsu: 'wss://ws.sora2.soramitsu.co.jp',
'SORA Parliament Ministry of Finance': 'wss://ws.mof.sora.org:4443'
Soramitsu: createProviderUrl('wss://ws.sora2.soramitsu.co.jp'),
'SORA Parliament Ministry of Finance': createProviderUrl('wss://ws.mof.sora.org:4443')
}
},
{
info: 'stafi',
isDisabled: true, // Cannot find type ChainId
text: t('rpc.prod.stafi', 'Stafi', { ns: 'apps-config' }),
providers: {
'Stafi Foundation': 'wss://mainnet-rpc.stafi.io',
'Patract Elara': 'wss://stafi.elara.patract.io'
'Stafi Foundation': createProviderUrl('wss://mainnet-rpc.stafi.io'),
'Patract Elara': createProviderUrl('wss://stafi.elara.patract.io')
}
},
{
info: 'subgame',
text: t('rpc.prod.subgame', 'SubGame', { ns: 'apps-config' }),
providers: {
SubGame: 'wss://mainnet.subgame.org/'
SubGame: createProviderUrl('wss://mainnet.subgame.org/')
}
},
{
info: 'subsocial',
text: t('rpc.prod.subsocial', 'Subsocial', { ns: 'apps-config' }),
providers: {
DappForce: 'wss://rpc.subsocial.network',
'Patract Elara': 'wss://subsocial.elara.patract.io'
DappForce: createProviderUrl('wss://rpc.subsocial.network'),
'Patract Elara': createProviderUrl('wss://subsocial.elara.patract.io')
}
},
{
info: 'uniarts',
text: t('rpc.prod.uniarts', 'UniArts', { ns: 'apps-config' }),
providers: {
UniArts: 'wss://mainnet.uniarts.vip:9443'
UniArts: createProviderUrl('wss://mainnet.uniarts.vip:9443')
}
},
{
info: 'westlake',
text: t('rpc.prod.westlake', 'Westlake', { ns: 'apps-config' }),
providers: {
DataHighway: 'wss://westlake.datahighway.com'
DataHighway: createProviderUrl('wss://westlake.datahighway.com')
}
}
], firstOnly);
Expand Down