merge from main

Author: cybele-ripple

jest.config.js

@@ -15,7 +15,6 @@ module.exports = {
   },
   transformIgnorePatterns: ['node_modules/(?!arc)/(?!d3)'],
   moduleNameMapper: {
-    '\\.svg\\?url$': '<rootDir>/testUtils/svgUrlTransform.js',
     'd3-hexbin': '<rootDir>/node_modules/d3-hexbin/build/d3-hexbin.min.js',
     d3: '<rootDir>/node_modules/d3/dist/d3.min.js',
   },

package-lock.json

@@ -87,6 +87,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "3.6.2",
     "react-error-overlay": "6.0.11",
+    "react-test-renderer": "^17.0.2",
     "sass": "^1.80.5",
     "source-map-explorer": "^2.5.3",
     "stylelint": "^15.11.0",

package.json

@@ -17,7 +17,7 @@
   "explorer": "Explorer",
   "xrpl_org": "XRPL.org",
   "github": "GitHub",
-  "header.search.placeholder": "Search by Token, Address, Ledger or Txn",
+  "header.search.placeholder": "Search by Token, Address, Ledger, Txn or VaultID",
   "xrp": "XRP",
   "xrpl_explorer": "XRPL Explorer",
   "ledgers": "Ledgers",
@@ -38,7 +38,6 @@
   "30D": "30D",
   "total_transactions": "# of Txns",
   "total_fees": "Total Fees",
-  "async_component_timedout": "Loading component took longer than expected",
   "async_component_failed": "Failed to load Component",
   "account_not_found": "Account not found",
   "account_empty_title": "No account ID was supplied",
@@ -69,6 +68,7 @@
   "transaction_legend_toggle_show": "Show Legend",
   "transactions.date_header": "Date/time (UTC)",
   "no_transactions_message": "No transactions found.",
+  "get_vault_transactions_failed": "Unable to load vault transactions at this time.",
   "retry_action": "Retry...",
   "uh_oh": "UH-OH!",
   "not_found_default_title": "Page Not Found",
@@ -80,6 +80,8 @@
   "ledger_index": "Ledger Index",
   "to": "to",
   "from": "from",
+  "request": "Request",
+  "terms": "Terms",
   "send": "Send",
   "delivered": "Delivered",
   "cancel_offer": "Cancel Offer",
@@ -170,6 +172,15 @@
   "transaction_type_name_EscrowCreate": "Escrow Create",
   "transaction_type_name_EscrowFinish": "Escrow Finish",
   "transaction_type_name_Invoke": "Invoke",
+  "transaction_type_name_LoanBrokerSet": "Loan Broker Set",
+  "transaction_type_name_LoanBrokerDelete": "Loan Broker Delete",
+  "transaction_type_name_LoanBrokerCoverDeposit": "Loan Broker Cover Deposit",
+  "transaction_type_name_LoanBrokerCoverWithdraw": "Loan Broker Cover Withdraw",
+  "transaction_type_name_LoanBrokerCoverClawback": "Loan Broker Cover Clawback",
+  "transaction_type_name_LoanSet": "Loan Set",
+  "transaction_type_name_LoanDelete": "Loan Delete",
+  "transaction_type_name_LoanManage": "Loan Manage",
+  "transaction_type_name_LoanPay": "Loan Pay",
   "transaction_type_name_MPTokenIssuanceCreate": "MPT Issuance Create",
   "transaction_type_name_MPTokenIssuanceDestroy": "MPT Issuance Destroy",
   "transaction_type_name_MPTokenIssuanceSet": "MPT Issuance Set",
@@ -264,7 +275,7 @@
   "number_of_affected_node": "It affected {{count}} nodes in the ledger:",
   "nodes_type": "{{action}} nodes",
   "node_meta_type": "It {{action}} a node with type",
-  "transaction_balance_line_one": "It <1><0>{{action}}</0></1> a <3><0>{{currency}}</0></3> RippleState node between <5><0>{{account}}</0></5> and <7><0>{{counterAccount}}</0></7>",
+  "transaction_balance_line_one": "It <1><0>{{action}}</0></1> a <4><0>{{currency}}</0></4> RippleState node between <6><0>{{account}}</0></6> and <8><0>{{counterAccount}}</0></8>",
   "transaction_balance_line_two": "Balance changed by <1><0>{{change}}</0></1> from <3><0>{{previousBalance}}</0></3> to <5><0>{{finalBalance}}</0></5>",
   "transaction_outstanding_balance_line_two": "Outstanding balance changed by <1><0>{{change}}</0></1> from <3><0>{{previousBalance}}</0></3> to <5><0>{{finalBalance}}</0></5>",
   "transaction_owned_directory": "It {{action}} a DirectoryNode node owned by",
