diff --git a/src/pages/Extrinsics/SubmitTx/SelectAccountFromExtension.tsx b/src/pages/Extrinsics/SubmitTx/SelectAccountFromExtension.tsx deleted file mode 100644 index c9283a3..0000000 --- a/src/pages/Extrinsics/SubmitTx/SelectAccountFromExtension.tsx +++ /dev/null @@ -1,66 +0,0 @@ -import { unsafeApi$ } from "@/state/chains/chain.state" -import { ActionButton } from "@/components/ActionButton" -import { onNexTx } from "@/pages/Transactions" -import { useStateObservable } from "@react-rxjs/core" -import { Binary } from "polkadot-api" -import { FC, useState } from "react" -import { noop } from "rxjs" -import { AccountProvider, selectedAccount$ } from "./AccountProvider" -import { ExtensionProvider } from "./ExtensionProvider" -import { Spinner } from "@/components/Icons" -import { twMerge } from "tailwind-merge" - -const SignAndSubmit: FC<{ callData: string; onClose: () => void }> = ({ - callData, - onClose, -}) => { - const account = useStateObservable(selectedAccount$) - const [isSigning, setIsSigning] = useState(false) - - if (!account) return null - - return ( - { - let nClients = 0 - const subscription = unsafeApi$.subscribe((client) => { - nClients++ - if (nClients > 1) return subscription.unsubscribe() - setIsSigning(true) - client - .txFromCallData(Binary.fromHex(callData)) - .then((x) => { - if (nClients === 1) - return x.sign(account.polkadotSigner).then((s) => { - onClose() - if (nClients === 1) onNexTx(s) - }) - }, noop) - .finally(() => { - subscription.unsubscribe() - setIsSigning(false) - }) - }) - }} - className="flex gap-2 items-center justify-center" - > - - Sign and Submit - - {isSigning && } - - ) -} - -export default function SelectAccountFromExtension(props: { - callData: string - onClose: () => void -}) { - return ( - <> - - - - - ) -} diff --git a/src/pages/Extrinsics/SubmitTx/SubmitTx.tsx b/src/pages/Extrinsics/SubmitTx/SubmitTx.tsx index 239b863..6df215b 100644 --- a/src/pages/Extrinsics/SubmitTx/SubmitTx.tsx +++ b/src/pages/Extrinsics/SubmitTx/SubmitTx.tsx @@ -9,9 +9,7 @@ import { toHex } from "@polkadot-api/utils" import { HexString } from "polkadot-api" import React, { lazy, Suspense, useState } from "react" -const SelectAccountFromExtension = lazy( - () => import("./SelectAccountFromExtension"), -) +const SendTransactionForm = lazy(() => import("./SubmitTxForm")) export const ExtrinsicModal: React.FC<{ callData: Uint8Array | HexString | undefined @@ -36,7 +34,7 @@ export const ExtrinsicModal: React.FC<{ > Create TX - void }> = ({ + callData, + onClose, +}) => { + const account = useStateObservable(selectedAccount$) + const [isSigning, setIsSigning] = useState(false) + + return ( + { + setIsSigning(true) + try { + const unsafeApi = await firstValueFrom(unsafeApi$) + const tx = await unsafeApi.txFromCallData(Binary.fromHex(callData)) + const signedExtrinsic = await tx.sign(account!.polkadotSigner) + trackSignedTx(signedExtrinsic) + onClose() + } catch (ex) { + console.error(ex) + } + setIsSigning(false) + }} + className="flex gap-2 items-center justify-center" + disabled={!account} + > + + Sign and Submit + + {isSigning && } + + ) +} + +const SubmitUnsigned: FC<{ callData: string; onClose: () => void }> = ({ + callData, + onClose, +}) => { + return ( + { + const data = fromHex(callData) + const unsignedTx = mergeUint8( + compactNumber.enc(data.length + 1), + new Uint8Array([4]), + data, + ) + trackUnsignedTx(toHex(unsignedTx)) + onClose() + }} + className="flex gap-2 items-center justify-center" + > + Submit without signing + + ) +} + +export default function SubmitTxF(props: { + callData: string + onClose: () => void +}) { + return ( + <> + + +
+ +
Or
+ +
+ + ) +} diff --git a/src/pages/RuntimeCalls/RuntimeCallResults.tsx b/src/pages/RuntimeCalls/RuntimeCallResults.tsx index 492d772..b982f0c 100644 --- a/src/pages/RuntimeCalls/RuntimeCallResults.tsx +++ b/src/pages/RuntimeCalls/RuntimeCallResults.tsx @@ -75,6 +75,15 @@ const ResultDisplay: FC<{ runtimeCallResult: RuntimeCallResult mode: "json" | "decoded" }> = ({ runtimeCallResult, mode }) => { + if ("error" in runtimeCallResult) { + return ( +
+
The call crashed
+
Message: {runtimeCallResult.error.message ?? "N/A"}
+
+ ) + } + if (!("result" in runtimeCallResult)) { return
Loading…
} diff --git a/src/pages/RuntimeCalls/runtimeCalls.state.ts b/src/pages/RuntimeCalls/runtimeCalls.state.ts index c8368c3..042bc64 100644 --- a/src/pages/RuntimeCalls/runtimeCalls.state.ts +++ b/src/pages/RuntimeCalls/runtimeCalls.state.ts @@ -5,7 +5,16 @@ import { partitionByKey, toKeySet, } from "@react-rxjs/utils" -import { from, map, Observable, startWith, switchMap, takeUntil } from "rxjs" +import { + catchError, + from, + map, + Observable, + of, + startWith, + switchMap, + takeUntil, +} from "rxjs" import { v4 as uuid } from "uuid" export type RuntimeCallMetadataMethod = { @@ -34,8 +43,8 @@ export const [removeRuntimeCallResult$, removeRuntimeCallResult] = export type RuntimeCallResult = { name: string type: number -} & ({ result: unknown } | {}) -const [getStorageSubscription$, storageSubscriptionKeyChange$] = partitionByKey( +} & ({ result: unknown } | { error?: any }) +const [getRuntimeCallSubscription$, runtimeCallKeyChange$] = partitionByKey( newRuntimeCallQuery$, () => uuid(), (src$, id) => @@ -48,6 +57,13 @@ const [getStorageSubscription$, storageSubscriptionKeyChange$] = partitionByKey( result, paused: false, })), + catchError((ex) => { + console.error(ex) + return of({ + ...props, + error: ex, + }) + }), startWith(props), ), ), @@ -56,7 +72,7 @@ const [getStorageSubscription$, storageSubscriptionKeyChange$] = partitionByKey( ) export const runtimeCallResultKeys$ = state( - storageSubscriptionKeyChange$.pipe( + runtimeCallKeyChange$.pipe( toKeySet(), map((keys) => [...keys].reverse()), ), @@ -64,6 +80,7 @@ export const runtimeCallResultKeys$ = state( ) export const runtimeCallResult$ = state( - (key: string): Observable => getStorageSubscription$(key), + (key: string): Observable => + getRuntimeCallSubscription$(key), null, ) diff --git a/src/pages/Transactions/index.ts b/src/pages/Transactions/index.ts index 497166a..812fa35 100644 --- a/src/pages/Transactions/index.ts +++ b/src/pages/Transactions/index.ts @@ -1,5 +1,5 @@ import { grouppedTransactions$ } from "./transactions.state" export * from "./Transactions" -export { onNexTx } from "./transactions.state" +export { trackSignedTx, trackUnsignedTx } from "./transactions.state" export const transactions$ = grouppedTransactions$ diff --git a/src/pages/Transactions/transactions.state.ts b/src/pages/Transactions/transactions.state.ts index d3fbdf8..e49be45 100644 --- a/src/pages/Transactions/transactions.state.ts +++ b/src/pages/Transactions/transactions.state.ts @@ -1,6 +1,11 @@ import { chainClient$ } from "@/state/chains/chain.state" import { state } from "@react-rxjs/core" -import { combineKeys, createSignal, partitionByKey } from "@react-rxjs/utils" +import { + combineKeys, + createSignal, + mergeWithKey, + partitionByKey, +} from "@react-rxjs/utils" import { HexString, InvalidTxError, TxBroadcastEvent } from "polkadot-api" import { catchError, @@ -13,20 +18,21 @@ import { withLatestFrom, } from "rxjs" -const [signedTx$, onNexTx] = createSignal() -export { onNexTx } +const [signedTx$, trackSignedTx] = createSignal() +const [unsignedTx$, trackUnsignedTx] = createSignal() +export { trackSignedTx, trackUnsignedTx } -const transactions$ = signedTx$.pipe( +const transactions$ = mergeWithKey({ signedTx$, unsignedTx$ }).pipe( withLatestFrom(chainClient$), mergeMap(([tx, { client }]) => { const submitAndWatch = client.submitAndWatch as ( tx: HexString, at: string, - withSigned: boolean, + withSigned?: boolean, ) => Observable let txHash: string = "" - return submitAndWatch(tx, "finalized", true).pipe( + return submitAndWatch(tx.payload, "finalized", true).pipe( tap((e) => { txHash = e.txHash }), diff --git a/src/state/chains/chain.state.ts b/src/state/chains/chain.state.ts index cb02cb3..d60bd00 100644 --- a/src/state/chains/chain.state.ts +++ b/src/state/chains/chain.state.ts @@ -30,6 +30,7 @@ import { WebsocketSource, } from "./websocket" import { getHashParams, setHashParams } from "@/hashParams" +import { withLogsRecorder } from "polkadot-api/logs-provider" export type ChainSource = WebsocketSource | SmoldotSource @@ -44,10 +45,16 @@ export const getChainSource = ({ endpoint === "light-client" ? createSmoldotSource(id, relayChain) : createWebsocketSource(id, endpoint) -export const getProvider = (source: ChainSource) => - source.type === "websocket" - ? getWebsocketProvider(source) - : getSmoldotProvider(source) +export const getProvider = (source: ChainSource) => { + const provider = + source.type === "websocket" + ? getWebsocketProvider(source) + : getSmoldotProvider(source) + + return import.meta.env.DEV + ? withLogsRecorder(console.debug, provider) + : provider +} export const [selectedChainChanged$, onChangeChain] = createSignal()