Integrate substrate connect with Apps

jest.config.cjs

@@ -25,5 +25,5 @@ module.exports = {
   setupFilesAfterEnv: ['<rootDir>/jest/jest-setup.ts'],
   testEnvironment: 'jsdom',
   testTimeout: 90000,
-  transformIgnorePatterns: ['/node_modules/(?!@polkadot|@babel/runtime/helpers/esm/)']
+  transformIgnorePatterns: ['/node_modules/(?!@polkadot|@babel/runtime/helpers/esm/|@substrate|smoldot)']
 };

package.json

@@ -74,6 +74,7 @@
     "@pinata/sdk": "^1.1.23",
     "@polkadot/dev": "^0.62.42",
     "@polkadot/ts": "^0.3.90",
+    "@substrate/connect": "0.3.10",
     "@types/bn.js": "^4.11.6",
     "@types/chart.js": "^2.9.32",
     "@types/file-saver": "^2.0.2",

packages/apps-config/src/endpoints/index.spec.ts

@@ -10,14 +10,20 @@ interface Endpoint {
   ws: string;
 }
 
+interface LightClientEndpoint {
+  name: string;
+  param: string;
+}
+
 const allEndpoints = createWsEndpoints((k: string, v?: string) => v || k);
 
-describe('urls are all valid', (): void => {
+describe('WS urls are all valid', (): void => {
   allEndpoints
     .filter(({ value }) =>
       value &&
       isString(value) &&
-      !value.includes('127.0.0.1')
+      !value.includes('127.0.0.1') &&
+      !value.includes('substrate-connect')
     )
     .map(({ text, value }): Endpoint => ({
       name: text as string,
@@ -30,6 +36,24 @@ describe('urls are all valid', (): void => {
     );
 });
 
+describe('light client urls are all valid', (): void => {
+  allEndpoints
+    .filter(({ value }) =>
+      value &&
+      isString(value) &&
+      value.includes('substrate-connect')
+    )
+    .map(({ text, value }): LightClientEndpoint => ({
+      name: text as string,
+      param: value
+    }))
+    .forEach(({ name, param }) =>
+      it(`${name} @ ${param}`, (): void => {
+        assert(param.substr(param.indexOf('-')) === '-substrate-connect', `${name} @ ${param} should end with '-substrate-connect'`);
+      })
+    );
+});
+
 describe('urls are sorted', (): void => {
   let hasDevelopment = false;
   let lastHeader = '';

packages/apps-config/src/endpoints/production.ts

@@ -4,7 +4,7 @@
 import type { TFunction } from 'i18next';
 import type { LinkOption } from './types';
 
-import { expandEndpoints } from './util';
+import { createProviderUrl, expandEndpoints } from './util';
 
 /* eslint-disable sort-keys */
 
@@ -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);