Skip to content

Commit c925895

Browse files
committed
use v1 protos
1 parent 539b8e1 commit c925895

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

grpc/execution/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ func protoU128ToBigInt(u128 *primitivev1.Uint128) *big.Int {
234234
return lo.Add(lo, hi)
235235
}
236236

237-
func (s *ExecutionServiceServerV1Alpha2) ExecuteOptimisticBlock(ctx context.Context, req *optimsticPb.BaseBlock) (*astriaPb.Block, error) {
237+
func (s *ExecutionServiceServerV1) ExecuteOptimisticBlock(ctx context.Context, req *optimsticPb.BaseBlock) (*astriaPb.Block, error) {
238238
// we need to execute the optimistic block
239239
log.Debug("ExecuteOptimisticBlock called", "timestamp", req.Timestamp, "sequencer_block_hash", req.SequencerBlockHash)
240240
executeOptimisticBlockRequestCount.Inc(1)
@@ -262,7 +262,7 @@ func (s *ExecutionServiceServerV1Alpha2) ExecuteOptimisticBlock(ctx context.Cont
262262

263263
txsToProcess := types.Transactions{}
264264
for _, tx := range req.Transactions {
265-
unmarshalledTx, err := validateAndUnmarshalSequencerTx(height, tx, s.bridgeAddresses, s.bridgeAllowedAssets, s.bridgeSenderAddress)
265+
unmarshalledTx, err := validateAndUnmarshalSequencerTx(height, tx, s.bridgeAddresses, s.bridgeAllowedAssets)
266266
if err != nil {
267267
log.Debug("failed to validate sequencer tx, ignoring", "tx", tx, "err", err)
268268
continue

grpc/execution/server_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ func TestExecutionServiceServerV1Alpha2_ExecuteOptimisticBlock(t *testing.T) {
261261
// create the txs to send
262262
// create 5 txs
263263
txs := []*types.Transaction{}
264-
marshalledTxs := []*sequencerblockv1alpha1.RollupData{}
264+
marshalledTxs := []*sequencerblockv1.RollupData{}
265265
for i := 0; i < 5; i++ {
266266
unsignedTx := types.NewTransaction(uint64(i), testToAddress, big.NewInt(1), params.TxGas, big.NewInt(params.InitialBaseFee*2), nil)
267267
tx, err := types.SignTx(unsignedTx, types.LatestSigner(ethservice.BlockChain().Config()), testKey)
@@ -270,8 +270,8 @@ func TestExecutionServiceServerV1Alpha2_ExecuteOptimisticBlock(t *testing.T) {
270270

271271
marshalledTx, err := tx.MarshalBinary()
272272
require.Nil(t, err, "Failed to marshal tx")
273-
marshalledTxs = append(marshalledTxs, &sequencerblockv1alpha1.RollupData{
274-
Value: &sequencerblockv1alpha1.RollupData_SequencedData{SequencedData: marshalledTx},
273+
marshalledTxs = append(marshalledTxs, &sequencerblockv1.RollupData{
274+
Value: &sequencerblockv1.RollupData_SequencedData{SequencedData: marshalledTx},
275275
})
276276
}
277277

@@ -287,7 +287,7 @@ func TestExecutionServiceServerV1Alpha2_ExecuteOptimisticBlock(t *testing.T) {
287287

288288
chainDestinationAddress := crypto.PubkeyToAddress(chainDestinationAddressPrivKey.PublicKey)
289289

290-
depositTx := &sequencerblockv1alpha1.RollupData{Value: &sequencerblockv1alpha1.RollupData_Deposit{Deposit: &sequencerblockv1alpha1.Deposit{
290+
depositTx := &sequencerblockv1.RollupData{Value: &sequencerblockv1.RollupData_Deposit{Deposit: &sequencerblockv1.Deposit{
291291
BridgeAddress: &primitivev1.Address{
292292
Bech32M: bridgeAddress,
293293
},

0 commit comments

Comments
 (0)