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.

Sign up for GitHub

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

Throw an AddChainError if the database isn't a string #861

Merged
merged 3 commits into from
Jul 8, 2023
Merged

Throw an AddChainError if the database isn't a string #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e028929
Throw an `AddChainError` if the database isn't a string
tomaka Jul 6, 2023
7d21665
PR link
tomaka Jul 6, 2023
2c09f9e
Accept undefined database
tomaka Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions wasm-node/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- Blocks are now reported to `chain_subscribeAllHeads` and `chain_subscribeNewHeads` subscribers only after they have been put in the cache, preventing race conditions where JSON-RPC clients suffer from a cache miss if they ask information about these blocks too quickly. ([#854](https://github.com/smol-dot/smoldot/pull/854))
- Runtime updates are now always reported to `state_subscribeRuntimeVersion` subscribers immediately after the `chain_subscribeNewHeads` notification corresponding to the block containing the runtime update. They were previously reported in a pseudo-random order. ([#854](https://github.com/smol-dot/smoldot/pull/854))
- All the storage subscriptions made using `state_subscribeStorage` are now queried together into a single networking request per block, instead of sending one networking query per storage key and per subscription. ([#854](https://github.com/smol-dot/smoldot/pull/854))
- An `AddChainError` is now thrown if the `databaseContent` parameter is not of type `string`. The database was previously silently ignored. ([#861](https://github.com/smol-dot/smoldot/pull/861))

## 1.0.11 - 2023-06-25

Expand Down
6 changes: 5 additions & 1 deletion wasm-node/javascript/src/internals/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,11 +499,15 @@ export function start(options: ClientOptions, wasmModule: SmoldotBytecode | Prom
jsonRpcMaxSubscriptions = 0xffffffff
}

// Sanitize `databaseContent`.
if (options.databaseContent !== undefined && typeof options.databaseContent !== 'string')
throw new AddChainError("`databaseContent` is not a string");

const promise = new Promise<{ success: true, chainId: number } | { success: false, error: string }>((resolve) => state.addChainResults.push(resolve));

state.instance.instance.addChain(
options.chainSpec,
typeof options.databaseContent === 'string' ? options.databaseContent : "",
options.databaseContent || "",
potentialRelayChainsIds,
!!options.disableJsonRpc,
jsonRpcMaxPendingRequests,
Expand Down