Compare commits
38 Commits
feature/ch
...
feat/accou
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aab2476a05 | ||
|
|
25c5b9c015 | ||
|
|
407e3946ce | ||
|
|
dc5b0d71eb | ||
|
|
3fd6c3f50e | ||
|
|
ec8bfc5eee | ||
|
|
b4a0bcb90d | ||
|
|
2c729e2aa4 | ||
|
|
1cb2542170 | ||
|
|
00b309df34 | ||
|
|
a6fc730de6 | ||
|
|
2245c5a221 | ||
|
|
60c33661ad | ||
|
|
ea21c85038 | ||
|
|
5478f43609 | ||
|
|
a9b64abb85 | ||
|
|
c6ced424d8 | ||
|
|
3a1159cffc | ||
|
|
3136de1bd1 | ||
|
|
67ffd3f1b4 | ||
|
|
8508cb69c4 | ||
|
|
89217d2633 | ||
|
|
ba1b64391c | ||
|
|
098d919a77 | ||
|
|
b2af37ab4b | ||
|
|
dcb7e94e86 | ||
|
|
67848b3d8d | ||
|
|
31a86263a1 | ||
|
|
4d0025afc1 | ||
|
|
f85bd2398d | ||
|
|
a2a6596cc5 | ||
|
|
37208ce97e | ||
|
|
bf4042926d | ||
|
|
3ccc1c16ac | ||
|
|
135f0c91a1 | ||
|
|
8f5786e242 | ||
|
|
810eb4ca27 | ||
|
|
e6574f9f12 |
@@ -116,9 +116,16 @@ export const AccountDialog = ({
|
|||||||
<Text
|
<Text
|
||||||
css={{
|
css={{
|
||||||
fontFamily: "$monospace",
|
fontFamily: "$monospace",
|
||||||
|
a: { "&:hover": { textDecoration: "underline" } },
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{activeAccount?.address}
|
<a
|
||||||
|
href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${activeAccount?.address}`}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
>
|
||||||
|
{activeAccount?.address}
|
||||||
|
</a>
|
||||||
</Text>
|
</Text>
|
||||||
</Flex>
|
</Flex>
|
||||||
<Flex css={{ marginLeft: "auto", color: "$mauve12" }}>
|
<Flex css={{ marginLeft: "auto", color: "$mauve12" }}>
|
||||||
@@ -215,7 +222,11 @@ export const AccountDialog = ({
|
|||||||
</Button>
|
</Button>
|
||||||
</Text>
|
</Text>
|
||||||
</Flex>
|
</Flex>
|
||||||
<Flex css={{ marginLeft: "auto" }}>
|
<Flex
|
||||||
|
css={{
|
||||||
|
marginLeft: "auto",
|
||||||
|
}}
|
||||||
|
>
|
||||||
<a
|
<a
|
||||||
href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${activeAccount?.address}`}
|
href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${activeAccount?.address}`}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
@@ -237,10 +248,22 @@ export const AccountDialog = ({
|
|||||||
<Text
|
<Text
|
||||||
css={{
|
css={{
|
||||||
fontFamily: "$monospace",
|
fontFamily: "$monospace",
|
||||||
|
a: { "&:hover": { textDecoration: "underline" } },
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{activeAccount && activeAccount.hooks.length > 0
|
{activeAccount && activeAccount.hooks.length > 0
|
||||||
? activeAccount.hooks.map((i) => truncate(i, 12)).join(",")
|
? activeAccount.hooks.map((i) => {
|
||||||
|
return (
|
||||||
|
<a
|
||||||
|
key={i}
|
||||||
|
href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${i}`}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
>
|
||||||
|
{truncate(i, 12)}
|
||||||
|
</a>
|
||||||
|
);
|
||||||
|
})
|
||||||
: "–"}
|
: "–"}
|
||||||
</Text>
|
</Text>
|
||||||
</Flex>
|
</Flex>
|
||||||
@@ -512,6 +535,7 @@ const ImportAccountDialog = () => {
|
|||||||
<Input
|
<Input
|
||||||
name="secret"
|
name="secret"
|
||||||
type="password"
|
type="password"
|
||||||
|
autoComplete="new-password"
|
||||||
value={value}
|
value={value}
|
||||||
onChange={(e) => setValue(e.target.value)}
|
onChange={(e) => setValue(e.target.value)}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
import { useCallback, useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
|
import ReconnectingWebSocket, { CloseEvent } from "reconnecting-websocket";
|
||||||
import { proxy, ref, useSnapshot } from "valtio";
|
import { proxy, ref, useSnapshot } from "valtio";
|
||||||
|
import { subscribeKey } from "valtio/utils";
|
||||||
import { Select } from ".";
|
import { Select } from ".";
|
||||||
import state, { ILog, transactionsState } from "../state";
|
import state, { ILog, transactionsState } from "../state";
|
||||||
import { extractJSON } from "../utils/json";
|
import { extractJSON } from "../utils/json";
|
||||||
@@ -15,7 +17,7 @@ export interface IStreamState {
|
|||||||
status: "idle" | "opened" | "closed";
|
status: "idle" | "opened" | "closed";
|
||||||
statusChangeTimestamp?: number;
|
statusChangeTimestamp?: number;
|
||||||
logs: ILog[];
|
logs: ILog[];
|
||||||
socket?: WebSocket;
|
socket?: ReconnectingWebSocket;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const streamState = proxy<IStreamState>({
|
export const streamState = proxy<IStreamState>({
|
||||||
@@ -24,12 +26,85 @@ export const streamState = proxy<IStreamState>({
|
|||||||
logs: [] as ILog[],
|
logs: [] as ILog[],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const onOpen = (account: ISelect | null) => {
|
||||||
|
if (!account) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// streamState.logs = [];
|
||||||
|
streamState.status = "opened";
|
||||||
|
streamState.statusChangeTimestamp = Date.now();
|
||||||
|
|
||||||
|
pushLog(`Debug stream opened for account ${account?.value}`, {
|
||||||
|
type: "success",
|
||||||
|
});
|
||||||
|
};
|
||||||
|
const onError = () => {
|
||||||
|
pushLog("Something went wrong! Check your connection and try again.", {
|
||||||
|
type: "error",
|
||||||
|
});
|
||||||
|
};
|
||||||
|
const onClose = (e: CloseEvent) => {
|
||||||
|
// 999 = closed websocket connection by switching account
|
||||||
|
if (e.code !== 4999) {
|
||||||
|
pushLog(`Connection was closed. [code: ${e.code}]`, {
|
||||||
|
type: "error",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
streamState.status = "closed";
|
||||||
|
streamState.statusChangeTimestamp = Date.now();
|
||||||
|
};
|
||||||
|
const onMessage = (event: any) => {
|
||||||
|
// Ping returns just account address, if we get that
|
||||||
|
// response we don't need to log anything
|
||||||
|
if (event.data !== streamState.selectedAccount?.value) {
|
||||||
|
pushLog(event.data);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let interval: NodeJS.Timer | null = null;
|
||||||
|
|
||||||
|
const addListeners = (account: ISelect | null) => {
|
||||||
|
if (account?.value && streamState.socket?.url.endsWith(account?.value)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
streamState.logs = [];
|
||||||
|
if (account?.value) {
|
||||||
|
if (interval) {
|
||||||
|
clearInterval(interval);
|
||||||
|
}
|
||||||
|
if (streamState.socket) {
|
||||||
|
streamState.socket?.removeEventListener("open", () => onOpen(account));
|
||||||
|
streamState.socket?.removeEventListener("close", onClose);
|
||||||
|
streamState.socket?.removeEventListener("error", onError);
|
||||||
|
streamState.socket?.removeEventListener("message", onMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
streamState.socket = ref(
|
||||||
|
new ReconnectingWebSocket(
|
||||||
|
`wss://${process.env.NEXT_PUBLIC_DEBUG_STREAM_URL}/${account?.value}`
|
||||||
|
)
|
||||||
|
);
|
||||||
|
if (streamState.socket) {
|
||||||
|
interval = setInterval(() => {
|
||||||
|
streamState.socket?.send("");
|
||||||
|
}, 10000);
|
||||||
|
}
|
||||||
|
|
||||||
|
streamState.socket.addEventListener("open", () => onOpen(account));
|
||||||
|
streamState.socket.addEventListener("close", onClose);
|
||||||
|
streamState.socket.addEventListener("error", onError);
|
||||||
|
streamState.socket.addEventListener("message", onMessage);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
subscribeKey(streamState, "selectedAccount", addListeners);
|
||||||
|
|
||||||
const DebugStream = () => {
|
const DebugStream = () => {
|
||||||
const { selectedAccount, logs, socket } = useSnapshot(streamState);
|
const { selectedAccount, logs } = useSnapshot(streamState);
|
||||||
const { activeHeader: activeTxTab } = useSnapshot(transactionsState);
|
const { activeHeader: activeTxTab } = useSnapshot(transactionsState);
|
||||||
const { accounts } = useSnapshot(state);
|
const { accounts } = useSnapshot(state);
|
||||||
|
|
||||||
const accountOptions = accounts.map(acc => ({
|
const accountOptions = accounts.map((acc) => ({
|
||||||
label: acc.name,
|
label: acc.name,
|
||||||
value: acc.address,
|
value: acc.address,
|
||||||
}));
|
}));
|
||||||
@@ -42,117 +117,21 @@ const DebugStream = () => {
|
|||||||
options={accountOptions}
|
options={accountOptions}
|
||||||
hideSelectedOptions
|
hideSelectedOptions
|
||||||
value={selectedAccount}
|
value={selectedAccount}
|
||||||
onChange={acc => (streamState.selectedAccount = acc as any)}
|
onChange={(acc) => {
|
||||||
|
streamState.socket?.close(
|
||||||
|
4999,
|
||||||
|
"Old connection closed because user switched account"
|
||||||
|
);
|
||||||
|
streamState.selectedAccount = acc as any;
|
||||||
|
}}
|
||||||
css={{ width: "100%" }}
|
css={{ width: "100%" }}
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const account = selectedAccount?.value;
|
|
||||||
if (account && (!socket || !socket.url.endsWith(account))) {
|
|
||||||
socket?.close();
|
|
||||||
streamState.socket = ref(
|
|
||||||
new WebSocket(
|
|
||||||
`wss://${process.env.NEXT_PUBLIC_DEBUG_STREAM_URL}/${account}`
|
|
||||||
)
|
|
||||||
);
|
|
||||||
} else if (!account && socket) {
|
|
||||||
socket.close();
|
|
||||||
streamState.socket = undefined;
|
|
||||||
}
|
|
||||||
}, [selectedAccount?.value, socket]);
|
|
||||||
|
|
||||||
const onMount = useCallback(async () => {
|
|
||||||
// deliberately using `proxy` values and not the `useSnapshot` ones to have no dep list
|
|
||||||
const acc = streamState.selectedAccount;
|
|
||||||
const status = streamState.status;
|
|
||||||
|
|
||||||
if (status === "opened" && acc) {
|
|
||||||
// fetch the missing ones
|
|
||||||
try {
|
|
||||||
const url = `https://${process.env.NEXT_PUBLIC_DEBUG_STREAM_URL}/recent/${acc?.value}`;
|
|
||||||
|
|
||||||
// TODO Remove after api sets cors properly
|
|
||||||
const res = await fetch("/api/proxy", {
|
|
||||||
method: "POST",
|
|
||||||
body: JSON.stringify({ url }),
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!res.ok) return;
|
|
||||||
|
|
||||||
const body = await res.json();
|
|
||||||
|
|
||||||
if (!body?.logs) return;
|
|
||||||
|
|
||||||
const start = streamState.statusChangeTimestamp || 0;
|
|
||||||
streamState.logs = [];
|
|
||||||
pushLog(`Debug stream opened for account ${acc.value}`, {
|
|
||||||
type: "success",
|
|
||||||
});
|
|
||||||
|
|
||||||
const logs = Object.entries(body.logs).filter(([tm]) => +tm >= start);
|
|
||||||
|
|
||||||
logs.forEach(([tm, log]) => pushLog(log));
|
|
||||||
} catch (error) {
|
|
||||||
console.error(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
onMount();
|
|
||||||
}, [onMount]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const account = selectedAccount?.value;
|
|
||||||
const socket = streamState.socket;
|
|
||||||
if (!socket) return;
|
|
||||||
|
|
||||||
const onOpen = () => {
|
|
||||||
streamState.logs = [];
|
|
||||||
streamState.status = "opened";
|
|
||||||
streamState.statusChangeTimestamp = Date.now();
|
|
||||||
pushLog(`Debug stream opened for account ${account}`, {
|
|
||||||
type: "success",
|
|
||||||
});
|
|
||||||
};
|
|
||||||
const onError = () => {
|
|
||||||
pushLog("Something went wrong! Check your connection and try again.", {
|
|
||||||
type: "error",
|
|
||||||
});
|
|
||||||
};
|
|
||||||
const onClose = (e: CloseEvent) => {
|
|
||||||
pushLog(`Connection was closed. [code: ${e.code}]`, {
|
|
||||||
type: "error",
|
|
||||||
});
|
|
||||||
streamState.selectedAccount = null;
|
|
||||||
streamState.status = "closed";
|
|
||||||
streamState.statusChangeTimestamp = Date.now();
|
|
||||||
};
|
|
||||||
const onMessage = (event: any) => {
|
|
||||||
pushLog(event.data);
|
|
||||||
};
|
|
||||||
|
|
||||||
socket.addEventListener("open", onOpen);
|
|
||||||
socket.addEventListener("close", onClose);
|
|
||||||
socket.addEventListener("error", onError);
|
|
||||||
socket.addEventListener("message", onMessage);
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
socket.removeEventListener("open", onOpen);
|
|
||||||
socket.removeEventListener("close", onClose);
|
|
||||||
socket.removeEventListener("message", onMessage);
|
|
||||||
socket.removeEventListener("error", onError);
|
|
||||||
};
|
|
||||||
}, [selectedAccount?.value, socket]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const account = transactionsState.transactions.find(
|
const account = transactionsState.transactions.find(
|
||||||
tx => tx.header === activeTxTab
|
(tx) => tx.header === activeTxTab
|
||||||
)?.state.selectedAccount;
|
)?.state.selectedAccount;
|
||||||
|
|
||||||
if (account && account.value !== streamState.selectedAccount?.value)
|
if (account && account.value !== streamState.selectedAccount?.value)
|
||||||
|
|||||||
@@ -34,7 +34,9 @@ const DeployEditor = () => {
|
|||||||
|
|
||||||
const [showContent, setShowContent] = useState(false);
|
const [showContent, setShowContent] = useState(false);
|
||||||
|
|
||||||
const activeFile = snap.files[snap.active];
|
const activeFile = snap.files[snap.active]?.compiledContent
|
||||||
|
? snap.files[snap.active]
|
||||||
|
: snap.files.filter((file) => file.compiledContent)[0];
|
||||||
const compiledSize = activeFile?.compiledContent?.byteLength || 0;
|
const compiledSize = activeFile?.compiledContent?.byteLength || 0;
|
||||||
const color =
|
const color =
|
||||||
compiledSize > FILESIZE_BREAKPOINTS[1]
|
compiledSize > FILESIZE_BREAKPOINTS[1]
|
||||||
@@ -60,12 +62,21 @@ const DeployEditor = () => {
|
|||||||
{activeFile?.lastCompiled && (
|
{activeFile?.lastCompiled && (
|
||||||
<ReactTimeAgo date={activeFile.lastCompiled} locale="en-US" />
|
<ReactTimeAgo date={activeFile.lastCompiled} locale="en-US" />
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{activeFile.compiledContent?.byteLength && (
|
{activeFile.compiledContent?.byteLength && (
|
||||||
<Text css={{ ml: "$2", color }}>
|
<Text css={{ ml: "$2", color }}>
|
||||||
({filesize(activeFile.compiledContent.byteLength)})
|
({filesize(activeFile.compiledContent.byteLength)})
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
</Flex>
|
</Flex>
|
||||||
|
{activeFile.compiledContent?.byteLength &&
|
||||||
|
activeFile.compiledContent?.byteLength >= 64000 && (
|
||||||
|
<Flex css={{ flexDirection: "column", py: "$3", pb: "$1" }}>
|
||||||
|
<Text css={{ ml: "$2", color: "$error" }}>
|
||||||
|
File size is larger than 64kB, cannot set hook!
|
||||||
|
</Text>
|
||||||
|
</Flex>
|
||||||
|
)}
|
||||||
<Button variant="link" onClick={() => setShowContent(true)}>
|
<Button variant="link" onClick={() => setShowContent(true)}>
|
||||||
View as WAT-file
|
View as WAT-file
|
||||||
</Button>
|
</Button>
|
||||||
@@ -119,8 +130,8 @@ const DeployEditor = () => {
|
|||||||
className="hooks-editor"
|
className="hooks-editor"
|
||||||
defaultLanguage={"wat"}
|
defaultLanguage={"wat"}
|
||||||
language={"wat"}
|
language={"wat"}
|
||||||
path={`file://tmp/c/${snap.files?.[snap.active]?.name}.wat`}
|
path={`file://tmp/c/${activeFile?.name}.wat`}
|
||||||
value={snap.files?.[snap.active]?.compiledWatContent || ""}
|
value={activeFile?.compiledWatContent || ""}
|
||||||
beforeMount={(monaco) => {
|
beforeMount={(monaco) => {
|
||||||
monaco.languages.register({ id: "wat" });
|
monaco.languages.register({ id: "wat" });
|
||||||
monaco.languages.setLanguageConfiguration("wat", wat.config);
|
monaco.languages.setLanguageConfiguration("wat", wat.config);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { useState, useEffect, useCallback } from "react";
|
import React, { useState, useEffect, useCallback, useRef } from "react";
|
||||||
import {
|
import {
|
||||||
Plus,
|
Plus,
|
||||||
Share,
|
Share,
|
||||||
@@ -101,7 +101,7 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
|
|||||||
if (!filename) {
|
if (!filename) {
|
||||||
return { error: "You need to add filename" };
|
return { error: "You need to add filename" };
|
||||||
}
|
}
|
||||||
if (snap.files.find(file => file.name === filename)) {
|
if (snap.files.find((file) => file.name === filename)) {
|
||||||
return { error: "Filename already exists." };
|
return { error: "Filename already exists." };
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -132,22 +132,55 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
|
|||||||
createNewFile(filename);
|
createNewFile(filename);
|
||||||
setFilename("");
|
setFilename("");
|
||||||
}, [filename, setIsNewfileDialogOpen, setFilename, validateFilename]);
|
}, [filename, setIsNewfileDialogOpen, setFilename, validateFilename]);
|
||||||
|
const scrollRef = useRef<HTMLDivElement>(null);
|
||||||
|
const containerRef = useRef<HTMLDivElement>(null);
|
||||||
const files = snap.files;
|
const files = snap.files;
|
||||||
return (
|
return (
|
||||||
<Flex css={{ flexShrink: 0, gap: "$0" }}>
|
<Flex css={{ flexShrink: 0, gap: "$0" }}>
|
||||||
<Flex
|
<Flex
|
||||||
|
id="kissa"
|
||||||
|
ref={scrollRef}
|
||||||
css={{
|
css={{
|
||||||
overflowX: "scroll",
|
overflowX: "scroll",
|
||||||
|
overflowY: "hidden",
|
||||||
py: "$3",
|
py: "$3",
|
||||||
|
pb: "$0",
|
||||||
flex: 1,
|
flex: 1,
|
||||||
"&::-webkit-scrollbar": {
|
"&::-webkit-scrollbar": {
|
||||||
height: 0,
|
height: "0.3em",
|
||||||
background: "transparent",
|
background: "rgba(0,0,0,.0)",
|
||||||
|
},
|
||||||
|
"&::-webkit-scrollbar-gutter": "stable",
|
||||||
|
"&::-webkit-scrollbar-thumb": {
|
||||||
|
backgroundColor: "rgba(0,0,0,.2)",
|
||||||
|
outline: "0px",
|
||||||
|
borderRadius: "9999px",
|
||||||
|
},
|
||||||
|
scrollbarColor: "rgba(0,0,0,.2) rgba(0,0,0,0)",
|
||||||
|
scrollbarGutter: "stable",
|
||||||
|
scrollbarWidth: "thin",
|
||||||
|
".dark &": {
|
||||||
|
"&::-webkit-scrollbar": {
|
||||||
|
background: "rgba(0,0,0,.0)",
|
||||||
|
},
|
||||||
|
"&::-webkit-scrollbar-gutter": "stable",
|
||||||
|
"&::-webkit-scrollbar-thumb": {
|
||||||
|
backgroundColor: "rgba(255,255,255,.2)",
|
||||||
|
outline: "0px",
|
||||||
|
borderRadius: "9999px",
|
||||||
|
},
|
||||||
|
scrollbarColor: "rgba(255,255,255,.2) rgba(0,0,0,0)",
|
||||||
|
scrollbarGutter: "stable",
|
||||||
|
scrollbarWidth: "thin",
|
||||||
},
|
},
|
||||||
}}
|
}}
|
||||||
|
onWheelCapture={(e) => {
|
||||||
|
if (scrollRef.current) {
|
||||||
|
scrollRef.current.scrollLeft += e.deltaY;
|
||||||
|
}
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<Container css={{ flex: 1 }}>
|
<Container css={{ flex: 1 }} ref={containerRef}>
|
||||||
<Stack
|
<Stack
|
||||||
css={{
|
css={{
|
||||||
gap: "$3",
|
gap: "$3",
|
||||||
@@ -233,8 +266,8 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
|
|||||||
<Label>Filename</Label>
|
<Label>Filename</Label>
|
||||||
<Input
|
<Input
|
||||||
value={filename}
|
value={filename}
|
||||||
onChange={e => setFilename(e.target.value)}
|
onChange={(e) => setFilename(e.target.value)}
|
||||||
onKeyPress={e => {
|
onKeyPress={(e) => {
|
||||||
if (e.key === "Enter") {
|
if (e.key === "Enter") {
|
||||||
handleConfirm();
|
handleConfirm();
|
||||||
}
|
}
|
||||||
@@ -509,8 +542,8 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
|
|||||||
type="number"
|
type="number"
|
||||||
min="1"
|
min="1"
|
||||||
value={editorSettings.tabSize}
|
value={editorSettings.tabSize}
|
||||||
onChange={e =>
|
onChange={(e) =>
|
||||||
setEditorSettings(curr => ({
|
setEditorSettings((curr) => ({
|
||||||
...curr,
|
...curr,
|
||||||
tabSize: Number(e.target.value),
|
tabSize: Number(e.target.value),
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -164,21 +164,15 @@ const HooksEditor = () => {
|
|||||||
onConnection: (connection) => {
|
onConnection: (connection) => {
|
||||||
// create and start the language client
|
// create and start the language client
|
||||||
const languageClient = createLanguageClient(connection);
|
const languageClient = createLanguageClient(connection);
|
||||||
languageClient.start();
|
const disposable = languageClient.start();
|
||||||
// connection.onDispose((d) => {
|
|
||||||
// console.log("disposed: ", d);
|
connection.onClose(() => {
|
||||||
// });
|
try {
|
||||||
// connection.onError((ee) => {
|
disposable.dispose();
|
||||||
// console.log(ee =)
|
} catch (err) {
|
||||||
// })
|
console.log("err", err);
|
||||||
// connection.onClose(() => {
|
}
|
||||||
// try {
|
});
|
||||||
// // disposable.stop();
|
|
||||||
// disposable.dispose();
|
|
||||||
// } catch (err) {
|
|
||||||
// console.log("err", err);
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,12 +30,6 @@ import PanelBox from "./PanelBox";
|
|||||||
import { templateFileIds } from "../state/constants";
|
import { templateFileIds } from "../state/constants";
|
||||||
import { styled } from "../stitches.config";
|
import { styled } from "../stitches.config";
|
||||||
|
|
||||||
import Starter from "../components/icons/Starter";
|
|
||||||
import Firewall from "../components/icons/Firewall";
|
|
||||||
import Notary from "../components/icons/Notary";
|
|
||||||
import Carbon from "../components/icons/Carbon";
|
|
||||||
import Peggy from "../components/icons/Peggy";
|
|
||||||
|
|
||||||
const ImageWrapper = styled(Flex, {
|
const ImageWrapper = styled(Flex, {
|
||||||
position: "relative",
|
position: "relative",
|
||||||
mt: "$2",
|
mt: "$2",
|
||||||
@@ -301,66 +295,18 @@ const Navigation = () => {
|
|||||||
},
|
},
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<PanelBox
|
{Object.values(templateFileIds).map((template) => (
|
||||||
as="a"
|
<PanelBox
|
||||||
href={`/develop/${templateFileIds.starter}`}
|
key={template.id}
|
||||||
>
|
as="a"
|
||||||
<ImageWrapper>
|
href={`/develop/${template.id}`}
|
||||||
<Starter />
|
>
|
||||||
</ImageWrapper>
|
<ImageWrapper>{template.icon()}</ImageWrapper>
|
||||||
<Heading>Starter</Heading>
|
<Heading>{template.name}</Heading>
|
||||||
|
|
||||||
<Text>
|
<Text>{template.description}</Text>
|
||||||
Just a basic starter with essential imports, just
|
</PanelBox>
|
||||||
accepts any transaction coming through
|
))}
|
||||||
</Text>
|
|
||||||
</PanelBox>
|
|
||||||
|
|
||||||
<PanelBox
|
|
||||||
as="a"
|
|
||||||
href={`/develop/${templateFileIds.firewall}`}
|
|
||||||
css={{ alignItems: "flex-start" }}
|
|
||||||
>
|
|
||||||
<ImageWrapper>
|
|
||||||
<Firewall />
|
|
||||||
</ImageWrapper>
|
|
||||||
<Heading>Firewall</Heading>
|
|
||||||
<Text>
|
|
||||||
This Hook essentially checks a blacklist of accounts
|
|
||||||
</Text>
|
|
||||||
</PanelBox>
|
|
||||||
<PanelBox
|
|
||||||
as="a"
|
|
||||||
href={`/develop/${templateFileIds.notary}`}
|
|
||||||
>
|
|
||||||
<ImageWrapper>
|
|
||||||
<Notary />
|
|
||||||
</ImageWrapper>
|
|
||||||
<Heading>Notary</Heading>
|
|
||||||
<Text>
|
|
||||||
Collecting signatures for multi-sign transactions
|
|
||||||
</Text>
|
|
||||||
</PanelBox>
|
|
||||||
<PanelBox
|
|
||||||
as="a"
|
|
||||||
href={`/develop/${templateFileIds.carbon}`}
|
|
||||||
>
|
|
||||||
<ImageWrapper>
|
|
||||||
<Carbon />
|
|
||||||
</ImageWrapper>
|
|
||||||
<Heading>Carbon</Heading>
|
|
||||||
<Text>Send a percentage of sum to an address</Text>
|
|
||||||
</PanelBox>
|
|
||||||
<PanelBox
|
|
||||||
as="a"
|
|
||||||
href={`/develop/${templateFileIds.peggy}`}
|
|
||||||
>
|
|
||||||
<ImageWrapper>
|
|
||||||
<Peggy />
|
|
||||||
</ImageWrapper>
|
|
||||||
<Heading>Peggy</Heading>
|
|
||||||
<Text>An oracle based stable coin hook</Text>
|
|
||||||
</PanelBox>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
</Flex>
|
</Flex>
|
||||||
<DialogClose asChild>
|
<DialogClose asChild>
|
||||||
@@ -394,6 +340,8 @@ const Navigation = () => {
|
|||||||
height: 0,
|
height: 0,
|
||||||
background: "transparent",
|
background: "transparent",
|
||||||
},
|
},
|
||||||
|
scrollbarColor: "transparent",
|
||||||
|
scrollbarWidth: "none",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Stack
|
<Stack
|
||||||
|
|||||||
@@ -22,12 +22,12 @@ import {
|
|||||||
import { TTS, tts } from "../utils/hookOnCalculator";
|
import { TTS, tts } from "../utils/hookOnCalculator";
|
||||||
import { deployHook } from "../state/actions";
|
import { deployHook } from "../state/actions";
|
||||||
import { useSnapshot } from "valtio";
|
import { useSnapshot } from "valtio";
|
||||||
import state from "../state";
|
import state, { SelectOption } from "../state";
|
||||||
import toast from "react-hot-toast";
|
import toast from "react-hot-toast";
|
||||||
import { prepareDeployHookTx, sha256 } from "../state/actions/deployHook";
|
import { prepareDeployHookTx, sha256 } from "../state/actions/deployHook";
|
||||||
import estimateFee from "../utils/estimateFee";
|
import estimateFee from "../utils/estimateFee";
|
||||||
|
|
||||||
const transactionOptions = Object.keys(tts).map((key) => ({
|
const transactionOptions = Object.keys(tts).map(key => ({
|
||||||
label: key,
|
label: key,
|
||||||
value: key as keyof TTS,
|
value: key as keyof TTS,
|
||||||
}));
|
}));
|
||||||
@@ -56,9 +56,22 @@ export type SetHookData = {
|
|||||||
export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
||||||
({ accountAddress }) => {
|
({ accountAddress }) => {
|
||||||
const snap = useSnapshot(state);
|
const snap = useSnapshot(state);
|
||||||
const account = snap.accounts.find((acc) => acc.address === accountAddress);
|
const activeFile = snap.files[snap.active]?.compiledContent
|
||||||
|
? snap.files[snap.active]
|
||||||
|
: snap.files.filter(file => file.compiledContent)[0];
|
||||||
const [isSetHookDialogOpen, setIsSetHookDialogOpen] = useState(false);
|
const [isSetHookDialogOpen, setIsSetHookDialogOpen] = useState(false);
|
||||||
|
|
||||||
|
const accountOptions: SelectOption[] = snap.accounts.map(acc => ({
|
||||||
|
label: acc.name,
|
||||||
|
value: acc.address,
|
||||||
|
}));
|
||||||
|
|
||||||
|
const [selectedAccount, setSelectedAccount] = useState(
|
||||||
|
accountOptions.find(acc => acc.value === accountAddress)
|
||||||
|
);
|
||||||
|
const account = snap.accounts.find(
|
||||||
|
acc => acc.address === selectedAccount?.value
|
||||||
|
);
|
||||||
const {
|
const {
|
||||||
register,
|
register,
|
||||||
handleSubmit,
|
handleSubmit,
|
||||||
@@ -68,11 +81,13 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
|||||||
getValues,
|
getValues,
|
||||||
formState: { errors },
|
formState: { errors },
|
||||||
} = useForm<SetHookData>({
|
} = useForm<SetHookData>({
|
||||||
defaultValues: {
|
defaultValues: snap.deployValues?.[activeFile?.name]
|
||||||
HookNamespace:
|
? snap.deployValues[activeFile?.name]
|
||||||
snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || "",
|
: {
|
||||||
Invoke: transactionOptions.filter((to) => to.label === "ttPAYMENT"),
|
HookNamespace:
|
||||||
},
|
snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || "",
|
||||||
|
Invoke: transactionOptions.filter(to => to.label === "ttPAYMENT"),
|
||||||
|
},
|
||||||
});
|
});
|
||||||
const { fields, append, remove } = useFieldArray({
|
const { fields, append, remove } = useFieldArray({
|
||||||
control,
|
control,
|
||||||
@@ -81,14 +96,21 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
|||||||
const [formInitialized, setFormInitialized] = useState(false);
|
const [formInitialized, setFormInitialized] = useState(false);
|
||||||
const [estimateLoading, setEstimateLoading] = useState(false);
|
const [estimateLoading, setEstimateLoading] = useState(false);
|
||||||
const watchedFee = watch("Fee");
|
const watchedFee = watch("Fee");
|
||||||
|
|
||||||
// Update value if activeWat changes
|
// Update value if activeWat changes
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setValue(
|
const defaultValue = snap.deployValues?.[activeFile?.name]
|
||||||
"HookNamespace",
|
? snap.deployValues?.[activeFile?.name].HookNamespace
|
||||||
snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || ""
|
: snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || "";
|
||||||
);
|
setValue("HookNamespace", defaultValue);
|
||||||
setFormInitialized(true);
|
setFormInitialized(true);
|
||||||
}, [snap.activeWat, snap.files, setValue]);
|
}, [
|
||||||
|
snap.activeWat,
|
||||||
|
snap.files,
|
||||||
|
setValue,
|
||||||
|
activeFile?.name,
|
||||||
|
snap.deployValues,
|
||||||
|
]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (
|
if (
|
||||||
watchedFee &&
|
watchedFee &&
|
||||||
@@ -108,7 +130,9 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
|||||||
const [hashedNamespace, setHashedNamespace] = useState("");
|
const [hashedNamespace, setHashedNamespace] = useState("");
|
||||||
const namespace = watch(
|
const namespace = watch(
|
||||||
"HookNamespace",
|
"HookNamespace",
|
||||||
snap.files?.[snap.active]?.name?.split(".")?.[0] || ""
|
snap.deployValues?.[activeFile?.name]
|
||||||
|
? snap.deployValues?.[activeFile?.name].HookNamespace
|
||||||
|
: snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || ""
|
||||||
);
|
);
|
||||||
const calculateHashedValue = useCallback(async () => {
|
const calculateHashedValue = useCallback(async () => {
|
||||||
const hashedVal = await sha256(namespace);
|
const hashedVal = await sha256(namespace);
|
||||||
@@ -136,14 +160,21 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
|||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [formInitialized]);
|
}, [formInitialized]);
|
||||||
|
|
||||||
if (!account) {
|
const tooLargeFile = () => {
|
||||||
return null;
|
const activeFile = snap.files[snap.active].compiledContent
|
||||||
}
|
? snap.files[snap.active]
|
||||||
|
: snap.files.filter(file => file.compiledContent)[0];
|
||||||
|
return Boolean(
|
||||||
|
activeFile?.compiledContent?.byteLength &&
|
||||||
|
activeFile?.compiledContent?.byteLength >= 64000
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
const onSubmit: SubmitHandler<SetHookData> = async (data) => {
|
const onSubmit: SubmitHandler<SetHookData> = async (data) => {
|
||||||
const currAccount = state.accounts.find(
|
const currAccount = state.accounts.find(
|
||||||
(acc) => acc.address === account.address
|
(acc) => acc.address === account?.address
|
||||||
);
|
);
|
||||||
|
if (!account) return;
|
||||||
if (currAccount) currAccount.isLoading = true;
|
if (currAccount) currAccount.isLoading = true;
|
||||||
const res = await deployHook(account, data);
|
const res = await deployHook(account, data);
|
||||||
if (currAccount) currAccount.isLoading = false;
|
if (currAccount) currAccount.isLoading = false;
|
||||||
@@ -163,8 +194,10 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
|||||||
uppercase
|
uppercase
|
||||||
variant={"secondary"}
|
variant={"secondary"}
|
||||||
disabled={
|
disabled={
|
||||||
|
!account ||
|
||||||
account.isLoading ||
|
account.isLoading ||
|
||||||
!snap.files.filter((file) => file.compiledWatContent).length
|
!snap.files.filter(file => file.compiledWatContent).length ||
|
||||||
|
tooLargeFile()
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
Set Hook
|
Set Hook
|
||||||
@@ -175,14 +208,22 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
|||||||
<DialogTitle>Deploy configuration</DialogTitle>
|
<DialogTitle>Deploy configuration</DialogTitle>
|
||||||
<DialogDescription as="div">
|
<DialogDescription as="div">
|
||||||
<Stack css={{ width: "100%", flex: 1 }}>
|
<Stack css={{ width: "100%", flex: 1 }}>
|
||||||
|
<Box css={{ width: "100%" }}>
|
||||||
|
<Label>Account</Label>
|
||||||
|
<Select
|
||||||
|
instanceId="deploy-account"
|
||||||
|
placeholder="Select account"
|
||||||
|
hideSelectedOptions
|
||||||
|
options={accountOptions}
|
||||||
|
value={selectedAccount}
|
||||||
|
onChange={(acc: any) => setSelectedAccount(acc)}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
<Box css={{ width: "100%" }}>
|
<Box css={{ width: "100%" }}>
|
||||||
<Label>Invoke on transactions</Label>
|
<Label>Invoke on transactions</Label>
|
||||||
<Controller
|
<Controller
|
||||||
name="Invoke"
|
name="Invoke"
|
||||||
control={control}
|
control={control}
|
||||||
defaultValue={transactionOptions.filter(
|
|
||||||
(to) => to.label === "ttPAYMENT"
|
|
||||||
)}
|
|
||||||
render={({ field }) => (
|
render={({ field }) => (
|
||||||
<Select
|
<Select
|
||||||
{...field}
|
{...field}
|
||||||
@@ -199,9 +240,6 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
|||||||
<Input
|
<Input
|
||||||
{...register("HookNamespace", { required: true })}
|
{...register("HookNamespace", { required: true })}
|
||||||
autoComplete={"off"}
|
autoComplete={"off"}
|
||||||
defaultValue={
|
|
||||||
snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || ""
|
|
||||||
}
|
|
||||||
/>
|
/>
|
||||||
{errors.HookNamespace?.type === "required" && (
|
{errors.HookNamespace?.type === "required" && (
|
||||||
<Box css={{ display: "inline", color: "$red11" }}>
|
<Box css={{ display: "inline", color: "$red11" }}>
|
||||||
@@ -264,7 +302,7 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
|||||||
type="number"
|
type="number"
|
||||||
{...register("Fee", { required: true })}
|
{...register("Fee", { required: true })}
|
||||||
autoComplete={"off"}
|
autoComplete={"off"}
|
||||||
onKeyPress={(e) => {
|
onKeyPress={e => {
|
||||||
if (e.key === "." || e.key === ",") {
|
if (e.key === "." || e.key === ",") {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
}
|
}
|
||||||
@@ -296,8 +334,9 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
|||||||
alignContent: "center",
|
alignContent: "center",
|
||||||
display: "flex",
|
display: "flex",
|
||||||
}}
|
}}
|
||||||
onClick={async (e) => {
|
onClick={async e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
if (!account) return;
|
||||||
setEstimateLoading(true);
|
setEstimateLoading(true);
|
||||||
const formValues = getValues();
|
const formValues = getValues();
|
||||||
try {
|
try {
|
||||||
@@ -396,7 +435,7 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
|||||||
<Button
|
<Button
|
||||||
variant="primary"
|
variant="primary"
|
||||||
type="submit"
|
type="submit"
|
||||||
isLoading={account.isLoading}
|
isLoading={account?.isLoading}
|
||||||
>
|
>
|
||||||
Set Hook
|
Set Hook
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -38,22 +38,22 @@ export const TxUI: FC<UIProps> = ({
|
|||||||
txFields,
|
txFields,
|
||||||
} = txState;
|
} = txState;
|
||||||
|
|
||||||
const transactionsOptions = transactionsData.map(tx => ({
|
const transactionsOptions = transactionsData.map((tx) => ({
|
||||||
value: tx.TransactionType,
|
value: tx.TransactionType,
|
||||||
label: tx.TransactionType,
|
label: tx.TransactionType,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const accountOptions: SelectOption[] = accounts.map(acc => ({
|
const accountOptions: SelectOption[] = accounts.map((acc) => ({
|
||||||
label: acc.name,
|
label: acc.name,
|
||||||
value: acc.address,
|
value: acc.address,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const destAccountOptions: SelectOption[] = accounts
|
const destAccountOptions: SelectOption[] = accounts
|
||||||
.map(acc => ({
|
.map((acc) => ({
|
||||||
label: acc.name,
|
label: acc.name,
|
||||||
value: acc.address,
|
value: acc.address,
|
||||||
}))
|
}))
|
||||||
.filter(acc => acc.value !== selectedAccount?.value);
|
.filter((acc) => acc.value !== selectedAccount?.value);
|
||||||
|
|
||||||
const [feeLoading, setFeeLoading] = useState(false);
|
const [feeLoading, setFeeLoading] = useState(false);
|
||||||
|
|
||||||
@@ -108,15 +108,15 @@ export const TxUI: FC<UIProps> = ({
|
|||||||
const specialFields = ["TransactionType", "Account", "Destination"];
|
const specialFields = ["TransactionType", "Account", "Destination"];
|
||||||
|
|
||||||
const otherFields = Object.keys(txFields).filter(
|
const otherFields = Object.keys(txFields).filter(
|
||||||
k => !specialFields.includes(k)
|
(k) => !specialFields.includes(k)
|
||||||
) as [keyof TxFields];
|
) as [keyof TxFields];
|
||||||
|
|
||||||
const switchToJson = () =>
|
const switchToJson = () =>
|
||||||
setState({ editorSavedValue: null, viewType: "json" });
|
setState({ editorSavedValue: null, viewType: "json" });
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const defaultOption = transactionsOptions.find(
|
const defaultOption = transactionsOptions.find(
|
||||||
tt => tt.value === "Payment"
|
(tt) => tt.value === "Payment"
|
||||||
);
|
);
|
||||||
if (defaultOption) {
|
if (defaultOption) {
|
||||||
handleChangeTxType(defaultOption);
|
handleChangeTxType(defaultOption);
|
||||||
@@ -204,7 +204,7 @@ export const TxUI: FC<UIProps> = ({
|
|||||||
/>
|
/>
|
||||||
</Flex>
|
</Flex>
|
||||||
)}
|
)}
|
||||||
{otherFields.map(field => {
|
{otherFields.map((field) => {
|
||||||
let _value = txFields[field];
|
let _value = txFields[field];
|
||||||
|
|
||||||
let value: string | undefined;
|
let value: string | undefined;
|
||||||
@@ -253,13 +253,39 @@ export const TxUI: FC<UIProps> = ({
|
|||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<Input
|
<Input
|
||||||
|
type={isFee ? "number" : "text"}
|
||||||
value={value}
|
value={value}
|
||||||
onChange={e => {
|
onChange={(e) => {
|
||||||
handleSetField(field, e.target.value);
|
if (isFee) {
|
||||||
|
const val = e.target.value
|
||||||
|
.replaceAll(".", "")
|
||||||
|
.replaceAll(",", "");
|
||||||
|
handleSetField(field, val);
|
||||||
|
} else {
|
||||||
|
handleSetField(field, e.target.value);
|
||||||
|
}
|
||||||
}}
|
}}
|
||||||
|
onKeyPress={
|
||||||
|
isFee
|
||||||
|
? (e) => {
|
||||||
|
if (e.key === "." || e.key === ",") {
|
||||||
|
e.preventDefault();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
: undefined
|
||||||
|
}
|
||||||
css={{
|
css={{
|
||||||
width: "70%",
|
width: "70%",
|
||||||
flex: "inherit",
|
flex: "inherit",
|
||||||
|
"-moz-appearance": "textfield",
|
||||||
|
"&::-webkit-outer-spin-button": {
|
||||||
|
"-webkit-appearance": "none",
|
||||||
|
margin: 0,
|
||||||
|
},
|
||||||
|
"&::-webkit-inner-spin-button ": {
|
||||||
|
"-webkit-appearance": "none",
|
||||||
|
margin: 0,
|
||||||
|
},
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@@ -268,6 +294,8 @@ export const TxUI: FC<UIProps> = ({
|
|||||||
size="xs"
|
size="xs"
|
||||||
variant="primary"
|
variant="primary"
|
||||||
outline
|
outline
|
||||||
|
disabled={txState.txIsDisabled}
|
||||||
|
isDisabled={txState.txIsDisabled}
|
||||||
isLoading={feeLoading}
|
isLoading={feeLoading}
|
||||||
css={{
|
css={{
|
||||||
position: "absolute",
|
position: "absolute",
|
||||||
|
|||||||
@@ -36,6 +36,7 @@
|
|||||||
"monaco-editor": "^0.33.0",
|
"monaco-editor": "^0.33.0",
|
||||||
"next": "^12.0.4",
|
"next": "^12.0.4",
|
||||||
"next-auth": "^4.0.0-beta.5",
|
"next-auth": "^4.0.0-beta.5",
|
||||||
|
"next-plausible": "^3.2.0",
|
||||||
"next-themes": "^0.1.1",
|
"next-themes": "^0.1.1",
|
||||||
"normalize-url": "^7.0.2",
|
"normalize-url": "^7.0.2",
|
||||||
"octokit": "^1.7.0",
|
"octokit": "^1.7.0",
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { ThemeProvider } from "next-themes";
|
|||||||
import { Toaster } from "react-hot-toast";
|
import { Toaster } from "react-hot-toast";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import { IdProvider } from "@radix-ui/react-id";
|
import { IdProvider } from "@radix-ui/react-id";
|
||||||
|
import PlausibleProvider from "next-plausible";
|
||||||
|
|
||||||
import { darkTheme, css } from "../stitches.config";
|
import { darkTheme, css } from "../stitches.config";
|
||||||
import Navigation from "../components/Navigation";
|
import Navigation from "../components/Navigation";
|
||||||
@@ -17,6 +18,8 @@ import TimeAgo from "javascript-time-ago";
|
|||||||
import en from "javascript-time-ago/locale/en.json";
|
import en from "javascript-time-ago/locale/en.json";
|
||||||
import { useSnapshot } from "valtio";
|
import { useSnapshot } from "valtio";
|
||||||
import Alert from "../components/AlertDialog";
|
import Alert from "../components/AlertDialog";
|
||||||
|
import { Button, Flex } from "../components";
|
||||||
|
import { ChatCircleText } from "phosphor-react";
|
||||||
|
|
||||||
TimeAgo.setDefaultLocale(en.locale);
|
TimeAgo.setDefaultLocale(en.locale);
|
||||||
TimeAgo.addLocale(en);
|
TimeAgo.addLocale(en);
|
||||||
@@ -37,7 +40,7 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppProps) {
|
|||||||
if (
|
if (
|
||||||
!gistId &&
|
!gistId &&
|
||||||
router.isReady &&
|
router.isReady &&
|
||||||
!router.pathname.includes("/sign-in") &&
|
router.pathname.includes("/develop") &&
|
||||||
!snap.files.length &&
|
!snap.files.length &&
|
||||||
!snap.mainModalShowed
|
!snap.mainModalShowed
|
||||||
) {
|
) {
|
||||||
@@ -114,6 +117,7 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppProps) {
|
|||||||
media="(prefers-color-scheme: light)"
|
media="(prefers-color-scheme: light)"
|
||||||
/>
|
/>
|
||||||
</Head>
|
</Head>
|
||||||
|
|
||||||
<IdProvider>
|
<IdProvider>
|
||||||
<SessionProvider session={session}>
|
<SessionProvider session={session}>
|
||||||
<ThemeProvider
|
<ThemeProvider
|
||||||
@@ -125,23 +129,40 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppProps) {
|
|||||||
dark: darkTheme.className,
|
dark: darkTheme.className,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Navigation />
|
<PlausibleProvider
|
||||||
<Component {...pageProps} />
|
domain="hooks-builder.xrpl.org"
|
||||||
<Toaster
|
trackOutboundLinks
|
||||||
toastOptions={{
|
>
|
||||||
className: css({
|
<Navigation />
|
||||||
backgroundColor: "$mauve1",
|
<Component {...pageProps} />
|
||||||
color: "$mauve10",
|
<Toaster
|
||||||
fontSize: "$sm",
|
toastOptions={{
|
||||||
zIndex: 9999,
|
className: css({
|
||||||
".dark &": {
|
backgroundColor: "$mauve1",
|
||||||
backgroundColor: "$mauve4",
|
color: "$mauve10",
|
||||||
color: "$mauve12",
|
fontSize: "$sm",
|
||||||
},
|
zIndex: 9999,
|
||||||
})(),
|
".dark &": {
|
||||||
}}
|
backgroundColor: "$mauve4",
|
||||||
/>
|
color: "$mauve12",
|
||||||
<Alert />
|
},
|
||||||
|
})(),
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Alert />
|
||||||
|
<Flex
|
||||||
|
as="a"
|
||||||
|
href="https://github.com/XRPLF/Hooks/discussions"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
css={{ position: "fixed", right: "$4", bottom: "$4" }}
|
||||||
|
>
|
||||||
|
<Button size="sm" variant="primary" outline>
|
||||||
|
<ChatCircleText size={14} style={{ marginRight: "0px" }} />
|
||||||
|
Bugs & Discussions
|
||||||
|
</Button>
|
||||||
|
</Flex>
|
||||||
|
</PlausibleProvider>
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
</SessionProvider>
|
</SessionProvider>
|
||||||
</IdProvider>
|
</IdProvider>
|
||||||
|
|||||||
@@ -32,14 +32,20 @@ const Test = () => {
|
|||||||
if (!showComponent) {
|
if (!showComponent) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
const hasScripts =
|
const hasScripts = Boolean(
|
||||||
snap.files.filter((f) => f.name.endsWith(".js")).length > 0;
|
snap.files.filter((f) => f.name.toLowerCase()?.endsWith(".js")).length
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container css={{ px: 0 }}>
|
<Container css={{ px: 0 }}>
|
||||||
<Split
|
<Split
|
||||||
direction="vertical"
|
direction="vertical"
|
||||||
sizes={
|
sizes={
|
||||||
getSplit("testVertical") || (hasScripts ? [50, 20, 30] : [50, 50])
|
hasScripts && getSplit("testVertical")?.length === 2
|
||||||
|
? [50, 20, 30]
|
||||||
|
: hasScripts
|
||||||
|
? [50, 20, 50]
|
||||||
|
: [50, 50]
|
||||||
}
|
}
|
||||||
gutterSize={4}
|
gutterSize={4}
|
||||||
gutterAlign="center"
|
gutterAlign="center"
|
||||||
@@ -95,7 +101,7 @@ const Test = () => {
|
|||||||
</Box>
|
</Box>
|
||||||
</Split>
|
</Split>
|
||||||
</Flex>
|
</Flex>
|
||||||
{hasScripts && (
|
{hasScripts ? (
|
||||||
<Flex
|
<Flex
|
||||||
as="div"
|
as="div"
|
||||||
css={{
|
css={{
|
||||||
@@ -110,7 +116,7 @@ const Test = () => {
|
|||||||
clearLog={() => (state.scriptLogs = [])}
|
clearLog={() => (state.scriptLogs = [])}
|
||||||
/>
|
/>
|
||||||
</Flex>
|
</Flex>
|
||||||
)}
|
) : null}
|
||||||
<Flex>
|
<Flex>
|
||||||
<Split
|
<Split
|
||||||
direction="horizontal"
|
direction="horizontal"
|
||||||
|
|||||||
@@ -54,15 +54,15 @@ export const prepareDeployHookTx = async (
|
|||||||
account: IAccount & { name?: string },
|
account: IAccount & { name?: string },
|
||||||
data: SetHookData
|
data: SetHookData
|
||||||
) => {
|
) => {
|
||||||
if (
|
const activeFile = state.files[state.active]?.compiledContent
|
||||||
!state.files ||
|
? state.files[state.active]
|
||||||
state.files.length === 0 ||
|
: state.files.filter((file) => file.compiledContent)[0];
|
||||||
!state.files?.[state.active]?.compiledContent
|
|
||||||
) {
|
if (!state.files || state.files.length === 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!state.files?.[state.active]?.compiledContent) {
|
if (!activeFile?.compiledContent) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!state.client) {
|
if (!state.client) {
|
||||||
@@ -99,7 +99,7 @@ export const prepareDeployHookTx = async (
|
|||||||
{
|
{
|
||||||
Hook: {
|
Hook: {
|
||||||
CreateCode: arrayBufferToHex(
|
CreateCode: arrayBufferToHex(
|
||||||
state.files?.[state.active]?.compiledContent
|
activeFile?.compiledContent
|
||||||
).toUpperCase(),
|
).toUpperCase(),
|
||||||
HookOn: calculateHookOn(hookOnValues),
|
HookOn: calculateHookOn(hookOnValues),
|
||||||
HookNamespace,
|
HookNamespace,
|
||||||
@@ -126,6 +126,10 @@ export const deployHook = async (
|
|||||||
data: SetHookData
|
data: SetHookData
|
||||||
) => {
|
) => {
|
||||||
if (typeof window !== "undefined") {
|
if (typeof window !== "undefined") {
|
||||||
|
const activeFile = state.files[state.active]?.compiledContent
|
||||||
|
? state.files[state.active]
|
||||||
|
: state.files.filter((file) => file.compiledContent)[0];
|
||||||
|
state.deployValues[activeFile.name] = data;
|
||||||
const tx = await prepareDeployHookTx(account, data);
|
const tx = await prepareDeployHookTx(account, data);
|
||||||
if (!tx) {
|
if (!tx) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ export const fetchFiles = (gistId: string) => {
|
|||||||
octokit
|
octokit
|
||||||
.request("GET /gists/{gist_id}", { gist_id: gistId })
|
.request("GET /gists/{gist_id}", { gist_id: gistId })
|
||||||
.then(async res => {
|
.then(async res => {
|
||||||
if (!Object.values(templateFileIds).includes(gistId)) {
|
if (!Object.values(templateFileIds).map(v => v.id).includes(gistId)) {
|
||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
// in case of templates, fetch header file(s) and append to res
|
// in case of templates, fetch header file(s) and append to res
|
||||||
|
|||||||
@@ -1,20 +1,41 @@
|
|||||||
// export const templateFileIds = {
|
import Carbon from "../../components/icons/Carbon";
|
||||||
// 'starter': '1d14e51e2e02dc0a508cb0733767a914', // TODO currently same as accept
|
import Firewall from "../../components/icons/Firewall";
|
||||||
// 'firewall': 'bcd6d0c0fcbe52545ddb802481ff9d26',
|
import Notary from "../../components/icons/Notary";
|
||||||
// 'notary': 'a789c75f591eeab7932fd702ed8cf9ea',
|
import Peggy from "../../components/icons/Peggy";
|
||||||
// 'carbon': '43925143fa19735d8c6505c34d3a6a47',
|
import Starter from "../../components/icons/Starter";
|
||||||
// 'peggy': 'ceaf352e2a65741341033ab7ef05c448',
|
|
||||||
// 'headers': '9b448e8a55fab11ef5d1274cb59f9cf3'
|
|
||||||
// }
|
|
||||||
|
|
||||||
export const templateFileIds = {
|
export const templateFileIds = {
|
||||||
'starter': '1f7d2963d9e342ea092286115274f3e3',
|
'starter': {
|
||||||
'firewall': '70edec690f0de4dd315fad1f4f996d8c',
|
id: '9106f1fe60482d90475bfe8f1315affe',
|
||||||
'notary': '3d5677768fe8a54c4f6317e185d9ba66',
|
name: 'Starter',
|
||||||
'carbon': 'a9fbcaf1b816b198c7fc0f62962bebf2',
|
description: 'Just a basic starter with essential imports, just accepts any transaction coming through',
|
||||||
'doubler': '56b86174aeb70b2b48eee962bad3e355',
|
icon: Starter
|
||||||
'peggy': 'd21298a37e1550b781682014762a567b',
|
|
||||||
'headers': '55f639bce59a49c58c45e663776b5138'
|
},
|
||||||
|
'firewall': {
|
||||||
|
id: '741816f53eddac862ef1ba400e1b9b84',
|
||||||
|
name: 'Firewall',
|
||||||
|
description: 'This Hook essentially checks a blacklist of accounts',
|
||||||
|
icon: Firewall
|
||||||
|
},
|
||||||
|
'notary': {
|
||||||
|
id: '0dfe12adb0aa75cff24c3c19497fb95a',
|
||||||
|
name: 'Notary',
|
||||||
|
description: 'Collecting signatures for multi-sign transactions',
|
||||||
|
icon: Notary
|
||||||
|
},
|
||||||
|
'carbon': {
|
||||||
|
id: '5941c19dce3e147948f564e224553c02',
|
||||||
|
name: 'Carbon',
|
||||||
|
description: 'Send a percentage of sum to an address',
|
||||||
|
icon: Carbon
|
||||||
|
},
|
||||||
|
'peggy': {
|
||||||
|
id: '52e61c02e777c44c913808981a4ca61f',
|
||||||
|
name: 'Peggy',
|
||||||
|
description: 'An oracle based stable coin hook',
|
||||||
|
icon: Peggy
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
export const apiHeaderFiles = ['hookapi.h', 'sfcodes.h', 'hookmacro.h']
|
export const apiHeaderFiles = ['hookapi.h', 'sfcodes.h', 'macro.h', 'extern.h', 'error.h'];
|
||||||
|
|||||||
@@ -52,6 +52,8 @@ export interface ILog {
|
|||||||
defaultCollapsed?: boolean
|
defaultCollapsed?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type DeployValue = Record<IFile['name'], any>;
|
||||||
|
|
||||||
export interface IState {
|
export interface IState {
|
||||||
files: IFile[];
|
files: IFile[];
|
||||||
gistId?: string | null;
|
gistId?: string | null;
|
||||||
@@ -82,7 +84,8 @@ export interface IState {
|
|||||||
compileOptions: {
|
compileOptions: {
|
||||||
optimizationLevel: '-O0' | '-O1' | '-O2' | '-O3' | '-O4' | '-Os';
|
optimizationLevel: '-O0' | '-O1' | '-O2' | '-O3' | '-O4' | '-Os';
|
||||||
strip: boolean
|
strip: boolean
|
||||||
}
|
},
|
||||||
|
deployValues: DeployValue
|
||||||
}
|
}
|
||||||
|
|
||||||
// let localStorageState: null | string = null;
|
// let localStorageState: null | string = null;
|
||||||
@@ -116,7 +119,8 @@ let initialState: IState = {
|
|||||||
compileOptions: {
|
compileOptions: {
|
||||||
optimizationLevel: '-O2',
|
optimizationLevel: '-O2',
|
||||||
strip: true
|
strip: true
|
||||||
}
|
},
|
||||||
|
deployValues: {}
|
||||||
};
|
};
|
||||||
|
|
||||||
let localStorageAccounts: string | null = null;
|
let localStorageAccounts: string | null = null;
|
||||||
|
|||||||
@@ -2981,6 +2981,11 @@ next-auth@^4.0.0-beta.5:
|
|||||||
preact-render-to-string "^5.1.19"
|
preact-render-to-string "^5.1.19"
|
||||||
uuid "^8.3.2"
|
uuid "^8.3.2"
|
||||||
|
|
||||||
|
next-plausible@^3.2.0:
|
||||||
|
version "3.2.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/next-plausible/-/next-plausible-3.2.0.tgz#d801346253e0c1cf64a02b9fc3a42050455cbc47"
|
||||||
|
integrity sha512-OlYcLXBG3kKd/fKMpm8SZ5IkUKSFm1/8t7cv6e5bewIqlpdZpdWuSrjbdJpbmutb2KPLXHzilKp09zmDGjy9KQ==
|
||||||
|
|
||||||
next-themes@^0.1.1:
|
next-themes@^0.1.1:
|
||||||
version "0.1.1"
|
version "0.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/next-themes/-/next-themes-0.1.1.tgz#122113a458bf1d1be5ffed66778ab924c106f82a"
|
resolved "https://registry.yarnpkg.com/next-themes/-/next-themes-0.1.1.tgz#122113a458bf1d1be5ffed66778ab924c106f82a"
|
||||||
|
|||||||
Reference in New Issue
Block a user