add debug logs

bridge/config.json

@@ -20,10 +20,6 @@
         "tx_type": "LegacyTx",
         "min_balance": 100000000000000000000
       },
-      "gas_oracle_config": {
-        "min_gas_price": 0,
-        "gas_price_diff": 50000
-      },
       "message_sender_private_keys": [
         "1212121212121212121212121212121212121212121212121212121212121212"
       ],
@@ -52,10 +48,6 @@
         "tx_type": "LegacyTx",
         "min_balance": 100000000000000000000
       },
-      "gas_oracle_config": {
-        "min_gas_price": 0,
-        "gas_price_diff": 50000
-      },
       "message_sender_private_keys": [
         "1212121212121212121212121212121212121212121212121212121212121212"
       ],
@@ -71,7 +63,6 @@
       "batch_gas_threshold": 3000000,
       "batch_tx_num_threshold": 44,
       "batch_time_sec": 300,
-      "batch_commit_time_sec": 1200,
       "batch_blocks_limit": 100,
       "commit_tx_calldata_size_limit": 200000,
       "public_input_config": {
@@ -82,8 +73,6 @@
   },
   "db_config": {
     "driver_name": "postgres",
-    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable",
-    "maxOpenNum": 200,
-    "maxIdleNum": 20
+    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable"
   }
 }

bridge/config/l2_config.go