@@ -276,13 +287,13 @@
   "account_balance_increased": "Balance increased by <1><0>{{difference}}</0><1><0>{{currency}}</0></1></1> from <3><0>{{previous}}</0><1><0>{{currency}}</0></1></3> to <5><0>{{final}}</0><1><0>{{currency}}</0></1></5>",
   "account_balance_decreased": "Balance decreased by <1><0>{{difference}}</0><1><0>{{currency}}</0></1></1> from <3><0>{{previous}}</0><1><0>{{currency}}</0></1></3> to <5><0>{{final}}</0><1><0>{{currency}}</0></1></5>",
   "decreased_from_to": "decreased by <1><0>{{change}}</0></1> from <3><0>{{previous}}</0></3> to <5><0>{{final}}</0></5>",
-  "offer_node_meta": "It <1><0>{{action}}</0></1> a <3><0>{{pair}}</0></3> offer node owned by <5><0>{{account}}</0></5> with sequence # <7><0>{{sequence}}</0></7>",
+  "offer_node_meta": "It {{action}} a <Currency/> / <Currency2/> offer node owned by <Account/> with sequence # {{sequence}}",
   "offer_replaces": "This offer replaces the existing offer #",
-  "offer_partially_filled": "The offer was partially filled",
-  "offer_filled": "The offer was filled",
-  "offer_cancelled": "The offer was cancelled",
+  "offer_partially_filled": "The offer was partially filled.",
+  "offer_filled": "The offer was filled.",
+  "offer_cancelled": "The offer was cancelled.",
   "offer_replaced": "This offer was replaced by the new offer #",
-  "offer_lack_of_funds": "The offer was partially filled, then cancelled due to lack of funds",
+  "offer_lack_of_funds": "The offer was partially filled, then cancelled due to lack of funds.",
   "transaction_sequence": "The transaction's sequence number is",
   "trust_set_description": "It establishes <1><0>{{amount}}</0></1> as the maximum amount of <3><0>{{currency}}</0></3> from <5><0>{{issuer}}</0></5> that <7><0>{{account}}</0></7> is willing to hold",
   "payment_desc_line_1": "The payment is from <source/> to <destination/>",
@@ -321,6 +332,8 @@
   "set_nftoken_minter_description": "It sets <0>{{account}}</0> as the authorized minter for this account",
   "deposit_auth": "It authorizes <1><0>{{account}}</0></1> to send payments to this account",
   "deposit_unauth": "It removes the authorization for <1><0>{{account}}</0></1> to send payments to this account",
+  "deposit_auth_credentials": "It authorizes the following credentials:",
+  "deposit_unauth_credentials": "It removes the authorization for the following credentials:",
   "invalid_xrpl_address": "Invalid XRPL address",
   "loading": "Loading",
   "get_ledger_failed": "Unable to load ledger",
@@ -348,6 +361,7 @@
   "threshold": "threshold",
   "consensus": "consensus",
   "enabled": "enabled",
+  "disabled": "disabled",
   "on_tx": "on (tx)",
   "yes": "Yes",
   "no": "No",
@@ -572,6 +586,7 @@
   "expiration": "Expiration",
   "domain_id": "Domain ID",
   "accepted_credentials": "Accepted Credentials",
+  "credential_ids": "Credential IDs",
   "data": "Data",
   "finish_function": "Finish Function",
   "quorum_description": "Min. number of trusted validations needed to confirm a ledger",
@@ -620,6 +635,28 @@
   "withdrawal_policy": "Withdrawal Policy",
   "account_creates_vault": "<Account/> created a vault for <Asset/>",
   "vault_id": "Vault ID",
