-
+
{
return (
-
);
};
diff --git a/src/pages/MainPage/ProgressInfoCard.tsx b/src/pages/MainPage/ProgressInfoCard.tsx
index 5ace1aa..a47b662 100644
--- a/src/pages/MainPage/ProgressInfoCard.tsx
+++ b/src/pages/MainPage/ProgressInfoCard.tsx
@@ -26,29 +26,57 @@ export const ProgressInfoCard = ({ status, submittedTxHash = '' }: ProgressInfoC
{status === 0 ? 'Ready to sign transaction.' : status > 0 && 'Transaction prepared.'}
- {status === 1 ? (
+
+ ) : (
+ status > 1 && 'Transaction signed.'
+ )}
- {status === 2 ? 'Ready to encrypt transaction.' : status === 3 ? (
+
+ ) : (
+ status > 3 && 'Transaction encrypted.'
+ )}
- {status === 4 ? 'Ready to submit transaction.' : status === 5 ? (
+
+ ) : (
+ status > 5 && 'Transaction submitted.'
+ )}
- {status >= 6 && (
)}
+ {status >= 6 &&
}
{status >= 6 && (
- Submitted Tx:
)}
{status >= 7 && (
- Original Tx:
)}
);
-};
\ No newline at end of file
+};
diff --git a/src/pages/MainPage/SubmitButton.tsx b/src/pages/MainPage/SubmitButton.tsx
index d62f7d5..3a0389a 100644
--- a/src/pages/MainPage/SubmitButton.tsx
+++ b/src/pages/MainPage/SubmitButton.tsx
@@ -1,11 +1,11 @@
import { Button } from '@nextui-org/react';
-import { Tooltip } from "@nextui-org/tooltip";
+import { Tooltip } from '@nextui-org/tooltip';
interface SubmitButtonProps {
- submit: () => void,
- status: number,
- transactionCount: number | undefined,
- isSubmitDisabled: boolean,
+ submit: () => void;
+ status: number;
+ transactionCount: number | undefined;
+ isSubmitDisabled: boolean;
}
const getStatusText = (status: number) => {
@@ -27,19 +27,31 @@ const getStatusText = (status: number) => {
}
};
-export const SubmitButton = ({ submit, status, transactionCount, isSubmitDisabled }: SubmitButtonProps) => {
+export const SubmitButton = ({
+ submit,
+ status,
+ transactionCount,
+ isSubmitDisabled,
+}: SubmitButtonProps) => {
return (
- {(status === 0 || status === 1) && transactionCount !== undefined ?
-
- Required nonce:
-
- {transactionCount + 1}
-
+ {(status === 0 || status === 1) && transactionCount !== undefined ? (
+
+
+ Required nonce:
+
{transactionCount + 1}
- : ""}
-
+ ) : (
+ ''
+ )}
+
{getStatusText(status)}
-
-
@@ -103,7 +99,7 @@ export const TransferForm = ({ submit, status, isSubmitDisabled }: TransferFormP
setAmount(balance?.formatted || "0"), [balance])}
+ onClick={useCallback(() => setAmount(balance?.formatted || '0'), [balance])}
>
Balance: {balance ? balance.formatted : '0'}
diff --git a/src/pages/MainPage/index.ts b/src/pages/MainPage/index.ts
index 6200f6c..e71de31 100644
--- a/src/pages/MainPage/index.ts
+++ b/src/pages/MainPage/index.ts
@@ -1 +1 @@
-export * from './MainPage';
\ No newline at end of file
+export * from './MainPage';
diff --git a/src/providers/GraphQLProvider.tsx b/src/providers/GraphQLProvider.tsx
index ad042f8..159f51b 100644
--- a/src/providers/GraphQLProvider.tsx
+++ b/src/providers/GraphQLProvider.tsx
@@ -21,9 +21,5 @@ export const GraphQLProvider = ({ children }: { children: any }) => {
});
}, [chainId]);
- return (
-
- {children}
-
- )
-}
+ return
{children} ;
+};
diff --git a/src/providers/Web3ModalProvider.tsx b/src/providers/Web3ModalProvider.tsx
index 0cf9a3c..9abf594 100644
--- a/src/providers/Web3ModalProvider.tsx
+++ b/src/providers/Web3ModalProvider.tsx
@@ -27,11 +27,11 @@ export const modal: Web3Modal = createWeb3Modal({
featuredWalletIds: [BRAWE_WALLET_ID],
includeWalletIds: [BRAWE_WALLET_ID],
themeVariables: {
- '--w3m-accent': '#f37e4b'
- }
+ '--w3m-accent': '#f37e4b',
+ },
});
-export function Web3ModalProvider({ children }: { children: React.ReactNode; }) {
+export function Web3ModalProvider({ children }: { children: React.ReactNode }) {
return (
{children}
diff --git a/src/services/shutter/blst.hpp.ts b/src/services/shutter/blst.hpp.ts
index f44de8b..93d0f6e 100644
--- a/src/services/shutter/blst.hpp.ts
+++ b/src/services/shutter/blst.hpp.ts
@@ -42,7 +42,7 @@ export interface ScalarConstructor {
}
export interface Scalar {
- hash_to (msg: binary_string, DST?: string): this;
+ hash_to(msg: binary_string, DST?: string): this;
dup(): Scalar;
from_bendian(be: bytes): this;
from_lendian(le: bytes): this;
@@ -76,7 +76,7 @@ export interface P1_Affine {
hash_or_encode: boolean,
msg: binary_string,
DST?: string,
- aug?: bytes
+ aug?: bytes,
): BLST_ERROR;
}
@@ -131,7 +131,7 @@ export interface P2_Affine {
hash_or_encode: boolean,
msg: binary_string,
DST?: string,
- aug?: bytes
+ aug?: bytes,
): BLST_ERROR;
}
@@ -192,31 +192,21 @@ export interface PairingConstructor {
}
export interface Pairing {
- aggregate(
- pk: P1_Affine,
- sig: P2_Affine,
- msg: binary_string,
- aug?: bytes
- ): BLST_ERROR;
- aggregate(
- pk: P2_Affine,
- sig: P1_Affine,
- msg: binary_string,
- aug?: bytes
- ): BLST_ERROR;
+ aggregate(pk: P1_Affine, sig: P2_Affine, msg: binary_string, aug?: bytes): BLST_ERROR;
+ aggregate(pk: P2_Affine, sig: P1_Affine, msg: binary_string, aug?: bytes): BLST_ERROR;
mul_n_aggregate(
pk: P1_Affine,
sig: P2_Affine,
scalar: scalar,
msg: binary_string,
- aug?: bytes
+ aug?: bytes,
): BLST_ERROR;
mul_n_aggregate(
pk: P2_Affine,
sig: P1_Affine,
scalar: scalar,
msg: binary_string,
- aug?: bytes
+ aug?: bytes,
): BLST_ERROR;
commit(): void;
merge(ctx: Pairing): BLST_ERROR;
diff --git a/src/services/shutter/encryptDataBlst.ts b/src/services/shutter/encryptDataBlst.ts
index d541429..62d3b3b 100644
--- a/src/services/shutter/encryptDataBlst.ts
+++ b/src/services/shutter/encryptDataBlst.ts
@@ -1,14 +1,10 @@
-import {
- hexToBytes,
- keccak256,
- bytesToBigInt,
- bytesToHex,
- numberToBytes,
-} from "viem";
-import pkg from "lodash";
+import { hexToBytes, keccak256, bytesToBigInt, bytesToHex, numberToBytes } from 'viem';
+import pkg from 'lodash';
const { zip } = pkg;
-import { Blst, P1, P2, PT } from "./blst.hpp.ts";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-expect-error
+import { Blst, P1, P2, PT } from './blst.hpp.ts';
declare global {
interface Window {
@@ -17,9 +13,8 @@ declare global {
}
const blsSubgroupOrderBytes = [
- 0x73, 0xed, 0xa7, 0x53, 0x29, 0x9d, 0x7d, 0x48, 0x33, 0x39, 0xd8, 0x08, 0x09,
- 0xa1, 0xd8, 0x05, 0x53, 0xbd, 0xa4, 0x02, 0xff, 0xfe, 0x5b, 0xfe, 0xff, 0xff,
- 0xff, 0xff, 0x00, 0x00, 0x00, 0x01,
+ 0x73, 0xed, 0xa7, 0x53, 0x29, 0x9d, 0x7d, 0x48, 0x33, 0x39, 0xd8, 0x08, 0x09, 0xa1, 0xd8, 0x05,
+ 0x53, 0xbd, 0xa4, 0x02, 0xff, 0xfe, 0x5b, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01,
];
const blsSubgroupOrder = bytesToBigInt(Uint8Array.from(blsSubgroupOrderBytes));
@@ -27,7 +22,7 @@ export async function encryptData(
msgHex: `0x${string}`,
identityPreimageHex: `0x${string}`,
eonKeyHex: `0x${string}`,
- sigmaHex: `0x${string}`
+ sigmaHex: `0x${string}`,
) {
const identity = await computeIdentityP1(identityPreimageHex);
const eonKey = await computeEonKeyP2(eonKeyHex);
@@ -37,15 +32,13 @@ export async function encryptData(
}
export async function computeIdentityP1(preimage: `0x${string}`): Promise {
- const preimageBytes = hexToBytes(
- ("0x1" + preimage.slice(2)) as `0x${string}`
- );
+ const preimageBytes = hexToBytes(('0x1' + preimage.slice(2)) as `0x${string}`);
const blst = window.blst;
const identity = new blst.P1().hash_to(
preimageBytes,
- "SHUTTER_V01_BLS12381G1_XMD:SHA-256_SSWU_RO_",
- null
+ 'SHUTTER_V01_BLS12381G1_XMD:SHA-256_SSWU_RO_',
+ null,
);
return identity;
@@ -57,18 +50,13 @@ async function computeEonKeyP2(eonKeyHex: `0x${string}`): Promise {
return eonKey;
}
-async function encrypt(
- msgHex: `0x${string}`,
- identity: P1,
- eonKey: P2,
- sigmaHex: `0x${string}`
-) {
+async function encrypt(msgHex: `0x${string}`, identity: P1, eonKey: P2, sigmaHex: `0x${string}`) {
const r = computeR(sigmaHex.slice(2), msgHex.slice(2));
const c1 = computeC1(r);
const c2 = await computeC2(sigmaHex, r, identity, eonKey);
const c3 = computeC3(
padAndSplit(hexToBytes(msgHex as `0x${string}`)),
- hexToBytes(sigmaHex as `0x${string}`)
+ hexToBytes(sigmaHex as `0x${string}`),
);
return {
@@ -111,12 +99,7 @@ function computeC1(r: bigint) {
return c1;
}
-async function computeC2(
- sigmaHex: string,
- r: bigint,
- identity: P1,
- eonKey: P2
-): Promise {
+async function computeC2(sigmaHex: string, r: bigint, identity: P1, eonKey: P2): Promise {
const blst = window.blst;
const p: PT = new blst.PT(identity, eonKey);
@@ -126,15 +109,12 @@ async function computeC2(
return result;
}
-function computeC3(
- messageBlocks: Uint8Array[],
- sigma: Uint8Array
-): Uint8Array[] {
+function computeC3(messageBlocks: Uint8Array[], sigma: Uint8Array): Uint8Array[] {
const keys = computeBlockKeys(sigma, messageBlocks.length);
return zip(keys, messageBlocks).map(([key, block]) => {
if (key === undefined || block === undefined) {
- throw new Error("Key or block is undefined");
+ throw new Error('Key or block is undefined');
}
return xorBlocks(key, block);
});
@@ -146,12 +126,12 @@ function hash2(p: PT): Uint8Array {
const result = new Uint8Array(finalExp.length + 1);
result[0] = 0x2;
result.set(finalExp, 1);
- return keccak256(result, "bytes");
+ return keccak256(result, 'bytes');
}
function hash3(bytesHex: string): bigint {
- const preimage = hexToBytes(("0x3" + bytesHex) as `0x${string}`);
- const hash = keccak256(preimage, "bytes");
+ const preimage = hexToBytes(('0x3' + bytesHex) as `0x${string}`);
+ const hash = keccak256(preimage, 'bytes');
const bigIntHash = bytesToBigInt(hash);
const result = bigIntHash % blsSubgroupOrder;
return result;
@@ -161,14 +141,14 @@ function hash4(bytes: Uint8Array): Uint8Array {
const preimage = new Uint8Array(bytes.length + 1);
preimage[0] = 0x4;
preimage.set(bytes, 1);
- const hash = keccak256(preimage, "bytes");
+ const hash = keccak256(preimage, 'bytes');
return hash;
}
//======================================
function xorBlocks(x: Uint8Array, y: Uint8Array): Uint8Array {
if (x.length !== y.length) {
- throw new Error("Both byte arrays must be of the same length.");
+ throw new Error('Both byte arrays must be of the same length.');
}
const result = new Uint8Array(x.length);
diff --git a/src/shared/ShutterTimer/ShutterTimer.tsx b/src/shared/ShutterTimer/ShutterTimer.tsx
index 5a8f5f6..fc13d7a 100644
--- a/src/shared/ShutterTimer/ShutterTimer.tsx
+++ b/src/shared/ShutterTimer/ShutterTimer.tsx
@@ -12,12 +12,36 @@ const SLOTS_PER_EPOCH = 16;
// const EPOCH_DURATION = SLOT_TIME * SLOTS_PER_EPOCH;
const getEpoch = (genesisTime: number) => {
- return Math.floor(((Date.now() / 1000) - genesisTime) / SLOT_TIME / SLOTS_PER_EPOCH);
-}
+ return Math.floor((Date.now() / 1000 - genesisTime) / SLOT_TIME / SLOTS_PER_EPOCH);
+};
const getSlot = (genesisTime: number) => {
- return Math.floor(((Date.now() / 1000) - genesisTime) / SLOT_TIME);
-}
+ return Math.floor((Date.now() / 1000 - genesisTime) / SLOT_TIME);
+};
+
+const getLoadingLabel = ({
+ isValidatorsLoading,
+ isProposersLoading,
+ isWaiting,
+ timeDifference,
+}: {
+ isValidatorsLoading: boolean;
+ isProposersLoading: boolean;
+ isWaiting: boolean;
+ timeDifference: number;
+}) => {
+ if (isValidatorsLoading) {
+ return 'Fetching shutter validators...';
+ }
+ if (isWaiting) {
+ return 'Waiting for epoch with shutter validators...';
+ }
+ if (isProposersLoading) {
+ return 'Fetching proposers...';
+ }
+
+ return `Next Shutter transactions will be included in ~${timeDifference} seconds`;
+};
export const ShutterTimer = () => {
const chainId = useChainId();
@@ -25,10 +49,16 @@ export const ShutterTimer = () => {
const [currentEpoch, setCurrentEpoch] = useState(getEpoch(chain.genesisTime));
const [timeDifference, setTimeDifference] = useState(0);
+ // waiting for next epoch
+ const [isWaiting, setIsWaiting] = useState(false);
- const { validatorIndexes: shutteredValidatorIndexes, isLoading } = useGetShutterValidatorIndexes(chainId);
+ const { validatorIndexes: shutteredValidatorIndexes, isLoading: isValidatorsLoading } =
+ useGetShutterValidatorIndexes(chainId);
- const { data: dutiesProposer } = useFetchDutiesProposer(chain.gbcUrl, currentEpoch);
+ const { data: dutiesProposer, isLoading: isProposersLoading } = useFetchDutiesProposer(
+ chain.gbcUrl,
+ currentEpoch,
+ );
const matches = useMemo(() => {
if (!shutteredValidatorIndexes || !dutiesProposer) return;
@@ -40,6 +70,11 @@ export const ShutterTimer = () => {
// console.log({ shutteredValidatorIndexes, dutiesProposer, currentEpoch, matches });
+ useEffect(() => {
+ setCurrentEpoch(getEpoch(chain.genesisTime));
+ setIsWaiting(false);
+ }, [chain]);
+
useEffect(() => {
if (!dutiesProposer || !matches) return;
@@ -49,8 +84,18 @@ export const ShutterTimer = () => {
if (!match) {
setTimeDifference(0);
- setCurrentEpoch(currentEpoch + 1);
- clearInterval(interval);
+
+ const nextEpochStart = chain.genesisTime + (currentEpoch + 1) * SLOTS_PER_EPOCH * SLOT_TIME;
+ const oneEpochAhead = Date.now() / 1000 + SLOTS_PER_EPOCH * SLOT_TIME;
+
+ if (nextEpochStart < oneEpochAhead) {
+ setCurrentEpoch(currentEpoch + 1);
+ clearInterval(interval);
+ setIsWaiting(false);
+ } else {
+ setIsWaiting(true);
+ }
+
return;
}
@@ -65,21 +110,30 @@ export const ShutterTimer = () => {
return (
- {isLoading ? (
-
+
+ {isValidatorsLoading || isProposersLoading || isWaiting ? (
+
- )}
+ )}
+
- )
+ );
};
diff --git a/src/shared/ShutterTimer/ValidatorRegistryQL.ts b/src/shared/ShutterTimer/ValidatorRegistryQL.ts
index b60c92a..92959c8 100644
--- a/src/shared/ShutterTimer/ValidatorRegistryQL.ts
+++ b/src/shared/ShutterTimer/ValidatorRegistryQL.ts
@@ -1,12 +1,17 @@
import { gql } from '@apollo/client';
export const GET_UPDATES = gql`
- query GetUpdates($first: Int!, $lastBlockNumber: Int!) {
- updateds(first: $first, orderBy: blockNumber, orderDirection: asc, where: { blockNumber_gte: $lastBlockNumber }) {
- id
- message
- signature
- blockNumber
- }
+ query GetUpdates($first: Int!, $lastBlockNumber: Int!) {
+ updateds(
+ first: $first
+ orderBy: blockNumber
+ orderDirection: asc
+ where: { blockNumber_gte: $lastBlockNumber }
+ ) {
+ id
+ message
+ signature
+ blockNumber
}
+ }
`;
diff --git a/src/shared/ShutterTimer/index.ts b/src/shared/ShutterTimer/index.ts
index 9954be1..8f5e3ec 100644
--- a/src/shared/ShutterTimer/index.ts
+++ b/src/shared/ShutterTimer/index.ts
@@ -1 +1 @@
-export * from './ShutterTimer';
\ No newline at end of file
+export * from './ShutterTimer';
diff --git a/src/shared/ShutterTimer/useFetchDutiesProposer.ts b/src/shared/ShutterTimer/useFetchDutiesProposer.ts
index 16d94a7..e476ab6 100644
--- a/src/shared/ShutterTimer/useFetchDutiesProposer.ts
+++ b/src/shared/ShutterTimer/useFetchDutiesProposer.ts
@@ -5,19 +5,20 @@ const DUTIES_PROPOSER_ENDPOINT = 'validator/duties/proposer';
// query
const DUTIES_PROPOSER_QUERY_KEY = 'duties-proposer';
-export const useFetchDutiesProposer = (gbcUrl: string, epoch: number) => useQuery({
- queryKey: [DUTIES_PROPOSER_QUERY_KEY, epoch],
- queryFn: async () => {
- try {
- const res = await fetch(`${gbcUrl}/${BASE_ENDPOINT}/${DUTIES_PROPOSER_ENDPOINT}/${epoch}`);
- const data = await res.json();
+export const useFetchDutiesProposer = (gbcUrl: string, epoch: number) =>
+ useQuery({
+ queryKey: [DUTIES_PROPOSER_QUERY_KEY, epoch],
+ queryFn: async () => {
+ try {
+ const res = await fetch(`${gbcUrl}/${BASE_ENDPOINT}/${DUTIES_PROPOSER_ENDPOINT}/${epoch}`);
+ const data = await res.json();
- console.log('[service][rpc-gbc] queried duties proposer', { data: data.data });
+ console.log('[service][rpc-gbc] queried duties proposer', { data: data.data });
- return data.data;
- } catch (error) {
- console.error('[service][apollo] Failed to query duties proposer', error);
- }
- },
- enabled: Boolean(gbcUrl),
-});
+ return data.data;
+ } catch (error) {
+ console.error('[service][apollo] Failed to query duties proposer', error);
+ }
+ },
+ enabled: Boolean(gbcUrl),
+ });
diff --git a/src/shared/ShutterTimer/useGetShutterValidatorIndexes.ts b/src/shared/ShutterTimer/useGetShutterValidatorIndexes.ts
index 7060e00..178ad11 100644
--- a/src/shared/ShutterTimer/useGetShutterValidatorIndexes.ts
+++ b/src/shared/ShutterTimer/useGetShutterValidatorIndexes.ts
@@ -26,10 +26,14 @@ function extractSubscriptionStatus(messageHex: string) {
}
export const useGetShutterValidatorIndexes = (chainId: number) => {
- const { validatorIndexes, lastBlockNumber} = useValidatorIndexesStore(state => state[chainId]);
+ const { validatorIndexes, lastBlockNumber } = useValidatorIndexesStore((state) => state[chainId]);
const { _hasHydrated, setValidatorIndexes, setLastBlockNumber } = useValidatorIndexesStore();
- const { data: logs, isLoading } = useGetValidatorRegistryLogs(chainId, lastBlockNumber, _hasHydrated);
+ const { data: logs, isLoading } = useGetValidatorRegistryLogs(
+ chainId,
+ lastBlockNumber,
+ _hasHydrated,
+ );
useEffect(() => {
let currentIndexes = validatorIndexes;
@@ -60,11 +64,10 @@ export const useGetShutterValidatorIndexes = (chainId: number) => {
setValidatorIndexes([...currentIndexes, ...indexes], chainId);
setLastBlockNumber(newLastBlock, chainId);
}
-
}, [logs]);
return {
validatorIndexes,
isLoading,
- }
+ };
};
diff --git a/src/shared/ShutterTimer/useGetValidatorRegistryLogs.ts b/src/shared/ShutterTimer/useGetValidatorRegistryLogs.ts
index 951f70f..d95a26d 100644
--- a/src/shared/ShutterTimer/useGetValidatorRegistryLogs.ts
+++ b/src/shared/ShutterTimer/useGetValidatorRegistryLogs.ts
@@ -4,16 +4,20 @@ import { useLazyQuery } from '@apollo/client';
import { GET_UPDATES } from './ValidatorRegistryQL';
export interface ValidatorRegistryLog {
- message: string,
- signature: string,
- blockNumber: string,
+ message: string;
+ signature: string;
+ blockNumber: string;
}
const SUB_GRAPH_MAX_QUERY_LOGS = 1000;
// query
const LOGS_QUERY_KEY = 'logs';
-export const useGetValidatorRegistryLogs = (chainId: number, lastBlockNumber: number, enabled: boolean) => {
+export const useGetValidatorRegistryLogs = (
+ chainId: number,
+ lastBlockNumber: number,
+ enabled: boolean,
+) => {
const [getUpdates] = useLazyQuery(GET_UPDATES);
return useQuery({
@@ -24,9 +28,13 @@ export const useGetValidatorRegistryLogs = (chainId: number, lastBlockNumber: nu
// eslint-disable-next-line no-constant-condition
while (true) {
- const blockNumber = allLogs.length ? allLogs[allLogs.length - 1].blockNumber : lastBlockNumber;
+ const blockNumber = allLogs.length
+ ? allLogs[allLogs.length - 1].blockNumber
+ : lastBlockNumber;
- const response = await getUpdates({ variables: { first: SUB_GRAPH_MAX_QUERY_LOGS, lastBlockNumber: Number(blockNumber) }});
+ const response = await getUpdates({
+ variables: { first: SUB_GRAPH_MAX_QUERY_LOGS, lastBlockNumber: Number(blockNumber) },
+ });
const logs = response.data?.updateds;
diff --git a/src/stores/createSelectors.ts b/src/stores/createSelectors.ts
index 68394ee..3f2ba15 100644
--- a/src/stores/createSelectors.ts
+++ b/src/stores/createSelectors.ts
@@ -4,14 +4,12 @@ type WithSelectors = S extends { getState: () => infer T }
? S & { use: { [K in keyof T]: () => T[K] } }
: never;
-export const createSelectors = >>(
- _store: S,
-) => {
- let store = _store as WithSelectors
- store.use = {}
- for (let k of Object.keys(store.getState())) {
- ;(store.use as any)[k] = () => store((s) => s[k as keyof typeof s])
+export const createSelectors = >>(_store: S) => {
+ const store = _store as WithSelectors;
+ store.use = {};
+ for (const k of Object.keys(store.getState())) {
+ (store.use as any)[k] = () => store((s) => s[k as keyof typeof s]);
}
- return store
+ return store;
};
diff --git a/src/stores/useValidatorIndexesStore.ts b/src/stores/useValidatorIndexesStore.ts
index 8a46f06..93cf9f5 100644
--- a/src/stores/useValidatorIndexesStore.ts
+++ b/src/stores/useValidatorIndexesStore.ts
@@ -6,20 +6,20 @@ import { createSelectors } from './createSelectors';
type State = {
[key: number]: {
- validatorIndexes: number[],
- lastBlockNumber: number,
- },
+ validatorIndexes: number[];
+ lastBlockNumber: number;
+ };
- _hasHydrated: boolean,
+ _hasHydrated: boolean;
};
type Action = {
- setValidatorIndexes: (validatorIndexes: number[], chainId: number) => void,
- addValidatorIndex: (validatorIndex: number, chainId: number) => void,
- removeValidatorIndex: (validatorIndex: number, chainId: number) => void,
- setLastBlockNumber: (lastBlockNumber: number, chainId: number) => void,
+ setValidatorIndexes: (validatorIndexes: number[], chainId: number) => void;
+ addValidatorIndex: (validatorIndex: number, chainId: number) => void;
+ removeValidatorIndex: (validatorIndex: number, chainId: number) => void;
+ setLastBlockNumber: (lastBlockNumber: number, chainId: number) => void;
- setHasHydrated: (state: boolean) => void,
+ setHasHydrated: (state: boolean) => void;
};
const useValidatorIndexesStoreBase = create()(
@@ -37,56 +37,62 @@ const useValidatorIndexesStoreBase = create()(
_hasHydrated: false,
setHasHydrated: (state) => set({ _hasHydrated: state }),
- setValidatorIndexes: (validatorIndexes, chainId) => set((state) => {
- return {
- [chainId]: {
- validatorIndexes: validatorIndexes,
- lastBlockNumber: state[chainId].lastBlockNumber,
- }
- };
- }),
- addValidatorIndex: (validatorIndex, chainId) => set((state) => {
- return {
- [chainId]: {
- validatorIndexes: [...state[chainId].validatorIndexes, validatorIndex],
- lastBlockNumber: state[chainId].lastBlockNumber,
- }
- }
- }),
- removeValidatorIndex: (validatorIndex, chainId) => set((state) => {
- return {
- [chainId]: {
- validatorIndexes: state[chainId].validatorIndexes.filter((index) => index !== validatorIndex),
- lastBlockNumber: state[chainId].lastBlockNumber,
- }
- };
- }),
- setLastBlockNumber: (lastBlockNumber, chainId) => set((state) => {
- return {
- [chainId]: {
- validatorIndexes: state[chainId].validatorIndexes,
- lastBlockNumber: lastBlockNumber,
- }
- };
- }),
+ setValidatorIndexes: (validatorIndexes, chainId) =>
+ set((state) => {
+ return {
+ [chainId]: {
+ validatorIndexes: validatorIndexes,
+ lastBlockNumber: state[chainId].lastBlockNumber,
+ },
+ };
+ }),
+ addValidatorIndex: (validatorIndex, chainId) =>
+ set((state) => {
+ return {
+ [chainId]: {
+ validatorIndexes: [...state[chainId].validatorIndexes, validatorIndex],
+ lastBlockNumber: state[chainId].lastBlockNumber,
+ },
+ };
+ }),
+ removeValidatorIndex: (validatorIndex, chainId) =>
+ set((state) => {
+ return {
+ [chainId]: {
+ validatorIndexes: state[chainId].validatorIndexes.filter(
+ (index) => index !== validatorIndex,
+ ),
+ lastBlockNumber: state[chainId].lastBlockNumber,
+ },
+ };
+ }),
+ setLastBlockNumber: (lastBlockNumber, chainId: number) =>
+ set((state) => {
+ return {
+ [chainId]: {
+ validatorIndexes: state[chainId].validatorIndexes,
+ lastBlockNumber: lastBlockNumber,
+ },
+ };
+ }),
}),
{
name: 'validator-indexes-storage', // name of the item in the storage (must be unique)
storage: createJSONStorage(() => window.localStorage), // (optional) by default, 'localStorage' is used
onRehydrateStorage: () => {
- console.log('hydration starts')
+ console.log('hydration starts');
return (state, error) => {
console.debug({ state });
if (error) {
- console.log('an error happened during hydration', error)
+ console.log('an error happened during hydration', error);
} else {
state?.setHasHydrated(true);
- console.log('hydration finished')
+ console.log('hydration finished');
}
- }
+ };
},
},
),
diff --git a/src/utils/eth.ts b/src/utils/eth.ts
index 3b05939..bb12d0d 100644
--- a/src/utils/eth.ts
+++ b/src/utils/eth.ts
@@ -3,12 +3,16 @@ import { utils } from 'ethers';
const functionSignature = 'transfer(address,uint256)';
const functionSelector = utils.id(functionSignature).slice(0, 10);
-export const encodeDataForTransfer = (recipientAddress: string, amount: number, decimals: number) => {
+export const encodeDataForTransfer = (
+ recipientAddress: string,
+ amount: number,
+ decimals: number,
+) => {
const tokenAmount = utils.parseUnits(amount.toString(), decimals);
const params = utils.defaultAbiCoder.encode(
- ["address", "uint256"],
- [recipientAddress, tokenAmount]
+ ['address', 'uint256'],
+ [recipientAddress, tokenAmount],
);
return functionSelector + params.slice(2);
diff --git a/src/utils/mappers.ts b/src/utils/mappers.ts
index 25c3dd8..4bef792 100644
--- a/src/utils/mappers.ts
+++ b/src/utils/mappers.ts
@@ -1,4 +1,3 @@
-
export const mapChainToOption = (chainData: any) => {
return {
...chainData,
@@ -6,7 +5,7 @@ export const mapChainToOption = (chainData: any) => {
label: chainData.name,
value: String(chainData.id),
avatar: chainData.img,
- }
+ };
};
export const mapChainsToOptions = (chains: any) => chains.map(mapChainToOption);
diff --git a/tailwind.config.js b/tailwind.config.js
index 642cfd1..4d34a0d 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,25 +1,29 @@
-import { nextui } from "@nextui-org/react";
+import { nextui } from '@nextui-org/react';
/** @type {import('tailwindcss').Config} */
export default {
- content: ["./index.html", "./src/**/*.{js,ts,jsx,tsx}", "./node_modules/@nextui-org/theme/dist/**/*.{js,ts,jsx,tsx}"],
+ content: [
+ './index.html',
+ './src/**/*.{js,ts,jsx,tsx}',
+ './node_modules/@nextui-org/theme/dist/**/*.{js,ts,jsx,tsx}',
+ ],
theme: {
extend: {},
},
- darkMode: "class",
+ darkMode: 'class',
plugins: [
nextui({
- defaultTheme: "light",
+ defaultTheme: 'light',
themes: {
light: {
colors: {
primary: {
- DEFAULT: "#3E6957",
+ DEFAULT: '#3E6957',
},
- secondary: "#f0ebde",
- foreground: "#ffffff",
+ secondary: '#f0ebde',
+ foreground: '#ffffff',
danger: {
- DEFAULT: "#f37e4b",
+ DEFAULT: '#f37e4b',
},
},
},
diff --git a/thegraph/m-shutter-validator-registry/src/validator-registry.ts b/thegraph/m-shutter-validator-registry/src/validator-registry.ts
index e537fe0..81f039e 100644
--- a/thegraph/m-shutter-validator-registry/src/validator-registry.ts
+++ b/thegraph/m-shutter-validator-registry/src/validator-registry.ts
@@ -1,16 +1,14 @@
-import { Updated as UpdatedEvent } from "../generated/ValidatorRegistry/ValidatorRegistry"
-import { Updated } from "../generated/schema"
+import { Updated as UpdatedEvent } from '../generated/ValidatorRegistry/ValidatorRegistry';
+import { Updated } from '../generated/schema';
export function handleUpdated(event: UpdatedEvent): void {
- let entity = new Updated(
- event.transaction.hash.concatI32(event.logIndex.toI32())
- )
- entity.message = event.params.message
- entity.signature = event.params.signature
+ const entity = new Updated(event.transaction.hash.concatI32(event.logIndex.toI32()));
+ entity.message = event.params.message;
+ entity.signature = event.params.signature;
- entity.blockNumber = event.block.number
- entity.blockTimestamp = event.block.timestamp
- entity.transactionHash = event.transaction.hash
+ entity.blockNumber = event.block.number;
+ entity.blockTimestamp = event.block.timestamp;
+ entity.transactionHash = event.transaction.hash;
- entity.save()
+ entity.save();
}
diff --git a/thegraph/m-shutter-validator-registry/tests/validator-registry-utils.ts b/thegraph/m-shutter-validator-registry/tests/validator-registry-utils.ts
index e6714b2..4f1a42a 100644
--- a/thegraph/m-shutter-validator-registry/tests/validator-registry-utils.ts
+++ b/thegraph/m-shutter-validator-registry/tests/validator-registry-utils.ts
@@ -1,18 +1,18 @@
-import { newMockEvent } from "matchstick-as"
-import { ethereum, Bytes } from "@graphprotocol/graph-ts"
-import { Updated } from "../generated/ValidatorRegistry/ValidatorRegistry"
+import { newMockEvent } from 'matchstick-as';
+import { ethereum, Bytes } from '@graphprotocol/graph-ts';
+import { Updated } from '../generated/ValidatorRegistry/ValidatorRegistry';
export function createUpdatedEvent(message: Bytes, signature: Bytes): Updated {
- let updatedEvent = changetype(newMockEvent())
+ const updatedEvent = changetype(newMockEvent());
- updatedEvent.parameters = new Array()
+ updatedEvent.parameters = [];
updatedEvent.parameters.push(
- new ethereum.EventParam("message", ethereum.Value.fromBytes(message))
- )
+ new ethereum.EventParam('message', ethereum.Value.fromBytes(message)),
+ );
updatedEvent.parameters.push(
- new ethereum.EventParam("signature", ethereum.Value.fromBytes(signature))
- )
+ new ethereum.EventParam('signature', ethereum.Value.fromBytes(signature)),
+ );
- return updatedEvent
+ return updatedEvent;
}
diff --git a/thegraph/m-shutter-validator-registry/tests/validator-registry.test.ts b/thegraph/m-shutter-validator-registry/tests/validator-registry.test.ts
index b3b0565..03cd530 100644
--- a/thegraph/m-shutter-validator-registry/tests/validator-registry.test.ts
+++ b/thegraph/m-shutter-validator-registry/tests/validator-registry.test.ts
@@ -4,50 +4,50 @@ import {
test,
clearStore,
beforeAll,
- afterAll
-} from "matchstick-as/assembly/index"
-import { Bytes } from "@graphprotocol/graph-ts"
-import { Updated } from "../generated/schema"
-import { Updated as UpdatedEvent } from "../generated/ValidatorRegistry/ValidatorRegistry"
-import { handleUpdated } from "../src/validator-registry"
-import { createUpdatedEvent } from "./validator-registry-utils"
+ afterAll,
+} from 'matchstick-as/assembly/index';
+import { Bytes } from '@graphprotocol/graph-ts';
+import { Updated } from '../generated/schema';
+import { Updated as UpdatedEvent } from '../generated/ValidatorRegistry/ValidatorRegistry';
+import { handleUpdated } from '../src/validator-registry';
+import { createUpdatedEvent } from './validator-registry-utils';
// Tests structure (matchstick-as >=0.5.0)
// https://thegraph.com/docs/en/developer/matchstick/#tests-structure-0-5-0
-describe("Describe entity assertions", () => {
+describe('Describe entity assertions', () => {
beforeAll(() => {
- let message = Bytes.fromI32(1234567890)
- let signature = Bytes.fromI32(1234567890)
- let newUpdatedEvent = createUpdatedEvent(message, signature)
- handleUpdated(newUpdatedEvent)
- })
+ const message = Bytes.fromI32(1234567890);
+ const signature = Bytes.fromI32(1234567890);
+ const newUpdatedEvent = createUpdatedEvent(message, signature);
+ handleUpdated(newUpdatedEvent);
+ });
afterAll(() => {
- clearStore()
- })
+ clearStore();
+ });
// For more test scenarios, see:
// https://thegraph.com/docs/en/developer/matchstick/#write-a-unit-test
- test("Updated created and stored", () => {
- assert.entityCount("Updated", 1)
+ test('Updated created and stored', () => {
+ assert.entityCount('Updated', 1);
// 0xa16081f360e3847006db660bae1c6d1b2e17ec2a is the default address used in newMockEvent() function
assert.fieldEquals(
- "Updated",
- "0xa16081f360e3847006db660bae1c6d1b2e17ec2a-1",
- "message",
- "1234567890"
- )
+ 'Updated',
+ '0xa16081f360e3847006db660bae1c6d1b2e17ec2a-1',
+ 'message',
+ '1234567890',
+ );
assert.fieldEquals(
- "Updated",
- "0xa16081f360e3847006db660bae1c6d1b2e17ec2a-1",
- "signature",
- "1234567890"
- )
+ 'Updated',
+ '0xa16081f360e3847006db660bae1c6d1b2e17ec2a-1',
+ 'signature',
+ '1234567890',
+ );
// More assert options:
// https://thegraph.com/docs/en/developer/matchstick/#asserts
- })
-})
+ });
+});
diff --git a/thegraph/shutter-validator-registry/src/validator-registry.ts b/thegraph/shutter-validator-registry/src/validator-registry.ts
index 030dd20..7f914f7 100644
--- a/thegraph/shutter-validator-registry/src/validator-registry.ts
+++ b/thegraph/shutter-validator-registry/src/validator-registry.ts
@@ -2,7 +2,7 @@ import { Bytes, BigInt } from '@graphprotocol/graph-ts';
import { Updated as UpdatedEvent } from '../generated/ValidatorRegistry/ValidatorRegistry';
import { Updated } from '../generated/schema';
-function extractValidatorIndex(messageBytes: Bytes): BigInt {
+function extractValidatorIndex(messageBytes: Bytes): bigint {
// Convert hex to bytes
// const messageBytes = utils.arrayify(messageHex);
@@ -26,17 +26,15 @@ function extractSubscriptionStatus(messageBytes: Bytes): boolean {
}
export function handleUpdated(event: UpdatedEvent): void {
- const entity = new Updated(
- event.transaction.hash.concatI32(event.logIndex.toI32())
- )
+ const entity = new Updated(event.transaction.hash.concatI32(event.logIndex.toI32()));
entity.message = event.params.message;
entity.signature = event.params.signature;
entity.validatorIndex = extractValidatorIndex(event.params.message);
entity.subscriptionStatus = extractSubscriptionStatus(event.params.message);
- entity.blockNumber = event.block.number
- entity.blockTimestamp = event.block.timestamp
- entity.transactionHash = event.transaction.hash
+ entity.blockNumber = event.block.number;
+ entity.blockTimestamp = event.block.timestamp;
+ entity.transactionHash = event.transaction.hash;
- entity.save()
+ entity.save();
}
diff --git a/thegraph/shutter-validator-registry/tests/validator-registry-utils.ts b/thegraph/shutter-validator-registry/tests/validator-registry-utils.ts
index e6714b2..4f1a42a 100644
--- a/thegraph/shutter-validator-registry/tests/validator-registry-utils.ts
+++ b/thegraph/shutter-validator-registry/tests/validator-registry-utils.ts
@@ -1,18 +1,18 @@
-import { newMockEvent } from "matchstick-as"
-import { ethereum, Bytes } from "@graphprotocol/graph-ts"
-import { Updated } from "../generated/ValidatorRegistry/ValidatorRegistry"
+import { newMockEvent } from 'matchstick-as';
+import { ethereum, Bytes } from '@graphprotocol/graph-ts';
+import { Updated } from '../generated/ValidatorRegistry/ValidatorRegistry';
export function createUpdatedEvent(message: Bytes, signature: Bytes): Updated {
- let updatedEvent = changetype(newMockEvent())
+ const updatedEvent = changetype(newMockEvent());
- updatedEvent.parameters = new Array()
+ updatedEvent.parameters = [];
updatedEvent.parameters.push(
- new ethereum.EventParam("message", ethereum.Value.fromBytes(message))
- )
+ new ethereum.EventParam('message', ethereum.Value.fromBytes(message)),
+ );
updatedEvent.parameters.push(
- new ethereum.EventParam("signature", ethereum.Value.fromBytes(signature))
- )
+ new ethereum.EventParam('signature', ethereum.Value.fromBytes(signature)),
+ );
- return updatedEvent
+ return updatedEvent;
}
diff --git a/thegraph/shutter-validator-registry/tests/validator-registry.test.ts b/thegraph/shutter-validator-registry/tests/validator-registry.test.ts
index b3b0565..03cd530 100644
--- a/thegraph/shutter-validator-registry/tests/validator-registry.test.ts
+++ b/thegraph/shutter-validator-registry/tests/validator-registry.test.ts
@@ -4,50 +4,50 @@ import {
test,
clearStore,
beforeAll,
- afterAll
-} from "matchstick-as/assembly/index"
-import { Bytes } from "@graphprotocol/graph-ts"
-import { Updated } from "../generated/schema"
-import { Updated as UpdatedEvent } from "../generated/ValidatorRegistry/ValidatorRegistry"
-import { handleUpdated } from "../src/validator-registry"
-import { createUpdatedEvent } from "./validator-registry-utils"
+ afterAll,
+} from 'matchstick-as/assembly/index';
+import { Bytes } from '@graphprotocol/graph-ts';
+import { Updated } from '../generated/schema';
+import { Updated as UpdatedEvent } from '../generated/ValidatorRegistry/ValidatorRegistry';
+import { handleUpdated } from '../src/validator-registry';
+import { createUpdatedEvent } from './validator-registry-utils';
// Tests structure (matchstick-as >=0.5.0)
// https://thegraph.com/docs/en/developer/matchstick/#tests-structure-0-5-0
-describe("Describe entity assertions", () => {
+describe('Describe entity assertions', () => {
beforeAll(() => {
- let message = Bytes.fromI32(1234567890)
- let signature = Bytes.fromI32(1234567890)
- let newUpdatedEvent = createUpdatedEvent(message, signature)
- handleUpdated(newUpdatedEvent)
- })
+ const message = Bytes.fromI32(1234567890);
+ const signature = Bytes.fromI32(1234567890);
+ const newUpdatedEvent = createUpdatedEvent(message, signature);
+ handleUpdated(newUpdatedEvent);
+ });
afterAll(() => {
- clearStore()
- })
+ clearStore();
+ });
// For more test scenarios, see:
// https://thegraph.com/docs/en/developer/matchstick/#write-a-unit-test
- test("Updated created and stored", () => {
- assert.entityCount("Updated", 1)
+ test('Updated created and stored', () => {
+ assert.entityCount('Updated', 1);
// 0xa16081f360e3847006db660bae1c6d1b2e17ec2a is the default address used in newMockEvent() function
assert.fieldEquals(
- "Updated",
- "0xa16081f360e3847006db660bae1c6d1b2e17ec2a-1",
- "message",
- "1234567890"
- )
+ 'Updated',
+ '0xa16081f360e3847006db660bae1c6d1b2e17ec2a-1',
+ 'message',
+ '1234567890',
+ );
assert.fieldEquals(
- "Updated",
- "0xa16081f360e3847006db660bae1c6d1b2e17ec2a-1",
- "signature",
- "1234567890"
- )
+ 'Updated',
+ '0xa16081f360e3847006db660bae1c6d1b2e17ec2a-1',
+ 'signature',
+ '1234567890',
+ );
// More assert options:
// https://thegraph.com/docs/en/developer/matchstick/#asserts
- })
-})
+ });
+});
diff --git a/tsconfig.app.json b/tsconfig.app.json
deleted file mode 100644
index a2385e4..0000000
--- a/tsconfig.app.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "compilerOptions": {
- "composite": true,
- "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
- "target": "ES2020",
- "useDefineForClassFields": true,
- "lib": ["ES2020", "DOM", "DOM.Iterable"],
- "module": "ESNext",
- "skipLibCheck": true,
-
- /* Bundler mode */
- "moduleResolution": "bundler",
- "allowImportingTsExtensions": true,
- "resolveJsonModule": true,
- "isolatedModules": true,
- "moduleDetection": "force",
- "noEmit": true,
- "jsx": "react-jsx",
-
- /* Linting */
- "strict": true,
- "noUnusedLocals": true,
- "noUnusedParameters": true,
- "noFallthroughCasesInSwitch": true,
-
- "paths": {
- "@/*": ["./src/*"]
- }
- },
- "include": ["src"]
-}
diff --git a/tsconfig.json b/tsconfig.json
index ea9d0cd..459b71b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,35 @@
{
- "files": [],
- "references": [
- {
- "path": "./tsconfig.app.json"
+ "compilerOptions": {
+ "allowJs": true,
+ "baseUrl": ".",
+ "esModuleInterop": true,
+ "forceConsistentCasingInFileNames": true,
+ "isolatedModules": true,
+ "jsx": "preserve",
+ "lib": [
+ "dom",
+ "dom.iterable",
+ "esnext",
+ "ES2020",
+ ],
+ "module": "esnext",
+ "moduleResolution": "node",
+ "noEmit": true,
+ "resolveJsonModule": true,
+ "skipLibCheck": true,
+ "strict": true,
+ "target": "ES2020",
+ "paths": {
+ "@/*": ["./src/*"]
},
- {
- "path": "./tsconfig.node.json"
- }
+ "incremental": true
+ },
+ "include": [
+ "src/**/*"
+ ],
+ "exclude": [
+ "node_modules",
+ "thegraph",
+ "public"
]
}
diff --git a/tsconfig.node.json b/tsconfig.node.json
deleted file mode 100644
index 3afdd6e..0000000
--- a/tsconfig.node.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "compilerOptions": {
- "composite": true,
- "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
- "skipLibCheck": true,
- "module": "ESNext",
- "moduleResolution": "bundler",
- "allowSyntheticDefaultImports": true,
- "strict": true,
- "noEmit": true
- },
- "include": ["vite.config.ts"]
-}
diff --git a/vite.config.ts b/vite.config.ts
index bbc4ffc..71b77d8 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,15 +1,15 @@
-import { defineConfig } from "vite";
-import react from "@vitejs/plugin-react";
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
// https://vitejs.dev/config/
export default defineConfig({
define: {
- "process.env": process.env,
+ 'process.env': process.env,
},
plugins: [react()],
resolve: {
alias: {
- "@/": "/src/",
+ '@/': '/src/',
},
},
});