Return Raw results on storage decode failures (#2862)

This commit is contained in:
Jaco Greeff
2020-11-19 12:12:00 +01:00
committed by GitHub
parent aa6ec6c9dc
commit 7a4fe4fe5f
4 changed files with 126 additions and 113 deletions
+3 -3
View File
@@ -468,10 +468,10 @@ export abstract class Decorate<ApiType extends ApiTypes> extends Events {
private _retrieveMapEntries (entry: StorageEntry, at: Hash | Uint8Array | string | null, arg?: Arg): Observable<[StorageKey, Codec][]> {
const query = this._rpcCore.state.queryStorageAt
? at
? (keyset: StorageKey[]) => this._rpcCore.state.queryStorageAt<Codec[]>(keyset, at)
: (keyset: StorageKey[]) => this._rpcCore.state.queryStorageAt<Codec[]>(keyset)
? (keyset: StorageKey[]) => this._rpcCore.state.queryStorageAt(keyset, at)
: (keyset: StorageKey[]) => this._rpcCore.state.queryStorageAt(keyset)
// this is horrible, but need older support (which now doesn't work with at)
: (keyset: StorageKey[]) => this._rpcCore.state.subscribeStorage<Codec[]>(keyset).pipe(take(1));
: (keyset: StorageKey[]) => this._rpcCore.state.subscribeStorage(keyset).pipe(take(1));
return this._retrieveMapKeys(entry, at, arg).pipe(
switchMap((keys) =>
+52 -44
View File
@@ -382,13 +382,7 @@ export class RpcCore implements RpcInterface {
if (rpc.type === 'StorageData') {
const key = params[0] as StorageKey;
try {
return this._formatStorageData(registry, key, result);
} catch (error) {
l.error(`Unable to decode storage ${key.section || 'unknown'}.${key.method || 'unknown'}:`, (error as Error).message);
throw error;
}
return this._formatStorageData(registry, key, result);
} else if (rpc.type === 'StorageChangeSet') {
const keys = params[0] as Vec<StorageKey>;
@@ -426,22 +420,32 @@ export class RpcCore implements RpcInterface {
: u8aToU8a(value);
if (meta.modifier.isOptional) {
return new Option(
registry,
createClass(registry, type),
isEmpty
? null
: createTypeUnsafe(registry, type, [input], true)
);
let inner = null;
if (!isEmpty) {
try {
inner = createTypeUnsafe(registry, type, [input], true);
} catch (error) {
l.error(`Unable to decode storage ${key.section || 'unknown'}.${key.method || 'unknown'}:`, (error as Error).message);
}
}
return new Option(registry, createClass(registry, type), inner);
}
return createTypeUnsafe(registry, type, [
isEmpty
? meta.fallback
? hexToU8a(meta.fallback.toHex())
: undefined
: input
], true);
try {
return createTypeUnsafe(registry, type, [
isEmpty
? meta.fallback
? hexToU8a(meta.fallback.toHex())
: undefined
: input
], true);
} catch (error) {
l.error(`Unable to decode storage ${key.section || 'unknown'}.${key.method || 'unknown'}:`, (error as Error).message);
return registry.createType('Raw', input);
}
}
private _formatStorageSet (registry: Registry, keys: Vec<StorageKey>, changes: [string, string | null][]): Codec[] {
@@ -453,24 +457,18 @@ export class RpcCore implements RpcInterface {
// - Codec - There is a valid value, non-empty
// - null - The storage key is empty
return keys.reduce((results: Codec[], key: StorageKey, index: number): Codec[] => {
try {
results.push(this._formatStorageSetEntry(registry, key, changes, withCache));
} catch (error) {
l.error(`Unable to decode storage ${key.section || 'unknown'}.${key.method || 'unknown'}: entry ${index + 1}/${keys.length}:`, (error as Error).message);
throw error;
}
results.push(this._formatStorageSetEntry(registry, key, changes, withCache, index));
return results;
}, []);
}
private _formatStorageSetEntry (registry: Registry, key: StorageKey, changes: [string, string | null][], witCache: boolean): Codec {
private _formatStorageSetEntry (registry: Registry, key: StorageKey, changes: [string, string | null][], witCache: boolean, entryIndex: number): Codec {
// Fallback to Raw (i.e. just the encoding) if we don't have a specific type
const type = key.outputType || 'Raw';
const hexKey = key.toHex();
const meta = key.meta || EMPTY_META;
const found = changes.find(([key]): boolean => key === hexKey);
const found = changes.find(([key]) => key === hexKey);
// if we don't find the value, this is our fallback
// - in the case of an array of values, fill the hole from the cache
@@ -490,21 +488,31 @@ export class RpcCore implements RpcInterface {
this.#storageCache.set(hexKey, value);
if (meta.modifier.isOptional) {
return new Option(
registry,
createClass(registry, type),
isEmpty
? null
: createTypeUnsafe(registry, type, [input], true)
);
let inner = null;
if (!isEmpty) {
try {
inner = createTypeUnsafe(registry, type, [input], true);
} catch (error) {
l.error(`Unable to decode storage ${key.section || 'unknown'}.${key.method || 'unknown'}: entry ${entryIndex}:`, (error as Error).message);
}
}
return new Option(registry, createClass(registry, type), inner);
}
return createTypeUnsafe(registry, type, [
isEmpty
? meta.fallback
? hexToU8a(meta.fallback.toHex())
: undefined
: input
], true);
try {
return createTypeUnsafe(registry, type, [
isEmpty
? meta.fallback
? hexToU8a(meta.fallback.toHex())
: undefined
: input
], true);
} catch (error) {
l.error(`Unable to decode storage ${key.section || 'unknown'}.${key.method || 'unknown'}: entry ${entryIndex}:`, (error as Error).message);
return registry.createType('Raw', input);
}
}
}