+  "single_asset_vault": "Single Asset Vault",
+  "loan_broker_id": "Loan Broker ID",
+  "loan_id": "Loan ID",
+  "management_fee_rate": "Management Fee Rate",
+  "debt_maximum": "Debt Maximum",
+  "cover_rate_minimum": "Cover Rate Minimum",
+  "cover_rate_liquidation": "Cover Rate Liquidation",
+  "counterparty": "Counterparty",
+  "principal_requested": "Principal Requested",
+  "payment_total": "Payment Total",
+  "payment_interval": "Payment Interval",
+  "grace_period": "Grace Period",
+  "loan_origination_fee": "Loan Origination Fee",
+  "loan_service_fee": "Loan Service Fee",
+  "late_payment_fee": "Late Payment Fee",
+  "close_payment_fee": "Close Payment Fee",
+  "full_payment_fee": "Full Payment Fee",
+  "overpayment_fee": "Overpayment Fee",
+  "interest_rate": "Interest Rate",
+  "late_interest_rate": "Late Interest Rate",
+  "close_interest_rate": "Close Interest Rate",
+  "overpayment_interest_rate": "Overpayment Interest Rate",
   "set_vault_data": "It sets the Vault Data to <Data/>",
   "set_vault_assets_maximum": "It sets the Vault Assets Maximum to <AssetsMaximum/>",
   "set_vault_domain_id": "It sets the Vault DomainID to <DomainID/>",
@@ -636,6 +673,7 @@
   "account_flag_title_lsf_disable_master": "Master Key Disabled",
   "account_flag_title_lsf_default_ripple": "Rippling",
   "account_flag_title_lsf_allow_trustline_clawback": "Clawback",
+  "account_flag_title_lsf_allow_trustline_locking": "Escrow",
   "account_flag_title_lsf_require_destination_tag": "Require Destination Tag",
   "account_flag_title_lsf_no_freeze": "No Freeze",
   "account_flag_title_lsf_require_auth": "Require Authorization",
@@ -651,6 +689,7 @@
   "account_flag_description_lsf_disable_master": "Disable the account's master key pair.",
   "account_flag_description_lsf_default_ripple": "Enable rippling on this account's trust lines by default.",
   "account_flag_description_lsf_allow_trustline_clawback": "Allow account to claw back tokens it has issued.",
+  "account_flag_description_lsf_allow_trustline_locking": "Allow Trust Line tokens (IOUs) issued by this account to be held in escrow.",
   "account_flag_description_lsf_require_destination_tag": "Require a destination tag to send transactions to this account.",
   "account_flag_description_lsf_no_freeze": "Permanently give up the ability to freeze individual trust lines or disable Global Freeze. This flag can never be disabled after being enabled.",
   "account_flag_description_lsf_require_auth": "Require authorization for users to hold balances issued by this address.",
@@ -696,6 +735,7 @@
   "account_page_asset_table_column_asset_class": "Asset Class",
   "account_page_asset_table_column_balance": "Balance",
   "account_page_asset_table_column_balance_usd": "Balance (USD)",
+  "account_page_asset_table_column_circulating_supply": "Circ Supply",
   "account_page_asset_table_column_currency_code": "Currency Code",
   "account_page_asset_table_column_frozen": "Frozen",
   "account_page_asset_table_column_highest_bid": "Highest Bid",
@@ -717,49 +757,41 @@
   "account_page_asset_table_no_lptoken": "No LP Tokens found",
   "account_page_asset_table_no_mpt": "No MPTs found",
   "account_page_asset_table_no_nft": "No NFTs found",
-  "general_overview": "General Overview",
-  "reputation_level": "Reputation Level",
-  "market_data": "Market Data",
-  "supply": "Supply",
-  "circulating_supply": "Circulating Supply",
-  "trades_24h": "Trades (24H)",
-  "amm_tvl": "AMM TVL",
+  "tx_hash": "Tx Hash",
+  "timestamp": "Timestamp (UTC)",
+  "amount_in": "Amount In",
+  "amount_out": "Amount Out",
+  "rate": "Rate",
+  "refresh_data": "Refresh data",
   "token_page.general_overview": "General Overview",
+  "token_page.market_data": "Market Data",
+  "token_page.all_tx": "All Token Transactions",
+  "token_page.dex_tx": "DEX Trades",
+  "token_page.transfers_tx": "Transfers",
+  "token_page.holders_table": "Holders",
   "token_page.issuer": "Issuer",
   "token_page.price": "Price",
   "token_page.holders": "# of Holders",
-  "token_page.trustlines": "# of Trustlines",
-  "token_page.transfer_fee": "Transfer Fee",
-  "token_page.reputation_level": "Reputation Level",
-  "token_page.market_data": "Market Data",
   "token_page.supply": "Supply",
