@@ -10,10 +10,9 @@ import {
1010 mapLookupToTypedef ,
1111 valueIsCompatibleWithDest ,
1212} from "@polkadot-api/metadata-compatibility"
13- import {
14- type ChainHead$ ,
15- getObservableClient ,
16- type RuntimeContext ,
13+ import type {
14+ ChainHead$ ,
15+ RuntimeContext ,
1716} from "@polkadot-api/observable-client"
1817import { Tuple , Vector } from "@polkadot-api/substrate-bindings"
1918import { Observable , combineLatest , filter , firstValueFrom , map } from "rxjs"
@@ -70,7 +69,7 @@ const TypesCodec = Tuple(EntryPointsCodec, TypedefsCodec)
7069
7170export const createCompatibilityToken = < D extends ChainDefinition > (
7271 chainDefinition : D ,
73- chainHead : ReturnType < ReturnType < typeof getObservableClient > [ "chainHead$" ] > ,
72+ chainHead : ChainHead$ ,
7473) : Promise < CompatibilityToken < D > > => {
7574 const awaitedRuntime = new Promise < ( ) => RuntimeContext > ( async ( resolve ) => {
7675 const loadedRuntime$ = chainHead . runtime$ . pipe ( filter ( ( v ) => v != null ) )
@@ -90,10 +89,18 @@ export const createCompatibilityToken = <D extends ChainDefinition>(
9089 compatibilityTokenApi . set ( token , {
9190 runtime,
9291 getPalletEntryPoint ( opType , pallet , name ) {
93- return entryPoints [ descriptors [ opType ] [ pallet ] [ name ] ]
92+ const idx = descriptors [ opType ] ?. [ pallet ] ?. [ name ]
93+ if ( idx == null )
94+ throw new Error (
95+ `Descriptor for ${ opType } ${ pallet } ${ name } ,
96+ )
97+ return entryPoints [ idx ]
9498 } ,
9599 getApiEntryPoint ( name , method ) {
96- return entryPoints [ descriptors . apis [ name ] [ method ] ]
100+ const idx = descriptors . apis ?. [ name ] ?. [ method ]
101+ if ( idx == null )
102+ throw new Error ( `Descriptor for API ${ name } ${ method } )
103+ return entryPoints [ idx ]
97104 } ,
98105 typedefNodes,
99106 } )
@@ -105,7 +112,7 @@ export const createCompatibilityToken = <D extends ChainDefinition>(
105112}
106113
107114export const createRuntimeToken = < D > (
108- chainHead : ReturnType < ReturnType < typeof getObservableClient > [ "chainHead$" ] > ,
115+ chainHead : ChainHead$ ,
109116) : Promise < RuntimeToken < D > > => {
110117 const awaitedRuntime = new Promise < ( ) => RuntimeContext > ( async ( resolve ) => {
111118 const loadedRuntime$ = chainHead . runtime$ . pipe ( filter ( ( v ) => v != null ) )
@@ -149,7 +156,7 @@ const getMetadataCache = (ctx: RuntimeContext) => {
149156export const compatibilityHelper = (
150157 descriptors : Promise < RuntimeToken | CompatibilityToken > ,
151158 getDescriptorEntryPoint : ( descriptorApi : CompatibilityTokenApi ) => EntryPoint ,
152- getRuntimeEntryPoint : ( ctx : RuntimeContext ) => EntryPoint ,
159+ getRuntimeEntryPoint : ( ctx : RuntimeContext ) => EntryPoint | null ,
153160) => {
154161 const getRuntimeTypedef = ( ctx : RuntimeContext , id : number ) => {
155162 const cache = getMetadataCache ( ctx )
@@ -176,6 +183,11 @@ export const compatibilityHelper = (
176183 ctx ||= compatibilityApi . runtime ( )
177184 const descriptorEntryPoint = getDescriptorEntryPoint ( compatibilityApi )
178185 const runtimeEntryPoint = getRuntimeEntryPoint ( ctx )
186+ if ( runtimeEntryPoint == null )
187+ return {
188+ args : CompatibilityLevel . Incompatible ,
189+ values : CompatibilityLevel . Incompatible ,
190+ }
179191 const descriptorNodes = compatibilityApi . typedefNodes
180192
181193 const cache = getMetadataCache ( ctx )
@@ -198,9 +210,8 @@ export const compatibilityHelper = (
198210 getCompatibilityLevel ( runtime ) >= threshold ,
199211 )
200212
201- const waitDescriptors = ( ) => descriptors
202213 const compatibleRuntime$ = ( chainHead : ChainHead$ , hash : string | null ) =>
203- combineLatest ( [ waitDescriptors ( ) , chainHead . getRuntimeContext$ ( hash ) ] )
214+ combineLatest ( [ descriptors , chainHead . getRuntimeContext$ ( hash ) ] )
204215
205216 const withCompatibleRuntime =
206217 < T > ( chainHead : ChainHead$ , mapper : ( x : T ) => string ) =>
@@ -209,7 +220,7 @@ export const compatibilityHelper = (
209220 ) : Observable < [ T , CompatibilityToken | RuntimeToken , RuntimeContext ] > =>
210221 combineLatest ( [
211222 source$ . pipe ( chainHead . withRuntime ( mapper ) ) ,
212- waitDescriptors ( ) ,
223+ descriptors ,
213224 ] ) . pipe ( map ( ( [ [ x , ctx ] , descriptors ] ) => [ x , descriptors , ctx ] ) )
214225
215226 const argsAreCompatible = (
@@ -225,6 +236,7 @@ export const compatibilityHelper = (
225236 if ( levels . values === CompatibilityLevel . Incompatible ) return false
226237
227238 const entryPoint = getRuntimeEntryPoint ( ctx )
239+ if ( entryPoint == null ) return false
228240
229241 return valueIsCompatibleWithDest (
230242 entryPoint . args ,
@@ -257,7 +269,7 @@ export const compatibilityHelper = (
257269 isCompatible,
258270 getCompatibilityLevel,
259271 getCompatibilityLevels,
260- waitDescriptors ,
272+ descriptors ,
261273 withCompatibleRuntime,
262274 compatibleRuntime$,
263275 argsAreCompatible,
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?v=4&size=40){kind=avatar}
0 commit comments