Skip to content

Commit 0c477c5

Browse files
jordanschalmjordanschalm
authored
Merge pull request #7057 from onflow/jord/sync-master-efm-20250218
Sync master / feature/efm-recovery
2 parents e8762b2 + 743c4ad commit 0c477c5

File tree

11 files changed

+54
-38
lines changed

11 files changed

+54
-38
lines changed

‎engine/access/subscription/streamer.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,15 @@ func (s *Streamer) Stream(ctx context.Context) {
7575
err := s.sendAllAvailable(ctx)
7676

7777
if err != nil {
78-
//TODO: The functionality to graceful shutdown on demand should be improved with https://github.com/onflow/flow-go/issues/5561
78+
// TODO: The functionality to graceful shutdown on demand should be improved with https://github.com/onflow/flow-go/issues/5561
7979
if errors.Is(err, ErrEndOfData) {
8080
s.sub.Close()
8181
return
8282
}
83-
83+
if errors.Is(err, context.Canceled) {
84+
s.sub.Fail(fmt.Errorf("client disconnected: %w", ctx.Err()))
85+
return
86+
}
8487
s.log.Err(err).Msg("error sending response")
8588
s.sub.Fail(err)
8689
return

‎engine/common/rpc/logging_interceptor.go

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,24 @@ import (
1111
)
1212

1313
func customClientCodeToLevel(c codes.Code) logging.Level {
14-
if c == codes.OK {
14+
switch c {
15+
case codes.OK:
1516
// log successful returns as Debug to avoid excessive logging in info mode
1617
return logging.LevelDebug
18+
case codes.DeadlineExceeded, codes.ResourceExhausted, codes.OutOfRange:
19+
// these are common, map to info
20+
return logging.LevelInfo
21+
default:
22+
return logging.DefaultServerCodeToLevel(c)
1723
}
18-
return logging.DefaultServerCodeToLevel(c)
1924
}
2025

2126
// LoggingInterceptor creates the logging interceptors to log incoming GRPC request and response (minus the payload body)
22-
func LoggingInterceptor(log zerolog.Logger) []grpc.UnaryServerInterceptor {
23-
loggingInterceptor := logging.UnaryServerInterceptor(InterceptorLogger(log), logging.WithLevels(customClientCodeToLevel))
24-
return []grpc.UnaryServerInterceptor{loggingInterceptor}
27+
func LoggingInterceptor(log zerolog.Logger) grpc.UnaryServerInterceptor {
28+
return logging.UnaryServerInterceptor(
29+
InterceptorLogger(log),
30+
logging.WithLevels(customClientCodeToLevel),
31+
)
2532
}
2633

2734
// InterceptorLogger adapts zerolog logger to interceptor logger.

‎fvm/evm/offchain/query/viewProvider.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,15 @@ func NewViewProvider(
3333
}
3434
}
3535

36-
// GetBlockView returns the block view for the given height
36+
// GetBlockView returns the block view for the given height (at the end of a block!)
37+
// The `GetSnapshotAt` function of `storageProvider`, will return
38+
// the block state at its start, before any transaction executions.
39+
// This is the intended functionality, when replaying & verifying blocks.
40+
// However, when reading the state from a block, we are interested
41+
// in its end state, after all transaction executions.
42+
// That is why we fetch the block snapshot at the next height.
3743
func (evp *ViewProvider) GetBlockView(height uint64) (*View, error) {
38-
readOnly, err := evp.storageProvider.GetSnapshotAt(height)
44+
readOnly, err := evp.storageProvider.GetSnapshotAt(height + 1)
3945
if err != nil {
4046
return nil, err
4147
}

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ require (
4848
github.com/multiformats/go-multiaddr-dns v0.4.1
4949
github.com/multiformats/go-multihash v0.2.3
5050
github.com/onflow/atree v0.9.0
51-
github.com/onflow/cadence v1.3.1
51+
github.com/onflow/cadence v1.3.3
5252
github.com/onflow/crypto v0.25.2
5353
github.com/onflow/flow v0.3.4
5454
github.com/onflow/flow-core-contracts/lib/go/contracts v1.6.0
5555
github.com/onflow/flow-core-contracts/lib/go/templates v1.6.0
56-
github.com/onflow/flow-go-sdk v1.3.1
56+
github.com/onflow/flow-go-sdk v1.3.3
5757
github.com/onflow/flow/protobuf/go/flow v0.4.9
5858
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
5959
github.com/pierrec/lz4 v2.6.1+incompatible

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,8 @@ github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483 h1:LpiQhTAfM9CAmNVEs0n
914914
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
915915
github.com/onflow/bridged-usdc/lib/go/contracts v1.0.0 h1:ofdfKH8KgY6qVFnlngTontds/IBERANeWl0PBPCtPOA=
916916
github.com/onflow/bridged-usdc/lib/go/contracts v1.0.0/go.mod h1:K4/oaEhhnSuJ9q6fpq1w9WEWRGtkNskhmoyH8t+X9Mk=
917-
github.com/onflow/cadence v1.3.1 h1:bs9TFHQy8HHbwTtCtg5cLdyndWhmwq55RSwID1cb220=
918-
github.com/onflow/cadence v1.3.1/go.mod h1:6/47FljVAdl3/31tShI8JOJW0sXYZHK1PwXkE+yk0qA=
917+
github.com/onflow/cadence v1.3.3 h1:h9uyhqfiiBahk0P7JHQ1XR5b42wOGRIn+fNRd3JppYs=
918+
github.com/onflow/cadence v1.3.3/go.mod h1:6/47FljVAdl3/31tShI8JOJW0sXYZHK1PwXkE+yk0qA=
919919
github.com/onflow/crypto v0.25.2 h1:GjHunqVt+vPcdqhxxhAXiMIF3YiLX7gTuTR5O+VG2ns=
920920
github.com/onflow/crypto v0.25.2/go.mod h1:fY7eLqUdMKV8EGOw301unP8h7PvLVy8/6gVR++/g0BY=
921921
github.com/onflow/flow v0.3.4 h1:FXUWVdYB90f/rjNcY0Owo30gL790tiYff9Pb/sycXYE=
@@ -928,8 +928,8 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3
928928
github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
929929
github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
930930
github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
931-
github.com/onflow/flow-go-sdk v1.3.1 h1:2YdTL/R1/DjMYYmyKgArTeQ93GKvLlfCeCpMVH7b8q4=
932-
github.com/onflow/flow-go-sdk v1.3.1/go.mod h1:0rMuCLShdX9F4pLBCPhlMGCFu8gu9SfiXT/Lc9qAi24=
931+
github.com/onflow/flow-go-sdk v1.3.3 h1:wj7llql3wesQYBePh3lEFI+jk3Df1sa13bRsL139JDo=
932+
github.com/onflow/flow-go-sdk v1.3.3/go.mod h1:tSLvYIac9DlmUEqKHSHbVRyv4mSB0va4AuiV3XB9ENc=
933933
github.com/onflow/flow-nft/lib/go/contracts v1.2.3 h1:4ju20g1xgDKWBT63rOj5f/Sa4Lc+naCSWT4p31x9yQk=
934934
github.com/onflow/flow-nft/lib/go/contracts v1.2.3/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
935935
github.com/onflow/flow-nft/lib/go/templates v1.2.1 h1:SAALMZPDw9Eb9p5kSLnmnFxjyig1MLiT4JUlLp0/bSE=

‎insecure/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,12 @@ require (
204204
github.com/olekukonko/tablewriter v0.0.5 // indirect
205205
github.com/onflow/atree v0.9.0 // indirect
206206
github.com/onflow/bridged-usdc/lib/go/contracts v1.0.0 // indirect
207-
github.com/onflow/cadence v1.3.1 // indirect
207+
github.com/onflow/cadence v1.3.3 // indirect
208208
github.com/onflow/flow-core-contracts/lib/go/contracts v1.6.0 // indirect
209209
github.com/onflow/flow-core-contracts/lib/go/templates v1.6.0 // indirect
210210
github.com/onflow/flow-ft/lib/go/contracts v1.0.1 // indirect
211211
github.com/onflow/flow-ft/lib/go/templates v1.0.1 // indirect
212-
github.com/onflow/flow-go-sdk v1.3.1 // indirect
212+
github.com/onflow/flow-go-sdk v1.3.3 // indirect
213213
github.com/onflow/flow-nft/lib/go/contracts v1.2.3 // indirect
214214
github.com/onflow/flow-nft/lib/go/templates v1.2.1 // indirect
215215
github.com/onflow/flow/protobuf/go/flow v0.4.9 // indirect

‎insecure/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -862,8 +862,8 @@ github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483 h1:LpiQhTAfM9CAmNVEs0n
862862
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
863863
github.com/onflow/bridged-usdc/lib/go/contracts v1.0.0 h1:ofdfKH8KgY6qVFnlngTontds/IBERANeWl0PBPCtPOA=
864864
github.com/onflow/bridged-usdc/lib/go/contracts v1.0.0/go.mod h1:K4/oaEhhnSuJ9q6fpq1w9WEWRGtkNskhmoyH8t+X9Mk=
865-
github.com/onflow/cadence v1.3.1 h1:bs9TFHQy8HHbwTtCtg5cLdyndWhmwq55RSwID1cb220=
866-
github.com/onflow/cadence v1.3.1/go.mod h1:6/47FljVAdl3/31tShI8JOJW0sXYZHK1PwXkE+yk0qA=
865+
github.com/onflow/cadence v1.3.3 h1:h9uyhqfiiBahk0P7JHQ1XR5b42wOGRIn+fNRd3JppYs=
866+
github.com/onflow/cadence v1.3.3/go.mod h1:6/47FljVAdl3/31tShI8JOJW0sXYZHK1PwXkE+yk0qA=
867867
github.com/onflow/crypto v0.25.2 h1:GjHunqVt+vPcdqhxxhAXiMIF3YiLX7gTuTR5O+VG2ns=
868868
github.com/onflow/crypto v0.25.2/go.mod h1:fY7eLqUdMKV8EGOw301unP8h7PvLVy8/6gVR++/g0BY=
869869
github.com/onflow/flow-core-contracts/lib/go/contracts v1.6.0 h1:zbJaqR3bHicNz68YFJ/6gieUkxnMYz8dKxQrUUCc+/M=
@@ -874,8 +874,8 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3
874874
github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
875875
github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
876876
github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
877-
github.com/onflow/flow-go-sdk v1.3.1 h1:2YdTL/R1/DjMYYmyKgArTeQ93GKvLlfCeCpMVH7b8q4=
878-
github.com/onflow/flow-go-sdk v1.3.1/go.mod h1:0rMuCLShdX9F4pLBCPhlMGCFu8gu9SfiXT/Lc9qAi24=
877+
github.com/onflow/flow-go-sdk v1.3.3 h1:wj7llql3wesQYBePh3lEFI+jk3Df1sa13bRsL139JDo=
878+
github.com/onflow/flow-go-sdk v1.3.3/go.mod h1:tSLvYIac9DlmUEqKHSHbVRyv4mSB0va4AuiV3XB9ENc=
879879
github.com/onflow/flow-nft/lib/go/contracts v1.2.3 h1:4ju20g1xgDKWBT63rOj5f/Sa4Lc+naCSWT4p31x9yQk=
880880
github.com/onflow/flow-nft/lib/go/contracts v1.2.3/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
881881
github.com/onflow/flow-nft/lib/go/templates v1.2.1 h1:SAALMZPDw9Eb9p5kSLnmnFxjyig1MLiT4JUlLp0/bSE=

‎integration/benchmark/mock/client.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎integration/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ require (
2020
github.com/ipfs/go-ds-badger2 v0.1.3
2121
github.com/ipfs/go-ds-pebble v0.3.1-0.20240828032824-d745b9d3200b
2222
github.com/libp2p/go-libp2p v0.38.2
23-
github.com/onflow/cadence v1.3.1
23+
github.com/onflow/cadence v1.3.3
2424
github.com/onflow/crypto v0.25.2
2525
github.com/onflow/flow-core-contracts/lib/go/contracts v1.6.0
2626
github.com/onflow/flow-core-contracts/lib/go/templates v1.6.0
2727
github.com/onflow/flow-go v0.38.0-preview.0.0.20241021221952-af9cd6e99de1
28-
github.com/onflow/flow-go-sdk v1.3.1
28+
github.com/onflow/flow-go-sdk v1.3.3
2929
github.com/onflow/flow-go/insecure v0.0.0-00010101000000-000000000000
3030
github.com/onflow/flow/protobuf/go/flow v0.4.9
3131
github.com/onflow/go-ethereum v1.14.7

‎integration/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -735,8 +735,8 @@ github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483 h1:LpiQhTAfM9CAmNVEs0n
735735
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
736736
github.com/onflow/bridged-usdc/lib/go/contracts v1.0.0 h1:ofdfKH8KgY6qVFnlngTontds/IBERANeWl0PBPCtPOA=
737737
github.com/onflow/bridged-usdc/lib/go/contracts v1.0.0/go.mod h1:K4/oaEhhnSuJ9q6fpq1w9WEWRGtkNskhmoyH8t+X9Mk=
738-
github.com/onflow/cadence v1.3.1 h1:bs9TFHQy8HHbwTtCtg5cLdyndWhmwq55RSwID1cb220=
739-
github.com/onflow/cadence v1.3.1/go.mod h1:6/47FljVAdl3/31tShI8JOJW0sXYZHK1PwXkE+yk0qA=
738+
github.com/onflow/cadence v1.3.3 h1:h9uyhqfiiBahk0P7JHQ1XR5b42wOGRIn+fNRd3JppYs=
739+
github.com/onflow/cadence v1.3.3/go.mod h1:6/47FljVAdl3/31tShI8JOJW0sXYZHK1PwXkE+yk0qA=
740740
github.com/onflow/crypto v0.25.2 h1:GjHunqVt+vPcdqhxxhAXiMIF3YiLX7gTuTR5O+VG2ns=
741741
github.com/onflow/crypto v0.25.2/go.mod h1:fY7eLqUdMKV8EGOw301unP8h7PvLVy8/6gVR++/g0BY=
742742
github.com/onflow/flow-core-contracts/lib/go/contracts v1.6.0 h1:zbJaqR3bHicNz68YFJ/6gieUkxnMYz8dKxQrUUCc+/M=
@@ -747,8 +747,8 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3
747747
github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
748748
github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
749749
github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
750-
github.com/onflow/flow-go-sdk v1.3.1 h1:2YdTL/R1/DjMYYmyKgArTeQ93GKvLlfCeCpMVH7b8q4=
751-
github.com/onflow/flow-go-sdk v1.3.1/go.mod h1:0rMuCLShdX9F4pLBCPhlMGCFu8gu9SfiXT/Lc9qAi24=
750+
github.com/onflow/flow-go-sdk v1.3.3 h1:wj7llql3wesQYBePh3lEFI+jk3Df1sa13bRsL139JDo=
751+
github.com/onflow/flow-go-sdk v1.3.3/go.mod h1:tSLvYIac9DlmUEqKHSHbVRyv4mSB0va4AuiV3XB9ENc=
752752
github.com/onflow/flow-nft/lib/go/contracts v1.2.3 h1:4ju20g1xgDKWBT63rOj5f/Sa4Lc+naCSWT4p31x9yQk=
753753
github.com/onflow/flow-nft/lib/go/contracts v1.2.3/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
754754
github.com/onflow/flow-nft/lib/go/templates v1.2.1 h1:SAALMZPDw9Eb9p5kSLnmnFxjyig1MLiT4JUlLp0/bSE=

0 commit comments

Comments
 (0)