-  "token_page.circulating_supply": "Circ Supply",
   "token_page.market_cap": "Market Cap",
   "token_page.volume_24h": "Traded Volume (24H)",
   "token_page.trades_24h": "# of Trades (24H)",
   "token_page.amm_tvl": "AMM TVL",
-  "token_page.all_tx": "All Token Transactions",
-  "token_page.dex_tx": "DEX Trades",
-  "token_page.transfers_tx": "Transfers",
-  "token_page.holders_table": "Holders",
-  "tx_hash": "Tx Hash",
-  "timestamp": "Timestamp (UTC)",
-  "amount_in": "Amount In",
-  "amount_out": "Amount Out",
-  "rate": "Rate",
+  "token_page.transfer_fee": "Transfer Fee",
   "token_page.holders_rank": "Rank",
   "token_page.holders_num_tokens": "# of Tokens",
   "token_page.holders_percent_supply": "% of Supply",
-  "token_page.holders_usd_value": "USD Value",
   "token_page.holders_no_holders": "No holders found",
+  "token_page.holders_usd_value": "USD Value",
+  "token_page.transfers_data_notice": "Data displayed is from 7/1/2025, 12:00:00 AM UTC onwards",
+  "token_page.transfers_no_transfers": "No transfers found",
+  "token_page.circulating_supply": "Circ Supply",
   "token_page.dex_type": "Type",
   "token_page.dex_amount_in_tooltip": "The amount of tokens sent by the \"FROM\" account in the trade",
   "token_page.dex_amount_out_tooltip": "The amount of tokens sent out by the \"To\" account in the trade",
   "token_page.dex_rate_tooltip": "Amount Out / Amount In",
   "token_page.dex_data_notice": "Data displayed is from 7/1/2025, 12:00:00 AM UTC onwards",
   "token_page.dex_no_trades": "No dex trades found",
-  "token_page.transfers_data_notice": "Data displayed is from 7/1/2025, 12:00:00 AM UTC onwards",
-  "token_page.transfers_no_transfers": "No transfers found",
   "token_page.token_label": "Token",
   "token_page.category_text": "IOU",
   "token_type.iou": "IOU",
@@ -852,10 +884,14 @@
   "vaults_disclaimer": "*Only vaults utilizing XRP and assets with a Trust Level ≥1 (per <0>XRPL Meta</0>) within the stablecoin asset class are displayed.",
   "amm_pool": "AMM Pool",
   "basic_info": "Basic Info",
+  "market_data": "Market Data",
   "auction": "Auction",
   "created_on": "Created On",
+  "volume_24h_tooltip": "Total DEX trade volume on this AMM from 00:00–23:59 UTC of the previous day",
   "fees_24h": "Fees (24H)",
+  "fees_24h_tooltip": "Total trading fees earned by this AMM from 00:00–23:59 UTC of the previous day",
   "apr_24h": "APR (24H)",
+  "apr_24h_tooltip": "Annualized return based on fees from 00:00–23:59 UTC of the previous day relative to TVL",
   "current_holder": "Current Holder",
   "discounted_fee": "Discounted Trading Fee",
   "price_paid": "Price Paid",
@@ -866,6 +902,7 @@
   "withdrawals": "Withdrawals",
   "lp_tokens_received": "LP Tokens Received",
   "lp_tokens_redeemed": "LP Tokens Redeemed",
+  "tvl_and_volume": "Total Value Locked and Volume",
   "no_deposits": "No deposits found.",
   "no_withdrawals": "No withdrawals found.",
   "liquidity_providers": "Liquidity Providers",
@@ -874,24 +911,5 @@
   "asset_2": "Asset 2",
   "usd_value": "USD Value",
   "amm_pool_deleted_label": "AMM Pool Deleted",
