From c403924d920c39cbabd271b4563a597002d6812b Mon Sep 17 00:00:00 2001 From: sideninja <75445744+sideninja@users.noreply.github.com> Date: Wed, 4 Sep 2024 13:17:23 +0200 Subject: [PATCH 1/2] update flow-go v0.37.10 --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 2d700cba..638ebb13 100644 --- a/go.mod +++ b/go.mod @@ -14,10 +14,10 @@ require ( github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/improbable-eng/grpc-web v0.15.0 github.com/logrusorgru/aurora v2.0.3+incompatible - github.com/onflow/cadence v1.0.0-preview.51 + github.com/onflow/cadence v1.0.0-preview.52 github.com/onflow/crypto v0.25.2 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 - github.com/onflow/flow-go v0.37.7-0.20240830182756-9ac9e1889c34 + github.com/onflow/flow-go v0.37.10 github.com/onflow/flow-go-sdk v1.0.0-preview.54 github.com/onflow/flow-nft/lib/go/contracts v1.2.1 github.com/onflow/flow/protobuf/go/flow v0.4.6 diff --git a/go.sum b/go.sum index 5de2dd7d..2e6096ea 100644 --- a/go.sum +++ b/go.sum @@ -2046,8 +2046,8 @@ github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs github.com/onflow/atree v0.8.0-rc.6 h1:GWgaylK24b5ta2Hq+TvyOF7X5tZLiLzMMn7lEt59fsA= github.com/onflow/atree v0.8.0-rc.6/go.mod h1:yccR+LR7xc1Jdic0mrjocbHvUD7lnVvg8/Ct1AA5zBo= github.com/onflow/cadence v1.0.0-M3/go.mod h1:odXGZZ/wGNA5mwT8bC9v8u8EXACHllB2ABSZK65TGL8= -github.com/onflow/cadence v1.0.0-preview.51 h1:L+toCS2Sw9bsExc2PxeNMmAK96fn2LdTOD9bl5K/etA= -github.com/onflow/cadence v1.0.0-preview.51/go.mod h1:7wvvecnAZtYOspLOS3Lh+FuAmMeSrXhAWiycC3kQ1UU= +github.com/onflow/cadence v1.0.0-preview.52 h1:hZ92e6lL2+PQa3C1i5jJh0zZYFdW89+X1MS0Bkd6Ayo= +github.com/onflow/cadence v1.0.0-preview.52/go.mod h1:7wvvecnAZtYOspLOS3Lh+FuAmMeSrXhAWiycC3kQ1UU= github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI= github.com/onflow/crypto v0.25.2 h1:GjHunqVt+vPcdqhxxhAXiMIF3YiLX7gTuTR5O+VG2ns= github.com/onflow/crypto v0.25.2/go.mod h1:fY7eLqUdMKV8EGOw301unP8h7PvLVy8/6gVR++/g0BY= @@ -2059,8 +2059,8 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/ github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A= github.com/onflow/flow-ft/lib/go/templates v1.0.0 h1:6cMS/lUJJ17HjKBfMO/eh0GGvnpElPgBXx7h5aoWJhs= github.com/onflow/flow-ft/lib/go/templates v1.0.0/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE= -github.com/onflow/flow-go v0.37.7-0.20240830182756-9ac9e1889c34 h1:5yHX09MtQxNvt2wT5KV1fz+1/iWvBl2IkDr5svGiFN0= -github.com/onflow/flow-go v0.37.7-0.20240830182756-9ac9e1889c34/go.mod h1:HFx3KzQeT+u3SoCGaD5zXyK7VF7SRI61P0aO2SDjaro= +github.com/onflow/flow-go v0.37.10 h1:Nz2Gp63+0ubb9FuQaEZgCsXNXM5WsXq/j0ukC74N5Vw= +github.com/onflow/flow-go v0.37.10/go.mod h1:bfOCsCk0v1J93vXd+zrYkCmRIVOaL9oAXvNFWgVOujE= github.com/onflow/flow-go-sdk v1.0.0-M1/go.mod h1:TDW0MNuCs4SvqYRUzkbRnRmHQL1h4X8wURsCw9P9beo= github.com/onflow/flow-go-sdk v1.0.0-preview.54 h1:5GjCkyIyvE9KolOUUPTkGdEiV/8qOe1MGnLHOLBmthA= github.com/onflow/flow-go-sdk v1.0.0-preview.54/go.mod h1:u9oFiS25TpnU1EW62PQlq22jzkwBAj4VEiiCBM6nhHo= From 83b91b6c756bc0e0b986a87e69a074d890045285 Mon Sep 17 00:00:00 2001 From: sideninja <75445744+sideninja@users.noreply.github.com> Date: Wed, 4 Sep 2024 13:29:39 +0200 Subject: [PATCH 2/2] update api for transaction validator --- emulator/blockchain.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/emulator/blockchain.go b/emulator/blockchain.go index 4d32d1db..e7abe1e3 100644 --- a/emulator/blockchain.go +++ b/emulator/blockchain.go @@ -59,7 +59,6 @@ import ( reusableRuntime "github.com/onflow/flow-go/fvm/runtime" "github.com/onflow/flow-go/fvm/storage/snapshot" flowgo "github.com/onflow/flow-go/model/flow" - "github.com/onflow/flow-go/module/metrics" "github.com/rs/zerolog" "github.com/onflow/flow-emulator/convert" @@ -824,7 +823,6 @@ func configureTransactionValidator(conf config, blocks *blocks) (*access.Transac return access.NewTransactionValidator( blocks, conf.GetChainID().Chain(), - metrics.NewNoopCollector(), access.TransactionValidationOptions{ Expiry: conf.TransactionExpiry, ExpiryBuffer: 0,