Compare commits

...

14 Commits

Author SHA1 Message Date
Vaclav Barta
3ed97d2873 requiring user-quoted Hook Parameter values 2022-04-19 12:37:21 +02:00
Valtteri Karesto
f49d69e75d Merge pull request #172 from eqlabs/fix/regression-#171
Fix/regression #171
2022-04-14 15:41:59 +03:00
Valtteri Karesto
da4b2e68ab Fix issue #171 2022-04-14 15:28:28 +03:00
Valtteri Karesto
5557b1bcba Remove console.logs 2022-04-14 15:27:08 +03:00
Valtteri Karesto
f4b5f98a44 Merge pull request #169 from eqlabs/feat/add-namespace-to-sethook
Add namespace to sethook modal
2022-04-14 15:19:08 +03:00
Valtteri Karesto
b1d39740de Changed labels, added default value to form so the initial render has correct value 2022-04-14 15:10:38 +03:00
Valtteri Karesto
16cbdafb27 Add computed sha256 field to sethook form 2022-04-14 11:52:24 +03:00
Valtteri Karesto
5559fb7be3 rename hash to sha256 2022-04-14 11:51:56 +03:00
Valtteri Karesto
3c4305127b Use user input namespace value 2022-04-13 23:58:02 +03:00
Valtteri Karesto
2a76fa0c35 Add namespace field to set hook modal 2022-04-13 23:57:47 +03:00
Valtteri Karesto
919c4e173c Merge pull request #166 from eqlabs/feat/remove-peek-from-context-menu
Feat/remove peek from context menu
2022-04-12 09:19:19 +03:00
Valtteri Karesto
e53a533026 Merge pull request #161 from eqlabs/fix/add-account-creation-error
Fixes issue #68
2022-04-11 14:54:12 +03:00
Valtteri Karesto
5f118e00cb Added error check 2022-04-11 11:46:49 +03:00
Valtteri Karesto
e795ce4472 Fixes issue #68 2022-04-06 14:15:53 +03:00
5 changed files with 71 additions and 20 deletions

View File

