Skip to content

Commit ef83bd7

Browse files
committed
fix
1 parent 12a66e5 commit ef83bd7

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

op-node/rollup/derive/attributes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (ba *FetchingAttributesBuilder) PreparePayloadAttributes(ctx context.Contex
146146
}
147147

148148
if ba.rollupCfg.IsJovianActivationBlock(nextL2Time) {
149-
jovian, err := JovianNetworkUpgradeTransactions(ba.rollupCfg.IsJovian(nextL2Time), ba.rollupCfg.IsJovian(nextL2Time))
149+
jovian, err := JovianNetworkUpgradeTransactions()
150150
if err != nil {
151151
return nil, NewCriticalError(fmt.Errorf("failed to build jovian network upgrade txs: %w", err))
152152
}

op-node/rollup/derive/jovian_upgrade_transactions.go

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -128,24 +128,20 @@ func OperatorFeeFixUpgradeTransactions() ([]hexutil.Bytes, error) {
128128
return upgradeTxns, nil
129129
}
130130

131-
func JovianNetworkUpgradeTransactions(IsDAFootprintBlockLimit, IsOperatorFeeFix bool) ([]hexutil.Bytes, error) {
131+
func JovianNetworkUpgradeTransactions() ([]hexutil.Bytes, error) {
132132
upgradeTxs := make([]hexutil.Bytes, 0)
133133

134-
if IsDAFootprintBlockLimit {
135-
txs, err := DAFootprintNetworkUpgradeTransactions()
136-
if err != nil {
137-
return nil, err
138-
}
139-
upgradeTxs = append(upgradeTxs, txs...)
134+
txs, err := DAFootprintNetworkUpgradeTransactions()
135+
if err != nil {
136+
return nil, err
140137
}
138+
upgradeTxs = append(upgradeTxs, txs...)
141139

142-
if IsOperatorFeeFix {
143-
txs, err := OperatorFeeFixUpgradeTransactions()
144-
if err != nil {
145-
return nil, err
146-
}
147-
upgradeTxs = append(upgradeTxs, txs...)
140+
txs, err = OperatorFeeFixUpgradeTransactions()
141+
if err != nil {
142+
return nil, err
148143
}
144+
upgradeTxs = append(upgradeTxs, txs...)
149145

150146
return upgradeTxs, nil
151147
}

0 commit comments

Comments
 (0)