diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 342fdf2fa..31f62847b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,7 +2,7 @@ name: "Push docker image to GCR" on: push: - branches: [main,grimsvotn] + branches: [main,grimsvotn-test] tags: - "v*" diff --git a/proposer/proposer.go b/proposer/proposer.go index 055e18acb..3d96c9e3c 100644 --- a/proposer/proposer.go +++ b/proposer/proposer.go @@ -184,9 +184,8 @@ func (p *Proposer) ProposeOp(ctx context.Context) error { } log.Info("Comparing proposer TKO balance to block fee", "proposer", p.l1ProposerAddress.Hex()) - if err := p.checkTaikoTokenBalance(); err != nil { - return fmt.Errorf("failed to check Taiko token balance: %w", err) + return fmt.Errorf("failed to check token balance: %w", err) } // Wait until L2 execution engine is synced at first. @@ -207,6 +206,32 @@ func (p *Proposer) ProposeOp(ctx context.Context) error { return fmt.Errorf("failed to fetch transaction pool content: %w", err) } + var ( + newTxLists []types.Transactions + signer = types.LatestSignerForChainID(p.rpc.L2ChainID) + ) + for _, txs := range txLists { + var filtered types.Transactions + for _, tx := range txs { + sender, err := types.Sender(signer, tx) + if err != nil { + return err + } + + for _, localAddress := range p.locals { + if sender == localAddress { + filtered = append(filtered, tx) + } + } + } + + if filtered.Len() != 0 { + newTxLists = append(newTxLists, filtered) + } + } + + txLists = newTxLists + log.Info("Transactions lists count", "count", len(txLists)) if len(txLists) == 0 { @@ -390,7 +415,7 @@ func getTxOpts( } } - opts.GasTipCap = gasTipCap + opts.GasTipCap = new(big.Int).Mul(gasTipCap, common.Big2) return opts, nil }