Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
115375aa56 | |||
|
f3c696fa1d | ||
|
1015a42d90 | ||
|
c350d3acd5 | ||
|
a9523b6428 | ||
|
aa55f5ea20 | ||
|
aadddf3a6e |
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user