@@ -59,6 +59,8 @@ export const Input = styled("input", {
},
"&:read-only": {
backgroundColor: "$mauve2",
color: "$text",
opacity: 0.8,
"&:focus": {
boxShadow: "inset 0px 0px 0px 1px $colors$mauve7",
},

View File

@@ -1,4 +1,4 @@
import React, { useState } from "react";
import React, { useCallback, useEffect, useState } from "react";
import { Plus, Trash, X } from "phosphor-react";
import Button from "./Button";
import Box from "./Box";
@@ -25,6 +25,7 @@ import type { IAccount } from "../state";
import { useSnapshot } from "valtio";
import state from "../state";
import toast from "react-hot-toast";
import { sha256 } from "../state/actions/deployHook";
const transactionOptions = Object.keys(tts).map((key) => ({
label: key,
@@ -36,6 +37,7 @@ export type SetHookData = {
value: keyof TTS;
label: string;
}[];
HookNamespace: string;
HookParameters: {
HookParameter: {
HookParameterName: string;
@@ -57,8 +59,13 @@ export const SetHookDialog: React.FC<{ account: IAccount }> = ({ account }) => {
register,
handleSubmit,
control,
// formState: { errors },
} = useForm<SetHookData>();
watch,
formState: { errors },
} = useForm<SetHookData>({
defaultValues: {
HookNamespace: snap.files?.[snap.active]?.name?.split(".")?.[0] || "",
},
});
const { fields, append, remove } = useFieldArray({
control,
name: "HookParameters", // unique name for your Field Array
@@ -71,6 +78,19 @@ export const SetHookDialog: React.FC<{ account: IAccount }> = ({ account }) => {
// control,
// name: "HookGrants", // unique name for your Field Array
// });
const [hashedNamespace, setHashedNamespace] = useState("");
const namespace = watch(
"HookNamespace",
snap.files?.[snap.active]?.name?.split(".")?.[0] || ""
);
const calculateHashedValue = useCallback(async () => {
const hashedVal = await sha256(namespace);
setHashedNamespace(hashedVal.toUpperCase());
}, [namespace]);
useEffect(() => {
calculateHashedValue();
}, [namespace, calculateHashedValue]);
if (!account) {
return null;
}
@@ -89,6 +109,7 @@ export const SetHookDialog: React.FC<{ account: IAccount }> = ({ account }) => {
}
toast.error(`Transaction failed! (${res?.engine_result_message})`);
};
return (
<Dialog open={isSetHookDialogOpen} onOpenChange={setIsSetHookDialogOpen}>
<DialogTrigger asChild>
@@ -129,6 +150,25 @@ export const SetHookDialog: React.FC<{ account: IAccount }> = ({ account }) => {
)}
/>
</Box>
<Box css={{ width: "100%" }}>
<label>Hook Namespace Seed</label>
<Input
{...register("HookNamespace", { required: true })}
autoComplete={"off"}
defaultValue={
snap.files?.[snap.active]?.name?.split(".")?.[0] || ""
}
/>
{errors.HookNamespace?.type === "required" && (
<Box css={{ display: "inline", color: "$red11" }}>
Namespace is required
</Box>
)}
<Box css={{ mt: "$3" }}>
<label>Hook Namespace (sha256)</label>
<Input readOnly value={hashedNamespace} />
</Box>
</Box>
<Box css={{ width: "100%" }}>
<label style={{ marginBottom: "10px", display: "block" }}>
Hook parameters
@@ -144,7 +184,7 @@ export const SetHookDialog: React.FC<{ account: IAccount }> = ({ account }) => {
)}
/>
<Input
placeholder="Parameter value"
placeholder="Value (hex-quoted)"
{...register(
`HookParameters.${index}.HookParameter.HookParameterValue`
)}

View File

@@ -5,7 +5,7 @@ import state, { IAccount } from "../index";
import calculateHookOn, { TTS } from "../../utils/hookOnCalculator";
import { SetHookData } from "../../components/SetHookDialog";
const hash = async (string: string) => {
export const sha256 = async (string: string) => {
const utf8 = new TextEncoder().encode(string);
const hashBuffer = await crypto.subtle.digest('SHA-256', utf8);
const hashArray = Array.from(new Uint8Array(hashBuffer));
@@ -66,12 +66,10 @@ export const deployHook = async (account: IAccount & { name?: string }, data: Se
if (!state.client) {
return;
}
const HookNamespace = await hash(arrayBufferToHex(
state.files?.[state.active]?.compiledContent
).toUpperCase());
const HookNamespace = (await sha256(data.HookNamespace)).toUpperCase();
const hookOnValues: (keyof TTS)[] = data.Invoke.map(tt => tt.value);
const { HookParameters } = data;
const filteredHookParameters = HookParameters.filter(hp => hp.HookParameter.HookParameterName && hp.HookParameter.HookParameterValue)?.map(aa => ({ HookParameter: { HookParameterName: toHex(aa.HookParameter.HookParameterName || ''), HookParameterValue: toHex(aa.HookParameter.HookParameterValue || '') } }));
const filteredHookParameters = HookParameters.filter(hp => hp.HookParameter.HookParameterName && hp.HookParameter.HookParameterValue)?.map(aa => ({ HookParameter: { HookParameterName: toHex(aa.HookParameter.HookParameterName || ''), HookParameterValue: aa.HookParameter.HookParameterValue || '' } }));
// const filteredHookGrants = HookGrants.filter(hg => hg.HookGrant.Authorize || hg.HookGrant.HookHash).map(hg => {
// return {
// HookGrant: {
@@ -220,4 +218,4 @@ export const deleteHook = async (account: IAccount & { name?: string }) => {
}
return submitRes;
}
};
};

View File

@@ -28,18 +28,19 @@ export const fetchFiles = (gistId: string) => {
const resHeader = await fetch(`${process.env.NEXT_PUBLIC_COMPILE_API_BASE_URL}/api/header-files`);
if (resHeader.ok) {
resHeaderJson = await resHeader.json();
const files = {
...res.data.files,
'hookapi.h': res.data.files?.['hookapi.h'] || { filename: 'hookapi.h', content: resHeaderJson.hookapi, language: 'C' },
'hookmacro.h': res.data.files?.['hookmacro.h'] || { filename: 'hookmacro.h', content: resHeaderJson.hookmacro, language: 'C' },
'sfcodes.h': res.data.files?.['sfcodes.h'] || { filename: 'sfcodes.h', content: resHeaderJson.sfcodes, language: 'C' },
};
res.data.files = files;
}
} catch (err) {
console.log(err)
}
const files = {
...res.data.files,
'hookapi.h': res.data.files?.['hookapi.h'] || { filename: 'hookapi.h', content: resHeaderJson.hookapi, language: 'C' },
'hookmacro.h': res.data.files?.['hookmacro.h'] || { filename: 'hookmacro.h', content: resHeaderJson.hookmacro, language: 'C' },
'sfcodes.h': res.data.files?.['sfcodes.h'] || { filename: 'sfcodes.h', content: resHeaderJson.sfcodes, language: 'C' },
};
res.data.files = files;
return res;
// If you want to load templates from GIST instad, uncomment the code below and comment the code above.

View File

@@ -1,5 +1,5 @@
import toast from "react-hot-toast";
import { derive } from "xrpl-accountlib";
import { derive, XRPL_Account } from "xrpl-accountlib";
import state from '../index';
import { names } from './addFaucetAccount';
@@ -12,8 +12,18 @@ export const importAccount = (secret: string) => {
if (state.accounts.find((acc) => acc.secret === secret)) {
return toast.error("Account already added!");
}
const account = derive.familySeed(secret);
if (!account.secret.familySeed) {
let account: XRPL_Account | null = null;
try {
account = derive.familySeed(secret);
} catch (err: any) {
if (err?.message) {
toast.error(err.message)
} else {
toast.error('Error occured while importing account')
}
return;
}
if (!account || !account.secret.familySeed) {
return toast.error(`Couldn't create account!`);
}
state.accounts.push({