feat(admin): getL1ToL2MessageByTxHash(l1DepositTxHash) #280
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
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 |
|---|---|---|
|
|
@@ -58,10 +58,12 @@ type OpSimulator struct { | |
| ethClient *ethclient.Client | ||
|
|
||
| stopped atomic.Bool | ||
|
|
||
| l1DepositStoreManager *L1DepositStoreManager | ||
| } | ||
|
|
||
| // OpSimulator wraps around the l2 chain. By embedding `Chain`, it also implements the same inteface | ||
| func New(log log.Logger, closeApp context.CancelCauseFunc, port uint64, host string, l1Chain, l2Chain config.Chain, peers map[uint64]config.Chain, interopDelay uint64, depositStoreManager *L1DepositStoreManager) *OpSimulator { | ||
| bgTasksCtx, bgTasksCancel := context.WithCancel(context.Background()) | ||
|
|
||
| crossL2Inbox, err := bindings.NewCrossL2Inbox(predeploys.CrossL2InboxAddr, l2Chain.EthClient()) | ||
|
|
@@ -88,6 +90,8 @@ func New(log log.Logger, closeApp context.CancelCauseFunc, port uint64, host str | |
| }, | ||
| }, | ||
|
|
||
| l1DepositStoreManager: depositStoreManager, | ||
|
|
||
| peers: peers, | ||
| } | ||
| } | ||
|
|
@@ -148,8 +152,9 @@ func (opSim *OpSimulator) startBackgroundTasks() { | |
| // Relay deposit tx from L1 to L2 | ||
| opSim.bgTasks.Go(func() error { | ||
| depositTxCh := make(chan *types.DepositTx) | ||
| l1DepositTxnLogCh := make(chan *types.Log) | ||
| portalAddress := common.Address(opSim.Config().L2Config.L1Addresses.OptimismPortalProxy) | ||
| sub, err := SubscribeDepositTx(context.Background(), opSim.l1Chain.EthClient(), portalAddress, depositTxCh, l1DepositTxnLogCh) | ||
|
There was a problem hiding this comment. similar to the indexer/relayer design for l2 to l2 messages, it will be more maintainable to have the indexer have a start function and run separately from the opsimulator. the op simulator then "listens" to the indexer to get the stream of deposit tx all of the setting new logs logic should happen inside the deposit indexer There was a problem hiding this comment. @jakim929 just clarifying the new indexer will be subscribing to deposit tx and storing, while the opsim would just be used to start the L1ToL2Indexer service correct? There was a problem hiding this comment. while indexer listens for new tranction a transaction event should also be sent from indexer to opsim to SendTransaction to done while the indexer store ref to the initial depTxn sub message There was a problem hiding this comment. or another way could be both opsim and indexer can both sub to deposit txn, the op sim executes transaction while the indexer just stores ref? |
||
| if err != nil { | ||
| return fmt.Errorf("failed to subscribe to deposit tx: %w", err) | ||
| } | ||
|
|
@@ -160,6 +165,7 @@ func (opSim *OpSimulator) startBackgroundTasks() { | |
| select { | ||
| case dep := <-depositTxCh: | ||
| depTx := types.NewTx(dep) | ||
| l1Log := <-l1DepositTxnLogCh | ||
| opSim.log.Debug("observed deposit event on L1", "hash", depTx.Hash().String()) | ||
|
|
||
| clnt := opSim.Chain.EthClient() | ||
|
|
@@ -168,6 +174,9 @@ func (opSim *OpSimulator) startBackgroundTasks() { | |
| } | ||
|
|
||
| opSim.log.Info("OptimismPortal#depositTransaction", "l2TxHash", depTx.Hash().String()) | ||
| if err := opSim.l1DepositStoreManager.Set(l1Log.TxHash, dep); err != nil { | ||
|
There was a problem hiding this comment. a single l1 transaction can have multiple deposit tx inside it so it cannot be used as the index. instead the deposit tx's own transaction hash might be a better one There was a problem hiding this comment. got it makes sense updating this |
||
| opSim.log.Error("failed to store deposit tx to chain: %w", "chain.id", chainId, "err", err) | ||
| } | ||
|
|
||
| case <-opSim.bgTasksCtx.Done(): | ||
| sub.Unsubscribe() | ||
|
|
||
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,63 @@ | ||
| package opsimulator | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "sync" | ||
|
|
||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/core/types" | ||
| ) | ||
|
|
||
| type L1DepositStore struct { | ||
| entryByHash map[common.Hash]*types.DepositTx | ||
|
There was a problem hiding this comment. some high level thoughts
There was a problem hiding this comment. update:
There was a problem hiding this comment.
|
||
| mu sync.RWMutex | ||
| } | ||
|
|
||
| type L1DepositStoreManager struct { | ||
| store *L1DepositStore | ||
| } | ||
|
|
||
| func NewL1DepositStore() *L1DepositStore { | ||
| return &L1DepositStore{ | ||
| entryByHash: make(map[common.Hash]*types.DepositTx), | ||
| } | ||
| } | ||
|
|
||
| func NewL1DepositStoreManager() *L1DepositStoreManager { | ||
| return &L1DepositStoreManager{ | ||
| store: NewL1DepositStore(), | ||
| } | ||
| } | ||
|
|
||
| func (s *L1DepositStore) Set(txnHash common.Hash, entry *types.DepositTx) error { | ||
| s.mu.Lock() | ||
| defer s.mu.Unlock() | ||
|
|
||
| s.entryByHash[txnHash] = entry | ||
| return nil | ||
| } | ||
|
|
||
| func (s *L1DepositStore) Get(txnHash common.Hash) (*types.DepositTx, error) { | ||
| s.mu.RLock() | ||
| defer s.mu.RUnlock() | ||
|
|
||
| entry, exists := s.entryByHash[txnHash] | ||
|
|
||
| if !exists { | ||
| return nil, fmt.Errorf("Deposit txn not found") | ||
| } | ||
|
|
||
| return entry, nil | ||
| } | ||
|
|
||
| func (s *L1DepositStoreManager) Get(txnHash common.Hash) (*types.DepositTx, error) { | ||
| return s.store.Get(txnHash) | ||
| } | ||
|
|
||
| func (s *L1DepositStoreManager) Set(txnHash common.Hash, entry *types.DepositTx) error { | ||
| if err := s.store.Set(txnHash, entry); err != nil { | ||
| return fmt.Errorf("failed to store message: %w", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
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,28 @@ | ||
| package opsimulator | ||
|
|
||
| import ( | ||
| "math/rand" | ||
| "testing" | ||
|
|
||
| optestutils "github.com/ethereum-optimism/optimism/op-service/testutils" | ||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/core/types" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestL1DepositStore_SetAndGet(t *testing.T) { | ||
| sm := NewL1DepositStoreManager() | ||
|
|
||
| rng := rand.New(rand.NewSource(int64(0))) | ||
| sourceHash := common.Hash{} | ||
| depInput := optestutils.GenerateDeposit(sourceHash, rng) | ||
| depTx := types.NewTx(depInput) | ||
| txnHash := depTx.Hash() | ||
|
|
||
| err := sm.store.Set(txnHash, depInput) | ||
| assert.NoError(t, err, "expect no error while store deposit txn ref") | ||
|
|
||
| retrievedEntry, err := sm.store.Get(txnHash) | ||
| assert.NoError(t, err, "expected no error when getting entry from store") | ||
| assert.Equal(t, depInput, retrievedEntry, "expected retrieved entry to equal stored entry") | ||
| } |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should query the indexer not the store directly.