-  "amm_pool_deleted_text": "This AMM pool has been deleted. All assets have been withdrawn and the pool is no longer active. Historical data is still available below.",
-  "refresh_data": "Refresh data",
-  "amms": "AMMs",
-  "top_1000_amms": "Top 1,000 AMMs",
-  "pool": "Pool",
-  "apy": "APY",
-  "actions": "Actions",
-  "view": "View",
-  "general_info": "General Info",
-  "number_of_amms": "# of AMMs",
-  "number_of_lps": "# of LPs",
-  "24h_volume": "24h Volume",
-  "tvl_and_volume": "TVL and Volume",
-  "apr_tooltip": "Annualized 24H fees",
-  "trading_fee_tooltip": "Accumulated fees in this pool in the last 24H",
-  "volume_24h_tooltip": "Total DEX trade volume on this AMM from 00:00–23:59 UTC of the previous day",
-  "fees_24h_tooltip": "Total trading fees earned by this AMM from 00:00–23:59 UTC of the previous day",
-  "apr_24h_tooltip": "Annualized return based on fees from 00:00–23:59 UTC of the previous day relative to TVL",
-  "number_of_amms_tooltip": "Number of active AMM pools with deposit/withdrawal activity",
-  "number_of_lps_tooltip": "Number of unique liquidity providers across all AMM pools"
+  "amm_pool_deleted_text": "This AMM pool has been deleted. All assets have been withdrawn and the pool is no longer active. Historical data is still available below."
 }

public/locales/en-US/translations.json

@@ -169,16 +169,3 @@ module.exports.getLedger = (parameters) => {
     return resp.ledger
   })
 }
-
-// get AMM info by AMM account ID
-module.exports.getAMMInfo = (ammAccountId) =>
-  query({
-    command: 'amm_info',
-    amm_account: ammAccountId,
-    ledger_index: 'validated',
-  }).then((resp) => {
-    if (resp.error_message) {
-      throw new utils.Error(resp.error_message, 500)
-    }
-    return resp
-  })

server/lib/rippled.js

@@ -1,18 +1,12 @@
 const api = require('express').Router()
 const getHealth = require('./health')
 const getCurrentMetrics = require('./currentMetrics')
-const {
-  getTokensSearch,
-  getAllTokens,
-  batchGetTokens,
-  getTokenById,
-} = require('./tokens')
+const { getTokensSearch, getAllTokens } = require('./tokens')
 const {
   getVaults,
   getVaultsAggregateStats,
   getVaultAssetPrices,
 } = require('./vaults')
-const { getAMMs, getAggregatedStats, getHistoricalTrends } = require('./amms')
 
 api.use('/healthz', (_req, res) => {
   res.status(200).send('success')
@@ -26,10 +20,6 @@ if (process.env.VITE_ENVIRONMENT !== 'custom') {
   api.get('/vaults/aggregate-statistics', getVaultsAggregateStats)
   api.get('/vaults/asset-prices', getVaultAssetPrices)
   api.get('/vaults', getVaults)
-  // AMM endpoints
-  api.use('/amms/aggregated', getAggregatedStats)
-  api.use('/amms/historical-trends', getHistoricalTrends)
-  api.use('/amms', getAMMs)
 }
 
 module.exports = api

server/routes/v1/index.js

@@ -1,4 +1,5 @@
-import { Route, useLocation, Routes, Navigate } from 'react-router-dom'
+import { Route, useLocation, Routes } from 'react-router'
+import { Navigate } from 'react-router-dom'
 import { Helmet, HelmetProvider } from 'react-helmet-async'
 import { QueryClientProvider } from 'react-query'
 import { useTranslation } from 'react-i18next'
@@ -30,7 +31,6 @@ import {
   TOKENS_ROUTE,
   VAULTS_ROUTE,
   AMM_POOL_ROUTE,
-  AMM_RANKINGS_ROUTE,
 } from './routes'
 import { LedgersPage as Ledgers } from '../Ledgers'
 import { Ledger } from '../Ledger'
@@ -53,7 +53,6 @@ import { Vault } from '../Vault'
 import { Vaults } from '../Vaults'
 import { AMMPool } from '../AMMPool'
 import { FEATURE_VAULTS_PAGE } from './featureFlags'
-import { AMMRankings } from '../AMMRankings'
 
 export const AppWrapper = () => {
   const mode = process.env.VITE_ENVIRONMENT
@@ -88,7 +87,6 @@ export const AppWrapper = () => {
       [VALIDATOR_ROUTE, Validator],
       [TOKEN_ROUTE, mode === 'mainnet' ? IOU : TokenNonMain],
       [TOKENS_ROUTE, Tokens],
-      [AMM_RANKINGS_ROUTE, AMMRankings],
       [NFT_ROUTE, NFT],
       [AMENDMENT_ROUTE, Amendment],
       [MPT_ROUTE, MPT],