Merge branch 'master' into remoteRollbackAndSnap

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
  fetch-depth: 0
  - uses: actions/setup-go@v4
  with:
- go-version: '1.18.x'
+ go-version: '1.19.x'
  - uses: actions/cache@v3
  with:
  path: ~/go/pkg/mod
@@ -41,7 +41,7 @@ jobs:
  - uses: actions/checkout@v3
  - uses: actions/setup-go@v4
  with:
- go-version: '1.18.x'
+ go-version: '1.19.x'
  - name: Run golangci-lint
  uses: golangci/golangci-lint-action@v3
  with:

emulator/blockchain.go

@@ -1641,3 +1641,12 @@ func (b *Blockchain) GetTransactionResultsByBlockID(blockID flowgo.Identifier) (
  }
  return results, nil
 }
+
+func (b *Blockchain) GetLogs(identifier flowgo.Identifier) ([]string, error) {
+ txResult, err := b.storage.TransactionResultByID(context.Background(), identifier)
+ if err != nil {
+ return nil, err
+
+ }
+ return txResult.Logs, nil
+}

emulator/emulator.go

@@ -162,6 +162,10 @@ type ExecutionCapable interface {
  CommitBlock() (*flowgo.Block, error)
 }
 
+type LogProvider interface {
+ GetLogs(flowgo.Identifier) ([]string, error)
+}
+
 // Emulator defines the method set of an emulated emulator.
 type Emulator interface {
  ServiceKey() ServiceKey
@@ -174,4 +178,5 @@ type Emulator interface {
  RollbackCapable
  AutoMineCapable
  ExecutionCapable
+ LogProvider
 }

go.mod

@@ -1,22 +1,22 @@
 module github.com/onflow/flow-emulator
 
-go 1.18
+go 1.19
 
 require (
  github.com/fxamacker/cbor/v2 v2.4.1-0.20230228173756-c0c9f774e40c
  github.com/glebarez/go-sqlite v1.21.1
  github.com/go-redis/redis/v8 v8.11.5
  github.com/golang/mock v1.6.0
- github.com/google/go-dap v0.9.1
+ github.com/google/go-dap v0.10.0
  github.com/gorilla/mux v1.8.0
  github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
  github.com/hashicorp/go-multierror v1.1.1
  github.com/improbable-eng/grpc-web v0.15.0
  github.com/logrusorgru/aurora v2.0.3+incompatible
- github.com/onflow/cadence v0.39.12
+ github.com/onflow/cadence v0.39.14
  github.com/onflow/flow-archive v1.3.4-0.20230503192214-9e81e82d4dcc
- github.com/onflow/flow-go v0.31.1-0.20230622201809-5001508cc224
- github.com/onflow/flow-go-sdk v0.41.6
+ github.com/onflow/flow-go v0.31.1-0.20230712191318-82d6e5f45ca1
+ github.com/onflow/flow-go-sdk v0.41.9
  github.com/onflow/flow-go/crypto v0.24.7
  github.com/onflow/flow-nft/lib/go/contracts v1.1.0
  github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20230602212908-08fc6536d391
@@ -29,41 +29,41 @@ require (
  github.com/slok/go-http-metrics v0.10.0
  github.com/spf13/cobra v1.7.0
  github.com/stretchr/testify v1.8.4
- golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15
- google.golang.org/grpc v1.53.0
+ golang.org/x/exp v0.0.0-20230321023759-10a507213a29
+ google.golang.org/grpc v1.56.1
 )
 
 require (
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/bits-and-blooms/bitset v1.5.0 // indirect
  github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect
- github.com/cenkalti/backoff/v4 v4.2.0 // indirect
+ github.com/cenkalti/backoff/v4 v4.2.1 // indirect
  github.com/cespare/xxhash v1.1.0 // indirect
  github.com/cespare/xxhash/v2 v2.2.0 // indirect
  github.com/coreos/go-semver v0.3.0 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
+ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
  github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
  github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
  github.com/dgraph-io/ristretto v0.1.0 // indirect
  github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect
  github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
  github.com/dustin/go-humanize v1.0.1 // indirect
  github.com/ef-ds/deque v1.0.4 // indirect
- github.com/envoyproxy/protoc-gen-validate v0.9.1 // indirect
+ github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
  github.com/ethereum/go-ethereum v1.9.13 // indirect
  github.com/fsnotify/fsnotify v1.6.0 // indirect
  github.com/fxamacker/circlehash v0.3.0 // indirect
  github.com/gammazero/deque v0.1.0 // indirect
  github.com/go-kit/kit v0.12.0 // indirect
  github.com/go-kit/log v0.2.1 // indirect
  github.com/go-logfmt/logfmt v0.5.1 // indirect
- github.com/go-logr/logr v1.2.3 // indirect
+ github.com/go-logr/logr v1.2.4 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
  github.com/go-test/deep v1.1.0 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
- github.com/golang/glog v1.0.0 // indirect
- github.com/golang/protobuf v1.5.2 // indirect
+ github.com/golang/glog v1.1.0 // indirect
+ github.com/golang/protobuf v1.5.3 // indirect
  github.com/golang/snappy v0.0.4 // indirect
  github.com/google/uuid v1.3.0 // indirect
  github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
@@ -72,40 +72,39 @@ require (
  github.com/hashicorp/hcl v1.0.0 // indirect
  github.com/inconshreveable/mousetrap v1.1.0 // indirect
  github.com/ipfs/bbloom v0.0.4 // indirect
- github.com/ipfs/go-block-format v0.0.3 // indirect
- github.com/ipfs/go-cid v0.3.2 // indirect
+ github.com/ipfs/go-block-format v0.1.2 // indirect
+ github.com/ipfs/go-cid v0.4.1 // indirect
  github.com/ipfs/go-datastore v0.6.0 // indirect
- github.com/ipfs/go-ipfs-blockstore v1.2.0 // indirect
+ github.com/ipfs/go-ipfs-blockstore v1.3.0 // indirect
  github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
  github.com/ipfs/go-ipfs-util v0.0.2 // indirect
- github.com/ipfs/go-ipld-format v0.3.0 // indirect
+ github.com/ipfs/go-ipld-format v0.5.0 // indirect
  github.com/ipfs/go-log v1.0.5 // indirect
  github.com/ipfs/go-log/v2 v2.5.1 // indirect
  github.com/ipfs/go-metrics-interface v0.0.1 // indirect
  github.com/jbenet/goprocess v0.1.4 // indirect
  github.com/kevinburke/go-bindata v3.23.0+incompatible // indirect
- github.com/klauspost/compress v1.15.15 // indirect
- github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+ github.com/klauspost/compress v1.16.5 // indirect
+ github.com/klauspost/cpuid/v2 v2.2.5 // indirect
  github.com/libp2p/go-buffer-pool v0.1.0 // indirect
- github.com/libp2p/go-libp2p v0.24.2 // indirect
- github.com/libp2p/go-openssl v0.1.0 // indirect
+ github.com/libp2p/go-libp2p v0.28.1 // indirect
  github.com/logrusorgru/aurora/v4 v4.0.0 // indirect
  github.com/magiconair/properties v1.8.7 // indirect
  github.com/mattn/go-colorable v0.1.13 // indirect
- github.com/mattn/go-isatty v0.0.18 // indirect
- github.com/mattn/go-pointer v0.0.1 // indirect
+ github.com/mattn/go-isatty v0.0.19 // indirect
  github.com/mattn/go-runewidth v0.0.14 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
- github.com/minio/sha256-simd v1.0.0 // indirect
+ github.com/minio/sha256-simd v1.0.1 // indirect
  github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
  github.com/mr-tron/base58 v1.2.0 // indirect
  github.com/multiformats/go-base32 v0.1.0 // indirect
  github.com/multiformats/go-base36 v0.2.0 // indirect
- github.com/multiformats/go-multiaddr v0.8.0 // indirect
- github.com/multiformats/go-multibase v0.1.1 // indirect
- github.com/multiformats/go-multicodec v0.7.0 // indirect
- github.com/multiformats/go-multihash v0.2.1 // indirect
+ github.com/multiformats/go-multiaddr v0.9.0 // indirect
+ github.com/multiformats/go-multibase v0.2.0 // indirect
+ github.com/multiformats/go-multicodec v0.9.0 // indirect
+ github.com/multiformats/go-multihash v0.2.3 // indirect
+ github.com/multiformats/go-multistream v0.4.1 // indirect
  github.com/multiformats/go-varint v0.0.7 // indirect
  github.com/onflow/atree v0.6.0 // indirect
  github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.3 // indirect
@@ -119,15 +118,14 @@ require (
  github.com/pierrec/lz4 v2.6.1+incompatible // indirect
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/prometheus/client_model v0.3.0 // indirect
- github.com/prometheus/common v0.39.0 // indirect
+ github.com/prometheus/client_model v0.4.0 // indirect
+ github.com/prometheus/common v0.42.0 // indirect
  github.com/prometheus/procfs v0.9.0 // indirect
  github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
  github.com/rivo/uniseg v0.4.4 // indirect
  github.com/rs/cors v1.8.0 // indirect
  github.com/schollz/progressbar/v3 v3.13.1 // indirect
  github.com/sethvargo/go-retry v0.2.3 // indirect
- github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
  github.com/spaolacci/murmur3 v1.1.0 // indirect
  github.com/spf13/afero v1.9.3 // indirect
  github.com/spf13/cast v1.5.0 // indirect
@@ -143,32 +141,33 @@ require (
  github.com/vmihailenco/tagparser v0.1.1 // indirect
  github.com/x448/float16 v0.8.4 // indirect
  github.com/zeebo/blake3 v0.2.3 // indirect
- go.opentelemetry.io/otel v1.14.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
+ go.opentelemetry.io/otel v1.16.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
  go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
- go.opentelemetry.io/otel/sdk v1.14.0 // indirect
- go.opentelemetry.io/otel/trace v1.14.0 // indirect
+ go.opentelemetry.io/otel/metric v1.16.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.16.0 // indirect
+ go.opentelemetry.io/otel/trace v1.16.0 // indirect
  go.opentelemetry.io/proto/otlp v0.19.0 // indirect
- go.uber.org/atomic v1.10.0 // indirect
- go.uber.org/multierr v1.9.0 // indirect
+ go.uber.org/atomic v1.11.0 // indirect
+ go.uber.org/multierr v1.11.0 // indirect
  go.uber.org/zap v1.24.0 // indirect
- golang.org/x/crypto v0.7.0 // indirect
- golang.org/x/net v0.8.0 // indirect
- golang.org/x/sync v0.1.0 // indirect
- golang.org/x/sys v0.6.0 // indirect
- golang.org/x/term v0.6.0 // indirect
- golang.org/x/text v0.8.0 // indirect
+ golang.org/x/crypto v0.10.0 // indirect
+ golang.org/x/net v0.10.0 // indirect
+ golang.org/x/sync v0.2.0 // indirect
+ golang.org/x/sys v0.9.0 // indirect
+ golang.org/x/term v0.9.0 // indirect
+ golang.org/x/text v0.10.0 // indirect
  golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
+ google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
  google.golang.org/protobuf v1.30.0 // indirect
  gopkg.in/ini.v1 v1.67.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
- lukechampine.com/blake3 v1.1.7 // indirect
+ lukechampine.com/blake3 v1.2.1 // indirect
  modernc.org/libc v1.22.3 // indirect
  modernc.org/mathutil v1.5.0 // indirect
  modernc.org/memory v1.5.0 // indirect
  modernc.org/sqlite v1.21.1 // indirect
- nhooyr.io/websocket v1.8.6 // indirect
+ nhooyr.io/websocket v1.8.7 // indirect
 )