@@ -34,8 +34,6 @@ type BatchProposerConfig struct {
 	BatchGasThreshold uint64 `json:"batch_gas_threshold"`
 	// Time waited to generate a batch even if gas_threshold not met
 	BatchTimeSec uint64 `json:"batch_time_sec"`
-	// Time waited to commit batches before the calldata met CommitTxCalldataSizeLimit
-	BatchCommitTimeSec uint64 `json:"batch_commit_time_sec"`
 	// Max number of blocks in a batch
 	BatchBlocksLimit uint64 `json:"batch_blocks_limit"`
 	// Commit tx calldata size limit in bytes, target to cap the gas use of commit tx at 2M gas

bridge/config/relayer_config.go

@@ -42,25 +42,15 @@ type RelayerConfig struct {
 	// MessengerContractAddress store the scroll messenger contract address.
 	MessengerContractAddress common.Address `json:"messenger_contract_address"`
 	// GasPriceOracleContractAddress store the scroll messenger contract address.
-	GasPriceOracleContractAddress common.Address `json:"gas_price_oracle_contract_address"`
+	GasPriceOracleContractAddress common.Address `json:"gas_proce_oracle_contract_address"`
 	// sender config
 	SenderConfig *SenderConfig `json:"sender_config"`
-	// gas oracle config
-	GasOracleConfig *GasOracleConfig `json:"gas_oracle_config"`
 	// The private key of the relayer
 	MessageSenderPrivateKeys   []*ecdsa.PrivateKey `json:"-"`
 	GasOracleSenderPrivateKeys []*ecdsa.PrivateKey `json:"-"`
 	RollupSenderPrivateKeys    []*ecdsa.PrivateKey `json:"-"`
 }
 
-// GasOracleConfig The config for updating gas price oracle.
-type GasOracleConfig struct {
-	// MinGasPrice store the minimum gas price to set.
-	MinGasPrice uint64 `json:"min_gas_price"`
-	// GasPriceDiff store the percentage of gas price difference.
-	GasPriceDiff uint64 `json:"gas_price_diff"`
-}
-
 // relayerConfigAlias RelayerConfig alias name
 type relayerConfigAlias RelayerConfig
 

bridge/l1/relayer.go

@@ -22,12 +22,6 @@ import (
 	"scroll-tech/bridge/sender"
 )
 
-const (
-	gasPriceDiffPrecision = 1000000
-
-	defaultGasPriceDiff = 50000 // 5%
-)
-
 // Layer1Relayer is responsible for
 //  1. fetch pending L1Message from db
 //  2. relay pending message to layer 2 node
@@ -49,10 +43,6 @@ type Layer1Relayer struct {
 	gasOracleCh     <-chan *sender.Confirmation
 	l1GasOracleABI  *abi.ABI
 
-	lastGasPrice uint64
-	minGasPrice  uint64
-	gasPriceDiff uint64
-
 	stopCh chan struct{}
 }
 
@@ -69,20 +59,10 @@ func NewLayer1Relayer(ctx context.Context, db database.OrmFactory, cfg *config.R
 	gasOracleSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.GasOracleSenderPrivateKeys)
 	if err != nil {
 		addr := crypto.PubkeyToAddress(cfg.GasOracleSenderPrivateKeys[0].PublicKey)
-		log.Error("new GasOracleSender failed", "main address", addr.String(), "err", err)
+		log.Error("new MessageSender failed", "main address", addr.String(), "err", err)
 		return nil, err
 	}
 
-	var minGasPrice uint64
-	var gasPriceDiff uint64
-	if cfg.GasOracleConfig != nil {
-		minGasPrice = cfg.GasOracleConfig.MinGasPrice
-		gasPriceDiff = cfg.GasOracleConfig.GasPriceDiff
-	} else {
-		minGasPrice = 0
-		gasPriceDiff = defaultGasPriceDiff
-	}
-
 	return &Layer1Relayer{
 		ctx: ctx,
 		db:  db,
@@ -95,9 +75,6 @@ func NewLayer1Relayer(ctx context.Context, db database.OrmFactory, cfg *config.R
 		gasOracleCh:     gasOracleSender.ConfirmChan(),
 		l1GasOracleABI:  bridge_abi.L1GasPriceOracleABI,
 
-		minGasPrice:  minGasPrice,
-		gasPriceDiff: gasPriceDiff,
-
 		cfg:    cfg,
 		stopCh: make(chan struct{}),
 	}, nil
@@ -170,31 +147,25 @@ func (r *Layer1Relayer) ProcessGasPriceOracle() {
 	block := blocks[0]
 
 	if block.GasOracleStatus == types.GasOraclePending {
-		expectedDelta := r.lastGasPrice * r.gasPriceDiff / gasPriceDiffPrecision
-		// last is undefine or (block.BaseFee >= minGasPrice && exceed diff)
-		if r.lastGasPrice == 0 || (block.BaseFee >= r.minGasPrice && (block.BaseFee >= r.lastGasPrice+expectedDelta || block.BaseFee <= r.lastGasPrice-expectedDelta)) {
-			baseFee := big.NewInt(int64(block.BaseFee))
-			data, err := r.l1GasOracleABI.Pack("setL1BaseFee", baseFee)
-			if err != nil {
-				log.Error("Failed to pack setL1BaseFee", "block.Hash", block.Hash, "block.Height", block.Number, "block.BaseFee", block.BaseFee, "err", err)
-				return
-			}
+		baseFee := big.NewInt(int64(block.BaseFee))
+		data, err := r.l1GasOracleABI.Pack("setL1BaseFee", baseFee)
+		if err != nil {
+			log.Error("Failed to pack setL1BaseFee", "block.Hash", block.Hash, "block.Height", block.Number, "block.BaseFee", block.BaseFee, "err", err)
+			return
+		}
 
-			hash, err := r.gasOracleSender.SendTransaction(block.Hash, &r.cfg.GasPriceOracleContractAddress, big.NewInt(0), data)
-			if err != nil {
-				if !errors.Is(err, sender.ErrNoAvailableAccount) {
-					log.Error("Failed to send setL1BaseFee tx to layer2 ", "block.Hash", block.Hash, "block.Height", block.Number, "err", err)
-				}
-				return
+		hash, err := r.gasOracleSender.SendTransaction(block.Hash, &r.cfg.GasPriceOracleContractAddress, big.NewInt(0), data)
+		if err != nil {
+			if !errors.Is(err, sender.ErrNoAvailableAccount) {
+				log.Error("Failed to send setL1BaseFee tx to layer2 ", "block.Hash", block.Hash, "block.Height", block.Number, "err", err)
 			}
+			return
+		}
 
-			err = r.db.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, block.Hash, types.GasOracleImporting, hash.String())
-			if err != nil {
-				log.Error("UpdateGasOracleStatusAndOracleTxHash failed", "block.Hash", block.Hash, "block.Height", block.Number, "err", err)
-				return
-			}
-			r.lastGasPrice = block.BaseFee
-			log.Info("Update l1 base fee", "txHash", hash.String(), "baseFee", baseFee)
+		err = r.db.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, block.Hash, types.GasOracleImporting, hash.String())
+		if err != nil {
+			log.Error("UpdateGasOracleStatusAndOracleTxHash failed", "block.Hash", block.Hash, "block.Height", block.Number, "err", err)
+			return
 		}
 	}
 }

bridge/l2/batch_proposer.go

@@ -64,7 +64,6 @@ type BatchProposer struct {
 	batchGasThreshold        uint64
 	batchTxNumThreshold      uint64
 	batchBlocksLimit         uint64
-	batchCommitTimeSec       uint64
 	commitCalldataSizeLimit  uint64
 	batchDataBufferSizeLimit uint64
 
@@ -87,7 +86,6 @@ func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, rela
 		batchGasThreshold:        cfg.BatchGasThreshold,
 		batchTxNumThreshold:      cfg.BatchTxNumThreshold,
 		batchBlocksLimit:         cfg.BatchBlocksLimit,
-		batchCommitTimeSec:       cfg.BatchCommitTimeSec,
 		commitCalldataSizeLimit:  cfg.CommitTxCalldataSizeLimit,
 		batchDataBufferSizeLimit: 100*cfg.CommitTxCalldataSizeLimit + 1*1024*1024, // @todo: determine the value.
 		proofGenerationFreq:      cfg.ProofGenerationFreq,
@@ -126,7 +124,6 @@ func (p *BatchProposer) Start() {
 
 				case <-ticker.C:
 					p.tryProposeBatch()
-					p.tryCommitBatches()
 				}
 			}
 		}(ctx)
@@ -160,7 +157,7 @@ func (p *BatchProposer) recoverBatchDataBuffer() {
 		}
 		blockBatches, err := p.orm.GetBlockBatches(map[string]interface{}{"hash": batchHash})
 		if err != nil || len(blockBatches) == 0 {
-			return nil, err
+			return nil, err //
 		}
 		blockBatchCache[batchHash] = blockBatches[0]
 		return blockBatches[0], nil
@@ -228,16 +225,11 @@ func (p *BatchProposer) tryProposeBatch() {
 
 		p.proposeBatch(blocks)
 	}
+
+	p.tryCommitBatches()
 }
 
 func (p *BatchProposer) tryCommitBatches() {
-	p.mutex.Lock()
-	defer p.mutex.Unlock()
-
-	if len(p.batchDataBuffer) == 0 {
-		return
-	}
-
 	// estimate the calldata length to determine whether to commit the pending batches
 	index := 0
 	commit := false
@@ -257,7 +249,8 @@ func (p *BatchProposer) tryCommitBatches() {
 			break
 		}
 	}
