Compare commits

...

7 Commits

Author SHA1 Message Date
115375aa56
Disable logging transactions 2024-11-02 09:51:18 +00:00
Martin HS
f3c696fa1d
all: release go-ethereum v1.13.8
Release 1.14.11
2024-10-01 15:17:59 +02:00
Péter Szilágyi
1015a42d90
Merge pull request #30522 from ethereum/master
Release Geth v1.14.10
2024-09-27 14:12:54 +03:00
Péter Szilágyi
c350d3acd5
Merge pull request #30456 from ethereum/master
Merge branch 'master' into release/1.14
2024-09-18 15:32:56 +03:00
Felix Lange
a9523b6428 Merge branch 'master' into release/1.14 2024-08-12 14:16:16 +02:00
Felix Lange
aa55f5ea20 Merge branch 'master' into release/1.14 2024-07-11 14:34:03 +02:00
Guillaume Ballet
aadddf3a6e params: release Geth v1.14.6 2024-07-02 15:19:57 +02:00
2 changed files with 6 additions and 2 deletions

@ -263,7 +263,7 @@ func New(config Config, chain BlockChain) *LegacyPool {
} }
pool.locals = newAccountSet(pool.signer) pool.locals = newAccountSet(pool.signer)
for _, addr := range config.Locals { for _, addr := range config.Locals {
log.Info("Setting new local account", "address", addr) // log.Info("Setting new local account", "address", addr)
pool.locals.add(addr) pool.locals.add(addr)
} }
pool.priced = newPricedList(pool.all) pool.priced = newPricedList(pool.all)
@ -804,7 +804,7 @@ func (pool *LegacyPool) add(tx *types.Transaction, local bool) (replaced bool, e
} }
// Mark local addresses and journal local transactions // Mark local addresses and journal local transactions
if local && !pool.locals.contains(from) { if local && !pool.locals.contains(from) {
log.Info("Setting new local account", "address", from) // log.Info("Setting new local account", "address", from)
pool.locals.add(from) pool.locals.add(from)
pool.priced.Removed(pool.all.RemoteToLocals(pool.locals)) // Migrate the remotes if it's marked as local first time. pool.priced.Removed(pool.all.RemoteToLocals(pool.locals)) // Migrate the remotes if it's marked as local first time.
} }

@ -1908,12 +1908,16 @@ func SubmitTransaction(ctx context.Context, b Backend, tx *types.Transaction) (c
return common.Hash{}, err return common.Hash{}, err
} }
_ = from
/**
if tx.To() == nil { if tx.To() == nil {
addr := crypto.CreateAddress(from, tx.Nonce()) addr := crypto.CreateAddress(from, tx.Nonce())
log.Info("Submitted contract creation", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "contract", addr.Hex(), "value", tx.Value()) log.Info("Submitted contract creation", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "contract", addr.Hex(), "value", tx.Value())
} else { } else {
log.Info("Submitted transaction", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "recipient", tx.To(), "value", tx.Value()) log.Info("Submitted transaction", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "recipient", tx.To(), "value", tx.Value())
} }
**/
return tx.Hash(), nil return tx.Hash(), nil
} }