forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-15 16:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ethereum:master' into portal

Browse source
This commit is contained in:
Chen Kai 2024-03-09 10:25:42 +08:00 committed by GitHub
commit ab24de936f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
console/console_test.go
View file

@ -152,8 +152,7 @@ func (env *tester) Close(t *testing.T) {
} }
// Tests that the node lists the correct welcome message, notably that it contains // Tests that the node lists the correct welcome message, notably that it contains
// the instance name, coinbase account, block number, data directory and supported // the instance name, block number, data directory and supported console modules.
// console modules.
func TestWelcome(t *testing.T) { func TestWelcome(t *testing.T) {
tester := newTester(t, nil) tester := newTester(t, nil)
defer tester.Close(t) defer tester.Close(t)
@ -171,7 +170,10 @@ func TestWelcome(t *testing.T) {
t.Fatalf("console output missing sync status: have\n%s\nwant also %s", output, want) t.Fatalf("console output missing sync status: have\n%s\nwant also %s", output, want)
} }
if want := fmt.Sprintf("datadir: %s", tester.workspace); !strings.Contains(output, want) { if want := fmt.Sprintf("datadir: %s", tester.workspace); !strings.Contains(output, want) {
t.Fatalf("console output missing coinbase: have\n%s\nwant also %s", output, want) t.Fatalf("console output missing datadir: have\n%s\nwant also %s", output, want)
}
if want := "modules: "; !strings.Contains(output, want) {
t.Fatalf("console output missing modules: have\n%s\nwant also %s", output, want)
} }
} }

6
ethclient/gethclient/gethclient.go
View file

@ -245,6 +245,12 @@ func toCallArg(msg ethereum.CallMsg) interface{} {
if msg.AccessList != nil { if msg.AccessList != nil {
arg["accessList"] = msg.AccessList arg["accessList"] = msg.AccessList
} }
if msg.BlobGasFeeCap != nil {
arg["maxFeePerBlobGas"] = (*hexutil.Big)(msg.BlobGasFeeCap)
}
if msg.BlobHashes != nil {
arg["blobVersionedHashes"] = msg.BlobHashes
}
return arg return arg
} }