Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: adapt validator node to ts-rs exported interfaces #923

Merged
merged 4 commits into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions applications/tari_dan_wallet_web_ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import { Chip, Avatar } from "@mui/material";
import { IoCheckmarkOutline, IoDiamondOutline, IoReload, IoHourglassOutline, IoCloseOutline } from "react-icons/io5";
import { useTheme } from "@mui/material/styles";
import { TransactionStatus } from "@tarilabs/typescript-bindings";
import type { TransactionStatus } from "@tarilabs/typescript-bindings";

interface StatusChipProps {
status: TransactionStatus;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {
} from "../../utils/json_rpc";
import { apiError } from "../helpers/types";
import queryClient from "../queryClient";
import { AccountsListResponse, Arg, ComponentAccessRules } from "@tarilabs/typescript-bindings";
import type { Arg, ComponentAccessRules } from "@tarilabs/typescript-bindings";

// Fees are passed as strings because Amount is tagged
export const useAccountsClaimBurn = (account: string, claimProof: string, fee: number) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { useQuery } from "@tanstack/react-query";
import { transactionsGet, transactionsGetAll } from "../../utils/json_rpc";
import { apiError } from "../helpers/types";

import { TransactionGetAllResponse, TransactionStatus } from "@tarilabs/typescript-bindings";
import type { TransactionStatus } from "@tarilabs/typescript-bindings";

const useTransactionDetails = (hash: string) => {
return useQuery({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ import { shortenString } from "../../utils/helpers";
import { DataTableCell } from "../../Components/StyledComponents";
import CopyToClipboard from "../../Components/CopyToClipboard";
import FetchStatusCheck from "../../Components/FetchStatusCheck";
import { Account, AccountNftInfo, BalanceEntry, substateIdToString } from "@tarilabs/typescript-bindings";
import { substateIdToString } from "@tarilabs/typescript-bindings";
import type { AccountNftInfo, BalanceEntry } from "@tarilabs/typescript-bindings/wallet-daemon-client";

function BalanceRow(props: BalanceEntry) {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import { DataTableCell } from "../../../Components/StyledComponents";
import { useAccountNFTsList, useAccountsGetBalances } from "../../../api/hooks/useAccounts";
import useAccountStore from "../../../store/accountStore";
import { shortenString } from "../../../utils/helpers";
import { AccountNftInfo, BalanceEntry } from "@tarilabs/typescript-bindings";
import type { AccountNftInfo, BalanceEntry } from "@tarilabs/typescript-bindings/wallet-daemon-client";

interface TabPanelProps {
children?: React.ReactNode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import { useTheme } from "@mui/material/styles";
import { accountsClaimBurn } from "../../../utils/json_rpc";
import useAccountStore from "../../../store/accountStore";
import { useKeysList } from "../../../api/hooks/useKeys";
import { AccountInfo, AccountsListResponse } from "@tarilabs/typescript-bindings";
import type { AccountInfo } from "@tarilabs/typescript-bindings/wallet-daemon-client";

export default function ClaimBurn() {
const [open, setOpen] = useState(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import useAccountStore from "../../../store/accountStore";
import { FormControl, InputLabel, MenuItem, Select, SelectChangeEvent } from "@mui/material";
import { useKeysList } from "../../../api/hooks/useKeys";
import { validatorsClaimFees } from "../../../utils/json_rpc";
import { AccountInfo } from "@tarilabs/typescript-bindings";
import type { AccountInfo } from "@tarilabs/typescript-bindings/wallet-daemon-client";

export default function ClaimFees() {
const [open, setOpen] = useState(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import Select, { SelectChangeEvent } from "@mui/material/Select";
import Dialog from "./AddAccount";
import useAccountStore from "../../../store/accountStore";
import { useAccountsList } from "../../../api/hooks/useAccounts";
import { AccountInfo } from "@tarilabs/typescript-bindings";
import type { AccountInfo } from "@tarilabs/typescript-bindings/wallet-daemon-client";

function SelectAccount() {
const { accountName, setAccountName } = useAccountStore();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
import CodeBlockExpand from "../../Components/CodeBlock";
import { useTheme } from "@mui/material/styles";
import { Event } from "@tarilabs/typescript-bindings";
import type { Event } from "@tarilabs/typescript-bindings";

function RowData({ component_address, template_address, topic, tx_hash, payload }: Event, index: number) {
const [open, setOpen] = useState(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
import CodeBlockExpand from "../../Components/CodeBlock";
import { useTheme } from "@mui/material/styles";
import { Instruction } from "@tarilabs/typescript-bindings";
import type { Instruction } from "@tarilabs/typescript-bindings";

function RowData({ title, data }: { title: string; data: Instruction }, index: number) {
const [open, setOpen] = useState(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
import CodeBlockExpand from "../../Components/CodeBlock";
import { useTheme } from "@mui/material/styles";
import { Instruction } from "@tarilabs/typescript-bindings";
import type { Instruction } from "@tarilabs/typescript-bindings";

function RowData({ title, data }: { title: string; data: Instruction }, index: number) {
const [open, setOpen] = useState(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import { TableContainer, Table, TableHead, TableRow, TableCell, TableBody } from "@mui/material";
import { DataTableCell } from "../../Components/StyledComponents";
import { LogEntry } from "@tarilabs/typescript-bindings";
import type { LogEntry } from "@tarilabs/typescript-bindings";

export default function Logs({ data }: { data: Array<LogEntry> }) {
return (
Expand All @@ -35,7 +35,7 @@ export default function Logs({ data }: { data: Array<LogEntry> }) {
</TableRow>
</TableHead>
<TableBody>
{data.map(({ level, message, timestamp }: LogEntry, index: number) => {
{data.map(({ level, message }: LogEntry, index: number) => {
return (
<TableRow key={index}>
<DataTableCell>{level}</DataTableCell>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
import { IoArrowDownCircle, IoArrowUpCircle } from "react-icons/io5";
import CodeBlockExpand from "../../Components/CodeBlock";
import { useTheme } from "@mui/material/styles";
import { Substate, SubstateId, TransactionResult } from "@tarilabs/typescript-bindings";
import type { Substate, SubstateId, TransactionResult } from "@tarilabs/typescript-bindings";

function RowData({ info, state }: { info: [SubstateId, Substate | number]; state: string }, index: number) {
const [open, setOpen] = useState(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,8 @@ import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
import Loading from "../../Components/Loading";
import Error from "../../Components/Error";
import {
FinalizeResult,
RejectReason,
TransactionResult,
getRejectReasonFromTransactionResult,
rejectReasonToString,
} from "@tarilabs/typescript-bindings";
import type { FinalizeResult, RejectReason, TransactionResult } from "@tarilabs/typescript-bindings";
import { getRejectReasonFromTransactionResult, rejectReasonToString } from "@tarilabs/typescript-bindings";

export default function TransactionDetails() {
const [expandedPanels, setExpandedPanels] = useState<string[]>([]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import { DataTableCell } from "../../Components/StyledComponents";
import { useGetAllTransactions } from "../../api/hooks/useTransactions";
import { emptyRows, handleChangePage, handleChangeRowsPerPage } from "../../utils/helpers";
import { useAccountsGet } from "../../api/hooks/useAccounts";
import { FinalizeResult, Transaction, TransactionStatus } from "@tarilabs/typescript-bindings";
import type { FinalizeResult, Transaction, TransactionStatus } from "@tarilabs/typescript-bindings";

export default function Transactions({ accountName }: { accountName: string }) {
const { data: accountsData } = useAccountsGet(accountName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ import FetchStatusCheck from "../../../Components/FetchStatusCheck";
import { AccordionIconButton, CodeBlock, DataTableCell } from "../../../Components/StyledComponents";
import { useAuthRevokeToken, useGetAllTokens } from "../../../api/hooks/useTokens";
import { shortenString } from "../../../utils/helpers";
import { Claims, JrpcPermission, JrpcPermissions, jrpcPermissionToString } from "@tarilabs/typescript-bindings";
import type { Claims, JrpcPermission, JrpcPermissions } from "@tarilabs/typescript-bindings";
import { jrpcPermissionToString } from "@tarilabs/typescript-bindings";

function AlertDialog({ fn, row }: any) {
const [open, setOpen] = useState(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import {
} from "../../../api/hooks/useAccounts";
import FetchStatusCheck from "../../../Components/FetchStatusCheck";
import queryClient from "../../../api/queryClient";
import { AccountInfo } from "@tarilabs/typescript-bindings";
import type { AccountInfo } from "@tarilabs/typescript-bindings/wallet-daemon-client";

function Account(account: AccountInfo, index: number) {
const { pathname } = useLocation();
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_dan_wallet_web_ui/src/utils/helpers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

import { ChangeEvent } from "react";
import { FinalizeResult, SubstateId, Transaction, TransactionStatus } from "@tarilabs/typescript-bindings";
import type { FinalizeResult, SubstateId, Transaction, TransactionStatus } from "@tarilabs/typescript-bindings";

const renderJson = (json: any) => {
if (Array.isArray(json)) {
Expand Down
4 changes: 2 additions & 2 deletions applications/tari_dan_wallet_web_ui/src/utils/json_rpc.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import { Mutex } from "async-mutex";
import { json } from "react-router-dom";
import {
import type {
AccountGetDefaultRequest,
AccountGetRequest,
AccountGetResponse,
Expand Down Expand Up @@ -94,7 +94,7 @@ import {
TransferResponse,
WebRtcStartRequest,
WebRtcStartResponse,
} from "@tarilabs/typescript-bindings";
} from "@tarilabs/typescript-bindings/wallet-daemon-client";

let token: String | null = null;
let json_id = 0;
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_indexer/src/http_ui/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pub async fn run_http_ui_server(address: SocketAddr, json_rpc_address: String) -
Ok(())
}

static PROJECT_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/../tari_indexer_web_ui/build");
static PROJECT_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/../tari_indexer_web_ui/dist");

async fn handler(uri: Uri) -> impl IntoResponse {
let path = uri.path();
Expand Down
38 changes: 17 additions & 21 deletions applications/tari_indexer_web_ui/.gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
build/*
!build/.gitkeep

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist/*
!dist/.gitkeep
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea

12 changes: 12 additions & 0 deletions applications/tari_indexer_web_ui/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Tari Indexer</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
Loading
Loading