Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Access] Update model Block REST API Response #6884

Merged
merged 10 commits into from
Feb 14, 2025
+54 −12
Merged

[Access] Update model Block REST API Response #6884

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3742778
Updated REST API Block model, updated flow version
UlyanaAndrukhiv Jan 14, 2025
0b700e7
Merge branch 'master' into UlianaAndrukhiv/6874-update-rest-block-res…
UlyanaAndrukhiv Jan 20, 2025
b823f12
Merge branch 'master' into UlianaAndrukhiv/6874-update-rest-block-res…
Guitarheroua Jan 23, 2025
28e9141
Added block status enum
Guitarheroua Jan 23, 2025
2a86b08
Merge branch 'master' into UlianaAndrukhiv/6874-update-rest-block-res…
Guitarheroua Jan 24, 2025
6dd7aa5
Merge branch 'master' into UlianaAndrukhiv/6874-update-rest-block-res…
Guitarheroua Feb 3, 2025
01984e3
chaged protobuf version
Guitarheroua Feb 3, 2025
7e2b0b5
Merge branch 'UlianaAndrukhiv/6874-update-rest-block-response' of git…
Guitarheroua Feb 3, 2025
5bc7392
Merge branch 'master' into UlianaAndrukhiv/6874-update-rest-block-res…
Guitarheroua Feb 10, 2025
a8bdf3b
Merge branch 'master' into UlianaAndrukhiv/6874-update-rest-block-res…
Guitarheroua Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion engine/access/rest/common/models/block.go
View file
Original file line number Diff line number Diff line change
@@ -63,10 +63,27 @@ func (b *Block) Build(
}

b.Links = self
b.BlockStatus = blockStatus.String()

var status BlockStatus
status.Build(blockStatus)
b.BlockStatus = &status

return nil
}

func (b *BlockStatus) Build(status flow.BlockStatus) {
switch status {
case flow.BlockStatusUnknown:
*b = BLOCK_UNKNOWN
case flow.BlockStatusFinalized:
*b = BLOCK_FINALIZED
case flow.BlockStatusSealed:
*b = BLOCK_SEALED
default:
*b = ""
}
}

