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

merge feat/record_transaction branch

Browse Source
This commit is contained in:
maskpp
2023-04-11 11:10:04 +08:00
parent 481b05e487 7b6556922c
commit bf1d007acf
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/types/transaction.go
View File

@@ -28,13 +28,14 @@ const (
// ScrollTx Contains tx message, hash is the index.
type ScrollTx struct {
ID string `json:"id" db:"id"`
TxHash sql.NullString `json:"tx_hash" db:"tx_hash"`
Sender sql.NullString `json:"sender" db:"sender"`
Nonce sql.NullInt64 `json:"nonce" db:"nonce"`
Target sql.NullString `json:"target" db:"target"`
Value sql.NullString `json:"value" db:"value"`
Data []byte `json:"data" db:"data"`
ID string `json:"id" db:"id"`
TxHash sql.NullString `json:"tx_hash" db:"tx_hash"`
Sender sql.NullString `json:"sender" db:"sender"`
Nonce sql.NullInt64 `json:"nonce" db:"nonce"`
Target sql.NullString `json:"target" db:"target"`
Value sql.NullString `json:"value" db:"value"`
Data []byte `json:"data" db:"data"`
ExtraData sql.NullString `json:"extraData" db:"extra_data"`
}
// GetTxHash returns `common.Hash` type of tx hash.

2
database/orm/transaction.go
View File

@@ -146,7 +146,7 @@ func (t *scrollTxOrm) GetBlockBatchTxMessages(fields map[string]interface{}, arg
query = query + fmt.Sprintf(" AND %s = :%s", key, key)
}
query = strings.Join(append([]string{query}, args...), " ")
query = fmt.Sprintf("select bt.index as index, bt.hash as id, tx.tx_hash, tx.sender, tx.nonce, tx.target, tx.value, tx.data from scroll_transaction as tx right join (%s) as bt on tx.id = bt.hash;", query)
query = fmt.Sprintf("select bt.index as index, bt.hash as id, tx.tx_hash, tx.sender, tx.nonce, tx.target, tx.value, tx.data, tx.extra_data from scroll_transaction as tx right join (%s) as bt on tx.id = bt.hash;", query)
db := t.db
rows, err := db.NamedQuery(db.Rebind(query), fields)

8
database/orm_test.go
View File

@@ -94,8 +94,8 @@ var (
func setupEnv(t *testing.T) error {
// Init db config and start db container.
dbConfig = &database.DBConfig{DriverName: "postgres"}
base.RunImages(t)
dbConfig.DSN = base.DBEndpoint()
//base.RunImages(t)
dbConfig.DSN = "postgres://maskpp:123456@localhost:5432/postgres?sslmode=disable" //base.DBEndpoint()
// Create db handler and reset db.
factory, err := database.NewOrmFactory(dbConfig)
@@ -581,7 +581,8 @@ func testTxOrmGetBlockBatchTxMessages(t *testing.T) {
signedTx, err := mockTx(auth)
assert.NoError(t, err)
err = ormTx.SaveTx(batchData1.Hash().String(), auth.From.String(), types.RollUpCommitTx, signedTx, "")
extraData := "extra data"
err = ormTx.SaveTx(batchData1.Hash().String(), auth.From.String(), types.RollUpCommitTx, signedTx, extraData)
assert.Nil(t, err)
batchIndex, txMsgs, err := ormTx.GetBlockBatchTxMessages(
@@ -596,4 +597,5 @@ func testTxOrmGetBlockBatchTxMessages(t *testing.T) {
assert.Equal(t, batchData1.Hash().String(), txMsgs[0].ID)
assert.Equal(t, false, txMsgs[1].TxHash.Valid)
assert.Equal(t, batchData2.Hash().String(), txMsgs[1].ID)
assert.Equal(t, extraData, txMsgs[0].ExtraData.String)
}