Merge tag 'v1.13.13' into merge/geth-v1.13.13

2024-02-22 11:19:29 -08:00
parent d45248db7a 7f131dcbc9
commit bd9dd1b3ce
153 changed files with 1799 additions and 1174 deletions
@@ -47,7 +47,7 @@ func TestReimportMirroredState(t *testing.T) {
 	genspec := &core.Genesis{
 		Config:    params.AllCliqueProtocolChanges,
 		ExtraData: make([]byte, extraVanity+common.AddressLength+extraSeal),
-		Alloc: map[common.Address]core.GenesisAccount{
+		Alloc: map[common.Address]types.Account{
 			addr: {Balance: big.NewInt(10000000000000000)},
 		},
 		BaseFee: big.NewInt(params.InitialBaseFee),