Merge pull request #62 from TalismanSociety/refactor/handle-pruned-bl…

…ocks Refactor/handle pruned blocks
TalismanSociety · Jul 26, 2024 · 7ca9702 · 7ca9702
2 parents 65c6ec5 + 17c8a4c
commit 7ca9702
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 11 deletions.
diff --git a/apps/multisig/.env.example b/apps/multisig/.env.example
@@ -2,4 +2,5 @@ REACT_APP_APPLICATION_NAME=Signet
 REACT_APP_HASURA_ENDPOINT=https://signet-metadata.talisman.xyz
 REACT_APP_SIWS_ENDPOINT=https://signet-metadata.talisman.xyz/siws
 REACT_APP_CONTACT_EMAIL=[email protected]
-REACT_APP_SIGNET_LANDING_PAGE=https://talisman.xyz/signet
+REACT_APP_SIGNET_LANDING_PAGE=https://talisman.xyz/signet
+REACT_APP_ON_FINALITY_API_KEY=
diff --git a/apps/multisig/scripts/chaingen.ts b/apps/multisig/scripts/chaingen.ts
@@ -69,6 +69,10 @@ const subscanUrlsOverride: Record<string, string> = {
   'bittensor': 'https://bittensor.com/scan',
 }
 
+const rpcUrlsOverride: Record<string, Rpc[]> = {
+  bittensor: [{ url: `wss://bittensor-finney.api.onfinality.io/ws?apikey=` }],
+}
+
 const networkLogoOverride: Record<string, string> = {
   'avail-turing-testnet': 'https://www.availproject.org/_next/static/media/logo_large.80d5666f.png',
 }
@@ -108,7 +112,7 @@ const generateSupportedChains = async () => {
         nativeToken: {
           id: chain.nativeToken?.id,
         },
-        rpcs: chain.rpcs,
+        rpcs: rpcUrlsOverride[chain.id] ?? chain.rpcs,
         squidIds: { chainData: chain.id },
         ss58Prefix: chain.prefix,
         subscanUrl: subscanUrlsOverride[chain.id] ?? chain.subscanUrl,
@@ -126,7 +130,7 @@ const generateSupportedChains = async () => {
   // DO NOT MODIFY THIS FILE MANUALLY
   // This file is auto-generated by scripts/chaingen.ts
   export type SupportedChainIds = ${supportedChainIds.map(id => `'${id}'`).join(' | ')}
-  export const supportedChains: Chain<SupportedChainIds>[] =  ${JSON.stringify(supportedChains, null, 2)} as const
+  export const supportedChains: Chain<SupportedChainIds>[] =  ${JSON.stringify(supportedChains, null, 2)}
   `
   )
 }

diff --git a/apps/multisig/src/domains/chains/generated-chains.ts b/apps/multisig/src/domains/chains/generated-chains.ts
@@ -29,7 +29,6 @@ export type SupportedChainIds =
   | 'rococo-neuro-web-testnet'
   | 'polimec'
   | 'bittensor'
-
 export const supportedChains: Chain<SupportedChainIds>[] = [
   {
     chainName: 'Polkadot',
@@ -702,7 +701,7 @@ export const supportedChains: Chain<SupportedChainIds>[] = [
     },
     rpcs: [
       {
-        url: 'wss://entrypoint-finney.opentensor.ai:443',
+        url: 'wss://bittensor-finney.api.onfinality.io/ws?apikey=',
       },
     ],
     squidIds: {

diff --git a/apps/multisig/src/domains/chains/pjs-api.ts b/apps/multisig/src/domains/chains/pjs-api.ts
@@ -8,6 +8,8 @@ import persistAtom from '@domains/persist'
 import { types, rpc, signedExtensions } from 'avail-js-sdk'
 import { ApiOptions } from '@polkadot/api/types'
 
+const RPC_PROVIDER = 'onfinality'
+
 export const customRpcsAtom = atom<Record<string, string | undefined>>({
   key: 'customRpcs',
   default: {},
@@ -32,7 +34,9 @@ const defaultPjsApiSelector = selectorFamily({
     if (rpcs.length === 0) return ApiPromise.create({ provider: new WsProvider([]) })
 
     let opt: ApiOptions = {
-      provider: new WsProvider(rpcs.map(({ url }) => url)),
+      provider: new WsProvider(
+        rpcs.map(({ url }) => (url.includes(RPC_PROVIDER) ? `${url}${process.env.REACT_APP_ON_FINALITY_API_KEY}` : url))
+      ),
     }
 
     const customExtension = squidIds ? customExtensions[squidIds.chainData] : undefined

diff --git a/apps/multisig/src/domains/chains/storage-getters.ts b/apps/multisig/src/domains/chains/storage-getters.ts
@@ -204,20 +204,26 @@ export const blockHashSelector = selectorFamily({
 })
 
 /** Give a {blockHash}-{chainGenesisHash}, get the block on chain */
-export const blockSelector = selectorFamily<SignedBlock, string>({
+export const blockSelector = selectorFamily<SignedBlock | null, string>({
   key: 'blockSelector',
   get:
     blockAndChainHash =>
     async ({ get }) => {
       const [blockHash, chainHash] = blockAndChainHash.split('-') as [string, string]
+
       const api = get(pjsApiSelector(chainHash))
-      const block = await api.rpc.chain.getBlock(blockHash)
-      return block
+      try {
+        const block = await api.rpc.chain.getBlock(blockHash)
+        return block
+      } catch (error) {
+        console.error({ error })
+        return null
+      }
     },
   dangerouslyAllowMutability: true,
 })
 
-export const blocksSelector = selectorFamily<SignedBlock[], string>({
+export const blocksSelector = selectorFamily<(SignedBlock | null)[], string>({
   key: 'blocksSelector',
   get:
     blockAndChainHashes =>

diff --git a/apps/multisig/src/domains/tx-history/index.tsx b/apps/multisig/src/domains/tx-history/index.tsx
@@ -330,7 +330,7 @@ export const useConfirmedTransactions = (teams: Team[]) => {
 
     paginatedTransactions.forEach(tx => {
       try {
-        const block = blocks.find(b => b.block.header.hash.toString() === tx.block.hash)
+        const block = blocks.find(b => b?.block.header.hash.toString() === tx.block.hash)
         const chain = teams.find(t => t.chain.genesisHash === tx.block.chainGenesisHash)?.chain
         const chainTokens = chain ? allActiveChainTokens.contents.get(chain.squidIds.chainData) : undefined
         const api = apis.contents[tx.block.chainGenesisHash]