Feature/remove raw

CHANGES.md

@@ -691,7 +691,7 @@ The following data models were either modified, added, removed, or renamed by ha
 - #3232 chifra daemon scrape values invalid
 - #3229 Indexing an unsupported EVM chain
 - #3227 chifra state cores
-- #3226 chifra abis should have a --raw option
+- #3226 chifra abis should have a --r aw option
 - #3225 Utilize BlockRange on eth_getLogs querys
 - #3223 ABI docs are vague and unclear
 - #3221 chifra blocks reports error incorrectly
@@ -1342,7 +1342,7 @@ There were no changes to the [Specification for the Unchained Index](https://tru
 - Many additional tests for all subcommands
 - Removed a fair amount of the C++ library testing code as being not needed and in preparation for porting to C++
 - Re-wrote logger package to more closely mimic the new GoLang structured log package which we will be switching to soon - if you depend on our logging messages for anything, please note that they will change.
-- Made sure RPC and Raw data agrees
+- Made sure RPC is valid
 
 ## Changes to Data Models
 

docs/content/chifra/accounts.md

@@ -71,7 +71,6 @@ Notes:
 Data models produced by this tool:
 
 - [appearance](/data-model/accounts/#appearance)
-- [appearancecount](/data-model/accounts/#appearancecount)
 - [bounds](/data-model/accounts/#bounds)
 - [monitor](/data-model/accounts/#monitor)
 
@@ -161,7 +160,6 @@ Notes:
 Data models produced by this tool:
 
 - [appearance](/data-model/accounts/#appearance)
-- [appearancecount](/data-model/accounts/#appearancecount)
 - [function](/data-model/other/#function)
 - [log](/data-model/chaindata/#log)
 - [message](/data-model/other/#message)

docs/content/chifra/chaindata.md

@@ -16,7 +16,7 @@ weight: 21000
 toc: true
 ---
 
-The Chain Data group of tools extract raw blockchain data directly from the node. You may extract
+The Chain Data group of tools extract blockchain data directly from the node. You may extract
 block data, transactional data, receipts, logs, traces, and other information. Each tool has it own
 set of options, allowing you to get exactly the data you need.
 
@@ -59,7 +59,6 @@ Flags:
   -a, --articulate        for the --logs option only, articulate the retrieved data if ABIs can be found
   -U, --count             display only the count of appearances for --addrs or --uniq
   -H, --ether             specify value in ether
-  -w, --raw               report JSON data from the source with minimal processing
   -o, --cache             force the results of the query into the cache
   -D, --decache           removes related items from the cache
   -x, --fmt string        export format, one of [none|json*|txt|csv]
@@ -82,8 +81,8 @@ Data models produced by this tool:
 - [appearance](/data-model/accounts/#appearance)
 - [block](/data-model/chaindata/#block)
 - [blockcount](/data-model/chaindata/#blockcount)
+- [lightblock](/data-model/chaindata/#lightblock)
 - [log](/data-model/chaindata/#log)
-- [logfilter](/data-model/chaindata/#logfilter)
 - [message](/data-model/other/#message)
 - [trace](/data-model/chaindata/#trace)
 - [traceaction](/data-model/chaindata/#traceaction)
@@ -97,8 +96,7 @@ Links:
 
 ## chifra transactions
 
-The `chifra transactions` tool retrieves transactions directly from the Ethereum node (using the `--raw`
-option) or from the TrueBlocks cache (if present). You may specify multiple transaction identifiers
+The `chifra transactions` tool retrieves transactions directly from the Ethereum node or from the TrueBlocks cache (if present). You may specify multiple transaction identifiers
 per invocation. Unlike the Ethereum RPC, the reported transactions include the transaction's receipt
 and generated logs.
 
@@ -129,7 +127,6 @@ Flags:
   -m, --emitter strings   for the --logs option only, filter logs to show only those logs emitted by the given address(es)
   -B, --topic strings     for the --logs option only, filter logs to show only those with this topic(s)
   -H, --ether             specify value in ether
-  -w, --raw               report JSON data from the source with minimal processing
   -o, --cache             force the results of the query into the cache
   -D, --decache           removes related items from the cache
   -x, --fmt string        export format, one of [none|json*|txt|csv]
@@ -181,7 +178,6 @@ Arguments:
 
 Flags:
   -a, --articulate   articulate the retrieved data if ABIs can be found
-  -w, --raw          report JSON data from the source with minimal processing
   -o, --cache        force the results of the query into the cache
   -D, --decache      removes related items from the cache
   -x, --fmt string   export format, one of [none|json*|txt|csv]
@@ -227,7 +223,6 @@ Flags:
   -m, --emitter strings   filter logs to show only those logs emitted by the given address(es)
   -B, --topic strings     filter logs to show only those with this topic(s)
   -a, --articulate        articulate the retrieved data if ABIs can be found
-  -w, --raw               report JSON data from the source with minimal processing
   -o, --cache             force the results of the query into the cache
   -D, --decache           removes related items from the cache
   -x, --fmt string        export format, one of [none|json*|txt|csv]
@@ -245,7 +240,6 @@ Data models produced by this tool:
 
 - [function](/data-model/other/#function)
 - [log](/data-model/chaindata/#log)
-- [logfilter](/data-model/chaindata/#logfilter)
 - [message](/data-model/other/#message)
 - [parameter](/data-model/other/#parameter)
 
@@ -280,7 +274,6 @@ Flags:
   -f, --filter string   call the node's trace_filter routine with bang-separated filter
   -U, --count           display only the number of traces for the transaction (fast)
   -H, --ether           specify value in ether
-  -w, --raw             report JSON data from the source with minimal processing
   -o, --cache           force the results of the query into the cache
   -D, --decache         removes related items from the cache
   -x, --fmt string      export format, one of [none|json*|txt|csv]

docs/content/chifra/globals.md

@@ -78,20 +78,18 @@ Where:
 
 ### Group 4
 
-The tools in this group have all of the above options, but have an additional option, `--raw`, which shows the underlying data queried directly from the node (or API provider in the case of `slurp`).
-
-| Group      | Cmd          | Enabled                    | Disabled |
-| ---------- | ------------ | -------------------------- | -------- |
-| chain_data | blocks       | Cache, Decache, Ether, Raw |          |
-| chain_data | transactions | Cache, Decache, Ether, Raw |          |
-| chain_data | receipts     | Cache, Decache, Ether, Raw |          |
-| chain_data | logs         | Cache, Decache, Ether, Raw |          |
-| chain_data | traces       | Cache, Decache, Ether, Raw |          |
-| other      | slurp        | Cache, Decache, Ether, Raw |          |
-
-Where:
-
-      --raw                passes the data queried from the node directly to the display
+**As of version 2.6.0, the `--r aw` option has been removed in  its entirity.
+Prior to that version, the following tools had this option which would pass
+the data received directly from the node without modification.**
+
+```[bash]
+chifra blocks
+chifra transactions
+chifra receipts
+chifra logs
+chifra traces
+chifra slurp
+```
 
 ### Group 5
 

docs/content/chifra/other.md

@@ -96,7 +96,6 @@ Flags:
   -U, --count           for --appearances mode only, display only the count of records
   -s, --sleep float     seconds to sleep between requests (default 0.25)
   -H, --ether           specify value in ether
-  -w, --raw             report JSON data from the source with minimal processing
   -o, --cache           force the results of the query into the cache
   -D, --decache         removes related items from the cache
   -x, --fmt string      export format, one of [none|json*|txt|csv]
@@ -118,7 +117,6 @@ Data models produced by this tool:
 - [monitor](/data-model/accounts/#monitor)
 - [parameter](/data-model/other/#parameter)
 - [slurp](/data-model/other/#slurp)
-- [slurpcount](/data-model/other/#slurpcount)
 
 Links:
 

docs/content/data-model/accounts.md

@@ -128,24 +128,6 @@ Names consist of the following fields:
 | isErc20    | `true` if the address is an ERC20, `false` otherwise                                | bool    |
 | isErc721   | `true` if the address is an ERC720, `false` otherwise                               | bool    |
 
-## AppearanceCount
-
-The `appearanceCount` data model is used mostly by the frontend explorer application. It carries
-various information about the monitor data for an address.
-
-The following commands produce and manage AppearanceCounts:
-
-- [chifra list](/chifra/accounts/#chifra-list)
-- [chifra export](/chifra/accounts/#chifra-export)
-
-AppearanceCounts consist of the following fields:
-
-| Field    | Description                                               | Type    |
-| -------- | --------------------------------------------------------- | ------- |
-| address  | the address for this count                                | address |
-| nRecords | the number of appearances for the given address           | uint64  |
-| fileSize | the size of the monitor file containing those appearances | uint64  |
-
 ## Bounds
 
 The Bounds data model displays information about a given address including how many times it's appeared on the chain and when the first and most recent blocks, timestamps, and dates are.

docs/content/data-model/chaindata.md

@@ -40,7 +40,7 @@ Blocks consist of the following fields:
 | difficulty    | the computational difficulty at this block                    | value                                               |
 | timestamp     | the Unix timestamp of the object                              | timestamp                                           |
 | date          | the timestamp as a date (calculated)                          | datetime                                            |
-| transactions  | a possibly empty array of transactions or transaction hashes  | [Transaction[]](/data-model/chaindata/#transaction) |
+| transactions  | a possibly empty array of transactions                        | [Transaction[]](/data-model/chaindata/#transaction) |
 | baseFeePerGas | the base fee for this block                                   | gas                                                 |
 | uncles        | a possibly empty array of uncle hashes                        | hash[]                                              |
 | withdrawals   | a possibly empty array of withdrawals (post Shanghai)         | [Withdrawal[]](/data-model/chaindata/#withdrawal)   |
@@ -165,25 +165,6 @@ Logs consist of the following fields:
 | articulatedLog   | a human-readable version of the topic and data fields                                             | [Function](/data-model/other/#function) |
 | compressedLog    | a truncated, more readable version of the articulation (calculated)                               | string                                  |
 
-## LogFilter
-
-Log filters are used to speed up querying of the node when searching for logs.
-
-The following commands produce and manage LogFilters:
-
-- [chifra blocks](/chifra/chaindata/#chifra-blocks)
-- [chifra logs](/chifra/chaindata/#chifra-logs)
-
-LogFilters consist of the following fields:
-
-| Field     | Description                                                            | Type      |
-| --------- | ---------------------------------------------------------------------- | --------- |
-| fromBlock | the first block in the block range to query with eth_getLogs           | blknum    |
-| toBlock   | the last block in the range to query with eth_getLogs                  | blknum    |
-| blockHash | an alternative to blocks specification, the hash of the block to query | hash      |
-| emitters  | one or more emitting addresses from which logs were emitted            | address[] |
-| topics    | one or more topics which logs represent                                | topic[]   |
-
 ## Trace
 
 The deepest layer of the Ethereum data is the trace. Every transaction has at least one trace which
@@ -221,8 +202,6 @@ Traces consist of the following fields:
 
 ### Notes
 
-When produced using the `--raw` option to `chifra traces`, this data model actually produces `transactionPosition` instead of `transactionIndex`. When produced without the `--raw` option, the model uses `transactionIndex` to be consistent with other data models such as the `transaction`.
-
 Traces and TraceActions, when produced during a self-destruct, export different fields when rendered in JSON. In CSV and TXT output, these fields change thier meaning while retaining the header of the original fields. The following table describes these differences:
 
 Fields that change during self-destruct transaction:
@@ -398,6 +377,32 @@ TimestampCounts consist of the following fields:
 | ----- | --------------------------------------------------- | ------ |
 | count | the number of timestamps in the timestamps database | uint64 |
 
+## LightBlock
+
+`chifra blocks --hashes` returns top level data specified block with only
+the hashes of the block's transactions.
+
+The following commands produce and manage LightBlocks:
+
+- [chifra blocks](/chifra/chaindata/#chifra-blocks)
+
+LightBlocks consist of the following fields:
+
+| Field         | Description                                                   | Type                                              |
+| ------------- | ------------------------------------------------------------- | ------------------------------------------------- |
+| gasLimit      | the system-wide maximum amount of gas permitted in this block | gas                                               |
+| hash          | the hash of the current block                                 | hash                                              |
+| blockNumber   | the number of the block                                       | blknum                                            |
+| parentHash    | hash of previous block                                        | hash                                              |
+| miner         | address of block's winning miner                              | address                                           |
+| difficulty    | the computational difficulty at this block                    | value                                             |
+| timestamp     | the Unix timestamp of the object                              | timestamp                                         |
+| date          | the timestamp as a date (calculated)                          | datetime                                          |
+| transactions  | a possibly empty array of transaction hashes                  | string[]                                          |
+| baseFeePerGas | the base fee for this block                                   | gas                                               |
+| uncles        | a possibly empty array of uncle hashes                        | hash[]                                            |
+| withdrawals   | a possibly empty array of withdrawals (post Shanghai)         | [Withdrawal[]](/data-model/chaindata/#withdrawal) |
+
 ## Base types
 
 This documentation mentions the following basic data types.

docs/content/data-model/other.md

@@ -145,21 +145,6 @@ Slurps consist of the following fields:
 | compressedTx     | truncated, more readable version of the articulation (calculated)                                     | string                                  |
 | isError          | `true` if the transaction ended in error, `false` otherwise                                           | bool                                    |
 
-## SlurpCount
-
-The `slurpCount` carries information about the counts returned by remote APIs.
-
-The following commands produce and manage SlurpCounts:
-
-- [chifra slurp](/chifra/other/#chifra-slurp)
-
-SlurpCounts consist of the following fields:
-
-| Field   | Description                                             | Type    |
-| ------- | ------------------------------------------------------- | ------- |
-| address | the address used to query the API                       | address |
-| count   | the number of records known by the API for this address | uint64  |
-
 ## Message
 
 The Message type is used in various places to return information about a command. For example, when using the `chifra names --autoname` feature in the SDK, a Message type is returned.
@@ -202,7 +187,6 @@ This documentation mentions the following basic data types.
 | string    | a normal character string              |                |
 | timestamp | a 64-bit unsigned integer              | Unix timestamp |
 | txnum     | an alias for a uint64                  |                |
-| uint64    | a 64-bit unsigned integer              |                |
 | value     | an alias for a 64-bit unsigned integer |                |
 | wei       | an unsigned big number                 | as a string    |
 

scripts/test-all.sh

@@ -28,7 +28,7 @@ CHIFRA="${REPO_ROOT}/src/apps/chifra"
 (cd "$CHIFRA" && go test --tags integration ./...)
 
 #------------------------------------------------
-echo "Reporting on the status of the stests submodule. No update..."
+echo "Reporting on the status of the tests submodule. No update..."
 git -C "$REPO_ROOT" submodule status tests
 
 #------------------------------------------------

sdk/abis_internal.go

@@ -48,7 +48,7 @@ func (opts *abisOptionsInternal) AbisBytes(w io.Writer) error {
 }
 
 // abisParseFunc handles special cases such as structs and enums (if any).
-func abisParseFunc(target interface{}, key, value string) (bool, error) {
+func abisParseFunc(target any, key, value string) (bool, error) {
 	var found bool
 	_, ok := target.(*abisOptionsInternal)
 	if !ok {

sdk/blocks.go

@@ -36,23 +36,23 @@ func (opts BlocksOptions) String() string {
 }
 
 // Blocks implements the chifra blocks command.
-func (opts *BlocksOptions) Blocks() ([]types.Block[types.Transaction], *types.MetaData, error) {
+func (opts *BlocksOptions) Blocks() ([]types.Block, *types.MetaData, error) {
 	in := opts.toInternal()
-	return queryBlocks[types.Block[types.Transaction]](in)
+	return queryBlocks[types.Block](in)
 }
 
 // BlocksHashes implements the chifra blocks --hashes command.
-func (opts *BlocksOptions) BlocksHashes() ([]types.Block[string], *types.MetaData, error) {
+func (opts *BlocksOptions) BlocksHashes() ([]types.LightBlock, *types.MetaData, error) {
 	in := opts.toInternal()
 	in.Hashes = true
-	return queryBlocks[types.Block[string]](in)
+	return queryBlocks[types.LightBlock](in)
 }
 
 // BlocksUncles implements the chifra blocks --uncles command.
-func (opts *BlocksOptions) BlocksUncles() ([]types.Block[string], *types.MetaData, error) {
+func (opts *BlocksOptions) BlocksUncles() ([]types.LightBlock, *types.MetaData, error) {
 	in := opts.toInternal()
 	in.Uncles = true
-	return queryBlocks[types.Block[string]](in)
+	return queryBlocks[types.LightBlock](in)
 }
 
 // BlocksTraces implements the chifra blocks --traces command.

sdk/blocks_internal.go

@@ -56,7 +56,7 @@ func (opts *blocksOptionsInternal) BlocksBytes(w io.Writer) error {
 }
 
 // blocksParseFunc handles special cases such as structs and enums (if any).
-func blocksParseFunc(target interface{}, key, value string) (bool, error) {
+func blocksParseFunc(target any, key, value string) (bool, error) {
 	var found bool
 	opts, ok := target.(*blocksOptionsInternal)
 	if !ok {
@@ -90,8 +90,8 @@ func GetBlocksOptions(args []string) (*blocksOptionsInternal, error) {
 }
 
 type blocksGeneric interface {
-	types.Block[types.Transaction] |
-		types.Block[string] |
+	types.Block |
+		types.LightBlock |
 		types.Trace |
 		types.Appearance |
 		types.Log |

sdk/chunks_internal.go

@@ -63,7 +63,7 @@ func (opts *chunksOptionsInternal) ChunksBytes(w io.Writer) error {
 }
 
 // chunksParseFunc handles special cases such as structs and enums (if any).
-func chunksParseFunc(target interface{}, key, value string) (bool, error) {
+func chunksParseFunc(target any, key, value string) (bool, error) {
 	var found bool
 	opts, ok := target.(*chunksOptionsInternal)
 	if !ok {

sdk/config_internal.go

@@ -44,7 +44,7 @@ func (opts *configOptionsInternal) ConfigBytes(w io.Writer) error {
 }
 
 // configParseFunc handles special cases such as structs and enums (if any).
-func configParseFunc(target interface{}, key, value string) (bool, error) {
+func configParseFunc(target any, key, value string) (bool, error) {
 	var found bool
 	opts, ok := target.(*configOptionsInternal)
 	if !ok {