add l1 block height to output type (#104)

initia-labs · Aug 12, 2024 · 7a2cc2e · 7a2cc2e
1 parent 9332e1a
commit 7a2cc2e
Show file tree

Hide file tree

Showing 9 changed files with 221 additions and 106 deletions.
diff --git a/api/opinit/ophost/v1/types.pulsar.go b/api/opinit/ophost/v1/types.pulsar.go
diff --git a/proto/opinit/ophost/v1/types.proto b/proto/opinit/ophost/v1/types.proto
@@ -84,11 +84,13 @@ message TokenPair {
 message Output {
   // Hash of the l2 output.
   bytes output_root = 1;
+  // The l1 block number that the output root was submitted in.
+  uint64 l1_block_number = 2;
   // Timestamp of the l1 block that the output root was submitted in.
-  google.protobuf.Timestamp l1_block_time = 2
+  google.protobuf.Timestamp l1_block_time = 3
       [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (amino.dont_omitempty) = true];
   // The l2 block number that the output root was submitted in.
-  uint64 l2_block_number = 3;
+  uint64 l2_block_number = 4;
 }
 
 // BatchInfoWithOutput defines the batch information with output.

diff --git a/x/ophost/keeper/genesis_test.go b/x/ophost/keeper/genesis_test.go
@@ -42,16 +42,19 @@ func Test_GenesisExport(t *testing.T) {
 	output1 := types.Output{
 		OutputRoot:    []byte{1, 2, 3},
 		L1BlockTime:   time.Now().UTC(),
+		L1BlockNumber: 1,
 		L2BlockNumber: 100,
 	}
 	output2 := types.Output{
 		OutputRoot:    []byte{1, 2, 3},
 		L1BlockTime:   time.Now().UTC(),
+		L1BlockNumber: 2,
 		L2BlockNumber: 200,
 	}
 	output3 := types.Output{
 		OutputRoot:    []byte{1, 2, 3},
 		L1BlockTime:   time.Now().UTC(),
+		L1BlockNumber: 1,
 		L2BlockNumber: 100,
 	}
 	require.NoError(t, input.OPHostKeeper.SetOutputProposal(ctx, 1, 1, output1))
@@ -118,16 +121,19 @@ func Test_GenesisImportExport(t *testing.T) {
 	}
 	output1 := types.Output{
 		OutputRoot:    []byte{1, 2, 3},
+		L1BlockNumber: 1,
 		L1BlockTime:   time.Now().UTC(),
 		L2BlockNumber: 100,
 	}
 	output2 := types.Output{
 		OutputRoot:    []byte{1, 2, 3},
+		L1BlockNumber: 2,
 		L1BlockTime:   time.Now().UTC(),
 		L2BlockNumber: 200,
 	}
 	output3 := types.Output{
 		OutputRoot:    []byte{1, 2, 3},
+		L1BlockNumber: 1,
 		L1BlockTime:   time.Now().UTC(),
 		L2BlockNumber: 100,
 	}

diff --git a/x/ophost/keeper/msg_server.go b/x/ophost/keeper/msg_server.go
@@ -151,6 +151,7 @@ func (ms MsgServer) ProposeOutput(ctx context.Context, req *types.MsgProposeOutp
 	// store output proposal
 	if err := ms.SetOutputProposal(ctx, bridgeId, outputIndex, types.Output{
 		OutputRoot:    outputRoot,
+		L1BlockNumber: uint64(sdkCtx.BlockHeight()),
 		L1BlockTime:   sdkCtx.BlockTime(),
 		L2BlockNumber: l2BlockNumber,
 	}); err != nil {

diff --git a/x/ophost/keeper/msg_server_test.go b/x/ophost/keeper/msg_server_test.go
@@ -85,6 +85,7 @@ func Test_ProposeOutput(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, types.Output{
 		OutputRoot:    []byte{1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+		L1BlockNumber: uint64(ctx.BlockHeight()),
 		L1BlockTime:   blockTime,
 		L2BlockNumber: 100,
 	}, output)

diff --git a/x/ophost/keeper/output_test.go b/x/ophost/keeper/output_test.go
@@ -28,21 +28,25 @@ func Test_IterateOutputProposal(t *testing.T) {
 	ctx, input := createDefaultTestInput(t)
 	output1 := types.Output{
 		OutputRoot:    []byte{1, 2, 3},
+		L1BlockNumber: 1,
 		L1BlockTime:   time.Now().UTC(),
 		L2BlockNumber: 101,
 	}
 	output2 := types.Output{
 		OutputRoot:    []byte{4, 5, 6},
+		L1BlockNumber: 2,
 		L1BlockTime:   time.Now().UTC(),
 		L2BlockNumber: 102,
 	}
 	output3 := types.Output{
 		OutputRoot:    []byte{7, 8, 9},
+		L1BlockNumber: 3,
 		L1BlockTime:   time.Now().UTC(),
 		L2BlockNumber: 103,
 	}
 	output4 := types.Output{
 		OutputRoot:    []byte{10, 11, 12},
+		L1BlockNumber: 4,
 		L1BlockTime:   time.Now().UTC(),
 		L2BlockNumber: 104,
 	}
@@ -93,6 +97,7 @@ func Test_IsFinalized(t *testing.T) {
 	proposeTime := time.Now().UTC()
 	err = input.OPHostKeeper.SetOutputProposal(ctx, 1, 1, types.Output{
 		OutputRoot:    []byte{1, 2, 3},
+		L1BlockNumber: 1,
 		L1BlockTime:   proposeTime,
 		L2BlockNumber: 100,
 	})
@@ -151,6 +156,7 @@ func Test_GetLastFinalizedOutput(t *testing.T) {
 	proposeTime := time.Now().UTC()
 	err = input.OPHostKeeper.SetOutputProposal(ctx, 1, 1, types.Output{
 		OutputRoot:    []byte{1, 2, 3},
+		L1BlockNumber: 1,
 		L1BlockTime:   proposeTime,
 		L2BlockNumber: 100,
 	})
@@ -166,6 +172,7 @@ func Test_GetLastFinalizedOutput(t *testing.T) {
 	require.Equal(t, uint64(1), index)
 	require.Equal(t, types.Output{
 		OutputRoot:    []byte{1, 2, 3},
+		L1BlockNumber: 1,
 		L1BlockTime:   proposeTime,
 		L2BlockNumber: 100,
 	}, output)
@@ -176,6 +183,7 @@ func Test_DeleteOutputProposal(t *testing.T) {
 
 	output := types.Output{
 		OutputRoot:    []byte{1, 2, 3},
+		L1BlockNumber: 1,
 		L1BlockTime:   ctx.BlockTime(),
 		L2BlockNumber: 100,
 	}