Merge pull request #4 from optimism-java/fix-clock-type

fix clock type
optimism-java · Sep 13, 2024 · 01ae5fc · 01ae5fc
2 parents f176d09 + b08300a
commit 01ae5fc
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/internal/handler/disputeGame.go b/internal/handler/disputeGame.go
@@ -95,17 +95,18 @@ func (r *RetryDisputeGameClient) ProcessDisputeGameMove(ctx context.Context, evt
 	}
 
 	claimData := &schema.GameClaimData{
-		GameContract: evt.ContractAddress,
-		DataIndex:    storageClaimSize,
-		ParentIndex:  data.ParentIndex,
-		CounteredBy:  data.CounteredBy.Hex(),
-		Claimant:     data.Claimant.Hex(),
-		Bond:         cast.ToString(data.Bond),
-		Claim:        hex.EncodeToString(data.Claim[:]),
-		Position:     cast.ToString(data.Position),
-		Clock:        data.Clock.Int64(),
-		OutputBlock:  outputblock,
-		EventID:      evt.ID,
+		GameContract:  evt.ContractAddress,
+		DataIndex:     storageClaimSize,
+		ParentIndex:   data.ParentIndex,
+		CounteredBy:   data.CounteredBy.Hex(),
+		Claimant:      data.Claimant.Hex(),
+		Bond:          cast.ToString(data.Bond),
+		Claim:         hex.EncodeToString(data.Claim[:]),
+		Position:      cast.ToString(data.Position),
+		Clock:         cast.ToString(data.Clock),
+		OutputBlock:   outputblock,
+		EventID:       evt.ID,
+		OnChainStatus: schema.GameClaimDataOnChainStatusValid,
 	}
 	err = r.DB.Transaction(func(tx *gorm.DB) error {
 		err = tx.Save(claimData).Error
@@ -182,7 +183,7 @@ func (r *RetryDisputeGameClient) addDisputeGame(ctx context.Context, evt *schema
 		Bond:          cast.ToString(claimData.Bond),
 		Claim:         hex.EncodeToString(claimData.Claim[:]),
 		Position:      cast.ToString(claimData.Position),
-		Clock:         claimData.Clock.Int64(),
+		Clock:         cast.ToString(claimData.Clock),
 		OutputBlock:   l2Block.Uint64(),
 		EventID:       evt.ID,
 		OnChainStatus: schema.GameClaimDataOnChainStatusValid,

diff --git a/internal/schema/game_claim_data.go b/internal/schema/game_claim_data.go
@@ -15,7 +15,7 @@ type GameClaimData struct {
 	Bond          string `json:"bond"`
 	Claim         string `json:"claim"`
 	Position      string `json:"position"`
-	Clock         int64  `json:"clock"`
+	Clock         string `json:"clock"`
 	OutputBlock   uint64 `json:"output_block"`
 	EventID       int64  `json:"event_id"`
 	OnChainStatus string `json:"on_chain_status"`

diff --git a/migration/version/migration_version.go b/migration/version/migration_version.go
@@ -7,6 +7,7 @@ import (
 	v3 "github.com/optimism-java/dispute-explorer/migration/version/v3"
 	v4 "github.com/optimism-java/dispute-explorer/migration/version/v4"
 	v5 "github.com/optimism-java/dispute-explorer/migration/version/v5"
+	v6 "github.com/optimism-java/dispute-explorer/migration/version/v6"
 )
 
 var ModelSchemaList = []*gormigrate.Migration{
@@ -15,4 +16,5 @@ var ModelSchemaList = []*gormigrate.Migration{
 	&v3.UpdateLostBondAndClaimDataTable,
 	&v4.UpdateClaimDataPositionColumnTable,
 	&v5.AddOnChainStatusForDisputeGameTable,
+	&v6.UpdateClaimDataClockColumnTable,
 }
diff --git a/migration/version/v6/update_clock_type.go b/migration/version/v6/update_clock_type.go
@@ -0,0 +1,16 @@
+package v6
+
+import (
+	"github.com/go-gormigrate/gormigrate/v2"
+	"gorm.io/gorm"
+)
+
+var UpdateClaimDataClockColumnTable = gormigrate.Migration{
+	ID: "v6",
+	Migrate: func(tx *gorm.DB) error {
+		type GameClaimData struct {
+			Clock string `json:"clock" gorm:"type:varchar(128);notnull"`
+		}
+		return tx.AutoMigrate(&GameClaimData{})
+	},
+}