-
Notifications
You must be signed in to change notification settings - Fork 146
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
0af3265
commit 0fd55ab
Showing
11 changed files
with
767 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved. | ||
| // See the file LICENSE for licensing terms. | ||
|
|
||
| package evm | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "sync" | ||
|
|
||
| "github.com/ava-labs/avalanchego/ids" | ||
| "github.com/ethereum/go-ethereum/log" | ||
|
|
||
| "github.com/ava-labs/avalanchego/network/p2p/gossip" | ||
|
|
||
| "github.com/ava-labs/coreth/core" | ||
| "github.com/ava-labs/coreth/core/txpool" | ||
| "github.com/ava-labs/coreth/core/types" | ||
| ) | ||
|
|
||
| var ( | ||
| _ gossip.Gossipable = (*GossipEthTx)(nil) | ||
| _ gossip.Gossipable = (*GossipAtomicTx)(nil) | ||
| _ gossip.Set[*GossipEthTx] = (*GossipEthTxPool)(nil) | ||
| ) | ||
|
|
||
| type GossipAtomicTx struct { | ||
| Tx *Tx | ||
| } | ||
|
|
||
| func (tx *GossipAtomicTx) GetID() ids.ID { | ||
| return tx.Tx.ID() | ||
| } | ||
|
|
||
| func (tx *GossipAtomicTx) Marshal() ([]byte, error) { | ||
| return tx.Tx.SignedBytes(), nil | ||
| } | ||
|
|
||
| func (tx *GossipAtomicTx) Unmarshal(bytes []byte) error { | ||
| atomicTx, err := ExtractAtomicTx(bytes, Codec) | ||
| tx.Tx = atomicTx | ||
|
|
||
| return err | ||
| } | ||
|
|
||
| func NewGossipEthTxPool(mempool *txpool.TxPool) (*GossipEthTxPool, error) { | ||
| bloom, err := gossip.NewBloomFilter(txGossipBloomMaxItems, txGossipBloomFalsePositiveRate) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to initialize bloom filter: %w", err) | ||
| } | ||
|
|
||
| return &GossipEthTxPool{ | ||
| mempool: mempool, | ||
| pendingTxs: make(chan core.NewTxsEvent), | ||
| bloom: bloom, | ||
| }, nil | ||
| } | ||
|
|
||
| type GossipEthTxPool struct { | ||
| mempool *txpool.TxPool | ||
| pendingTxs chan core.NewTxsEvent | ||
|
|
||
| bloom *gossip.BloomFilter | ||
| lock sync.RWMutex | ||
| } | ||
|
|
||
| func (g *GossipEthTxPool) Subscribe(ctx context.Context) { | ||
| g.mempool.SubscribeNewTxsEvent(g.pendingTxs) | ||
|
|
||
| for { | ||
| select { | ||
| case <-ctx.Done(): | ||
| log.Debug("shutting down subscription") | ||
| return | ||
| case pendingTxs := <-g.pendingTxs: | ||
| g.lock.Lock() | ||
| for _, pendingTx := range pendingTxs.Txs { | ||
| tx := &GossipEthTx{Tx: pendingTx} | ||
| g.bloom.Add(tx) | ||
| reset, err := gossip.ResetBloomFilterIfNeeded(g.bloom, txGossipMaxFalsePositiveRate) | ||
| if err != nil { | ||
| log.Error("failed to reset bloom filter", "err", err) | ||
| continue | ||
| } | ||
|
|
||
| if reset { | ||
| log.Debug("resetting bloom filter", "reason", "reached max filled ratio") | ||
|
|
||
| g.mempool.IteratePending(func(tx *types.Transaction) bool { | ||
| g.bloom.Add(&GossipEthTx{Tx: pendingTx}) | ||
| return true | ||
| }) | ||
| } | ||
| } | ||
| g.lock.Unlock() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Add enqueues the transaction to the mempool. Subscribe should be called | ||
| // to receive an event if tx is actually added to the mempool or not. | ||
| func (g *GossipEthTxPool) Add(tx *GossipEthTx) error { | ||
| return g.mempool.AddRemotes([]*types.Transaction{tx.Tx})[0] | ||
| } | ||
|
|
||
| func (g *GossipEthTxPool) Iterate(f func(tx *GossipEthTx) bool) { | ||
| g.mempool.IteratePending(func(tx *types.Transaction) bool { | ||
| return f(&GossipEthTx{Tx: tx}) | ||
| }) | ||
| } | ||
|
|
||
| func (g *GossipEthTxPool) GetFilter() ([]byte, []byte, error) { | ||
| g.lock.RLock() | ||
| defer g.lock.RUnlock() | ||
|
|
||
| bloom, err := g.bloom.Bloom.MarshalBinary() | ||
| salt := g.bloom.Salt | ||
|
|
||
| return bloom, salt[:], err | ||
| } | ||
|
|
||
| type GossipEthTx struct { | ||
| Tx *types.Transaction | ||
| } | ||
|
|
||
| func (tx *GossipEthTx) GetID() ids.ID { | ||
| return ids.ID(tx.Tx.Hash()) | ||
| } | ||
|
|
||
| func (tx *GossipEthTx) Marshal() ([]byte, error) { | ||
| return tx.Tx.MarshalBinary() | ||
| } | ||
|
|
||
| func (tx *GossipEthTx) Unmarshal(bytes []byte) error { | ||
| tx.Tx = &types.Transaction{} | ||
| return tx.Tx.UnmarshalBinary(bytes) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved. | ||
| // See the file LICENSE for licensing terms. | ||
|
|
||
| package evm | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/ava-labs/avalanchego/utils/crypto/secp256k1" | ||
| "github.com/ava-labs/avalanchego/vms/components/verify" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/ava-labs/avalanchego/ids" | ||
| ) | ||
|
|
||
| func TestGossipAtomicTxMarshal(t *testing.T) { | ||
| require := require.New(t) | ||
|
|
||
| expected := &GossipAtomicTx{ | ||
| Tx: &Tx{ | ||
| UnsignedAtomicTx: &UnsignedImportTx{}, | ||
| Creds: []verify.Verifiable{}, | ||
| }, | ||
| } | ||
|
|
||
| key0 := testKeys[0] | ||
| require.NoError(expected.Tx.Sign(Codec, [][]*secp256k1.PrivateKey{{key0}})) | ||
|
|
||
| bytes, err := expected.Marshal() | ||
| require.NoError(err) | ||
|
|
||
| actual := &GossipAtomicTx{} | ||
| require.NoError(actual.Unmarshal(bytes)) | ||
|
|
||
| require.NoError(err) | ||
| require.Equal(expected.GetID(), actual.GetID()) | ||
| } | ||
|
|
||
| func TestAtomicMempoolIterate(t *testing.T) { | ||
| txs := []*GossipAtomicTx{ | ||
| { | ||
| Tx: &Tx{ | ||
| UnsignedAtomicTx: &TestUnsignedTx{ | ||
| IDV: ids.GenerateTestID(), | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| Tx: &Tx{ | ||
| UnsignedAtomicTx: &TestUnsignedTx{ | ||
| IDV: ids.GenerateTestID(), | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| add []*GossipAtomicTx | ||
| f func(tx *GossipAtomicTx) bool | ||
| possibleValues []*GossipAtomicTx | ||
| expectedLen int | ||
| }{ | ||
| { | ||
| name: "func matches nothing", | ||
| add: txs, | ||
| f: func(*GossipAtomicTx) bool { | ||
| return false | ||
| }, | ||
| possibleValues: nil, | ||
| }, | ||
| { | ||
| name: "func matches all", | ||
| add: txs, | ||
| f: func(*GossipAtomicTx) bool { | ||
| return true | ||
| }, | ||
| possibleValues: txs, | ||
| expectedLen: 2, | ||
| }, | ||
| { | ||
| name: "func matches subset", | ||
| add: txs, | ||
| f: func(tx *GossipAtomicTx) bool { | ||
| return tx.Tx == txs[0].Tx | ||
| }, | ||
| possibleValues: txs, | ||
| expectedLen: 1, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| require := require.New(t) | ||
| m, err := NewMempool(ids.Empty, 10) | ||
| require.NoError(err) | ||
|
|
||
| for _, add := range tt.add { | ||
| require.NoError(m.Add(add)) | ||
| } | ||
|
|
||
| matches := make([]*GossipAtomicTx, 0) | ||
| f := func(tx *GossipAtomicTx) bool { | ||
| match := tt.f(tx) | ||
|
|
||
| if match { | ||
| matches = append(matches, tx) | ||
| } | ||
|
|
||
| return match | ||
| } | ||
|
|
||
| m.Iterate(f) | ||
|
|
||
| require.Len(matches, tt.expectedLen) | ||
| require.Subset(tt.possibleValues, matches) | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.