github/scroll
1
1
Fork 0
mirror of https://github.com/scroll-tech/scroll.git synced 2026-04-23 03:00:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix comments

Browse Source
This commit is contained in:
maskpp
2023-04-04 21:23:33 +08:00
parent e5ccef40a9
commit 4d9e8ed47d
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bridge/relayer/l1_relayer.go
View File

@@ -152,7 +152,7 @@ func (r *Layer1Relayer) processSavedEvent(msg *types.L1Message) error {
if err != nil {
log.Error("UpdateLayer1StatusAndLayer2Hash failed", "msg.msgHash", msg.MsgHash, "msg.height", msg.Height, "err", err)
}
err = r.db.SaveTx(msg.MsgHash, from.String(), types.L1MessageTx, tx)
err = r.db.SaveTx(msg.MsgHash, from.String(), types.L1toL2MessageTx, tx)
if err != nil {
log.Error("failed to save l1 relay tx message", "msg.msgHash", msg.MsgHash, "msg.height", msg.Height, "tx.hash", tx.Hash().String(), "err", err)
}
@@ -205,7 +205,7 @@ func (r *Layer1Relayer) ProcessGasPriceOracle() {
log.Error("UpdateGasOracleStatusAndOracleTxHash failed", "block.Hash", block.Hash, "block.Height", block.Number, "err", err)
return
}
err = r.db.SaveTx(block.Hash, from.String(), types.L1GasOracleTx, tx)
err = r.db.SaveTx(block.Hash, from.String(), types.L1toL2GasOracleTx, tx)
if err != nil {
log.Error("failed to store l1 gas oracle tx message", "block.Hash", block.Hash, "block.Height", block.Number, "tx.hash", tx.Hash().String(), "err", err)
}

8
bridge/relayer/l2_relayer.go
View File

@@ -249,7 +249,7 @@ func (r *Layer2Relayer) processSavedEvent(msg *types.L2Message) error {
log.Error("UpdateLayer2StatusAndLayer1Hash failed", "msgHash", msg.MsgHash, "err", err)
return err
}
err = r.db.SaveTx(msg.MsgHash, senderAddr.String(), types.L2MessageTx, tx)
err = r.db.SaveTx(msg.MsgHash, senderAddr.String(), types.L2toL1MessageTx, tx)
if err != nil {
log.Error("failed to save l2 relay tx message", "msg.hash", msg.MsgHash, "tx.hash", tx.Hash().String(), "err", err)
}
@@ -297,7 +297,7 @@ func (r *Layer2Relayer) ProcessGasPriceOracle() {
return
}
// Record gas oracle tx message.
err = r.db.SaveTx(batch.Hash, from.String(), types.L2GasOracleTx, tx)
err = r.db.SaveTx(batch.Hash, from.String(), types.L2toL1GasOracleTx, tx)
if err != nil {
log.Error("failed to save l2 gas oracle tx message", "batch.Hash", batch.Hash, "tx.Hash", tx.Hash().String(), "err", err)
}
@@ -357,7 +357,7 @@ func (r *Layer2Relayer) SendCommitTx(batchData []*types.BatchData) error {
}
}
// Record gas oracle tx message.
err = r.db.SaveTx(txID, from.String(), types.L2RollUpCommitTx, tx)
err = r.db.SaveTx(txID, from.String(), types.RollUpCommitTx, tx)
if err != nil {
log.Error("failed to save l2 commitBatches tx message", "batches.id", txID, "tx.hash", tx.Hash().String(), "err", err)
}
@@ -503,7 +503,7 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
if err != nil {
log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_hash", hash, "err", err)
}
err = r.db.SaveTx(txID, from.String(), types.L2RollupFinalizeTx, tx)
err = r.db.SaveTx(txID, from.String(), types.RollupFinalizeTx, tx)
if err != nil {
log.Error("failed to save l2 committed tx message", "batch.hash", txID, "tx.hash", tx.Hash().String(), "err", err)
}

24
common/types/transaction.go
View File

@@ -8,18 +8,18 @@ type TxType int
const (
// UndefinedTx undefined scroll tx type
UndefinedTx TxType = iota
// L1MessageTx is sent by l1 relayer but to L2
L1MessageTx
// L1GasOracleTx is sent by l1 relayer but to L2
L1GasOracleTx
// L2MessageTx is sent by l2 relayer but to L1
L2MessageTx
// L2GasOracleTx is sent by l2 relayer but to L1
L2GasOracleTx
// L2RollUpCommitTx is sent to L2
L2RollUpCommitTx
// L2RollupFinalizeTx is sent to L2
L2RollupFinalizeTx
// L1toL2MessageTx is sent by l1 relayer but to L2
L1toL2MessageTx
// L1toL2GasOracleTx is sent by l1 relayer but to L2
L1toL2GasOracleTx
// L2toL1MessageTx is sent by l2 relayer but to L1
L2toL1MessageTx
// L2toL1GasOracleTx is sent by l2 relayer but to L1
L2toL1GasOracleTx
// RollUpCommitTx is sent to L2
RollUpCommitTx
// RollupFinalizeTx is sent to L2
RollupFinalizeTx
)
// ScrollTx Contains tx message, hash is the index.

10
database/orm_test.go
View File

@@ -477,7 +477,7 @@ func testTxOrmSaveTxAndGetTxByHash(t *testing.T) {
signedTx, err := auth.Signer(auth.From, tx)
assert.NoError(t, err)
err = ormTx.SaveTx("1", auth.From.String(), types.L1MessageTx, signedTx)
err = ormTx.SaveTx("1", auth.From.String(), types.L1toL2MessageTx, signedTx)
assert.Nil(t, err)
// Update tx message by id.
@@ -501,12 +501,12 @@ func testTxOrmGetL1TxMessages(t *testing.T) {
signedTx, err := mockTx(auth)
assert.NoError(t, err)
err = ormTx.SaveTx(templateL1Message[0].MsgHash, auth.From.String(), types.L1MessageTx, signedTx)
err = ormTx.SaveTx(templateL1Message[0].MsgHash, auth.From.String(), types.L1toL2MessageTx, signedTx)
assert.Nil(t, err)
signedTx, err = mockTx(auth)
assert.NoError(t, err)
err = ormTx.SaveTx("3", auth.From.String(), types.L1MessageTx, signedTx)
err = ormTx.SaveTx("3", auth.From.String(), types.L1toL2MessageTx, signedTx)
assert.Nil(t, err)
// Insert into db
@@ -540,7 +540,7 @@ func testTxOrmGetL2TxMessages(t *testing.T) {
signedTx, err := mockTx(auth)
assert.NoError(t, err)
err = ormTx.SaveTx(templateL1Message[0].MsgHash, auth.From.String(), types.L2MessageTx, signedTx)
err = ormTx.SaveTx(templateL1Message[0].MsgHash, auth.From.String(), types.L2toL1MessageTx, signedTx)
assert.Nil(t, err)
// Insert into db
@@ -580,7 +580,7 @@ func testTxOrmGetBlockBatchTxMessages(t *testing.T) {
signedTx, err := mockTx(auth)
assert.NoError(t, err)
err = ormTx.SaveTx(batchData1.Hash().String(), auth.From.String(), types.L2RollUpCommitTx, signedTx)
err = ormTx.SaveTx(batchData1.Hash().String(), auth.From.String(), types.RollUpCommitTx, signedTx)
assert.Nil(t, err)
txMsgs, err := ormTx.GetBlockBatchTxMessages(