-	if !commit && p.batchDataBuffer[0].Timestamp()+p.batchCommitTimeSec > uint64(time.Now().Unix()) {
+	log.Info("tryCommitBatches", "calldataByteLen", calldataByteLen, "p.commitCalldataSizeLimit", p.commitCalldataSizeLimit)
+	if !commit {
 		return
 	}
 
@@ -295,13 +288,14 @@ func (p *BatchProposer) proposeBatch(blocks []*types.BlockInfo) {
 		return
 	}
 
-	var gasUsed, txNum uint64
-	reachThreshold := false
+	var (
+		length         = len(blocks)
+		gasUsed, txNum uint64
+	)
 	// add blocks into batch until reach batchGasThreshold
 	for i, block := range blocks {
 		if (gasUsed+block.GasUsed > p.batchGasThreshold) || (txNum+block.TxNum > p.batchTxNumThreshold) {
 			blocks = blocks[:i]
-			reachThreshold = true
 			break
 		}
 		gasUsed += block.GasUsed
@@ -311,7 +305,7 @@ func (p *BatchProposer) proposeBatch(blocks []*types.BlockInfo) {
 	// if too few gas gathered, but we don't want to halt, we then check the first block in the batch:
 	// if it's not old enough we will skip proposing the batch,
 	// otherwise we will still propose a batch
-	if !reachThreshold && blocks[0].BlockTimestamp+p.batchTimeSec > uint64(time.Now().Unix()) {
+	if length == len(blocks) && blocks[0].BlockTimestamp+p.batchTimeSec > uint64(time.Now().Unix()) {
 		return
 	}
 

bridge/l2/relayer.go

@@ -29,12 +29,6 @@ import (
 	"scroll-tech/bridge/utils"
 )
 
-const (
-	gasPriceDiffPrecision = 1000000
-
-	defaultGasPriceDiff = 50000 // 5%
-)
-
 // Layer2Relayer is responsible for
 //  1. Committing and finalizing L2 blocks on L1
 //  2. Relaying messages from L2 to L1
@@ -61,10 +55,6 @@ type Layer2Relayer struct {
 	gasOracleCh     <-chan *sender.Confirmation
 	l2GasOracleABI  *abi.ABI
 
-	lastGasPrice uint64
-	minGasPrice  uint64
-	gasPriceDiff uint64
-
 	// A list of processing message.
 	// key(string): confirmation ID, value(string): layer2 hash.
 	processingMessage sync.Map
@@ -101,16 +91,6 @@ func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db databa
 		return nil, err
 	}
 
-	var minGasPrice uint64
-	var gasPriceDiff uint64
-	if cfg.GasOracleConfig != nil {
-		minGasPrice = cfg.GasOracleConfig.MinGasPrice
-		gasPriceDiff = cfg.GasOracleConfig.GasPriceDiff
-	} else {
-		minGasPrice = 0
-		gasPriceDiff = defaultGasPriceDiff
-	}
-
 	return &Layer2Relayer{
 		ctx: ctx,
 		db:  db,
@@ -129,9 +109,6 @@ func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db databa
 		gasOracleCh:     gasOracleSender.ConfirmChan(),
 		l2GasOracleABI:  bridge_abi.L2GasPriceOracleABI,
 
-		minGasPrice:  minGasPrice,
-		gasPriceDiff: gasPriceDiff,
-
 		cfg:                         cfg,
 		processingMessage:           sync.Map{},
 		processingBatchesCommitment: sync.Map{},
@@ -261,32 +238,25 @@ func (r *Layer2Relayer) ProcessGasPriceOracle() {
 			log.Error("Failed to fetch SuggestGasPrice from l2geth", "err", err)
 			return
 		}
-		suggestGasPriceUint64 := uint64(suggestGasPrice.Int64())
-		expectedDelta := r.lastGasPrice * r.gasPriceDiff / gasPriceDiffPrecision
 
-		// last is undefine or (suggestGasPriceUint64 >= minGasPrice && exceed diff)
-		if r.lastGasPrice == 0 || (suggestGasPriceUint64 >= r.minGasPrice && (suggestGasPriceUint64 >= r.lastGasPrice+expectedDelta || suggestGasPriceUint64 <= r.lastGasPrice-expectedDelta)) {
-			data, err := r.l2GasOracleABI.Pack("setL2BaseFee", suggestGasPrice)
-			if err != nil {
-				log.Error("Failed to pack setL2BaseFee", "batch.Hash", batch.Hash, "GasPrice", suggestGasPrice.Uint64(), "err", err)
-				return
-			}
+		data, err := r.l2GasOracleABI.Pack("setL2BaseFee", suggestGasPrice)
+		if err != nil {
+			log.Error("Failed to pack setL2BaseFee", "batch.Hash", batch.Hash, "block.BaseFee", suggestGasPrice.Uint64(), "err", err)
+			return
+		}
 
-			hash, err := r.gasOracleSender.SendTransaction(batch.Hash, &r.cfg.GasPriceOracleContractAddress, big.NewInt(0), data)
-			if err != nil {
-				if !errors.Is(err, sender.ErrNoAvailableAccount) {
-					log.Error("Failed to send setL2BaseFee tx to layer2 ", "batch.Hash", batch.Hash, "err", err)
-				}
-				return
+		hash, err := r.gasOracleSender.SendTransaction(batch.Hash, &r.cfg.GasPriceOracleContractAddress, big.NewInt(0), data)
+		if err != nil {
+			if !errors.Is(err, sender.ErrNoAvailableAccount) {
+				log.Error("Failed to send setL2BaseFee tx to layer2 ", "batch.Hash", batch.Hash, "err", err)
 			}
+			return
+		}
 
-			err = r.db.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, batch.Hash, types.GasOracleImporting, hash.String())
-			if err != nil {
-				log.Error("UpdateGasOracleStatusAndOracleTxHash failed", "batch.Hash", batch.Hash, "err", err)
-				return
-			}
-			r.lastGasPrice = suggestGasPriceUint64
-			log.Info("Update l2 gas price", "txHash", hash.String(), "GasPrice", suggestGasPrice)
+		err = r.db.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, batch.Hash, types.GasOracleImporting, hash.String())
+		if err != nil {
+			log.Error("UpdateGasOracleStatusAndOracleTxHash failed", "batch.Hash", batch.Hash, "err", err)
+			return
 		}
 	}
 }
@@ -315,6 +285,7 @@ func (r *Layer2Relayer) SendCommitTx(batchData []*types.BatchData) error {
 	// generate a unique txID and send transaction
 	var bytes []byte
 	for _, batch := range batchData {
+		log.Info("!!!!!", "BatchIndex", batch.Batch.BatchIndex, "BatchHash", batch.Hash().String(), "ParentBatchHash", batch.Batch.ParentBatchHash.String(), "PrevStateRoot", batch.Batch.PrevStateRoot.String(), "NewStateRoot", batch.Batch.NewStateRoot.String())
 		bytes = append(bytes, batch.Hash().Bytes()...)
 	}
 	txID := crypto.Keccak256Hash(bytes).String()
@@ -322,6 +293,7 @@ func (r *Layer2Relayer) SendCommitTx(batchData []*types.BatchData) error {
 	if err != nil {
 		if !errors.Is(err, sender.ErrNoAvailableAccount) {
 			log.Error("Failed to send commitBatches tx to layer1 ", "err", err)
+			fmt.Printf("Calldata = %v\n", common.Bytes2Hex(calldata))
 		}
 		return err
 	}

build/push-docker-tag.Jenkinsfile

@@ -1,6 +1,6 @@
 imagePrefix = 'scrolltech'
 credentialDocker = 'dockerhub'
-TAGNAME = ''
+
 pipeline {
     agent any
     options {
@@ -41,18 +41,13 @@ pipeline {
                                 if (TAGNAME == ""){
                                     return;
                                 }
-                                def brigeImageName = "scrolltech/bridge:$TAGNAME"
-                                sh "docker login --username=$dockerUser --password=$dockerPassword"
-                                sh "echo $brigeImageName"
-                                sh "docker manifest inspect scrolltech/bridge:$TAGNAME > /dev/null"
-                                sh "echo $?"
-                                // sh "docker login --username=${dockerUser} --password=${dockerPassword}"
-                                // sh "make -C bridge docker"
-                                // sh "make -C coordinator docker"
-                                // sh "docker tag scrolltech/bridge:latest scrolltech/bridge:${TAGNAME}"
-                                // sh "docker tag scrolltech/coordinator:latest scrolltech/coordinator:${TAGNAME}"
-                                // sh "docker push scrolltech/bridge:${TAGNAME}"
-                                // sh "docker push scrolltech/coordinator:${TAGNAME}"
+                                sh "docker login --username=${dockerUser} --password=${dockerPassword}"
+                                sh "make -C bridge docker"
+                                sh "make -C coordinator docker"
+                                sh "docker tag scrolltech/bridge:latest scrolltech/bridge:${TAGNAME}"
+                                sh "docker tag scrolltech/coordinator:latest scrolltech/coordinator:${TAGNAME}"
+                                sh "docker push scrolltech/bridge:${TAGNAME}"
+                                sh "docker push scrolltech/coordinator:${TAGNAME}"
                             }                              
                     }
                }

common/types/batch.go

@@ -39,14 +39,6 @@ type BatchData struct {
 	piCfg *PublicInputHashConfig
 }
 
-// Timestamp returns the timestamp of the first block in the BlockData.
-func (b *BatchData) Timestamp() uint64 {
-	if len(b.Batch.Blocks) == 0 {
-		return 0
-	}
-	return b.Batch.Blocks[0].Timestamp
-}
-
 // Hash calculates the hash of this batch.
 func (b *BatchData) Hash() *common.Hash {
 	if b.hash != nil {

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "alpha-v1.11"
+var tag = "alpha-v1.6"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

coordinator/config.json

@@ -12,9 +12,7 @@
   },
   "db_config": {
     "driver_name": "postgres",
-    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable",
-    "maxOpenNum": 200,
-    "maxIdleNum": 20
+    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable"
   },
   "l2_config": {
     "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc"

database/config.go

@@ -12,8 +12,8 @@ type DBConfig struct {
 	DSN        string `json:"dsn"`
 	DriverName string `json:"driver_name"`
 
-	MaxOpenNum int `json:"maxOpenNum"`
-	MaxIdleNum int `json:"maxIdleNum"`
+	MaxOpenNum int `json:"maxOpenNum" default:"200"`
+	MaxIdleNum int `json:"maxIdleNum" default:"20"`
 }
 
 // NewConfig returns a new instance of Config.

database/config.json

@@ -1,6 +1,4 @@
 {
   "dsn": "postgres://postgres:123456@localhost:5444/test?sslmode=disable",
-  "driver_name": "postgres",
-  "maxOpenNum": 200,
-  "maxIdleNum": 20
+  "driver_name": "postgres"
 }

database/orm_factory.go

@@ -38,7 +38,7 @@ func NewOrmFactory(cfg *DBConfig) (OrmFactory, error) {
 		return nil, err
 	}
 
-	db.SetMaxOpenConns(cfg.MaxOpenNum)
+	db.SetMaxIdleConns(cfg.MaxOpenNum)
 	db.SetMaxIdleConns(cfg.MaxIdleNum)
 	if err = db.Ping(); err != nil {
 		return nil, err