Commit f538497f authored by Matthew Slipper's avatar Matthew Slipper Committed by GitHub

op-deployer: Update artifacts url (#12278)

* op-deployer: Update artifacts url

* increase estimator multiples

* log transactions
parent a83c3752
...@@ -9,17 +9,17 @@ import ( ...@@ -9,17 +9,17 @@ import (
) )
var ( var (
// baseFeePadFactor = 20% as a divisor // baseFeePadFactor = 50% as a divisor
baseFeePadFactor = big.NewInt(5) baseFeePadFactor = big.NewInt(2)
// tipMulFactor = 10 as a multiplier // tipMulFactor = 20 as a multiplier
tipMulFactor = big.NewInt(10) tipMulFactor = big.NewInt(20)
// dummyBlobFee is a dummy value for the blob fee. Since this gas estimator will never // dummyBlobFee is a dummy value for the blob fee. Since this gas estimator will never
// post blobs, it's just set to 1. // post blobs, it's just set to 1.
dummyBlobFee = big.NewInt(1) dummyBlobFee = big.NewInt(1)
) )
// DeployerGasPriceEstimator is a custom gas price estimator for use with op-deployer. // DeployerGasPriceEstimator is a custom gas price estimator for use with op-deployer.
// It pads the base fee by 20% and multiplies the suggested tip by 10. // It pads the base fee by 50% and multiplies the suggested tip by 20.
func DeployerGasPriceEstimator(ctx context.Context, client txmgr.ETHBackend) (*big.Int, *big.Int, *big.Int, error) { func DeployerGasPriceEstimator(ctx context.Context, client txmgr.ETHBackend) (*big.Int, *big.Int, *big.Int, error) {
chainHead, err := client.HeaderByNumber(ctx, nil) chainHead, err := client.HeaderByNumber(ctx, nil)
if err != nil { if err != nil {
......
...@@ -32,12 +32,11 @@ type KeyedBroadcaster struct { ...@@ -32,12 +32,11 @@ type KeyedBroadcaster struct {
} }
type KeyedBroadcasterOpts struct { type KeyedBroadcasterOpts struct {
Logger log.Logger Logger log.Logger
ChainID *big.Int ChainID *big.Int
Client *ethclient.Client Client *ethclient.Client
Signer opcrypto.SignerFn Signer opcrypto.SignerFn
From common.Address From common.Address
TXManagerLogger log.Logger
} }
func NewKeyedBroadcaster(cfg KeyedBroadcasterOpts) (*KeyedBroadcaster, error) { func NewKeyedBroadcaster(cfg KeyedBroadcasterOpts) (*KeyedBroadcaster, error) {
...@@ -70,14 +69,9 @@ func NewKeyedBroadcaster(cfg KeyedBroadcasterOpts) (*KeyedBroadcaster, error) { ...@@ -70,14 +69,9 @@ func NewKeyedBroadcaster(cfg KeyedBroadcasterOpts) (*KeyedBroadcaster, error) {
mgrCfg.MinTipCap.Store(minTipCap) mgrCfg.MinTipCap.Store(minTipCap)
mgrCfg.MinBaseFee.Store(minBaseFee) mgrCfg.MinBaseFee.Store(minBaseFee)
txmLogger := log.NewLogger(log.DiscardHandler())
if cfg.TXManagerLogger != nil {
txmLogger = cfg.TXManagerLogger
}
mgr, err := txmgr.NewSimpleTxManagerFromConfig( mgr, err := txmgr.NewSimpleTxManagerFromConfig(
"transactor", "transactor",
txmLogger, cfg.Logger,
&metrics.NoopTxMetrics{}, &metrics.NoopTxMetrics{},
mgrCfg, mgrCfg,
) )
......
...@@ -15,7 +15,7 @@ import ( ...@@ -15,7 +15,7 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
var V160ArtifactsURL = state.MustParseArtifactsURL("https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-155f65e7dcbea1b7b3d37a0fc39cc8b6a1c03b6c5b677886ca2420e10e9c1ea6.tar.gz") var V160ArtifactsURL = state.MustParseArtifactsURL("https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-ee07c78c3d8d4cd8f7a933c050f5afeebaa281b57b226cc6f092b19de2a8d61f.tar.gz")
type InitConfig struct { type InitConfig struct {
L1ChainID uint64 L1ChainID uint64
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment