diff --git a/Cargo.lock b/Cargo.lock index 83dd160e3e..51ac4efd85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1575,7 +1575,7 @@ dependencies = [ [[package]] name = "consensus_tests" -version = "0.8.1" +version = "0.8.2" dependencies = [ "async-trait", "fern", @@ -3192,7 +3192,7 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generate_ristretto_value_lookup" -version = "0.8.1" +version = "0.8.2" dependencies = [ "clap 3.2.25", "human_bytes", @@ -4355,7 +4355,7 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "integration_tests" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "base64 0.21.7", @@ -5060,7 +5060,7 @@ dependencies = [ [[package]] name = "libp2p-messaging" -version = "0.8.1" +version = "0.8.2" dependencies = [ "async-trait", "futures-bounded", @@ -5216,7 +5216,7 @@ dependencies = [ [[package]] name = "libp2p-substream" -version = "0.8.1" +version = "0.8.2" dependencies = [ "libp2p", "smallvec 1.13.2", @@ -7488,7 +7488,7 @@ dependencies = [ [[package]] name = "proto_builder" -version = "0.8.1" +version = "0.8.2" dependencies = [ "prost-build 0.12.6", "sha2", @@ -8905,7 +8905,7 @@ dependencies = [ [[package]] name = "sqlite_message_logger" -version = "0.8.1" +version = "0.8.2" dependencies = [ "chrono", "diesel", @@ -9247,7 +9247,7 @@ dependencies = [ [[package]] name = "tari_base_node_client" -version = "0.8.1" +version = "0.8.2" dependencies = [ "async-trait", "log", @@ -9266,7 +9266,7 @@ dependencies = [ [[package]] name = "tari_bor" -version = "0.8.1" +version = "0.8.2" dependencies = [ "ciborium", "ciborium-io", @@ -9452,7 +9452,7 @@ dependencies = [ [[package]] name = "tari_consensus" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "indexmap 2.6.0", @@ -9601,7 +9601,7 @@ dependencies = [ [[package]] name = "tari_dan_app_utilities" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -9643,7 +9643,7 @@ dependencies = [ [[package]] name = "tari_dan_common_types" -version = "0.8.1" +version = "0.8.2" dependencies = [ "borsh", "ethnum", @@ -9668,7 +9668,7 @@ dependencies = [ [[package]] name = "tari_dan_engine" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "blake2", @@ -9702,7 +9702,7 @@ dependencies = [ [[package]] name = "tari_dan_p2p" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "prost 0.12.6", @@ -9723,7 +9723,7 @@ dependencies = [ [[package]] name = "tari_dan_storage" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "borsh", @@ -9751,7 +9751,7 @@ dependencies = [ [[package]] name = "tari_dan_storage_sqlite" -version = "0.8.1" +version = "0.8.2" dependencies = [ "chrono", "diesel", @@ -9772,7 +9772,7 @@ dependencies = [ [[package]] name = "tari_dan_wallet_cli" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "base64 0.20.0", @@ -9801,7 +9801,7 @@ dependencies = [ [[package]] name = "tari_dan_wallet_crypto" -version = "0.8.1" +version = "0.8.2" dependencies = [ "blake2", "chacha20poly1305", @@ -9820,7 +9820,7 @@ dependencies = [ [[package]] name = "tari_dan_wallet_daemon" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "axum 0.6.20", @@ -9869,7 +9869,7 @@ dependencies = [ [[package]] name = "tari_dan_wallet_sdk" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -9901,7 +9901,7 @@ dependencies = [ [[package]] name = "tari_dan_wallet_storage_sqlite" -version = "0.8.1" +version = "0.8.2" dependencies = [ "bigdecimal", "chrono", @@ -9924,7 +9924,7 @@ dependencies = [ [[package]] name = "tari_engine_types" -version = "0.8.1" +version = "0.8.2" dependencies = [ "base64 0.21.7", "blake2", @@ -9949,7 +9949,7 @@ dependencies = [ [[package]] name = "tari_epoch_manager" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -9975,7 +9975,7 @@ source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#0e72c [[package]] name = "tari_generate" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "clap 3.2.25", @@ -10003,7 +10003,7 @@ dependencies = [ [[package]] name = "tari_indexer" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-graphql", @@ -10055,7 +10055,7 @@ dependencies = [ [[package]] name = "tari_indexer_client" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "multiaddr 0.18.1", @@ -10075,7 +10075,7 @@ dependencies = [ [[package]] name = "tari_indexer_lib" -version = "0.8.1" +version = "0.8.2" dependencies = [ "async-trait", "futures 0.3.31", @@ -10192,7 +10192,7 @@ dependencies = [ [[package]] name = "tari_networking" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -10242,7 +10242,7 @@ dependencies = [ [[package]] name = "tari_rpc_framework" -version = "0.8.1" +version = "0.8.2" dependencies = [ "async-trait", "bitflags 2.6.0", @@ -10267,7 +10267,7 @@ dependencies = [ [[package]] name = "tari_rpc_macros" -version = "0.8.1" +version = "0.8.2" dependencies = [ "proc-macro2", "quote", @@ -10276,7 +10276,7 @@ dependencies = [ [[package]] name = "tari_rpc_state_sync" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "futures 0.3.31", @@ -10295,7 +10295,7 @@ dependencies = [ [[package]] name = "tari_scaffolder" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "clap 3.2.25", @@ -10366,7 +10366,7 @@ dependencies = [ [[package]] name = "tari_signaling_server" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "axum 0.6.20", @@ -10389,7 +10389,7 @@ dependencies = [ [[package]] name = "tari_state_store_sqlite" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "diesel", @@ -10413,7 +10413,7 @@ dependencies = [ [[package]] name = "tari_state_tree" -version = "0.8.1" +version = "0.8.2" dependencies = [ "indexmap 2.6.0", "log", @@ -10440,7 +10440,7 @@ dependencies = [ [[package]] name = "tari_swarm" -version = "0.8.1" +version = "0.8.2" dependencies = [ "libp2p", "libp2p-messaging", @@ -10451,7 +10451,7 @@ dependencies = [ [[package]] name = "tari_swarm_daemon" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -10493,7 +10493,7 @@ dependencies = [ [[package]] name = "tari_template_abi" -version = "0.8.1" +version = "0.8.2" dependencies = [ "hashbrown 0.13.2", "serde", @@ -10503,7 +10503,7 @@ dependencies = [ [[package]] name = "tari_template_builtin" -version = "0.8.1" +version = "0.8.2" dependencies = [ "tari_engine_types", ] @@ -10525,7 +10525,7 @@ dependencies = [ [[package]] name = "tari_template_macros" -version = "0.8.1" +version = "0.8.2" dependencies = [ "indoc", "proc-macro2", @@ -10537,7 +10537,7 @@ dependencies = [ [[package]] name = "tari_template_manager" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "bytes 1.10.0", @@ -10571,7 +10571,7 @@ dependencies = [ [[package]] name = "tari_template_test_tooling" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "rand", @@ -10606,7 +10606,7 @@ dependencies = [ [[package]] name = "tari_transaction" -version = "0.8.1" +version = "0.8.2" dependencies = [ "borsh", "indexmap 2.6.0", @@ -10624,7 +10624,7 @@ dependencies = [ [[package]] name = "tari_transaction_manifest" -version = "0.8.1" +version = "0.8.2" dependencies = [ "proc-macro2", "syn 1.0.109", @@ -10656,7 +10656,7 @@ dependencies = [ [[package]] name = "tari_validator_node" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "axum 0.6.20", @@ -10717,7 +10717,7 @@ dependencies = [ [[package]] name = "tari_validator_node_cli" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "clap 3.2.25", @@ -10745,7 +10745,7 @@ dependencies = [ [[package]] name = "tari_validator_node_client" -version = "0.8.1" +version = "0.8.2" dependencies = [ "multiaddr 0.18.1", "reqwest", @@ -10763,7 +10763,7 @@ dependencies = [ [[package]] name = "tari_validator_node_rpc" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -10785,7 +10785,7 @@ dependencies = [ [[package]] name = "tari_wallet_daemon_client" -version = "0.8.1" +version = "0.8.2" dependencies = [ "chrono", "reqwest", @@ -10804,7 +10804,7 @@ dependencies = [ [[package]] name = "tari_watcher" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "clap 3.2.25", @@ -10833,7 +10833,7 @@ dependencies = [ [[package]] name = "tariswap_bench" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "clap 4.5.20", @@ -11449,7 +11449,7 @@ dependencies = [ [[package]] name = "transaction_generator" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "bincode 2.0.0-rc.3", @@ -11472,7 +11472,7 @@ dependencies = [ [[package]] name = "transaction_submitter" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "clap 4.5.20", diff --git a/Cargo.toml b/Cargo.toml index f25c7ff9a1..0d8c68aaba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ # NOTE: When editing this version, also edit the versions in template_built_in/templates/account and account_nft [workspace.package] -version = "0.8.1" +version = "0.8.2" edition = "2021" authors = ["The Tari Development Community"] repository = "https://github.com/tari-project/tari-dan" diff --git a/applications/tari_dan_wallet_web_ui/package-lock.json b/applications/tari_dan_wallet_web_ui/package-lock.json index 3ac5c43eb5..6fa004b20f 100644 --- a/applications/tari_dan_wallet_web_ui/package-lock.json +++ b/applications/tari_dan_wallet_web_ui/package-lock.json @@ -41,7 +41,7 @@ }, "../../bindings": { "name": "@tari-project/typescript-bindings", - "version": "1.4.0", + "version": "1.4.1", "license": "ISC", "devDependencies": { "shx": "^0.3.4", @@ -50,10 +50,10 @@ }, "../../clients/javascript/wallet_daemon_client": { "name": "@tari-project/wallet_jrpc_client", - "version": "1.4.0", + "version": "1.4.1", "license": "ISC", "dependencies": { - "@tari-project/typescript-bindings": "^1.4.0" + "@tari-project/typescript-bindings": "^1.4.1" }, "devDependencies": { "typescript": "^5.3.3" diff --git a/applications/tari_dan_wallet_web_ui/src/Components/CopyAddress.tsx b/applications/tari_dan_wallet_web_ui/src/Components/CopyAddress.tsx new file mode 100644 index 0000000000..7408f3b0be --- /dev/null +++ b/applications/tari_dan_wallet_web_ui/src/Components/CopyAddress.tsx @@ -0,0 +1,45 @@ +// Copyright 2022. The Tari Project +// +// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the +// following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following +// disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the +// following disclaimer in the documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote +// products derived from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import { SubstateId, shortenString } from "@tari-project/typescript-bindings"; +import { shortenSubstateId, substateIdToString } from "../utils/helpers"; +import CopyToClipboard from "./CopyToClipboard"; + +interface Props { + address: SubstateId | string; + display?: SubstateId | string; +} + +export default function CopyAddress({ address, display }: Props) { + const [shortAddress, addressString] = + typeof address === "object" + ? [shortenSubstateId(address), substateIdToString(address)] + : [shortenString(address), address]; + const displayStr = display && (typeof display === "object" ? shortenSubstateId(display) : display); + + return ( + <> + {displayStr || shortAddress} + + + ); +} diff --git a/applications/tari_dan_wallet_web_ui/src/Components/CopyToClipboard.tsx b/applications/tari_dan_wallet_web_ui/src/Components/CopyToClipboard.tsx index f8cfc61df1..538b09320e 100644 --- a/applications/tari_dan_wallet_web_ui/src/Components/CopyToClipboard.tsx +++ b/applications/tari_dan_wallet_web_ui/src/Components/CopyToClipboard.tsx @@ -32,12 +32,17 @@ interface CopyProps { } const CopyToClipboard = ({ copy, floatright, title }: CopyProps) => { - const [open, setOpen] = useState(false); - const handleClick = (copyThis: string) => { - setOpen(true); - navigator.clipboard.writeText(copyThis); + const [tooltip, setTooltip] = useState(null); + const handleClick = async (copyThis: string) => { + try { + await navigator.clipboard.writeText(copyThis); + setTooltip("Copied to clipboard"); + } catch (err) { + setTooltip("Permission denied to copy"); + console.log(err); + } setTimeout(() => { - setOpen(false); + setTooltip(null); }, 2000); }; @@ -53,7 +58,7 @@ const CopyToClipboard = ({ copy, floatright, title }: CopyProps) => { : { marginLeft: "10px", marginRight: "10px" } } > - + - {shortenString(props.token_symbol || props.resource_address)} - + {props.resource_type} {props.balance} @@ -101,12 +99,10 @@ function AccountDetailsLayout() { {accountsData.account.name} - {shortenString(substateIdToString(accountsData.account.address))} - + - {shortenString(accountsData.public_key)} - + )} diff --git a/applications/tari_dan_wallet_web_ui/src/routes/AssetVault/Components/AccountDetails.tsx b/applications/tari_dan_wallet_web_ui/src/routes/AssetVault/Components/AccountDetails.tsx index 6f9daf3f30..d09ab7ba42 100644 --- a/applications/tari_dan_wallet_web_ui/src/routes/AssetVault/Components/AccountDetails.tsx +++ b/applications/tari_dan_wallet_web_ui/src/routes/AssetVault/Components/AccountDetails.tsx @@ -21,13 +21,10 @@ // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import Box from "@mui/material/Box"; -import CopyToClipboard from "../../../Components/CopyToClipboard"; -import FetchStatusCheck from "../../../Components/FetchStatusCheck"; import { GridHeadCell, GridDataCell } from "../../../Components/StyledComponents"; -import { useAccountsGet } from "../../../api/hooks/useAccounts"; -import { shortenString, shortenSubstateId, substateIdToString } from "../../../utils/helpers"; import { styled } from "@mui/material/styles"; import useAccountStore from "../../../store/accountStore"; +import CopyAddress from "../../../Components/CopyAddress"; const GridContainer = styled(Box)(({ theme }) => ({ display: "grid", @@ -57,12 +54,10 @@ function AccountDetails() { Public Key {account.name} - {shortenSubstateId(account.address)} - + - {shortenString(publicKey)} - + ); diff --git a/applications/tari_dan_wallet_web_ui/src/routes/AssetVault/Components/Assets.tsx b/applications/tari_dan_wallet_web_ui/src/routes/AssetVault/Components/Assets.tsx index 2d423546ff..4eb43ed8ed 100644 --- a/applications/tari_dan_wallet_web_ui/src/routes/AssetVault/Components/Assets.tsx +++ b/applications/tari_dan_wallet_web_ui/src/routes/AssetVault/Components/Assets.tsx @@ -31,16 +31,16 @@ import TableRow from "@mui/material/TableRow"; import Tabs from "@mui/material/Tabs"; import Typography from "@mui/material/Typography"; import { useState } from "react"; -import CopyToClipboard from "../../../Components/CopyToClipboard"; import FetchStatusCheck from "../../../Components/FetchStatusCheck"; import { DataTableCell } from "../../../Components/StyledComponents"; import { useAccountNFTsList, useAccountsGetBalances } from "../../../api/hooks/useAccounts"; import useAccountStore from "../../../store/accountStore"; -import { shortenString, shortenSubstateId, substateIdToString } from "../../../utils/helpers"; +import { shortenSubstateId, substateIdToString } from "../../../utils/helpers"; import NFTList from "../../../Components/NFTList"; import { Button } from "@mui/material"; import { SendMoneyDialog } from "./SendMoney"; import { ResourceAddress, ResourceType, VaultId, BalanceEntry, Account } from "@tari-project/typescript-bindings"; +import CopyAddress from "../../../Components/CopyAddress"; interface TabPanelProps { children?: React.ReactNode; @@ -65,14 +65,13 @@ function BalanceRow(props: BalanceRowProps) { return ( - {shortenSubstateId(vault_address)} - + - - {token_symbol || shortenSubstateId(resource_address)} {resource_type} - - + {showBalance ? balance : "*************"} diff --git a/applications/tari_dan_wallet_web_ui/src/routes/AssetVault/Components/ClaimFees.tsx b/applications/tari_dan_wallet_web_ui/src/routes/AssetVault/Components/ClaimFees.tsx index fab8a890f6..78e39d9f1b 100644 --- a/applications/tari_dan_wallet_web_ui/src/routes/AssetVault/Components/ClaimFees.tsx +++ b/applications/tari_dan_wallet_web_ui/src/routes/AssetVault/Components/ClaimFees.tsx @@ -40,6 +40,7 @@ import { GetValidatorFeesResponse, rejectReasonToString, substateIdToString, + TransactionResult, } from "@tari-project/typescript-bindings"; import { FileContent } from "use-file-picker/types"; import { toHexString } from "../../../utils/helpers"; @@ -152,7 +153,9 @@ export default function ClaimFees() { setPopup({ title: "Claim failed", error: true, - message: rejectReasonToString(getRejectReasonFromTransactionResult(resp.result.result)), + message: rejectReasonToString( + getRejectReasonFromTransactionResult(resp.result.result as TransactionResult), + ), }); } }) diff --git a/applications/tari_dan_wallet_web_ui/src/routes/Transactions/Events.tsx b/applications/tari_dan_wallet_web_ui/src/routes/Transactions/Events.tsx index 4f67f90ef5..3e23f94e88 100644 --- a/applications/tari_dan_wallet_web_ui/src/routes/Transactions/Events.tsx +++ b/applications/tari_dan_wallet_web_ui/src/routes/Transactions/Events.tsx @@ -23,13 +23,12 @@ import { useState } from "react"; import { TableContainer, Table, TableHead, TableRow, TableCell, TableBody, Collapse } from "@mui/material"; import { DataTableCell, AccordionIconButton } from "../../Components/StyledComponents"; -import { shortenString, shortenSubstateId, substateIdToString } from "../../utils/helpers"; -import CopyToClipboard from "../../Components/CopyToClipboard"; 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 type { Event } from "@tari-project/typescript-bindings"; +import CopyAddress from "../../Components/CopyAddress"; function RowData({ substate_id, template_address, topic, tx_hash, payload }: Event, index: number) { const [open, setOpen] = useState(false); @@ -49,18 +48,9 @@ function RowData({ substate_id, template_address, topic, tx_hash, payload }: Eve {topic} - - {shortenSubstateId(substate_id)} - {substate_id && } - - - {shortenString(template_address)} - {template_address && } - - - {shortenString(tx_hash)} - {tx_hash && } - + {substate_id ? : "--"} + {template_address ? : "--"} + {tx_hash ? : "--"} - {shortenString(name)} - + - {shortenSubstateId(account.account.address)} - + {account.account.key_index} - {shortenString(account.public_key)} - + diff --git a/applications/tari_indexer_web_ui/src/routes/VN/Components/Connections.tsx b/applications/tari_indexer_web_ui/src/routes/VN/Components/Connections.tsx index 1d68a7a961..ab6dbc0202 100644 --- a/applications/tari_indexer_web_ui/src/routes/VN/Components/Connections.tsx +++ b/applications/tari_indexer_web_ui/src/routes/VN/Components/Connections.tsx @@ -102,7 +102,7 @@ function Connections() { /> Peer ID - Address + CopyAddress Age Direction Latency diff --git a/applications/tari_validator_node_web_ui/package-lock.json b/applications/tari_validator_node_web_ui/package-lock.json index 9b7f086906..178922ea6e 100644 --- a/applications/tari_validator_node_web_ui/package-lock.json +++ b/applications/tari_validator_node_web_ui/package-lock.json @@ -38,7 +38,7 @@ }, "../../bindings": { "name": "@tari-project/typescript-bindings", - "version": "1.4.0", + "version": "1.4.1", "license": "ISC", "devDependencies": { "shx": "^0.3.4", diff --git a/applications/tari_validator_node_web_ui/src/routes/VN/Components/Connections.tsx b/applications/tari_validator_node_web_ui/src/routes/VN/Components/Connections.tsx index 7c1c5ca46f..daa64a98e5 100644 --- a/applications/tari_validator_node_web_ui/src/routes/VN/Components/Connections.tsx +++ b/applications/tari_validator_node_web_ui/src/routes/VN/Components/Connections.tsx @@ -101,7 +101,7 @@ function Connections() { /> Peer ID - Address + CopyAddress Age Direction Latency diff --git a/applications/tari_validator_node_web_ui/src/routes/VN/Components/Templates.tsx b/applications/tari_validator_node_web_ui/src/routes/VN/Components/Templates.tsx index 4b0e560ede..74bf8d5532 100644 --- a/applications/tari_validator_node_web_ui/src/routes/VN/Components/Templates.tsx +++ b/applications/tari_validator_node_web_ui/src/routes/VN/Components/Templates.tsx @@ -20,9 +20,9 @@ // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import {useEffect, useState} from "react"; -import {getTemplates} from "../../../utils/json_rpc"; -import {shortenString} from "./helpers"; +import { useEffect, useState } from "react"; +import { getTemplates } from "../../../utils/json_rpc"; +import { shortenString } from "./helpers"; import "./Templates.css"; import Table from "@mui/material/Table"; import TableBody from "@mui/material/TableBody"; @@ -30,8 +30,8 @@ import TableCell from "@mui/material/TableCell"; import TableContainer from "@mui/material/TableContainer"; import TableHead from "@mui/material/TableHead"; import TableRow from "@mui/material/TableRow"; -import {BoxHeading2, DataTableCell} from "../../../Components/StyledComponents"; -import {Link} from "react-router-dom"; +import { BoxHeading2, DataTableCell } from "../../../Components/StyledComponents"; +import { Link } from "react-router-dom"; import CopyToClipboard from "../../../Components/CopyToClipboard"; import IconButton from "@mui/material/IconButton"; import KeyboardArrowRightIcon from "@mui/icons-material/KeyboardArrowRight"; @@ -42,152 +42,152 @@ import TablePagination from "@mui/material/TablePagination"; import SearchFilter from "../../../Components/SearchFilter"; import Typography from "@mui/material/Typography"; import Fade from "@mui/material/Fade"; -import {emptyRows} from "../../../utils/helpers"; -import type {TemplateMetadata} from "@tari-project/typescript-bindings"; +import { emptyRows } from "../../../utils/helpers"; +import type { TemplateMetadata } from "@tari-project/typescript-bindings"; type ColumnKey = keyof TemplateMetadata; function Templates() { - const [templates, setTemplates] = useState([]); - const [lastSort, setLastSort] = useState({column: "", order: -1}); + const [templates, setTemplates] = useState([]); + const [lastSort, setLastSort] = useState({ column: "", order: -1 }); - useEffect(() => { - getTemplates({limit: 10}).then((response) => { - setTemplates(response.templates.slice()); - }); - }, []); + useEffect(() => { + getTemplates({ limit: 10 }).then((response) => { + setTemplates(response.templates.slice()); + }); + }, []); - const sort = (column: ColumnKey, order: number) => { - // let order = 1; - // if (lastSort.column === column) { - // order = -lastSort.order; - // } - if (column) { - setTemplates( - [...templates].sort((r0, r1) => (r0[column] > r1[column] ? order : r0[column] < r1[column] ? -order : 0)), - ); - setLastSort({column, order}); - } - }; + const sort = (column: ColumnKey, order: number) => { + // let order = 1; + // if (lastSort.column === column) { + // order = -lastSort.order; + // } + if (column) { + setTemplates( + [...templates].sort((r0, r1) => (r0[column] > r1[column] ? order : r0[column] < r1[column] ? -order : 0)), + ); + setLastSort({ column, order }); + } + }; - const [page, setPage] = useState(0); - const [rowsPerPage, setRowsPerPage] = useState(10); + const [page, setPage] = useState(0); + const [rowsPerPage, setRowsPerPage] = useState(10); - // Avoid a layout jump when reaching the last page with empty rows. - const emptyRowsCnt = emptyRows(page, rowsPerPage, templates); + // Avoid a layout jump when reaching the last page with empty rows. + const emptyRowsCnt = emptyRows(page, rowsPerPage, templates); - const handleChangePage = (_event: unknown, newPage: number) => { - setPage(newPage); - }; + const handleChangePage = (_event: unknown, newPage: number) => { + setPage(newPage); + }; - const handleChangeRowsPerPage = (event: React.ChangeEvent) => { - setRowsPerPage(parseInt(event.target.value, 10)); - setPage(0); - }; + const handleChangeRowsPerPage = (event: React.ChangeEvent) => { + setRowsPerPage(parseInt(event.target.value, 10)); + setPage(0); + }; - return ( - <> - - - row.address.toLowerCase().includes(value.toLowerCase()), - }, - ]} - placeholder="Search for Templates" + return ( + <> + + + row.address.toLowerCase().includes(value.toLowerCase()), + }, + ]} + placeholder="Search for Templates" + /> + + + + + + + sort("id" as ColumnKey, 1), + icon: , + }, + { + title: "Sort Descending", + fn: () => sort("id" as ColumnKey, -1), + icon: , + }, + ]} + showArrow + lastSort={lastSort} + columnName="id" + sortFunction={sort} /> - - -
- - - - sort("id" as ColumnKey, 1), - icon: , - }, - { - title: "Sort Descending", - fn: () => sort("id" as ColumnKey, -1), - icon: , - }, - ]} - showArrow - lastSort={lastSort} - columnName="id" - sortFunction={sort} - /> - - Name - Status - Functions - - - - {templates - .slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage) - .map(({address, binary_sha, name}, i) => ( - - - - {shortenString(address)} - - - - {name} - Active - - - - - - - - - ))} - {templates.length === 0 && ( - - - - No results found - - - - )} - {emptyRowsCnt > 0 && ( - - - - )} - -
- - - - ); + + Name + Status + Functions + + + + {templates + .slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage) + .map(({ address, binary_sha, name }, i) => ( + + + + {shortenString(address)} + + + + {name} + Active + + + + + + + + + ))} + {templates.length === 0 && ( + + + + No results found + + + + )} + {emptyRowsCnt > 0 && ( + + + + )} + + + + + + ); } export default Templates; diff --git a/bindings/dist/helpers/helpers.js b/bindings/dist/helpers/helpers.js index 3c297f0e72..65085e25b7 100644 --- a/bindings/dist/helpers/helpers.js +++ b/bindings/dist/helpers/helpers.js @@ -95,8 +95,8 @@ export function rejectReasonToString(reason) { if ("ShardRejected" in reason) { return `ShardRejected(${reason.ShardRejected})`; } - if ("FeesNotPaid" in reason) { - return `FeesNotPaid(${reason.FeesNotPaid})`; + if ("InsufficientFeesPaid" in reason) { + return `InsufficientFeesPaid(${reason.InsufficientFeesPaid})`; } if ("ForeignShardGroupDecidedToAbort" in reason) { const r = reason.ForeignShardGroupDecidedToAbort; diff --git a/bindings/dist/types/AbortReason.d.ts b/bindings/dist/types/AbortReason.d.ts index e624719fad..ef32530887 100644 --- a/bindings/dist/types/AbortReason.d.ts +++ b/bindings/dist/types/AbortReason.d.ts @@ -1 +1 @@ -export type AbortReason = "None" | "TransactionAtomMustBeAbort" | "TransactionAtomMustBeCommit" | "InputLockConflict" | "ForeignPledgeInputConflict" | "LockInputsFailed" | "LockOutputsFailed" | "LockInputsOutputsFailed" | "InvalidTransaction" | "ExecutionFailure" | "OneOrMoreInputsNotFound" | "ForeignShardGroupDecidedToAbort" | "FeesNotPaid" | "EarlyAbort"; +export type AbortReason = "None" | "TransactionAtomMustBeAbort" | "TransactionAtomMustBeCommit" | "InputLockConflict" | "ForeignPledgeInputConflict" | "LockInputsFailed" | "LockOutputsFailed" | "LockInputsOutputsFailed" | "InvalidTransaction" | "ExecutionFailure" | "OneOrMoreInputsNotFound" | "ForeignShardGroupDecidedToAbort" | "InsufficientFeesPaid" | "EarlyAbort"; diff --git a/bindings/dist/types/FeeSource.d.ts b/bindings/dist/types/FeeSource.d.ts index f97f238e28..c70e79d18c 100644 --- a/bindings/dist/types/FeeSource.d.ts +++ b/bindings/dist/types/FeeSource.d.ts @@ -1 +1 @@ -export type FeeSource = "Initial" | "RuntimeCall" | "Storage" | "Events" | "Logs"; +export type FeeSource = "Initial" | "RuntimeCall" | "Storage" | "Events" | "Logs" | "TransactionWeight"; diff --git a/bindings/dist/types/PublishedTemplate.d.ts b/bindings/dist/types/PublishedTemplate.d.ts index 1e11c9fb50..b64978306e 100644 --- a/bindings/dist/types/PublishedTemplate.d.ts +++ b/bindings/dist/types/PublishedTemplate.d.ts @@ -1,5 +1,4 @@ export interface PublishedTemplate { author: string; - binary: Array; binary_hash: string; } diff --git a/bindings/dist/types/RejectReason.d.ts b/bindings/dist/types/RejectReason.d.ts index ed51491b54..dea4de8c6f 100644 --- a/bindings/dist/types/RejectReason.d.ts +++ b/bindings/dist/types/RejectReason.d.ts @@ -15,5 +15,5 @@ export type RejectReason = { abort_reason: string; }; } | { - FeesNotPaid: string; + InsufficientFeesPaid: string; } | "Unknown"; diff --git a/bindings/src/types/AbortReason.ts b/bindings/src/types/AbortReason.ts index 0bef32e2c4..e7628b7091 100644 --- a/bindings/src/types/AbortReason.ts +++ b/bindings/src/types/AbortReason.ts @@ -13,5 +13,5 @@ export type AbortReason = | "ExecutionFailure" | "OneOrMoreInputsNotFound" | "ForeignShardGroupDecidedToAbort" - | "FeesNotPaid" + | "InsufficientFeesPaid" | "EarlyAbort"; diff --git a/bindings/src/types/FeeSource.ts b/bindings/src/types/FeeSource.ts index cb18543544..7207438f29 100644 --- a/bindings/src/types/FeeSource.ts +++ b/bindings/src/types/FeeSource.ts @@ -1,3 +1,3 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -export type FeeSource = "Initial" | "RuntimeCall" | "Storage" | "Events" | "Logs"; +export type FeeSource = "Initial" | "RuntimeCall" | "Storage" | "Events" | "Logs" | "TransactionWeight"; diff --git a/bindings/src/types/PublishedTemplate.ts b/bindings/src/types/PublishedTemplate.ts index eb5ed584aa..66988ef4e8 100644 --- a/bindings/src/types/PublishedTemplate.ts +++ b/bindings/src/types/PublishedTemplate.ts @@ -2,6 +2,5 @@ export interface PublishedTemplate { author: string; - binary: Array; binary_hash: string; } diff --git a/bindings/src/types/RejectReason.ts b/bindings/src/types/RejectReason.ts index 27c1cc18a0..9197988844 100644 --- a/bindings/src/types/RejectReason.ts +++ b/bindings/src/types/RejectReason.ts @@ -8,5 +8,5 @@ export type RejectReason = | { FailedToLockOutputs: string } | "ForeignPledgeInputConflict" | { ForeignShardGroupDecidedToAbort: { start_shard: number; end_shard: number; abort_reason: string } } - | { FeesNotPaid: string } + | { InsufficientFeesPaid: string } | "Unknown"; diff --git a/clients/javascript/wallet_daemon_client/package-lock.json b/clients/javascript/wallet_daemon_client/package-lock.json index ade2e45ba1..2695f141d0 100644 --- a/clients/javascript/wallet_daemon_client/package-lock.json +++ b/clients/javascript/wallet_daemon_client/package-lock.json @@ -9,7 +9,7 @@ "version": "1.4.1", "license": "ISC", "dependencies": { - "@tari-project/typescript-bindings": "^1.4.0" + "@tari-project/typescript-bindings": "^1.4.1" }, "devDependencies": { "typescript": "^5.3.3" @@ -22,9 +22,9 @@ "extraneous": true }, "node_modules/@tari-project/typescript-bindings": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@tari-project/typescript-bindings/-/typescript-bindings-1.4.0.tgz", - "integrity": "sha512-Dk5rX2NKs00BpH4tp3TdKREzo12NqAEKB88j7DYn46LwrLwN2I2Oa9/ernTF3Q/Uwz/zoT7p1B7RZRdvKqBuGw==" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@tari-project/typescript-bindings/-/typescript-bindings-1.4.1.tgz", + "integrity": "sha512-kCfpTaWdjB9hBjcJ2uAxIzjcsWBzT8CkiMRpdtQkzkUJWKL/8S7ItF3idpD9O4GhgqmXGnaCvlqGMIFE8/isIA==" }, "node_modules/typescript": { "version": "5.3.3", diff --git a/clients/javascript/wallet_daemon_client/package.json b/clients/javascript/wallet_daemon_client/package.json index d573397f82..6ef9779688 100644 --- a/clients/javascript/wallet_daemon_client/package.json +++ b/clients/javascript/wallet_daemon_client/package.json @@ -25,7 +25,7 @@ "author": "", "license": "ISC", "dependencies": { - "@tari-project/typescript-bindings": "^1.4.0" + "@tari-project/typescript-bindings": "^1.4.1" }, "devDependencies": { "typescript": "^5.3.3"