PoS_EVM
/
woop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix allowed txs to be able to handle multiple txs for same from address (#4624)

Browse Source
pull/4627/head
Gheis Mohammadi 10 months ago committed by GitHub
parent 8717ccf61d
commit c24ea5cebd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 47 additions and 33 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      cmd/harmony/main.go
  2. 44
      cmd/harmony/main_test.go
  3. 24
      core/tx_pool.go
  4. 2
      node/node.go

10
cmd/harmony/main.go
Unescape View File

@ -1064,8 +1064,8 @@ func setupBlacklist(hc harmonyconfig.HarmonyConfig) (map[ethCommon.Address]struc
return addrMap, nil return addrMap, nil
} }
func parseAllowedTxs(data []byte) (map[ethCommon.Address]core.AllowedTxData, error) { func parseAllowedTxs(data []byte) (map[ethCommon.Address][]core.AllowedTxData, error) {
allowedTxs := make(map[ethCommon.Address]core.AllowedTxData) allowedTxs := make(map[ethCommon.Address][]core.AllowedTxData)
for _, line := range strings.Split(string(data), "\n") { for _, line := range strings.Split(string(data), "\n") {
line = strings.TrimSpace(line) line = strings.TrimSpace(line)
if len(line) != 0 { // AllowedTxs file may have trailing empty string line if len(line) != 0 { // AllowedTxs file may have trailing empty string line
@ -1086,16 +1086,16 @@ func parseAllowedTxs(data []byte) (map[ethCommon.Address]core.AllowedTxData, err
if err != nil { if err != nil {
return nil, err return nil, err
} }
allowedTxs[from] = core.AllowedTxData{ allowedTxs[from] = append(allowedTxs[from], core.AllowedTxData{
To: to, To: to,
Data: data, Data: data,
} })
} }
} }
return allowedTxs, nil return allowedTxs, nil
} }
func setupAllowedTxs(hc harmonyconfig.HarmonyConfig) (map[ethCommon.Address]core.AllowedTxData, error) { func setupAllowedTxs(hc harmonyconfig.HarmonyConfig) (map[ethCommon.Address][]core.AllowedTxData, error) {
utils.Logger().Debug().Msgf("Using AllowedTxs file at `%s`", hc.TxPool.AllowedTxsFile) utils.Logger().Debug().Msgf("Using AllowedTxs file at `%s`", hc.TxPool.AllowedTxsFile)
data, err := os.ReadFile(hc.TxPool.AllowedTxsFile) data, err := os.ReadFile(hc.TxPool.AllowedTxsFile)
if err != nil { if err != nil {

44
cmd/harmony/main_test.go
Unescape View File

@ -16,22 +16,26 @@ func TestAllowedTxsParse(t *testing.T) {
one1s4dvv454dtmkzsulffz3epewsyhrjq9y0g3fqz->0x985458E523dB3d53125813eD68c274899e9DfAb4:0xa9059cbb one1s4dvv454dtmkzsulffz3epewsyhrjq9y0g3fqz->0x985458E523dB3d53125813eD68c274899e9DfAb4:0xa9059cbb
one1s4dvv454dtmkzsulffz3epewsyhrjq9y0g3fqz->one10fhdp2g9q5azrs2ukk608x6krd4rleg0ueskug:0x one1s4dvv454dtmkzsulffz3epewsyhrjq9y0g3fqz->one10fhdp2g9q5azrs2ukk608x6krd4rleg0ueskug:0x
`) `)
expected := map[ethCommon.Address]core.AllowedTxData{ expected := map[ethCommon.Address][]core.AllowedTxData{
common.HexToAddress("0x7A6Ed0a905053A21C15cB5b4F39b561B6A3FE50f"): core.AllowedTxData{ common.HexToAddress("0x7A6Ed0a905053A21C15cB5b4F39b561B6A3FE50f"): {
To: common.HexToAddress("0x855Ac656956AF761439f4a451c872E812E3900a4"), core.AllowedTxData{
Data: common.FromHex("0x"), To: common.HexToAddress("0x855Ac656956AF761439f4a451c872E812E3900a4"),
Data: common.FromHex("0x"),
},
core.AllowedTxData{
To: common.HexToAddress("0x985458E523dB3d53125813eD68c274899e9DfAb4"),
Data: common.FromHex("0xa9059cbb"),
},
}, },
common.HexToAddress("0x7A6Ed0a905053A21C15cB5b4F39b561B6A3FE50f"): core.AllowedTxData{ common.HexToAddress("0x855Ac656956AF761439f4a451c872E812E3900a4"): {
To: common.HexToAddress("0x985458E523dB3d53125813eD68c274899e9DfAb4"), core.AllowedTxData{
Data: common.FromHex("0xa9059cbb"), To: common.HexToAddress("0x985458E523dB3d53125813eD68c274899e9DfAb4"),
}, Data: common.FromHex("0xa9059cbb"),
common.HexToAddress("0x855Ac656956AF761439f4a451c872E812E3900a4"): core.AllowedTxData{ },
To: common.HexToAddress("0x985458E523dB3d53125813eD68c274899e9DfAb4"), core.AllowedTxData{
Data: common.FromHex("0xa9059cbb"), To: common.HexToAddress("0x7A6Ed0a905053A21C15cB5b4F39b561B6A3FE50f"),
}, Data: common.FromHex("0x"),
common.HexToAddress("0x855Ac656956AF761439f4a451c872E812E3900a4"): core.AllowedTxData{ },
To: common.HexToAddress("0x7A6Ed0a905053A21C15cB5b4F39b561B6A3FE50f"),
Data: common.FromHex("0x"),
}, },
} }
got, err := parseAllowedTxs(testData) got, err := parseAllowedTxs(testData)
@ -41,10 +45,12 @@ func TestAllowedTxsParse(t *testing.T) {
if len(got) != len(expected) { if len(got) != len(expected) {
t.Errorf("lenght of allowed transactions not equal, got: %d expected: %d", len(got), len(expected)) t.Errorf("lenght of allowed transactions not equal, got: %d expected: %d", len(got), len(expected))
} }
for from, txData := range got { for from, txsData := range got {
expectedTxData := expected[from] for i, txData := range txsData {
if expectedTxData.To != txData.To || !bytes.Equal(expectedTxData.Data, txData.Data) { expectedTxData := expected[from][i]
t.Errorf("txData not equal: got: %v expected: %v", txData, expectedTxData) if expectedTxData.To != txData.To || !bytes.Equal(expectedTxData.Data, txData.Data) {
t.Errorf("txData not equal: got: %v expected: %v", txData, expectedTxData)
}
} }
} }
} }

24
core/tx_pool.go
Unescape View File

@ -172,8 +172,8 @@ type TxPoolConfig struct {
AddEvent func(tx types.PoolTransaction, local bool) // Fire add event AddEvent func(tx types.PoolTransaction, local bool) // Fire add event
Blacklist map[common.Address]struct{} // Set of accounts that cannot be a part of any transaction Blacklist map[common.Address]struct{} // Set of accounts that cannot be a part of any transaction
AllowedTxs map[common.Address]AllowedTxData // Set of allowed transactions can break the blocklist AllowedTxs map[common.Address][]AllowedTxData // Set of allowed transactions can break the blocklist
} }
// DefaultTxPoolConfig contains the default configurations for the transaction // DefaultTxPoolConfig contains the default configurations for the transaction
@ -193,7 +193,7 @@ var DefaultTxPoolConfig = TxPoolConfig{
Lifetime: 30 * time.Minute, // --txpool.lifetime Lifetime: 30 * time.Minute, // --txpool.lifetime
Blacklist: map[common.Address]struct{}{}, Blacklist: map[common.Address]struct{}{},
AllowedTxs: map[common.Address]AllowedTxData{}, AllowedTxs: map[common.Address][]AllowedTxData{},
} }
// sanitize checks the provided user configurations and changes anything that's // sanitize checks the provided user configurations and changes anything that's
@ -753,12 +753,20 @@ func (pool *TxPool) validateTx(tx types.PoolTransaction, local bool) error {
} }
// do whitelist check first, if tx not in whitelist, do blacklist check // do whitelist check first, if tx not in whitelist, do blacklist check
if allowedTx, exists := pool.config.AllowedTxs[from]; exists { if allowedTxs, exists := pool.config.AllowedTxs[from]; exists {
if to := tx.To(); to == nil || *to != allowedTx.To || !bytes.Equal(tx.Data(), allowedTx.Data) { txIsAllowed := false
toAddr := common.Address{} to := tx.To()
if to != nil { toAddr := common.Address{}
toAddr = *to if to != nil {
toAddr = *to
for _, allowedTx := range allowedTxs {
if toAddr == allowedTx.To && bytes.Equal(tx.Data(), allowedTx.Data) {
txIsAllowed = true
break
}
} }
}
if !txIsAllowed {
return errors.WithMessagef(ErrAllowedTxs, "transaction sender: %x, receiver: %x, input: %x", tx.From(), toAddr, tx.Data()) return errors.WithMessagef(ErrAllowedTxs, "transaction sender: %x, receiver: %x, input: %x", tx.From(), toAddr, tx.Data())
} }
} else { } else {

2
node/node.go
Unescape View File

@ -1027,7 +1027,7 @@ func New(
host p2p.Host, host p2p.Host,
consensusObj *consensus.Consensus, consensusObj *consensus.Consensus,
blacklist map[common.Address]struct{}, blacklist map[common.Address]struct{},
allowedTxs map[common.Address]core.AllowedTxData, allowedTxs map[common.Address][]core.AllowedTxData,
localAccounts []common.Address, localAccounts []common.Address,
harmonyconfig *harmonyconfig.HarmonyConfig, harmonyconfig *harmonyconfig.HarmonyConfig,
registry *registry.Registry, registry *registry.Registry,

Write Preview
Loading…
Cancel
Save