func (b *BlockPayload) Build(payload *flow.Payload) error {
var blockSeal BlockSeals
err := blockSeal.Build(payload.Seals)
6 changes: 6 additions & 0 deletions engine/access/rest/common/models/enums.go
View file
Original file line number Diff line number Diff line change
@@ -15,3 +15,9 @@ const (
SUCCESS_RESULT = SUCCESS_TransactionExecution
FAILURE_RESULT = FAILURE_TransactionExecution
)

const (
BLOCK_UNKNOWN = UNKNOWN_BlockStatus
BLOCK_FINALIZED = FINALIZED_BlockStatus
BLOCK_SEALED = SEALED_BlockStatus
)
4 changes: 2 additions & 2 deletions engine/access/rest/common/models/model_block.go
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ type Block struct {
Header *BlockHeader `json:"header"`
Payload *BlockPayload `json:"payload,omitempty"`
ExecutionResult *ExecutionResult `json:"execution_result,omitempty"`
Expandable *BlockExpandable `json:"_expandable"`
Expandable *BlockExpandable `json:"_expandable,omitempty"`
Links *Links `json:"_links,omitempty"`
BlockStatus string `json:"block_status"`
BlockStatus *BlockStatus `json:"block_status"`
}
19 changes: 19 additions & 0 deletions engine/access/rest/common/models/model_block_status.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
* Access API
*
* No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
*
* API version: 1.0.0
* Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
*/
package models

// BlockStatus : This value indicates the status of a block.
type BlockStatus string

// List of BlockStatus
const (
UNKNOWN_BlockStatus BlockStatus = "BLOCK_UNKNOWN"
FINALIZED_BlockStatus BlockStatus = "BLOCK_FINALIZED"
SEALED_BlockStatus BlockStatus = "BLOCK_SEALED"
)
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ require (
github.com/onflow/flow-core-contracts/lib/go/contracts v1.4.0
github.com/onflow/flow-core-contracts/lib/go/templates v1.4.0
github.com/onflow/flow-go-sdk v1.3.1
github.com/onflow/flow/protobuf/go/flow v0.4.7
github.com/onflow/flow/protobuf/go/flow v0.4.9
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
github.com/pierrec/lz4 v2.6.1+incompatible
github.com/pkg/errors v0.9.1
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -934,8 +934,8 @@ github.com/onflow/flow-nft/lib/go/contracts v1.2.2 h1:XFERNVUDGbZ4ViZjt7P1cGD80m
github.com/onflow/flow-nft/lib/go/contracts v1.2.2/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
github.com/onflow/flow-nft/lib/go/templates v1.2.1 h1:SAALMZPDw9Eb9p5kSLnmnFxjyig1MLiT4JUlLp0/bSE=
github.com/onflow/flow-nft/lib/go/templates v1.2.1/go.mod h1:W6hOWU0xltPqNpv9gQX8Pj8Jtf0OmRxc1XX2V0kzJaI=
github.com/onflow/flow/protobuf/go/flow v0.4.7 h1:iP6DFx4wZ3ETORsyeqzHu7neFT3d1CXF6wdK+AOOjmc=
github.com/onflow/flow/protobuf/go/flow v0.4.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/flow/protobuf/go/flow v0.4.9 h1:UfsWWqj6VQbEHvaw8kSGvIawCpEfz3gOGZfcdugNxVE=
github.com/onflow/flow/protobuf/go/flow v0.4.9/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/go-ethereum v1.14.7 h1:gg3awYqI02e3AypRdpJKEvNTJ6kz/OhAqRti0h54Wlc=
github.com/onflow/go-ethereum v1.14.7/go.mod h1:zV14QLrXyYu5ucvcwHUA0r6UaqveqbXaehAVQJlSW+I=
github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 h1:sxyWLqGm/p4EKT6DUlQESDG1ZNMN9GjPCm1gTq7NGfc=
2 changes: 1 addition & 1 deletion insecure/go.mod
View file
Original file line number Diff line number Diff line change
@@ -212,7 +212,7 @@ require (
github.com/onflow/flow-go-sdk v1.3.1 // indirect
github.com/onflow/flow-nft/lib/go/contracts v1.2.2 // indirect
github.com/onflow/flow-nft/lib/go/templates v1.2.1 // indirect
github.com/onflow/flow/protobuf/go/flow v0.4.7 // indirect
github.com/onflow/flow/protobuf/go/flow v0.4.9 // indirect
github.com/onflow/go-ethereum v1.14.7 // indirect
github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 // indirect
github.com/onflow/sdks v0.6.0-preview.1 // indirect
4 changes: 2 additions & 2 deletions insecure/go.sum
View file
Original file line number Diff line number Diff line change
@@ -880,8 +880,8 @@ github.com/onflow/flow-nft/lib/go/contracts v1.2.2 h1:XFERNVUDGbZ4ViZjt7P1cGD80m
github.com/onflow/flow-nft/lib/go/contracts v1.2.2/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
github.com/onflow/flow-nft/lib/go/templates v1.2.1 h1:SAALMZPDw9Eb9p5kSLnmnFxjyig1MLiT4JUlLp0/bSE=
github.com/onflow/flow-nft/lib/go/templates v1.2.1/go.mod h1:W6hOWU0xltPqNpv9gQX8Pj8Jtf0OmRxc1XX2V0kzJaI=
github.com/onflow/flow/protobuf/go/flow v0.4.7 h1:iP6DFx4wZ3ETORsyeqzHu7neFT3d1CXF6wdK+AOOjmc=
github.com/onflow/flow/protobuf/go/flow v0.4.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/flow/protobuf/go/flow v0.4.9 h1:UfsWWqj6VQbEHvaw8kSGvIawCpEfz3gOGZfcdugNxVE=
github.com/onflow/flow/protobuf/go/flow v0.4.9/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/go-ethereum v1.14.7 h1:gg3awYqI02e3AypRdpJKEvNTJ6kz/OhAqRti0h54Wlc=
github.com/onflow/go-ethereum v1.14.7/go.mod h1:zV14QLrXyYu5ucvcwHUA0r6UaqveqbXaehAVQJlSW+I=
github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 h1:sxyWLqGm/p4EKT6DUlQESDG1ZNMN9GjPCm1gTq7NGfc=
2 changes: 1 addition & 1 deletion integration/go.mod
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ require (
github.com/onflow/flow-go v0.38.0-preview.0.0.20241021221952-af9cd6e99de1
github.com/onflow/flow-go-sdk v1.3.1
github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000
github.com/onflow/flow/protobuf/go/flow v0.4.7
github.com/onflow/flow/protobuf/go/flow v0.4.9
github.com/onflow/go-ethereum v1.14.7
github.com/prometheus/client_golang v1.20.5
github.com/prometheus/client_model v0.6.1
4 changes: 2 additions & 2 deletions integration/go.sum
View file
Original file line number Diff line number Diff line change
@@ -753,8 +753,8 @@ github.com/onflow/flow-nft/lib/go/contracts v1.2.2 h1:XFERNVUDGbZ4ViZjt7P1cGD80m
github.com/onflow/flow-nft/lib/go/contracts v1.2.2/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
github.com/onflow/flow-nft/lib/go/templates v1.2.1 h1:SAALMZPDw9Eb9p5kSLnmnFxjyig1MLiT4JUlLp0/bSE=
github.com/onflow/flow-nft/lib/go/templates v1.2.1/go.mod h1:W6hOWU0xltPqNpv9gQX8Pj8Jtf0OmRxc1XX2V0kzJaI=
github.com/onflow/flow/protobuf/go/flow v0.4.7 h1:iP6DFx4wZ3ETORsyeqzHu7neFT3d1CXF6wdK+AOOjmc=
github.com/onflow/flow/protobuf/go/flow v0.4.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/flow/protobuf/go/flow v0.4.9 h1:UfsWWqj6VQbEHvaw8kSGvIawCpEfz3gOGZfcdugNxVE=
github.com/onflow/flow/protobuf/go/flow v0.4.9/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
github.com/onflow/go-ethereum v1.14.7 h1:gg3awYqI02e3AypRdpJKEvNTJ6kz/OhAqRti0h54Wlc=
github.com/onflow/go-ethereum v1.14.7/go.mod h1:zV14QLrXyYu5ucvcwHUA0r6UaqveqbXaehAVQJlSW+I=
github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 h1:sxyWLqGm/p4EKT6DUlQESDG1ZNMN9GjPCm1gTq7NGfc=