blockscout

Commit Graph

Author	SHA1	Message	Date
nikitosing	23419e7180	fix: Fix incorrect image_url parsing from NFT meta (#9956 ) * fix: Fix incorrect image_url parsing from NFT meta * Add regression test	7 months ago
Victor Baranov	9e64ff8d6e	IPFS gateway URL extra params (#9898 ) * IPFS gateway URL authentication params * Fix cspell * Fix explorer tests * Add IPFS gateway URL custom header support * Parse cataloged value of IPFS_GATEWAY_URL_PARAM_LOCATION * Update apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex Co-authored-by: Qwerty5Uiop <105209995+Qwerty5Uiop@users.noreply.github.com> * Update apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex Co-authored-by: Qwerty5Uiop <105209995+Qwerty5Uiop@users.noreply.github.com> * Process review comments * Return exit(:shutdown) --------- Co-authored-by: Qwerty5Uiop <105209995+Qwerty5Uiop@users.noreply.github.com>	7 months ago
Victor Baranov	ac2ff4638e	Zerion API proxy (#9896 ) * Zerion API proxy * Add envs to common-blockscout.env * Change proxy endpoint path	7 months ago
varasev	97fccb1601	feat: Support the 2nd version of L2<->L1 Polygon zkEVM Bridge (#9637 ) * Add support for Polygon zkEVM bridge v2 (draft version) * Refactoring for mix credo * Fix config/runtime.exs * Support arbitrary network ids * Additional env variables * Fixes for the bridge * Update changelog * Fix spelling * mix format * Sanitize token decimals in zkevm and tx action modules * Small refactoring * Update spelling --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com>	8 months ago
nikitosing	788058add8	fix: Fix UTF-8 json handling in NFT metadata fetching (#9707 ) * fix: Fix UTF-8 json handling in NFT metadata fetching * Fix cspell * Process review comment * Fix tests	8 months ago
varasev	2b686a6213	chore: Temporarily ignore OP batches written to Celestia (#9734 ) * Ignore OP batches written to Celestia * Add Celestia to cspell.json * Fix typo in Indexer.Transform.Optimism.Withdrawals --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com>	8 months ago
Maxim Filonov	dea361d56f	Add secondary coin and transaction stats (#9483 ) * Add volume_24h * Add secondary coin and transactions stats * Process review comments * Allow different source for secondary coin * Fix exchange_rates_secondary_coin_price_source --------- Co-authored-by: Nikita Pozdniakov <nikitosing4@mail.ru>	8 months ago
Alexander Kolotov	51d82f1dbf	zksync chain type support (#9631 ) * zkSync customizations * Insert placeholders instead of deriving current token balances * ZkSync Batches status tracking (#9080) * initial version of batch tracking * missed file added * attempt to add DB migration * Finalized L1 txs tracking * keep batches in DB * Batches statuses tracker introduction * rpc endponts to get batches data * extended views for blocks and transactions * Refactoring of fetchers * Fetch historical blocks * handle_info calls simplified * Ability to recover missed blocks * zksync info in a separate sub-map * added doc comments, part 1 * finalized doc comments * actual bathes count instead of the last imported batch * fix formatting * credo fixes * Address dialyzer warnings * Fix spelling * remaining issues with spelling and dialyzer * Attempt to address BlockScout Web Tests issue * review comments addressed, part 1 * review comments addressed, part 2 * collection all_options for import module reworked to get rid of dialyzer findings * removed unnecessary functionality * proper import * Credo fixes * Add CHAIN_TYPE=zksync to image generation workflow * Proper handling of empty transactions list in etc_getBlockByNumber * Merge master * Address merge issues * Fix format * Refactoring of chain type specific code for block and transaction views * Consistent name for functions * add exceptions for Credo.Check.Design.AliasUsage * Fix rebasing conflicts * Fix rebase conflicts * fix issue with stability fees in tx view * make Stability related tests dependent on chain type in compile time * move zksync related migration * Changelog updated * removal of duplicated migration * List r,s,v as optional attributes for transaction --------- Co-authored-by: Viktor Baranov <baranov.viktor.27@gmail.com> Co-authored-by: Qwerty5Uiop <alex000010@bk.ru>	9 months ago
Victor Baranov	610f6223ab	API v1 bridgedtokenlist endpoint (#9506 ) * bridgedtokenlist API endpoint * Change spec for bridged_token_usd_cap function * Fix review comments * Return bridged_token_usd_cap as string	9 months ago
varasev	ce5e2f54e4	Support Optimism Ecotone upgrade by Indexer.Fetcher.Optimism.TxnBatch module (#9571 ) * Draft for Ecotone support by Indexer.Fetcher.Optimism.TxnBatch module * Small refactoring * Use RollupL1ReorgMonitor for Optimism * Move EIP-4844 decode function to Explorer.Chain.Optimism.TxnBatch * Small refactoring * Update changelog * Update cspell.json * Extend logs * Fix init_continue in Indexer.Fetcher.Optimism * mix format --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com>	9 months ago
Viktor Baranov	7a7a424f9e	Fix format and cspell tests	9 months ago
Victor Baranov	9819522ea1	Optimism chain type (#9460 ) * Transaction page L1 fields * Path fix * Reduce the number of files from 19 to 5 in logs rotate config * Customize optimism-goerli deployment * Optimism branding * Remove testnet logo text. OG uses customized label * Fix Circles theme * L1 tx fields fix for Optimism BedRock update * Remove redundant line * Add gas_price handling for elixir_to_params and change function ordering * Remove l1TxOrigin handling for another version of RPC * Add GA * Fix realtime fetcher test * Update Changelog * Fix internal transactions processing for non-consensus blocks * Lose consensus only for consensus=true blocks * Fix handling transaction RPC responses without some fields * Fix tests except for indexer module * Add Optimism BedRock support (Txn Batches, Output Roots, Deposits, Withdrawals) (#6980) * Add op_output_roots table * Add OptimismOutputRoots runner * Add initial code for output roots fetcher * Add checks to init function * Partially add logs and L1 reorgs handling * Add reorgs handling * Add RPC retries * Write output roots to database * Log output roots handling * Update indexer README * Add API v2 for Optimism Output Roots * Add op_withdrawals table * Add OptimismWithdrawals runner * Prepare realtime optimism withdrawals fetching * Add realtime optimism withdrawals fetching * Define checks in init function * log.first_topic can be nil * Show total count of output roots in API v2 * Add msg_nonce gaps filler * Refactoring * Intermediate refactoring * Add historical withdrawals handling and refactor * Finish op_withdrawals table filling * Small refactoring * Add op_withdrawal_events table * Add OptimismWithdrawalEvents runner * Add OptimismWithdrawalEvent fetcher * Update indexer README * Add API v2 for Optimism Withdrawals * Add env variables to common-blockscout.env and Makefile * Set `from` as address object instead of just address hash for withdrawal * mix format * Add op_transaction_batches table * Add OptimismTxnBatches runner * Add a draft for OptimismTxnBatch fetcher * Add a draft for OptimismTxnBatch * Extend a draft for OptimismTxnBatch * Extend OptimismTxnBatch * Finish OptimismTxnBatch (without reorgs handling yet) * Optimize OptimismTxnBatch fetcher * Remove duplicated txn batches * Add zlib_inflate_handler for empty case * Add reorgs handling for txn batches * Fix reorgs handling for txn batches * Small refactor * Finish Indexer.Fetcher.OptimismTxnBatch (without refactoring yet) * Apply new ex_rlp version * Add API v2 for Optimism Txn Batches * Add env variables to common-blockscout.env and Makefile * Refactor OptimismTxnBatch fetcher for mix credo * Replace binary_slice with binary_part function to run with Elixir 1.13 * Update changelog * Update indexer readme * Rename op_withdrawals.l2_tx_hash field to l2_transaction_hash * Rename l1_tx_hash fields to l1_transaction_hash * Rename tx fields to transaction fields * Rename env variables * Rename env variables * Add an indexer helper * Add an indexer helper * Small refactoring * Fix tx_count for txn batches view * Use EthereumJSONRPC.Block.ByHash instead of the raw call * Infinity timeout for blocks query * Small refactoring * Refactor init function for two modules * Small refactoring * Rename l1_transaction_timestamp field to l1_timestamp * Rename withdrawal_hash field to hash * Refactor for decode_data function * Refactor for mix credo * Add INDEXER_OPTIMISM_L1_BATCH_BLOCKS_CHUNK_SIZE env and small refactoring * Add INDEXER_OPTIMISM_L1_BATCH_BLOCKS_CHUNK_SIZE env to other files * Add an index for l1_block_number field * Add an index for l1_block_number field * Remove redundant :ok * Use faster way to count rows in a table * Refactor reorgs monitor functions * Clarify frame structure * Reduce storage consumption for optimism transaction batches * Reuse CacheHelper.estimated_count_from function * Bedrock optimism deposits (#6993) * Create `op_deposits` table * Add OptimismDeposit runner * WIP Fetcher * Finish fetcher * Integrate deposits into APIv2 * Add envs * Fix requests * Remove debug * Update envs names * Rename `tx` -> `transaction` * Reuse `decode_data/2` * Fix review * Add `uninstall_filter` * Fix formatting * Switch to realtime mode more carefully * Fix review Allow nil in timestamp Add progress logging Improve check_interval calculation * Fix logging and env * Fix Association.NotLoaded error * Replace switching to realtime mode log * Remove excess start_block * Fix reorg logging * Fix `from_block` > `to_block` and add realtime logging * Fix block boundaries --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com> * mix format * Return total count of L2 entity by a separate API request * Filter by consensus blocks * Parallelize tx count operation and small refactoring * Use read replica for L2 entities in API * Parse block_number and tx_hash for Optimism Deposits module * Return page_size back to 50 * Small fixes and refactoring * Update apps/block_scout_web/lib/block_scout_web/api_router.ex Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com> * Small optimization * Use ecto association instead of explicit join for txn batches * Refactoring * Use Stream inspead of Enum * Small refactoring * Add assoc for transaction batches in OptimismFrameSequence * Use common reorg monitor for Optimism modules * Rename Explorer.Helpers to Explorer.Helper * Don't start an optimism module unless the main optimism module is not started * Don't start reorg monitor for optimism modules when it is not needed * Small refactoring * Remove debug broadcasting * Add Optimism BedRock Deposits to the main page in API (#7200) * Add Optimism BedRock Deposits to the main page in API * Update changelog * Pass the number of deposits instead of only one item per once --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com> * Refactor for credo * Output L1 fields in API v2 for transaction page * Update changelog * Use helper * Refactor Indexer.Fetcher.Optimism * Fix l1_timestamp issue in OptimismTxnBatch fetcher * Reset Logger metadata before Indexer.Transform.OptimismWithdrawals.parse function finishes * Fix IDs ordering in remove_duplicates function of Indexer.Fetcher.OptimismTxnBatch * Consider rewriting of the first frame in Indexer.Fetcher.OptimismTxnBatch * Fix Indexer.Fetcher.OptimismTxnBatch (consider chunking) * Fix Indexer.Fetcher.OptimismTxnBatch * Fix handling invalid frame sequences in Indexer.Fetcher.OptimismTxnBatch * Read Optimism finalization period from a smart contract * Fixes for dialyzer * Fix for EthereumJSONRPC tests * Fixes for Explorer tests * Fixes for Explorer tests * Fix of block/realtime/fetcher_test.exs * mix format and small fixes for block_scout_web tests * Reset GA cache * Fix handling nil in PendingBlockOperation.estimated_count() --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com> Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com> * Fix autocomplete * Fix merging conflicts * Add exit handler to Indexer.Fetcher.OptimismWithdrawal * Fix transactions ordering in Indexer.Fetcher.OptimismTxnBatch * Update changelog * Refactor to fix credo * Mix credo fix * Fix transaction batches module for L2 OP stack (#7827) * Fix mixed transactions handling in Indexer.Fetcher.OptimismTxnBatch * Ignore duplicated frame * Update changelog * Add sorting to the future frames list * Change list order --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com> * Remove unused aliases * Ignore previously handled frame by OP transaction batches module (#8122) * Ignore duplicated frame * Update changelog --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com> * Return alias for Explorer.Chain.Cache.Helper in chain.ex * Ignore invalid frame by OP transaction batches module (#8208) * Update changelog * Ignore invalid frame * Update changelog --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com> * Fix Indexer.Fetcher.OptimismTxnBatch * Fix API v2 for OP Withdrawals * Refactor optimism fetchers init * Add log for switching from fallback url * Fix for Indexer.Fetcher.OptimismTxnBatch * Add OP withdrawal status to transaction page in API (#8702) * Add OP withdrawal status to transaction page in API * Update changelog * Small refactoring * Update .dialyzer-ignore --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com> * Add start pause to `Indexer.Fetcher.OptimismTxnBatch` * Small refactor of `Indexer.Fetcher.OptimismTxnBatch` * Consider consensus block only when retrieving OP withdrawal transaction status (#8811) * Consider consensus block only when retrieving OP withdrawal transaction status * Update changelog * Clear GA cache --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com> * Hotfix for optimism_withdrawal_transaction_status function * Return all OP Withdrawals bound to L2 transaction * Try to import config * Remove unused functions from Explorer.Chain * Refactor for mix credo * Fix order of proxy standards: 1167, 1967 * Fixes in Optimism due to changed log topics type * Fix for EthereumJSONRPC tests * Clear GA cache and update cspell.json * Fix indexer tests * Return current exchange rate in api/v2/stats * Fix log decoding bug * Temp disable build of image for arm64 * Rewrite Indexer.Fetcher.OptimismTxnBatch module * Add handling of span batches * Add support of latest block for Optimism modules * Update changelog and spelling * Rewrite Indexer.Fetcher.OptimismTxnBatch module * Add handling of span batches * Add support of latest block for Optimism modules * Refactoring * Partially add specs and docs for public functions * Refactoring * add an entry to CHANEGELOG.md * apply review (use origin entity instead of joined entity in with tx status) * Fixes after rebase * Remove old UI sustomizations * Optimism chain type * Change structure of folders * Fixes after review * Fix CHANGELOG * Fixes after 2nd review * Process 3d review: add tests for fee/2 function * Process 4th review * Review fix: move Op related functions from chain.ex * Review fix: make OptimismFinalizationPeriod configurable * Process review comment * System.get_env("CHAIN_TYPE") => Application.get_env(:explorer, :chain_type) --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com> Co-authored-by: Qwerty5Uiop <alex000010@bk.ru> Co-authored-by: varasev <33550681+varasev@users.noreply.github.com> Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com> Co-authored-by: rlgns98kr <rlgns98kr@gmail.com>	9 months ago
Viktor Baranov	0a69f47795	Fix parsing contract creation	9 months ago
Viktor Baranov	6bf70ae7bf	Filecoin JSON RPC variant	9 months ago
Qwerty5Uiop	42425edef8	Null round handling (#9403 ) * Null round handling * Add repo for filecoin chain type * Add repo for filecoin chain type * Modify gas price constraint for Filecoin as it for PolygonEdge * Fix null round heights db type * Add filecoin to chain-type matrix --------- Co-authored-by: Viktor Baranov <baranov.viktor.27@gmail.com>	9 months ago
POA	816b5d1844	mix format and update spelling	9 months ago
POA	033ffb5132	Update spelling	9 months ago
Qwerty5Uiop	ae1915482a	Filter non-traceable transactions for zetachain	9 months ago
Victor Baranov	00ce0f0480	Parse contract codes and balances from custom genesis.json (#9349 ) * Parse contract codes and balances from custom genesis.json * Process reviewer comment * Process reviewer comment	9 months ago
nikitosing	a47d83f0be	Add bridged tokens functionality, could be enabled by compile time en… (#9169 ) * Add bridged tokens functionality, could be enabled by compile time env var * Process reviewer's comment * Fix credo * Process review comments * Reset GA cache * Fix warning	10 months ago
Maxim Filonov	47cef53dbf	Fix getblockreward; Add getblockcountdown actions	10 months ago
varasev	c7724f51df	Shibarium Bridge indexer and API v2 extension (#8929 ) * Define shibarium_bridge table * Add ShibariumBridgeOperations runner * Add init for Indexer.Fetcher.Shibarium.L1 * Draft for Indexer.Fetcher.Shibarium.L1 * mix format for Indexer.Fetcher.Shibarium.L1 * Fix Indexer.Fetcher.Shibarium.L1 * Refactor Indexer.Fetcher.Shibarium.L1 * Add draft (incomplete) for Indexer.Fetcher.Shibarium.L2 * Extend draft (incomplete) for Indexer.Fetcher.Shibarium.L2 * Extend draft (incomplete) for Indexer.Fetcher.Shibarium.L2 * Complete unrefactored Indexer.Fetcher.Shibarium.L2 * Improve Indexer.Fetcher.Shibarium.L2 * Prepare Indexer.Fetcher.Shibarium.L2 for transformer * Add unrefactored Indexer.Transform.Shibarium.Bridge * Small refactoring of Shibarium modules * Refactoring * Add API v2 for Shibarium Deposits and Withdrawals * Small fixes * Update changelog * Fixes and refactoring * Partially add specs and docs * Partially add specs and docs * Log topic type changed to bytea * Small improvements * Cache deposits and withdrawals counters for Shibarium * Fixes for credo * Fixes for Chain.import related to CHAIN_TYPE * Reset GA cache * Small refactoring * Update mix.exs * Remove unnecessary credo ignore --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com> Co-authored-by: Viktor Baranov <baranov.viktor.27@gmail.com>	10 months ago
nikitosing	7f0cdc843c	New RPC API endpoints (#9068 ) * Done tokennfttx endpoint * Add solidity-single-file verification option to verifysourcecode endpoint * Fix tokentx bug * Add verifyproxycontract and checkproxyverification endpoints * Do not return twin contracts in getsourcecode RPC API endpoint * Process review comments * Update messages * Reset GA cache	10 months ago
Viktor Baranov	9825192aba	Noves.fi API proxy	11 months ago
Viktor Baranov	05242dbb66	Allow payable function with output appear in the Read tab	11 months ago
Qwerty5Uiop	fd13a8c269	Denormalization migration + dynamic logic support	11 months ago
Maxim Filonov	f2a79e45da	Expand gas price oracle functionality	11 months ago
Nikita Pozdniakov	f0b05faace	Add ACCOUNT_WATCHLIST_NOTIFICATIONS_LIMIT_FOR_30_DAYS	12 months ago
Viktor Baranov	c761c52eac	Solidityscan report API endpoint	12 months ago
Maxim Filonov	d275b2256d	Add general sorting for any scheme	12 months ago
Viktor Baranov	95b3101483	Smart-contract proxy detection refactoring	1 year ago
varasev	e9522deb1e	Suave functional (#8556 ) * Add execution_node field indexing * Add `wrapped` field (and its subfields) indexing * Add allowed_peekers field for transaction to API v2 response * Add execution_node field for transaction to API v2 response * Add Suave fields for regular transaction to API v2 response * Add API v2 endpoint for transactions filtered by execution node * Add index for execution_node field * Small fixes * Update changelog * Fix for CHAIN_TYPE, backward compatibility * Update spelling * Fix for dyalizer * Fix default_on_conflict * Fix test.exs * Fix view for Suave transaction * Add Suave-specific comments * mix format * Set pool_size to 1 for suave * Small refactoring for repo * mix format, mix dialyzer --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com>	1 year ago
POA	977c653503	Add new words to cspell.json	1 year ago
Viktor Baranov	e485c1d7d9	DefiLlama TVL source	1 year ago
Victor Baranov	3421d84c93	Merge pull request #8252 from blockscout/mf-rootstock-tx-types Add remasc and bridge tx types	1 year ago
varasev	3235ab1caa	Deposits and Withdrawals for Polygon Edge (#8180 ) * Prepare tables for Polygon Supernet Withdrawals module * Prepare Indexer.Fetcher.PolygonSupernetWithdrawal * Prepare Indexer.Fetcher.PolygonSupernetWithdrawalExit * Prepare tables for Polygon Supernet Deposits module * Partially add Polygon Supernet Deposits module * Add Polygon Supernet Deposits module * Extend transaction data in API v2 for Polygon Supernet Deposits and Withdrawals * Extend API v2 for list of Polygon Supernet Deposits * Extend API v2 for list of Polygon Supernet Withdrawals * Modify collated_gas_price constraint to support Immutable test chain * Update number of retries * Fix Indexer.Fetcher.PolygonSupernetWithdrawal * Fix API v2 for Indexer.Fetcher.PolygonSupernetWithdrawal * Return page_size to 50 * Fix API v2 for Indexer.Fetcher.PolygonSupernetDeposit * Fix Explorer.Validator.MetadataRetriever to prevent sending request to nil address * Refactor PolygonSupernet* modules * Refactor PolygonSupernet* modules * Small refactoring of PolygonSupernet* modules * Update changelog * Fixes for dialyzer and cspell * Fix of Explorer tests * Add env vars for docker * Add env variable for eth_getLogs * Share event signatures between modules * Refactoring for fill_block_range function * Small refactoring of transaction actions module * Move polygon_supernet_* modules to a separate folder * Add specs for public functions * Remove redundant function * Reuse decode_data function * Move polygon_supernet_* files into a separate folder * Move polygon_supernet_* files into a separate folder * Partially disband Explorer.Chain module * Define chain type * Remove infinite waiting for safe block * max format * Rename Polygon Supernet to Polygon Edge * Set INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE to polygon_edge if CHAIN_TYPE is polygon_edge * Fix chain type definition * Fix repos list definition in releases_tasks * INDEXER_POLYGON_SUPERNET_ -> INDEXER_POLYGON_EDGE_ --------- Co-authored-by: POA <33550681+poa@users.noreply.github.com> Co-authored-by: Viktor Baranov <baranov.viktor.27@gmail.com>	1 year ago
Viktor Baranov	b1ab8bcc77	Fix market cap calculation in case of CMC	1 year ago
Nikita Pozdniakov	cd201e83dc	Add sitemap.xml	1 year ago
Nikita Pozdniakov	3c8c1d014c	Reset GA cache; Process review comment	1 year ago
Viktor Baranov	885d925b06	Arm compatible docker image	1 year ago
Viktor Baranov	033ced834f	Extend cspell config	2 years ago
Maxim Filonov	bbf0a07de2	Add .exs and .eex checking in cspell	2 years ago
dependabot[bot]	9d96f3b45d	Bump httpoison from 1.8.2 to 2.1.0 and remove Wobserver dep (#7084 ) * Bump httpoison from 1.8.2 to 2.1.0 Bumps [httpoison](https://github.com/edgurgel/httpoison) from 1.8.2 to 2.1.0. - [Release notes](https://github.com/edgurgel/httpoison/releases) - [Commits](https://github.com/edgurgel/httpoison/compare/v1.8.2...v2.1.0) --- updated-dependencies: - dependency-name: httpoison dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Remove wobserver --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Viktor Baranov <baranov.viktor.27@gmail.com>	2 years ago
sl1depengwyn	da4d64a181	Extend spell check for .env and makefile	2 years ago
sl1depengwyn	f08c7dbe0c	Fix `formating` in spell check	2 years ago
Viktor Baranov	c7a557129e	Fix spell in namings, add spell checking in CI	2 years ago

47 Commits (6f5dc3b5d365b0b0e3c2ce1ade3bed67ea9331aa)