From 2a40d9ec4d206330f883da6739b9c797a6d8a567 Mon Sep 17 00:00:00 2001 From: Edd Date: Wed, 31 Jan 2024 10:36:58 +0000 Subject: [PATCH] feat(explorer): support for more external chains (#5687) --- apps/explorer/.env | 2 - apps/explorer/.env.capsule | 1 - apps/explorer/.env.devnet | 1 - apps/explorer/.env.mainnet | 1 - apps/explorer/.env.mainnet-mirror | 1 - apps/explorer/.env.testnet | 1 - apps/explorer/.env.validators-testnet | 1 - apps/explorer/.env.vegacapsule | 1 - .../eth-explorer-link/eth-explorer-link.tsx | 34 -- .../external-chain-icon.tsx | 34 ++ .../external-explorer-link/external-chain.ts | 38 ++ .../external-explorer-link.tsx | 41 ++ .../details/chain-events/tx-contract-call.tsx | 34 +- .../tx-erc20-asset-limits-updated.tsx | 6 +- .../chain-events/tx-erc20-asset-list.tsx | 6 +- .../details/chain-events/tx-erc20-deposit.tsx | 6 +- .../chain-events/tx-erc20-withdrawal.tsx | 6 +- .../details/chain-events/tx-stake-deposit.tsx | 6 +- .../details/chain-events/tx-stake-remove.tsx | 6 +- .../chain-events/tx-stake-totalsupply.tsx | 6 +- .../transfer/blocks/transfer-participants.tsx | 1 + .../txs/details/tx-eth-key-rotate.tsx | 10 +- .../txs/details/tx-issue-signatures.tsx | 6 +- .../txs/details/tx-node-announce.tsx | 6 +- .../components/txs/details/tx-node-vote.tsx | 6 +- .../txs/details/tx-undelegation.tsx | 2 +- .../txs/details/tx-withdraw-submission.tsx | 6 +- .../src/app/components/txs/tx-order-type.tsx | 9 + apps/explorer/src/app/config/env.ts | 1 - .../src/app/routes/oracles/Oracles.graphql | 2 + .../routes/oracles/OraclesForMarkets.graphql | 1 + .../routes/oracles/__generated__/Oracles.ts | 8 +- .../__generated__/OraclesForMarkets.ts | 5 +- .../components/oracle-details-type.tsx | 2 +- .../oracles/components/oracle-eth-source.tsx | 25 +- .../oracles/components/oracle-signers.tsx | 15 +- .../app/routes/oracles/components/oracle.tsx | 7 +- apps/explorer/src/assets/chain-arb-logo.svg | 38 ++ apps/explorer/src/assets/chain-dcn-logo.svg | 1 + apps/explorer/src/assets/chain-eth-logo.svg | 21 ++ apps/explorer/src/assets/chain-gno-logo.svg | 15 + apps/explorer/src/types/explorer.d.ts | 350 ++++++++++++++++-- 42 files changed, 626 insertions(+), 143 deletions(-) delete mode 100644 apps/explorer/src/app/components/links/eth-explorer-link/eth-explorer-link.tsx create mode 100644 apps/explorer/src/app/components/links/external-explorer-link/external-chain-icon.tsx create mode 100644 apps/explorer/src/app/components/links/external-explorer-link/external-chain.ts create mode 100644 apps/explorer/src/app/components/links/external-explorer-link/external-explorer-link.tsx create mode 100644 apps/explorer/src/assets/chain-arb-logo.svg create mode 100644 apps/explorer/src/assets/chain-dcn-logo.svg create mode 100644 apps/explorer/src/assets/chain-eth-logo.svg create mode 100644 apps/explorer/src/assets/chain-gno-logo.svg diff --git a/apps/explorer/.env b/apps/explorer/.env index d79b3a9a5..899fb1f1f 100644 --- a/apps/explorer/.env +++ b/apps/explorer/.env @@ -1,5 +1,4 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 -NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.rocks NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml NX_VEGA_ENV=STAGNET1 @@ -9,7 +8,6 @@ NX_VEGA_WALLET_URL=http://localhost:1789 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket NX_BLOCK_EXPLORER=https://be.stagnet1.vega.rocks/rest -NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json NX_VEGA_GOVERNANCE_URL=https://governance.stagnet1.vega.rocks NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json diff --git a/apps/explorer/.env.capsule b/apps/explorer/.env.capsule index 39ab79e82..bf553dad8 100644 --- a/apps/explorer/.env.capsule +++ b/apps/explorer/.env.capsule @@ -1,6 +1,5 @@ # App configuration variables NX_VEGA_ENV=CUSTOM -NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json NX_VEGA_EXPLORER_URL=/ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json diff --git a/apps/explorer/.env.devnet b/apps/explorer/.env.devnet index abe211865..2a40fda87 100644 --- a/apps/explorer/.env.devnet +++ b/apps/explorer/.env.devnet @@ -2,7 +2,6 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml NX_VEGA_ENV=DEVNET NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest -NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_VEGA_GOVERNANCE_URL=https://dev.governance.vega.xyz NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml diff --git a/apps/explorer/.env.mainnet b/apps/explorer/.env.mainnet index 21423c3db..0cb69279e 100644 --- a/apps/explorer/.env.mainnet +++ b/apps/explorer/.env.mainnet @@ -4,7 +4,6 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/maste NX_VEGA_URL=https://api.vega.community/graphql NX_VEGA_ENV=MAINNET NX_BLOCK_EXPLORER=https://be.vega.community/rest -NX_ETHERSCAN_URL=https://etherscan.io NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/ diff --git a/apps/explorer/.env.mainnet-mirror b/apps/explorer/.env.mainnet-mirror index 527870b91..64bb4280e 100644 --- a/apps/explorer/.env.mainnet-mirror +++ b/apps/explorer/.env.mainnet-mirror @@ -4,7 +4,6 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter NX_VEGA_URL=https://api.mainnet-mirror.vega.rocks/graphql NX_VEGA_ENV=MAINNET_MIRROR NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.rocks/rest -NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_VEGA_GOVERNANCE_URL=https://governance.mainnet-mirror.vega.rocks NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks/ diff --git a/apps/explorer/.env.testnet b/apps/explorer/.env.testnet index eaa7350d5..8089573d2 100644 --- a/apps/explorer/.env.testnet +++ b/apps/explorer/.env.testnet @@ -4,7 +4,6 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter NX_VEGA_ENV=TESTNET NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz -NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf diff --git a/apps/explorer/.env.validators-testnet b/apps/explorer/.env.validators-testnet index 348f6ce45..8b58d3b8f 100644 --- a/apps/explorer/.env.validators-testnet +++ b/apps/explorer/.env.validators-testnet @@ -4,7 +4,6 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/maste NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql NX_VEGA_REST=https://api-validators-testnet.vega.rocks/ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8 -NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest diff --git a/apps/explorer/.env.vegacapsule b/apps/explorer/.env.vegacapsule index ad5d2d29e..6bc2a0df8 100644 --- a/apps/explorer/.env.vegacapsule +++ b/apps/explorer/.env.vegacapsule @@ -3,7 +3,6 @@ NX_TENDERMINT_URL=http://localhost:26607/ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26607/websocket NX_VEGA_ENV=CUSTOM NX_BLOCK_EXPLORER= -NX_ETHERSCAN_URL=https://sepolia.etherscan.io NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json NX_VEGA_EXPLORER_URL=/ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json diff --git a/apps/explorer/src/app/components/links/eth-explorer-link/eth-explorer-link.tsx b/apps/explorer/src/app/components/links/eth-explorer-link/eth-explorer-link.tsx deleted file mode 100644 index 92273980b..000000000 --- a/apps/explorer/src/app/components/links/eth-explorer-link/eth-explorer-link.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import React from 'react'; - -import { DATA_SOURCES } from '../../../config'; -import Hash from '../hash'; - -export enum EthExplorerLinkTypes { - block = 'block', - address = 'address', - tx = 'tx', -} - -export type EthExplorerLinkProps = Partial & { - id: string; - type: EthExplorerLinkTypes; -}; - -export const EthExplorerLink = ({ - id, - type, - ...props -}: EthExplorerLinkProps) => { - const link = `${DATA_SOURCES.ethExplorerUrl}/${type}/${id}`; - return ( - - - - ); -}; diff --git a/apps/explorer/src/app/components/links/external-explorer-link/external-chain-icon.tsx b/apps/explorer/src/app/components/links/external-explorer-link/external-chain-icon.tsx new file mode 100644 index 000000000..27f86d034 --- /dev/null +++ b/apps/explorer/src/app/components/links/external-explorer-link/external-chain-icon.tsx @@ -0,0 +1,34 @@ +import type { ChainIdMapping } from './external-chain'; +import { SUPPORTED_CHAIN_IDS, SUPPORTED_CHAIN_LABELS } from './external-chain'; + +export const SUPPORTED_CHAIN_ICON_URLS: ChainIdMapping = { + '1': '/assets/chain-eth-logo.svg', + '100': '/assets/chain-gno-logo.svg', + '42161': '/assets/chain-arb-logo.svg', + '11155111': '/assets/chain-eth-logo.svg', +}; + +export type ExternalChainIconProps = { + chainId?: string; +}; + +export const ExternalChainIcon = ({ + // If chainID is not provided, default to a non-existent chain + chainId = '-1', +}: ExternalChainIconProps) => { + if (SUPPORTED_CHAIN_IDS.includes(chainId)) { + const url = SUPPORTED_CHAIN_ICON_URLS[chainId]; + const alt = SUPPORTED_CHAIN_LABELS[chainId]; + + return ( + {alt} + ); + } else { + return null; + } +}; diff --git a/apps/explorer/src/app/components/links/external-explorer-link/external-chain.ts b/apps/explorer/src/app/components/links/external-explorer-link/external-chain.ts new file mode 100644 index 000000000..6a0a77ac1 --- /dev/null +++ b/apps/explorer/src/app/components/links/external-explorer-link/external-chain.ts @@ -0,0 +1,38 @@ +export type ChainIdMapping = { + [K in typeof SUPPORTED_CHAIN_IDS[number]]: string; +}; +export const SUPPORTED_CHAIN_IDS: string[] = ['1', '100', '42161', '11155111']; + +export const SUPPORTED_CHAIN_LABELS: ChainIdMapping = { + '1': 'Ethereum', + '100': 'Gnosis', + '42161': 'Arbitrum', + '11155111': 'Sepolia', +}; + +export function getExternalExplorerLink(chainId: string, type: string) { + if (SUPPORTED_CHAIN_IDS.includes(chainId)) { + switch (chainId) { + case '1': + return 'https://etherscan.io'; + case '100': + return 'https://gnosisscan.io'; + case '42161': + return 'https://arbiscan.io'; + case '11155111': + return 'https://sepolia.etherscan.io'; + default: + return '#'; + } + } else { + return '#'; + } +} + +export function getExternalChainLabel(chainId?: string) { + if (chainId && SUPPORTED_CHAIN_IDS.includes(chainId)) { + return SUPPORTED_CHAIN_LABELS[chainId]; + } else { + return 'Custom Chain'; + } +} diff --git a/apps/explorer/src/app/components/links/external-explorer-link/external-explorer-link.tsx b/apps/explorer/src/app/components/links/external-explorer-link/external-explorer-link.tsx new file mode 100644 index 000000000..29b0e54b6 --- /dev/null +++ b/apps/explorer/src/app/components/links/external-explorer-link/external-explorer-link.tsx @@ -0,0 +1,41 @@ +import Hash from '../hash'; +import { getExternalExplorerLink } from './external-chain'; +import { ExternalChainIcon } from './external-chain-icon'; + +export enum EthExplorerLinkTypes { + block = 'block', + address = 'address', + tx = 'tx', +} + +export type ExternalExplorerLinkProps = Partial & { + id: string; + type: EthExplorerLinkTypes; + // Defaults to Ethereum Mainnet, as chain support was added late + chain?: string; + code?: boolean; +}; + +export const ExternalExplorerLink = ({ + id, + type, + chain = '1', + code = false, + ...props +}: ExternalExplorerLinkProps) => { + const link = `${getExternalExplorerLink(chain, type)}/${type}/${id}${ + code ? '#code' : '' + }`; + return ( + + + + + ); +}; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-contract-call.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-contract-call.tsx index f7c367eaf..2b7fc7927 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-contract-call.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-contract-call.tsx @@ -1,9 +1,10 @@ import { TableCell, TableRow } from '../../../table'; import { t } from '@vegaprotocol/i18n'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../../links/eth-explorer-link/eth-explorer-link'; +} from '../../../links/external-explorer-link/external-explorer-link'; +import { getExternalChainLabel } from '../../../links/external-explorer-link/external-chain'; import type { components } from '../../../../../types/explorer'; import { defaultAbiCoder, base64 } from 'ethers/lib/utils'; import { BigNumber } from 'ethers'; @@ -44,10 +45,10 @@ export const TxDetailsContractCall = ({ }, }); - if (!contractCall || !contractCall.result) { + if (!contractCall) { return null; } - + const chainLabel = getExternalChainLabel(contractCall.sourceChainId); return ( <> {contractCall.specId && ( @@ -64,9 +65,12 @@ export const TxDetailsContractCall = ({ )} {contractCall.blockHeight && ( - {t('ETH block')} - + + @@ -75,14 +79,24 @@ export const TxDetailsContractCall = ({ )} {data?.oracleSpec?.dataSourceSpec && ( )} - - {t('Result')} - {decodeEthCallResult(contractCall.result)} - + {contractCall.error && ( + + {t('Call error')} + {contractCall.error} + + )} + + {contractCall.result && ( + + {t('Result')} + {decodeEthCallResult(contractCall.result)} + + )} ); }; diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.tsx index 394a16158..a8efcc27a 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.tsx @@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { AssetLink } from '../../../links'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../../links/eth-explorer-link/eth-explorer-link'; +} from '../../../links/external-explorer-link/external-explorer-link'; interface TxDetailsChainEventErc20AssetLimitsUpdatedProps { assetLimitsUpdated: components['schemas']['vegaERC20AssetLimitsUpdated']; @@ -42,7 +42,7 @@ export const TxDetailsChainEventErc20AssetLimitsUpdated = ({ {t('ERC20 asset')} - diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.tsx index 597e317db..6e044f566 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.tsx @@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { AssetLink } from '../../../links'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../../links/eth-explorer-link/eth-explorer-link'; +} from '../../../links/external-explorer-link/external-explorer-link'; interface TxDetailsChainEventErc20AssetListProps { assetList: components['schemas']['vegaERC20AssetList']; @@ -32,7 +32,7 @@ export const TxDetailsChainEventErc20AssetList = ({ {t('Source')} - diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.tsx index 9615a2537..4a1f9524e 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.tsx @@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { AssetLink, PartyLink } from '../../../links'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../../links/eth-explorer-link/eth-explorer-link'; +} from '../../../links/external-explorer-link/external-explorer-link'; interface TxDetailsChainEventProps { deposit: components['schemas']['vegaERC20Deposit']; @@ -36,7 +36,7 @@ export const TxDetailsChainEventDeposit = ({ {t('Source')} - diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.tsx index e34ab1a73..2c9aa9851 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.tsx @@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { AssetLink } from '../../../links'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../../links/eth-explorer-link/eth-explorer-link'; +} from '../../../links/external-explorer-link/external-explorer-link'; interface TxDetailsChainEventWithdrawalProps { withdrawal: components['schemas']['vegaERC20Withdrawal']; @@ -35,7 +35,7 @@ export const TxDetailsChainEventWithdrawal = ({ {t('Recipient')} - diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.tsx index 356f70f27..1c72c2b3b 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.tsx @@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { PartyLink } from '../../../links'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../../links/eth-explorer-link/eth-explorer-link'; +} from '../../../links/external-explorer-link/external-explorer-link'; interface TxDetailsChainEventStakeDepositProps { deposit: components['schemas']['vegaStakeDeposited']; @@ -39,7 +39,7 @@ export const TxDetailsChainEventStakeDeposit = ({ {t('Source')} - diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.tsx index 54dcb3695..e8075782d 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.tsx @@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { PartyLink } from '../../../links'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../../links/eth-explorer-link/eth-explorer-link'; +} from '../../../links/external-explorer-link/external-explorer-link'; interface TxDetailsChainEventStakeRemoveProps { remove: components['schemas']['vegaStakeRemoved']; @@ -39,7 +39,7 @@ export const TxDetailsChainEventStakeRemove = ({ {t('Source')} - diff --git a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.tsx b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.tsx index 81ab43d86..8bfef5709 100644 --- a/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.tsx +++ b/apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.tsx @@ -3,9 +3,9 @@ import { t } from '@vegaprotocol/i18n'; import { TableRow, TableCell } from '../../../table'; import type { components } from '../../../../../types/explorer'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../../links/eth-explorer-link/eth-explorer-link'; +} from '../../../links/external-explorer-link/external-explorer-link'; interface TxDetailsChainEventStakeTotalSupplyProps { update: components['schemas']['vegaStakeTotalSupply']; @@ -38,7 +38,7 @@ export const TxDetailsChainEventStakeTotalSupply = ({ {t('Source')} - diff --git a/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-participants.tsx b/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-participants.tsx index 1a689b8e7..e84e79f57 100644 --- a/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-participants.tsx +++ b/apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-participants.tsx @@ -41,6 +41,7 @@ const AccountType: Record = { ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY: 'Reward Return Volatility', ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING: 'Reward Validator Ranking', ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD: 'Pending Fee Referral Reward', + ACCOUNT_TYPE_ORDER_MARGIN: 'Order Margin', }; interface TransferParticipantsProps { diff --git a/apps/explorer/src/app/components/txs/details/tx-eth-key-rotate.tsx b/apps/explorer/src/app/components/txs/details/tx-eth-key-rotate.tsx index ecd49e6c6..88e75f5e9 100644 --- a/apps/explorer/src/app/components/txs/details/tx-eth-key-rotate.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-eth-key-rotate.tsx @@ -5,9 +5,9 @@ import { TxDetailsShared } from './shared/tx-details-shared'; import { TableCell, TableRow, TableWithTbody } from '../../table'; import type { components } from '../../../../types/explorer'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../links/eth-explorer-link/eth-explorer-link'; +} from '../../links/external-explorer-link/external-explorer-link'; import { BlockLink } from '../../links'; type EthKeyRotate = components['schemas']['v1EthereumKeyRotateSubmission']; @@ -46,7 +46,7 @@ export const TxDetailsEthKeyRotate = ({ {t('Old Address')} - @@ -57,7 +57,7 @@ export const TxDetailsEthKeyRotate = ({ {t('New Address')} - @@ -68,7 +68,7 @@ export const TxDetailsEthKeyRotate = ({ {t('Submitter address')} - diff --git a/apps/explorer/src/app/components/txs/details/tx-issue-signatures.tsx b/apps/explorer/src/app/components/txs/details/tx-issue-signatures.tsx index b39b8800f..23c74bed6 100644 --- a/apps/explorer/src/app/components/txs/details/tx-issue-signatures.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-issue-signatures.tsx @@ -6,9 +6,9 @@ import { TableRow, TableCell, TableWithTbody } from '../../table'; import type { components } from '../../../../types/explorer'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../links/eth-explorer-link/eth-explorer-link'; +} from '../../links/external-explorer-link/external-explorer-link'; import { NodeLink } from '../../links'; type Command = components['schemas']['v1IssueSignatures']; @@ -57,7 +57,7 @@ export const TxDetailsIssueSignatures = ({ {t('ETH key')} - diff --git a/apps/explorer/src/app/components/txs/details/tx-node-announce.tsx b/apps/explorer/src/app/components/txs/details/tx-node-announce.tsx index 46a9806d8..4d35bacaa 100644 --- a/apps/explorer/src/app/components/txs/details/tx-node-announce.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-node-announce.tsx @@ -6,9 +6,9 @@ import { TableRow, TableCell, TableWithTbody } from '../../table'; import type { components } from '../../../../types/explorer'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../links/eth-explorer-link/eth-explorer-link'; +} from '../../links/external-explorer-link/external-explorer-link'; import { PartyLink } from '../../links'; import Hash from '../../links/hash'; import { ExternalLink } from '@vegaprotocol/ui-toolkit'; @@ -72,7 +72,7 @@ export const TxDetailsNodeAnnounce = ({ {t('Ethereum Address')} - diff --git a/apps/explorer/src/app/components/txs/details/tx-node-vote.tsx b/apps/explorer/src/app/components/txs/details/tx-node-vote.tsx index f5159cae2..94f4896ba 100644 --- a/apps/explorer/src/app/components/txs/details/tx-node-vote.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-node-vote.tsx @@ -8,9 +8,9 @@ import { useExplorerNodeVoteQuery } from './__generated__/Node-vote'; import { PartyLink } from '../../links'; import { Time } from '../../time'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../links/eth-explorer-link/eth-explorer-link'; +} from '../../links/external-explorer-link/external-explorer-link'; interface TxDetailsNodeVoteProps { txData: BlockExplorerTransactionResult | undefined; @@ -143,7 +143,7 @@ export function TxHash({ hash }: TxDetailsEthTxHashProps) { Ethereum TX: - + ); diff --git a/apps/explorer/src/app/components/txs/details/tx-undelegation.tsx b/apps/explorer/src/app/components/txs/details/tx-undelegation.tsx index bd35129da..82392f7c1 100644 --- a/apps/explorer/src/app/components/txs/details/tx-undelegation.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-undelegation.tsx @@ -8,7 +8,7 @@ import GovernanceAssetBalance from '../../asset-balance/governance-asset-balance import type { components } from '../../../../types/explorer'; export const methodText: Record< - components['schemas']['UndelegateSubmissionMethod'], + components['schemas']['v1UndelegateSubmissionMethod'], string > = { METHOD_NOW: 'Immediate', diff --git a/apps/explorer/src/app/components/txs/details/tx-withdraw-submission.tsx b/apps/explorer/src/app/components/txs/details/tx-withdraw-submission.tsx index 2377e29e8..ecac69598 100644 --- a/apps/explorer/src/app/components/txs/details/tx-withdraw-submission.tsx +++ b/apps/explorer/src/app/components/txs/details/tx-withdraw-submission.tsx @@ -4,9 +4,9 @@ import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint import { TxDetailsShared } from './shared/tx-details-shared'; import { TableCell, TableRow, TableWithTbody } from '../../table'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../links/eth-explorer-link/eth-explorer-link'; +} from '../../links/external-explorer-link/external-explorer-link'; import { txSignatureToDeterministicId } from '../lib/deterministic-ids'; import AssetBalance from '../../asset-balance/asset-balance'; import { useScrollToLocation } from '../../../hooks/scroll-to-location'; @@ -57,7 +57,7 @@ export const TxDetailsWithdrawSubmission = ({ {t('Recipient')} - diff --git a/apps/explorer/src/app/components/txs/tx-order-type.tsx b/apps/explorer/src/app/components/txs/tx-order-type.tsx index 62ba4fffb..239c55de1 100644 --- a/apps/explorer/src/app/components/txs/tx-order-type.tsx +++ b/apps/explorer/src/app/components/txs/tx-order-type.tsx @@ -1,6 +1,7 @@ import { t } from '@vegaprotocol/i18n'; import type { components } from '../../../types/explorer'; import { VoteIcon } from '../vote-icon/vote-icon'; +import { ExternalChainIcon } from '../links/external-explorer-link/external-chain-icon'; interface TxOrderTypeProps { orderType: string; @@ -188,6 +189,9 @@ export function getLabelForChainEvent( } return t('Multisig update'); } else if (chainEvent.contractCall) { + if (chainEvent.contractCall.error) { + return t('Call error'); + } return t('Contract call'); } return t('Chain Event'); @@ -257,6 +261,11 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => { data-testid="tx-type" className={`text-sm rounded-md leading-tight px-2 inline-block whitespace-nowrap ${colours}`} > + {command?.chainEvent && ( + + )} {type} ); diff --git a/apps/explorer/src/app/config/env.ts b/apps/explorer/src/app/config/env.ts index 50e6998f8..f06125d76 100644 --- a/apps/explorer/src/app/config/env.ts +++ b/apps/explorer/src/app/config/env.ts @@ -14,7 +14,6 @@ export const ENV = { blockExplorerUrl: windowOrDefault('NX_BLOCK_EXPLORER'), tendermintUrl: windowOrDefault('NX_TENDERMINT_URL'), tendermintWebsocketUrl: windowOrDefault('NX_TENDERMINT_WEBSOCKET_URL'), - ethExplorerUrl: windowOrDefault('NX_ETHERSCAN_URL'), governanceUrl: windowOrDefault('NX_VEGA_GOVERNANCE_URL'), vegaRepoUrl: windowOrDefault('NX_VEGA_REPO_URL'), }, diff --git a/apps/explorer/src/app/routes/oracles/Oracles.graphql b/apps/explorer/src/app/routes/oracles/Oracles.graphql index d3bb6caa7..91a9e2121 100644 --- a/apps/explorer/src/app/routes/oracles/Oracles.graphql +++ b/apps/explorer/src/app/routes/oracles/Oracles.graphql @@ -78,6 +78,7 @@ fragment ExplorerOracleDataSource on OracleSpec { } } } + sourceChainId filters { key { name @@ -118,6 +119,7 @@ fragment ExplorerOracleDataSource on OracleSpec { address requiredConfirmations method + sourceChainId filters { key { type diff --git a/apps/explorer/src/app/routes/oracles/OraclesForMarkets.graphql b/apps/explorer/src/app/routes/oracles/OraclesForMarkets.graphql index ccfa2f4c5..7116f6356 100644 --- a/apps/explorer/src/app/routes/oracles/OraclesForMarkets.graphql +++ b/apps/explorer/src/app/routes/oracles/OraclesForMarkets.graphql @@ -67,6 +67,7 @@ fragment ExplorerOracleDataSourceSpec on ExternalDataSourceSpec { sourceType { ... on EthCallSpec { address + sourceChainId } ... on DataSourceSpecConfiguration { signers { diff --git a/apps/explorer/src/app/routes/oracles/__generated__/Oracles.ts b/apps/explorer/src/app/routes/oracles/__generated__/Oracles.ts index 69bd18f2f..d94ecdda4 100644 --- a/apps/explorer/src/app/routes/oracles/__generated__/Oracles.ts +++ b/apps/explorer/src/app/routes/oracles/__generated__/Oracles.ts @@ -5,19 +5,19 @@ import * as Apollo from '@apollo/client'; const defaultOptions = {} as const; export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } }; -export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array | null, args?: Array | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } }; +export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array | null, args?: Array | null, method: string, requiredConfirmations: number, address: string, sourceChainId: number, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } }; export type ExplorerOracleSpecsQueryVariables = Types.Exact<{ [key: string]: never; }>; -export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array | null, args?: Array | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null }; +export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array | null, args?: Array | null, method: string, requiredConfirmations: number, address: string, sourceChainId: number, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null }; export type ExplorerOracleSpecByIdQueryVariables = Types.Exact<{ id: Types.Scalars['ID']; }>; -export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array | null, args?: Array | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null }; +export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array | null, args?: Array | null, method: string, requiredConfirmations: number, address: string, sourceChainId: number, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null }; export const ExplorerOracleDataConnectionFragmentDoc = gql` fragment ExplorerOracleDataConnection on OracleSpec { @@ -101,6 +101,7 @@ export const ExplorerOracleDataSourceFragmentDoc = gql` } } } + sourceChainId filters { key { name @@ -141,6 +142,7 @@ export const ExplorerOracleDataSourceFragmentDoc = gql` address requiredConfirmations method + sourceChainId filters { key { type diff --git a/apps/explorer/src/app/routes/oracles/__generated__/OraclesForMarkets.ts b/apps/explorer/src/app/routes/oracles/__generated__/OraclesForMarkets.ts index 0a2cbfc37..0a1a543c1 100644 --- a/apps/explorer/src/app/routes/oracles/__generated__/OraclesForMarkets.ts +++ b/apps/explorer/src/app/routes/oracles/__generated__/OraclesForMarkets.ts @@ -9,12 +9,12 @@ export type ExplorerOracleFutureFragment = { __typename?: 'Future', dataSourceSp export type ExplorerOracleForMarketsMarketFragment = { __typename?: 'Market', id: string, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Spot' } } } }; -export type ExplorerOracleDataSourceSpecFragment = { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } | { __typename?: 'EthCallSpec', address: string } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }; +export type ExplorerOracleDataSourceSpecFragment = { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } | { __typename?: 'EthCallSpec', address: string, sourceChainId: number } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }; export type ExplorerOracleFormMarketsQueryVariables = Types.Exact<{ [key: string]: never; }>; -export type ExplorerOracleFormMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Spot' } } } } }> } | null, oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } | { __typename?: 'EthCallSpec', address: string } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null }; +export type ExplorerOracleFormMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Spot' } } } } }> } | null, oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } | { __typename?: 'EthCallSpec', address: string, sourceChainId: number } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null }; export const ExplorerOracleFutureFragmentDoc = gql` fragment ExplorerOracleFuture on Future { @@ -90,6 +90,7 @@ export const ExplorerOracleDataSourceSpecFragmentDoc = gql` sourceType { ... on EthCallSpec { address + sourceChainId } ... on DataSourceSpecConfiguration { signers { diff --git a/apps/explorer/src/app/routes/oracles/components/oracle-details-type.tsx b/apps/explorer/src/app/routes/oracles/components/oracle-details-type.tsx index 4fb821b7b..1c267d0f9 100644 --- a/apps/explorer/src/app/routes/oracles/components/oracle-details-type.tsx +++ b/apps/explorer/src/app/routes/oracles/components/oracle-details-type.tsx @@ -28,7 +28,7 @@ export function isInternalSourceType(s: SourceType) { export function getExternalType(s: SourceType) { if (s.sourceType.__typename === 'EthCallSpec') { - return 'Ethereum Contract Call'; + return 'Contract Call'; } else { return 'External Data'; } diff --git a/apps/explorer/src/app/routes/oracles/components/oracle-eth-source.tsx b/apps/explorer/src/app/routes/oracles/components/oracle-eth-source.tsx index ad71bdc64..30cb7e06b 100644 --- a/apps/explorer/src/app/routes/oracles/components/oracle-eth-source.tsx +++ b/apps/explorer/src/app/routes/oracles/components/oracle-eth-source.tsx @@ -1,18 +1,24 @@ import { TableRow, TableCell, TableHeader } from '../../../components/table'; import type { SourceType } from './oracle'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../../components/links/eth-explorer-link/eth-explorer-link'; +} from '../../../components/links/external-explorer-link/external-explorer-link'; +import { getExternalChainLabel } from '../../../components/links/external-explorer-link/external-chain'; +import { t } from 'i18next'; interface OracleDetailsEthSourceProps { sourceType: SourceType; + chain?: string; } /** * Given an Oracle that sources data from Ethereum, this component will render * a link to the smart contract and some basic details */ -export function OracleEthSource({ sourceType }: OracleDetailsEthSourceProps) { +export function OracleEthSource({ + sourceType, + chain = '1', +}: OracleDetailsEthSourceProps) { if ( sourceType.__typename !== 'DataSourceDefinitionExternal' || sourceType.sourceType.__typename !== 'EthCallSpec' @@ -26,11 +32,20 @@ export function OracleEthSource({ sourceType }: OracleDetailsEthSourceProps) { return null; } + const chainLabel = getExternalChainLabel(chain); + return ( - Ethereum Contract + + {chainLabel} {t('Contract')} + - + ⇒ {sourceType.sourceType.method} diff --git a/apps/explorer/src/app/routes/oracles/components/oracle-signers.tsx b/apps/explorer/src/app/routes/oracles/components/oracle-signers.tsx index 3df060c82..e56052710 100644 --- a/apps/explorer/src/app/routes/oracles/components/oracle-signers.tsx +++ b/apps/explorer/src/app/routes/oracles/components/oracle-signers.tsx @@ -1,8 +1,8 @@ import { PartyLink } from '../../../components/links'; import { - EthExplorerLink, + ExternalExplorerLink, EthExplorerLinkTypes, -} from '../../../components/links/eth-explorer-link/eth-explorer-link'; +} from '../../../components/links/external-explorer-link/external-explorer-link'; import { TableRow, TableCell, TableHeader } from '../../../components/table'; import { remove0x } from '@vegaprotocol/utils'; @@ -37,13 +37,15 @@ export function getAddressLink(signer: Signer) { } if (signer.__typename === 'ETHAddress') { - return ; + return ( + + ); } else if (signer.__typename === 'PubKey' && address.length !== 64) { // This is a hack: some older oracles were submitted before proper checks stopped // ETH addresses being returned as Vega addresses // Hacky 0x prefixing as a bonus return ( - @@ -61,7 +63,10 @@ interface OracleDetailsSignersProps { /** * Given an Oracle, this component will render either a link to Ethereum - * or the Vega party depending on which type is specified + * or the Vega party depending on which type is specified. + * + * Note that this won't be shown for external contract calls as they do not + * have a signer in the same way. */ export function OracleSigners({ sourceType }: OracleDetailsSignersProps) { if (sourceType.__typename !== 'DataSourceDefinitionExternal') { diff --git a/apps/explorer/src/app/routes/oracles/components/oracle.tsx b/apps/explorer/src/app/routes/oracles/components/oracle.tsx index 1ff08fdc7..b4e8b3117 100644 --- a/apps/explorer/src/app/routes/oracles/components/oracle.tsx +++ b/apps/explorer/src/app/routes/oracles/components/oracle.tsx @@ -42,6 +42,11 @@ export const OracleDetails = ({ dataConnection, }: OracleDetailsProps) => { const sourceType = dataSource.dataSourceSpec.spec.data.sourceType; + const chain = + dataSource.dataSourceSpec.spec.data.sourceType.sourceType.__typename === + 'EthCallSpec' + ? dataSource.dataSourceSpec.spec.data.sourceType.sourceType.sourceChainId.toString() + : undefined; return (
@@ -60,7 +65,7 @@ export const OracleDetails = ({ - + {t('Filter')} diff --git a/apps/explorer/src/assets/chain-arb-logo.svg b/apps/explorer/src/assets/chain-arb-logo.svg new file mode 100644 index 000000000..dd17407f5 --- /dev/null +++ b/apps/explorer/src/assets/chain-arb-logo.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/explorer/src/assets/chain-dcn-logo.svg b/apps/explorer/src/assets/chain-dcn-logo.svg new file mode 100644 index 000000000..0095585d6 --- /dev/null +++ b/apps/explorer/src/assets/chain-dcn-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/explorer/src/assets/chain-eth-logo.svg b/apps/explorer/src/assets/chain-eth-logo.svg new file mode 100644 index 000000000..684e96873 --- /dev/null +++ b/apps/explorer/src/assets/chain-eth-logo.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + diff --git a/apps/explorer/src/assets/chain-gno-logo.svg b/apps/explorer/src/assets/chain-gno-logo.svg new file mode 100644 index 000000000..97842427e --- /dev/null +++ b/apps/explorer/src/assets/chain-gno-logo.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/apps/explorer/src/types/explorer.d.ts b/apps/explorer/src/types/explorer.d.ts index 92bd34b15..156c15fd1 100644 --- a/apps/explorer/src/types/explorer.d.ts +++ b/apps/explorer/src/types/explorer.d.ts @@ -28,7 +28,7 @@ export interface paths { '/transactions': { /** * List transactions - * @description List transactions from the Vega blockchain + * @description List transactions from the Vega blockchain from the newest to the oldest transactions. */ get: operations['BlockExplorer_ListTransactions']; }; @@ -117,15 +117,31 @@ export interface components { | 'EXPIRY_STRATEGY_CANCELS' | 'EXPIRY_STRATEGY_SUBMIT'; /** - * @description - METHOD_NOW: Undelegate straight away, losing all rewards for the current epoch. - * - METHOD_AT_END_OF_EPOCH: Undelegate at the end of an epoch, retaining all rewards for the current epoch. - * @default METHOD_UNSPECIFIED + * - SIZE_OVERRIDE_SETTING_UNSPECIFIED: Never valid + * - SIZE_OVERRIDE_SETTING_NONE: No override, the size within the contained normal order submission will be used + * - SIZE_OVERRIDE_SETTING_POSITION: Use the total position of the trader + * @default SIZE_OVERRIDE_SETTING_UNSPECIFIED * @enum {string} */ - readonly UndelegateSubmissionMethod: - | 'METHOD_UNSPECIFIED' - | 'METHOD_NOW' - | 'METHOD_AT_END_OF_EPOCH'; + readonly StopOrderSizeOverrideSetting: + | 'SIZE_OVERRIDE_SETTING_UNSPECIFIED' + | 'SIZE_OVERRIDE_SETTING_NONE' + | 'SIZE_OVERRIDE_SETTING_POSITION'; + readonly StopOrderSizeOverrideValue: { + /** Scaling percentage of the current position’s size */ + readonly percentage?: string; + }; + /** + * - MODE_UNSPECIFIED: Never valid. + * - MODE_CROSS_MARGIN: Cross margin mode - margin is dynamically acquired and released as a position is marked to market + * - MODE_ISOLATED_MARGIN: Isolated margin mode - margin for any newly opened position volume is transferred to the margin account when the trade is executed + * @default MODE_UNSPECIFIED + * @enum {string} + */ + readonly UpdateMarginModeMode: + | 'MODE_UNSPECIFIED' + | 'MODE_CROSS_MARGIN' + | 'MODE_ISOLATED_MARGIN'; readonly blockexplorerapiv1Transaction: { /** * Height of the block the transaction was found in @@ -307,6 +323,30 @@ export interface components { readonly stopOrdersSubmission?: readonly components['schemas']['v1StopOrdersSubmission'][]; /** @description List of order submissions to be processed sequentially. */ readonly submissions?: readonly components['schemas']['v1OrderSubmission'][]; + /** Update margin mode instruction */ + readonly updateMarginMode?: readonly components['schemas']['v1UpdateMarginMode'][]; + }; + /** + * @description Command that allows a token holder to submit a batch governance proposal that can be voted on by any other token holders, and eventually enacted on the Vega network. + * For example this command can be used to propose a new market and a network parameter change with it. + */ + readonly v1BatchProposalSubmission: { + /** @description Rationale behind a proposal. */ + readonly rationale?: components['schemas']['vegaProposalRationale']; + /** @description Arbitrary human-readable reference identifying the proposal. */ + readonly reference?: string; + /** @description Proposal terms containing the type and details of the proposal, as well as time spans for voting and enactment. */ + readonly terms?: components['schemas']['v1BatchProposalSubmissionTerms']; + }; + /** Terms for a batch governance proposal submission */ + readonly v1BatchProposalSubmissionTerms: { + /** @description List of individual changes included in the batch proposal. */ + readonly changes?: readonly components['schemas']['vegaBatchProposalTermsChange'][]; + /** + * Format: int64 + * @description Closing timestamp in Unix time; adheres to `minClose` and `maxClose` limits. + */ + readonly closingTimestamp?: string; }; /** @description A validator command sent automatically that provides information of events that have happened on foreign chains. */ readonly v1ChainEvent: { @@ -347,6 +387,12 @@ export interface components { readonly team?: components['schemas']['v1CreateReferralSetTeam']; }; readonly v1CreateReferralSetTeam: { + /** + * @description List of public keys that are allowed to join the team. + * Only applicable to closed teams. Removing a party from the allow list does not remove + * the party from the team. + */ + readonly allowList?: readonly string[]; /** @description External link to an avatar for the team. */ readonly avatarUrl?: string; /** @description Whether or not the team is closed to new party members. */ @@ -432,6 +478,8 @@ export interface components { readonly applyReferralCode?: components['schemas']['v1ApplyReferralCode']; /** @description Command to submit a batch of order instructions. */ readonly batchMarketInstructions?: components['schemas']['v1BatchMarketInstructions']; + /** @description Command to submit a batch governance proposal. */ + readonly batchProposalSubmission?: components['schemas']['v1BatchProposalSubmission']; /** * Format: uint64 * @description Block height which has been used to calculate the transaction proof-of-work. @@ -449,6 +497,8 @@ export interface components { readonly ethereumKeyRotateSubmission?: components['schemas']['v1EthereumKeyRotateSubmission']; /** @description Command to request signatures to amend the multisig-control contract. */ readonly issueSignatures?: components['schemas']['v1IssueSignatures']; + /** @description Command to join a team. */ + readonly joinTeam?: components['schemas']['v1JoinTeam']; /** @description Validator command sent manually by a node operator to rotate their node's Vega keys. */ readonly keyRotateSubmission?: components['schemas']['v1KeyRotateSubmission']; /** @description Command to amend a liquidity commitment. */ @@ -489,6 +539,10 @@ export interface components { readonly transfer?: components['schemas']['commandsv1Transfer']; /** @description Command to remove tokens delegated to a validator. */ readonly undelegateSubmission?: components['schemas']['v1UndelegateSubmission']; + /** @description Command to update the margin mode of a party in a market. */ + readonly updateMarginMode?: components['schemas']['v1UpdateMarginMode']; + /** @description Command to update a party's profile. */ + readonly updatePartyProfile?: components['schemas']['v1UpdatePartyProfile']; /** @description Command to update a referral set. */ readonly updateReferralSet?: components['schemas']['v1UpdateReferralSet']; /** @description Validator command sent automatically to signal regular participation in the network. */ @@ -525,6 +579,11 @@ export interface components { /** @description Node ID of the validator node that will be signed in or out of the smart contract. */ readonly validatorNodeId?: string; }; + /** @description Command that allows the submitter to join a team or change teams if they are already a member of a team. */ + readonly v1JoinTeam: { + /** @description ID of the team to join, this is the same as the referral code used to generate the team. */ + readonly id?: string; + }; /** @description A validator command sent manually that allows a node operator to indicate to the network that their node's Vega key will be rotated. */ readonly v1KeyRotateSubmission: { /** @description Hash of the node's current Vega public key. */ @@ -686,6 +745,17 @@ export interface components { readonly peggedReference?: components['schemas']['vegaPeggedReference']; /** @description New price for the order. This field is an unsigned integer scaled to the market's decimal places. */ readonly price?: string; + /** + * Format: uint64 + * @description New size for the order. + * Amending the size causes the size and remaining part of the order to be changed by the difference between the original and amended size. + * - Specifying a size smaller than the current size leaves the order at its current order book position. + * - Specifying a size larger than the current size removes and reinserts the order at the back of the price level. + * - Specifying a size that results in the remaining part of the order being reduced to zero cancels the order. + * This field is an unsigned integer scaled to the market's decimal places. + * If specified, size_delta must be set to 0. + */ + readonly size?: string; /** * Format: int64 * @description Amend the size for the order by the delta specified: @@ -693,6 +763,7 @@ export interface components { * - To increase the size from the current value, set a positive integer value * - To leave the size unchanged set a value of zero * This field needs to be scaled using the market's position decimal places. + * If specified, size must not be set. */ readonly sizeDelta?: string; /** @description New time in force for the order. */ @@ -863,6 +934,10 @@ export interface components { readonly orderSubmission?: components['schemas']['v1OrderSubmission']; /** @description Order will be submitted if the last traded price on the market breaches the given price. */ readonly price?: string; + /** Indicates if this order is linked to an order or position to derive the order size */ + readonly sizeOverrideSetting?: components['schemas']['StopOrderSizeOverrideSetting']; + /** If this order is linked to a position, provide an optional scaling factor */ + readonly sizeOverrideValue?: components['schemas']['StopOrderSizeOverrideValue']; /** @description Order will be submitted if the last traded price has moved the given percent from the highest/lowest mark price since the stop order was submitted. */ readonly trailingPercentOffset?: string; }; @@ -909,10 +984,42 @@ export interface components { */ readonly amount?: string; /** @description Method of delegation. */ - readonly method?: components['schemas']['UndelegateSubmissionMethod']; + readonly method?: components['schemas']['v1UndelegateSubmissionMethod']; /** @description Node ID to undelegate stake from. */ readonly nodeId?: string; }; + /** + * @description - METHOD_NOW: Undelegate straight away, losing all rewards for the current epoch. + * - METHOD_AT_END_OF_EPOCH: Undelegate at the end of an epoch, retaining all rewards for the current epoch. + * @default METHOD_UNSPECIFIED + * @enum {string} + */ + readonly v1UndelegateSubmissionMethod: + | 'METHOD_UNSPECIFIED' + | 'METHOD_NOW' + | 'METHOD_AT_END_OF_EPOCH'; + readonly v1UpdateMarginMode: { + /** Margin factor to use for margin in isolated mode. It is a multiplier that defines how much margin needs to be set aside */ + readonly marginFactor?: string; + /** @description Market to change margin mode for. */ + readonly marketId?: string; + /** @description Margin mode to use. */ + readonly mode?: components['schemas']['UpdateMarginModeMode']; + }; + /** + * @description Command to associate metadata to a public key, known as a party ID. + * Partial update is not supported, meaning previous values must be included in + * the update, otherwise they are removed. + */ + readonly v1UpdatePartyProfile: { + /** @description Alias given to the party. It must be unique network-wide. */ + readonly alias?: string; + /** + * @description Freeform data to associate to the party. + * Support a maximum of 10 entries. + */ + readonly metadata?: readonly components['schemas']['vegaMetadata'][]; + }; /** * @description A command that allows the referrer of a referral set to update team details for a referral set. * Any field that is left unset or has a default value indicates that this field on the original referral set will be left unchanged. @@ -926,9 +1033,18 @@ export interface components { readonly team?: components['schemas']['v1UpdateReferralSetTeam']; }; readonly v1UpdateReferralSetTeam: { + /** + * @description List of public keys that are allowed to join the team. + * Only applicable to closed teams. Removing a party from the allow list does not remove + * the party from the team. + */ + readonly allowList?: readonly string[]; /** @description New link to an avatar for the team. */ readonly avatarUrl?: string; - /** @description Whether or not the team is closed to new party members. */ + /** + * @description Whether or not the team is closed to new party members. When closed, only parties specified in the allow list can + * join the team. + */ readonly closed?: boolean; /** @description New name of the team. */ readonly name?: string; @@ -1014,6 +1130,7 @@ export interface components { * - ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY: Per asset market reward account given for return volatility * - ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING: Per asset market reward account given to validators by their ranking * - ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD: Per asset account for pending fee referral reward payouts + * - ACCOUNT_TYPE_ORDER_MARGIN: Per asset market account for party in isolated margin mode * @default ACCOUNT_TYPE_UNSPECIFIED * @enum {string} */ @@ -1045,7 +1162,8 @@ export interface components { | 'ACCOUNT_TYPE_REWARD_RELATIVE_RETURN' | 'ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY' | 'ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING' - | 'ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD'; + | 'ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD' + | 'ACCOUNT_TYPE_ORDER_MARGIN'; /** Vega representation of an external asset */ readonly vegaAssetDetails: { /** @description Vega built-in asset. */ @@ -1071,6 +1189,42 @@ export interface components { /** @description Minimum economically meaningful amount in the asset. */ readonly quantum?: string; }; + /** Terms change for a batch governance proposal */ + readonly vegaBatchProposalTermsChange: { + /** @description Proposal change to cancel a governance initiated transfe. */ + readonly cancelTransfer?: components['schemas']['vegaCancelTransfer']; + /** + * Format: int64 + * @description Timestamp as Unix time in seconds when proposal terms gets enacted if proposal passed the vote, + * constrained by `minEnact` and `maxEnact` network parameters. + */ + readonly enactmentTimestamp?: string; + /** + * @description Proposal change for a freeform request, which can be voted on but does not change the behaviour of the system, + * and can be used to gauge community sentiment. + */ + readonly newFreeform?: components['schemas']['vegaNewFreeform']; + /** @description Proposal change for creating new futures market. */ + readonly newMarket?: components['schemas']['vegaNewMarket']; + /** @description Proposal change for creating new spot market. */ + readonly newSpotMarket?: components['schemas']['vegaNewSpotMarket']; + /** @description Proposal change for a governance initiated transfer. */ + readonly newTransfer?: components['schemas']['vegaNewTransfer']; + /** @description Proposal change for updating an asset. */ + readonly updateAsset?: components['schemas']['vegaUpdateAsset']; + /** @description Proposal change for modifying an existing futures market. */ + readonly updateMarket?: components['schemas']['vegaUpdateMarket']; + /** @description Proposal change for updating the state of a market. */ + readonly updateMarketState?: components['schemas']['vegaUpdateMarketState']; + /** @description Proposal change for updating Vega network parameters. */ + readonly updateNetworkParameter?: components['schemas']['vegaUpdateNetworkParameter']; + /** @description Proposal change for updating the referral program. */ + readonly updateReferralProgram?: components['schemas']['vegaUpdateReferralProgram']; + /** @description Proposal change for modifying an existing spot market. */ + readonly updateSpotMarket?: components['schemas']['vegaUpdateSpotMarket']; + /** @description Proposal change for updating the volume discount program. */ + readonly updateVolumeDiscountProgram?: components['schemas']['vegaUpdateVolumeDiscountProgram']; + }; readonly vegaBenefitTier: { /** * @description Required number of epochs a party must have been in a referral set to @@ -1125,6 +1279,44 @@ export interface components { /** @description ID of the governance transfer proposal. */ readonly transferId?: string; }; + /** @description Mark price configuration parameters. */ + readonly vegaCompositePriceConfiguration: { + /** @description Cash amount, in asset decimals, used for the calculation of the mark price from the order book. */ + readonly cashAmount?: string; + /** @description Which method is used for the calculation of the composite price for the market. */ + readonly compositePriceType?: components['schemas']['vegaCompositePriceType']; + /** @description Additional price sources to be used for index price calculation. */ + readonly dataSourcesSpec?: readonly components['schemas']['vegaDataSourceDefinition'][]; + /** List of each price source and its corresponding binding */ + readonly dataSourcesSpecBinding?: readonly components['schemas']['vegaSpecBindingForCompositePrice'][]; + /** + * Format: uint64 + * @description Decay power used for the calculation of mark price. + */ + readonly decayPower?: string; + /** @description Decay weight used for calculation of mark price. */ + readonly decayWeight?: string; + /** + * @description For how long a price source is considered valid. One entry for each data source + * such that the first is for the trade based mark price, the second is for the book based price + * the third is for the first oracle, followed by more oracle data source staleness tolerance. + */ + readonly sourceStalenessTolerance?: readonly string[]; + /** @description Weights for each composite price data source. */ + readonly sourceWeights?: readonly string[]; + }; + /** + * @description - COMPOSITE_PRICE_TYPE_WEIGHTED: Composite price is calculated as a weighted average of the underlying mark prices. + * - COMPOSITE_PRICE_TYPE_MEDIAN: Composite price is calculated as a median of the underlying mark prices. + * - COMPOSITE_PRICE_TYPE_LAST_TRADE: Composite price is calculated as the last trade price. + * @default COMPOSITE_PRICE_TYPE_UNSPECIFIED + * @enum {string} + */ + readonly vegaCompositePriceType: + | 'COMPOSITE_PRICE_TYPE_UNSPECIFIED' + | 'COMPOSITE_PRICE_TYPE_WEIGHTED' + | 'COMPOSITE_PRICE_TYPE_MEDIAN' + | 'COMPOSITE_PRICE_TYPE_LAST_TRADE'; /** * @description Represents the top level object that handles data sources. * Data source definition can be external or internal, with whatever @@ -1197,21 +1389,17 @@ export interface components { readonly tradingTerminationProperty?: string; }; /** - * Describes which property of the data source data is to be - * used as settlement data and which to use as the trading terminated trigger + * @description Describes which properties of the data source data is to be + * used for settlement. */ readonly vegaDataSourceSpecToPerpetualBinding: { /** - * @description Name of the property in the source data that should be used as settlement data. - * If it is set to "prices.BTC.value", then the perpetual market will use the value of - * this property as settlement data. + * @description Name of the property in the source data that should be used for settlement data. + * If it is set to "prices.BTC.value" for example, then the perpetual market will use the value of + * this property to get settlement data. */ readonly settlementDataProperty?: string; - /** - * @description Name of the property in the source data that should be used as settlement data. - * If it is set to "prices.BTC.value", then the perpetual market will use the value of - * this property as settlement data. - */ + /** @description Name of the property in the source data that should be used to determine the perpetual's settlement schedule. */ readonly settlementScheduleProperty?: string; }; /** @@ -1493,6 +1681,11 @@ export interface components { * Format: uint64 */ readonly requiredConfirmations?: string; + /** + * Format: uint64 + * @description The ID of the EVM based chain which is to be used to source the oracle data. + */ + readonly sourceChainId?: string; /** @description Conditions for determining when to call the contract method. */ readonly trigger?: components['schemas']['vegaEthCallTrigger']; }; @@ -1519,6 +1712,11 @@ export interface components { * @description Result of contract call, packed according to the ABI stored in the associated data source spec. */ readonly result?: string; + /** + * Format: uint64 + * @description Source chain for this chain event. + */ + readonly sourceChainId?: string; /** @description ID of the data source spec that triggered this contract call. */ readonly specId?: string; }; @@ -1597,6 +1795,42 @@ export interface components { readonly tolerance?: string; readonly value?: components['schemas']['vegaStateVarValue']; }; + /** @description Liquidation strategy used when the network holds a position resulting from position resolution. */ + readonly vegaLiquidationStrategy: { + /** @description Fraction of the open position the market will try to close in a single attempt; range 0 through 1. */ + readonly disposalFraction?: string; + /** + * Format: int64 + * @description Interval, in seconds, at which the network will attempt to close its position. + */ + readonly disposalTimeStep?: string; + /** + * Format: uint64 + * @description Size of the position that the network will try to close in a single attempt. + */ + readonly fullDisposalSize?: string; + /** @description Max fraction of the total volume of the orderbook, within liquidity bounds, that the network can use to close its position; range 0 through 1. */ + readonly maxFractionConsumed?: string; + }; + /** @description Market settings that describe how the liquidity fee is calculated. */ + readonly vegaLiquidityFeeSettings: { + /** @description Constant liquidity fee used when using the constant fee method. */ + readonly feeConstant?: string; + /** @description Method used to calculate the market's liquidity fee. */ + readonly method?: components['schemas']['vegaLiquidityFeeSettingsMethod']; + }; + /** + * @description - METHOD_MARGINAL_COST: Fee is the smallest value of all bids, such that liquidity providers with nominated fees less than or equal to this value still have sufficient commitment to fulfil the market's target stake. + * - METHOD_WEIGHTED_AVERAGE: Fee is the weighted average of all liquidity providers' nominated fees, weighted by their committment. + * - METHOD_CONSTANT: Fee is set by the market to a constant value irrespective of any liquidity provider's nominated fee. + * @default METHOD_UNSPECIFIED + * @enum {string} + */ + readonly vegaLiquidityFeeSettingsMethod: + | 'METHOD_UNSPECIFIED' + | 'METHOD_MARGINAL_COST' + | 'METHOD_WEIGHTED_AVERAGE' + | 'METHOD_CONSTANT'; /** LiquidityMonitoringParameters contains settings used for liquidity monitoring */ readonly vegaLiquidityMonitoringParameters: { /** @@ -1674,6 +1908,13 @@ export interface components { readonly vegaMatrixValue: { readonly value?: readonly components['schemas']['vegaVectorValue'][]; }; + /** @description Generic structure holding a key/value pair. */ + readonly vegaMetadata: { + /** @description Key of the metadata. */ + readonly key?: string; + /** @description Value of the metadata. */ + readonly value?: string; + }; /** Represents a network parameter on Vega */ readonly vegaNetworkParameter: { /** @description Unique key of the network parameter. */ @@ -1708,6 +1949,10 @@ export interface components { readonly instrument?: components['schemas']['vegaInstrumentConfiguration']; /** @description Linear slippage factor is used to cap the slippage component of maintenance margin - it is applied to the slippage volume. */ readonly linearSlippageFactor?: string; + /** @description Liquidation strategy for this market. */ + readonly liquidationStrategy?: components['schemas']['vegaLiquidationStrategy']; + /** @description Specifies how the liquidity fee for the market will be calculated. */ + readonly liquidityFeeSettings?: components['schemas']['vegaLiquidityFeeSettings']; /** @description Liquidity monitoring parameters. */ readonly liquidityMonitoringParameters?: components['schemas']['vegaLiquidityMonitoringParameters']; /** Liquidity SLA parameters */ @@ -1720,6 +1965,8 @@ export interface components { * price levels over which automated liquidity provisions will be deployed. */ readonly lpPriceRange?: string; + /** @description Mark price configuration. */ + readonly markPriceConfiguration?: components['schemas']['vegaCompositePriceConfiguration']; /** @description Optional new futures market metadata, tags. */ readonly metadata?: readonly string[]; /** @@ -1750,6 +1997,8 @@ export interface components { readonly decimalPlaces?: string; /** @description New spot market instrument configuration. */ readonly instrument?: components['schemas']['vegaInstrumentConfiguration']; + /** @description Specifies how the liquidity fee for the market will be calculated. */ + readonly liquidityFeeSettings?: components['schemas']['vegaLiquidityFeeSettings']; /** @description Log normal risk model parameters, valid only if MODEL_LOG_NORMAL is selected. */ readonly logNormal?: components['schemas']['vegaLogNormalRiskModel']; /** @description Optional new spot market metadata, tags. */ @@ -1865,6 +2114,14 @@ export interface components { readonly dataSourceSpecForSettlementData?: components['schemas']['vegaDataSourceDefinition']; /** @description Data source spec describing the data source for settlement schedule. */ readonly dataSourceSpecForSettlementSchedule?: components['schemas']['vegaDataSourceDefinition']; + /** @description Lower bound for the funding-rate such that the funding-rate will never be lower than this value. */ + readonly fundingRateLowerBound?: string; + /** @description Factor applied to funding-rates. This scales the impact that spot price deviations have on funding payments. */ + readonly fundingRateScalingFactor?: string; + /** @description Upper bound for the funding-rate such that the funding-rate will never be higher than this value. */ + readonly fundingRateUpperBound?: string; + /** @description Composite price configuration to drive the calculation of the index price used for funding payments. If undefined the default mark price of the market is used. */ + readonly indexPriceConfiguration?: components['schemas']['vegaCompositePriceConfiguration']; /** @description Continuously compounded interest rate used in funding rate calculation, in the range [-1, 1]. */ readonly interestRate?: string; /** @description Controls how much the upcoming funding payment liability contributes to party's margin, in the range [0, 1]. */ @@ -2042,6 +2299,14 @@ export interface components { */ readonly probabilityOfTrading?: number; }; + /** + * @description Describes which property of the data source data is to be + * used for price source. + */ + readonly vegaSpecBindingForCompositePrice: { + /** @description The property name of price. */ + readonly priceSourceProperty?: string; + }; /** Spot product configuration */ readonly vegaSpotProduct: { /** @description Base asset ID. */ @@ -2172,6 +2437,8 @@ export interface components { readonly code?: string; /** @description Future. */ readonly future?: components['schemas']['vegaUpdateFutureProduct']; + /** Instrument name */ + readonly name?: string; /** @description Perpetual. */ readonly perpetual?: components['schemas']['vegaUpdatePerpetualProduct']; }; @@ -2188,6 +2455,10 @@ export interface components { readonly instrument?: components['schemas']['vegaUpdateInstrumentConfiguration']; /** @description Linear slippage factor is used to cap the slippage component of maintenance margin - it is applied to the slippage volume. */ readonly linearSlippageFactor?: string; + /** Liquidation strategy parameters */ + readonly liquidationStrategy?: components['schemas']['vegaLiquidationStrategy']; + /** @description Specifies how the liquidity fee for the market will be calculated. */ + readonly liquidityFeeSettings?: components['schemas']['vegaLiquidityFeeSettings']; /** @description Liquidity monitoring parameters. */ readonly liquidityMonitoringParameters?: components['schemas']['vegaLiquidityMonitoringParameters']; /** Liquidity SLA parameters */ @@ -2200,6 +2471,8 @@ export interface components { * price levels over which automated liquidity provisions will be deployed. */ readonly lpPriceRange?: string; + /** @description Mark price configuration. */ + readonly markPriceConfiguration?: components['schemas']['vegaCompositePriceConfiguration']; /** @description Optional futures market metadata, tags. */ readonly metadata?: readonly string[]; /** @description Price monitoring parameters. */ @@ -2238,6 +2511,14 @@ export interface components { readonly dataSourceSpecForSettlementData?: components['schemas']['vegaDataSourceDefinition']; /** @description Data source spec describing the data source for settlement schedule. */ readonly dataSourceSpecForSettlementSchedule?: components['schemas']['vegaDataSourceDefinition']; + /** @description Lower bound for the funding-rate such that the funding-rate will never be lower than this value. */ + readonly fundingRateLowerBound?: string; + /** @description Factor applied to funding-rates. This scales the impact that spot price deviations have on funding payments. */ + readonly fundingRateScalingFactor?: string; + /** @description Upper bound for the funding-rate such that the funding-rate will never be higher than this value. */ + readonly fundingRateUpperBound?: string; + /** @description Configuration for the index price used in funding payment calculation. */ + readonly indexPriceConfiguration?: components['schemas']['vegaCompositePriceConfiguration']; /** @description Continuously compounded interest rate used in funding rate calculation, in the range [-1, 1]. */ readonly interestRate?: string; /** @description Controls how much the upcoming funding payment liability contributes to party's margin, in the range [0, 1]. */ @@ -2258,6 +2539,8 @@ export interface components { }; /** Configuration to update a spot market on Vega */ readonly vegaUpdateSpotMarketConfiguration: { + /** @description Specifies how the liquidity fee for the market will be calculated. */ + readonly liquidityFeeSettings?: components['schemas']['vegaLiquidityFeeSettings']; /** @description Log normal risk model parameters, valid only if MODEL_LOG_NORMAL is selected. */ readonly logNormal?: components['schemas']['vegaLogNormalRiskModel']; /** @description Optional spot market metadata, tags. */ @@ -2356,19 +2639,14 @@ export interface operations { }; /** * List transactions - * @description List transactions from the Vega blockchain + * @description List transactions from the Vega blockchain from the newest to the oldest transactions. */ BlockExplorer_ListTransactions: { parameters: { query?: { - /** - * @description Number of transactions to be returned from the blockchain. - * This is deprecated, use first and last instead. - */ - limit?: number; - /** @description Optional cursor to paginate the request. */ + /** @description Cursor to paginate the request. It can be used in conjunction with the `after` cursor. */ before?: string; - /** @description Optional cursor to paginate the request. */ + /** @description Cursor to paginate the request. It can be used in conjunction with the `before` cursor. */ after?: string; /** @description Transaction command types filter, for listing transactions with specified command types. */ cmdTypes?: readonly string[]; @@ -2377,13 +2655,19 @@ export interface operations { /** @description Party IDs filter, can be sender or receiver. */ parties?: readonly string[]; /** - * @description Number of transactions to be returned from the blockchain. Use in conjunction with the `after` cursor to paginate forwards. - * On its own, this will return the first `first` transactions. + * @description Number of transactions to be returned from the blockchain. + * Use in conjunction with the `after` cursor to paginate forwards. Paginating forwards means toward the most recent + * transactions. + * It cannot be used in conjunction with the `before` cursor. + * On its own, this will return the `first` most recent transactions. */ first?: number; /** - * @description Number of transactions to be returned from the blockchain. Use in conjunction with the `before` cursor to paginate backwards. - * On its own, this will return the last `last` transactions. + * @description Number of transactions to be returned from the blockchain. + * Use in conjunction with the `before` cursor to paginate backwards. Paginating forwards means toward the least recent + * transactions. + * It cannot be used in conjunction with the `after` cursor. + * On its own, this will return the `last` oldest transactions. */ last?: number; };