Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/more-examples-6 #3615

Merged
merged 17 commits into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Makes output for Blocks.baseFeePerGas into Wei not uint64 - breaking
  • Loading branch information
tjayrush committed Apr 26, 2024
commit 7e36a4b77177f52f4df499ade577f5f533032ba6
10 changes: 5 additions & 5 deletions src/apps/chifra/internal/init/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ func (opts *InitOptions) validateInit() error {
// }
// } else if len(opts.Template) > 0 {
// return validate.Usage("The {0} option requires the {1} flag.", "--template", "--example")
}

historyFile := config.PathToCache(chain) + "tmp/history.txt"
if history.FromHistoryBool(historyFile, "init") && !opts.All {
return validate.Usage("You previously called chifra init --all. You must continue to do so.")
} else {
historyFile := config.PathToCache(chain) + "tmp/history.txt"
if history.FromHistoryBool(historyFile, "init") && !opts.All {
return validate.Usage("You previously called chifra init --all. You must continue to do so.")
}
}

return opts.Globals.Validate()
Expand Down
2 changes: 1 addition & 1 deletion src/apps/chifra/pkg/types/types_block.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func (s *Block[Tx]) Model(chain, format string, verbose bool, extraOptions map[s
"difficulty": s.Difficulty,
"timestamp": s.Timestamp,
"date": s.Date(),
"baseFeePerGas": s.BaseFeePerGas.Uint64(),
"baseFeePerGas": base.FormattedValue(&s.BaseFeePerGas, false, 18),
}

order = []string{
Expand Down
2 changes: 1 addition & 1 deletion tests
Submodule tests updated 70 files
+1 −1 gold/apps/chifra/chifra_run_blocks.txt
+1 −1 gold/tools/getBlocks/api_tests/getBlocks_blockByHash.txt
+1 −1 gold/tools/getBlocks/api_tests/getBlocks_bloom.txt
+3 −3 gold/tools/getBlocks/api_tests/getBlocks_blooms.txt
+1 −1 gold/tools/getBlocks/api_tests/getBlocks_byhash.txt
+1 −1 gold/tools/getBlocks/api_tests/getBlocks_cache.txt
+1 −1 gold/tools/getBlocks/api_tests/getBlocks_cache_one.txt
+1 −1 gold/tools/getBlocks/api_tests/getBlocks_cache_traces.txt
+1 −1 gold/tools/getBlocks/api_tests/getBlocks_cache_txs.txt
+4 −4 gold/tools/getBlocks/api_tests/getBlocks_combo_one_range.txt
+1 −1 gold/tools/getBlocks/api_tests/getBlocks_empty.txt
+2 −2 gold/tools/getBlocks/api_tests/getBlocks_fmt_default.txt
+2 −2 gold/tools/getBlocks/api_tests/getBlocks_fmt_json.txt
+2 −2 gold/tools/getBlocks/api_tests/getBlocks_list_all.txt
+10 −10 gold/tools/getBlocks/api_tests/getBlocks_list_list_count.txt
+2 −2 gold/tools/getBlocks/api_tests/getBlocks_range.txt
+1 −1 gold/tools/getBlocks/api_tests/getBlocks_special_1.txt
+1 −1 gold/tools/getBlocks/api_tests/getBlocks_special_2.txt
+3 −3 gold/tools/getBlocks/api_tests/getBlocks_uncles.txt
+3 −3 gold/tools/getBlocks/api_tests/getBlocks_uncles2.txt
+3 −3 gold/tools/getBlocks/api_tests/getBlocks_uncles_old_bug.txt
+11 −11 gold/tools/getBlocks/cmd_file1_out.file
+25 −25 gold/tools/getBlocks/cmd_file2_out.file
+1 −1 gold/tools/getBlocks/getBlocks_blockByHash.txt
+1 −1 gold/tools/getBlocks/getBlocks_bloom.txt
+3 −3 gold/tools/getBlocks/getBlocks_blooms.txt
+1 −1 gold/tools/getBlocks/getBlocks_byhash.txt
+1 −1 gold/tools/getBlocks/getBlocks_cache.txt
+1 −1 gold/tools/getBlocks/getBlocks_cache_one.txt
+1 −1 gold/tools/getBlocks/getBlocks_cache_traces.txt
+1 −1 gold/tools/getBlocks/getBlocks_cache_txs.txt
+11 −11 gold/tools/getBlocks/getBlocks_cmd_file1.txt
+25 −25 gold/tools/getBlocks/getBlocks_cmd_file2.txt
+4 −4 gold/tools/getBlocks/getBlocks_combo_one_range.txt
+1 −1 gold/tools/getBlocks/getBlocks_empty.txt
+2 −2 gold/tools/getBlocks/getBlocks_fmt_default.txt
+2 −2 gold/tools/getBlocks/getBlocks_fmt_json.txt
+2 −2 gold/tools/getBlocks/getBlocks_range.txt
+1 −1 gold/tools/getBlocks/getBlocks_special_1.txt
+1 −1 gold/tools/getBlocks/getBlocks_special_2.txt
+3 −3 gold/tools/getBlocks/getBlocks_uncles.txt
+3 −3 gold/tools/getBlocks/getBlocks_uncles2.txt
+3 −3 gold/tools/getBlocks/getBlocks_uncles_old_bug.txt
+1 −1 gold/tools/getBlocks/sdk_tests/getBlocks_blockByHash.txt
+1 −1 gold/tools/getBlocks/sdk_tests/getBlocks_bloom.txt
+3 −3 gold/tools/getBlocks/sdk_tests/getBlocks_blooms.txt
+1 −1 gold/tools/getBlocks/sdk_tests/getBlocks_byhash.txt
+1 −1 gold/tools/getBlocks/sdk_tests/getBlocks_cache.txt
+1 −1 gold/tools/getBlocks/sdk_tests/getBlocks_cache_one.txt
+1 −1 gold/tools/getBlocks/sdk_tests/getBlocks_cache_traces.txt
+1 −1 gold/tools/getBlocks/sdk_tests/getBlocks_cache_txs.txt
+1 −1 gold/tools/getBlocks/sdk_tests/getBlocks_caps_disallowed_1.txt
+4 −4 gold/tools/getBlocks/sdk_tests/getBlocks_combo_one_range.txt
+1 −1 gold/tools/getBlocks/sdk_tests/getBlocks_empty.txt
+2 −2 gold/tools/getBlocks/sdk_tests/getBlocks_fmt_api.txt
+2 −2 gold/tools/getBlocks/sdk_tests/getBlocks_fmt_csv.txt
+2 −2 gold/tools/getBlocks/sdk_tests/getBlocks_fmt_default.txt
+2 −2 gold/tools/getBlocks/sdk_tests/getBlocks_fmt_json.txt
+2 −2 gold/tools/getBlocks/sdk_tests/getBlocks_fmt_junk.txt
+2 −2 gold/tools/getBlocks/sdk_tests/getBlocks_fmt_txt.txt
+2 −2 gold/tools/getBlocks/sdk_tests/getBlocks_list_all.txt
+10 −10 gold/tools/getBlocks/sdk_tests/getBlocks_list_list_count.txt
+2 −2 gold/tools/getBlocks/sdk_tests/getBlocks_range.txt
+4 −4 gold/tools/getBlocks/sdk_tests/getBlocks_redir_output.txt
+5 −5 gold/tools/getBlocks/sdk_tests/getBlocks_redir_output_append.txt
+1 −1 gold/tools/getBlocks/sdk_tests/getBlocks_special_1.txt
+1 −1 gold/tools/getBlocks/sdk_tests/getBlocks_special_2.txt
+3 −3 gold/tools/getBlocks/sdk_tests/getBlocks_uncles.txt
+3 −3 gold/tools/getBlocks/sdk_tests/getBlocks_uncles2.txt
+3 −3 gold/tools/getBlocks/sdk_tests/getBlocks_uncles_old_bug.txt
Loading