From 364b721fdc0716c36fc7c2d4c2fa69f3be8f0836 Mon Sep 17 00:00:00 2001 From: Peter Argue <89119817+peterargue@users.noreply.github.com> Date: Wed, 18 Sep 2024 16:31:47 -0700 Subject: [PATCH] Update flow-go to v0.38.0-preview.0 --- emulator/blockchain.go | 8 +++++--- go.mod | 6 +++--- go.sum | 12 ++++++------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/emulator/blockchain.go b/emulator/blockchain.go index e7abe1e3..93ce9e72 100644 --- a/emulator/blockchain.go +++ b/emulator/blockchain.go @@ -59,6 +59,7 @@ 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" @@ -823,6 +824,7 @@ func configureTransactionValidator(conf config, blocks *blocks) (*access.Transac return access.NewTransactionValidator( blocks, conf.GetChainID().Chain(), + metrics.NewNoopCollector(), access.TransactionValidationOptions{ Expiry: conf.TransactionExpiry, ExpiryBuffer: 0, @@ -1321,7 +1323,7 @@ func (b *Blockchain) executeNextTransaction(ctx fvm.Context) (*types.Transaction tr.Debug = b.debugSignatureError(tr.Error, txnBody) } - //add to source map if any pragma + // add to source map if any pragma if pragmas.Contains(PragmaSourceFile) { location := common.NewTransactionLocation(nil, tr.TransactionID.Bytes()) sourceFile := pragmas.FilterByName(PragmaSourceFile).First().Argument() @@ -1410,7 +1412,7 @@ func (b *Blockchain) commitBlock() (*flowgo.Block, error) { return nil, err } - //notify listeners on new block + // notify listeners on new block b.broadcaster.Publish() // reset pending block using current block and ledger state @@ -1553,7 +1555,7 @@ func (b *Blockchain) executeScriptAtBlockID(script []byte, arguments [][]byte, i scriptError = convert.VMErrorToEmulator(output.Err) } - //add to source map if any pragma + // add to source map if any pragma if pragmas.Contains(PragmaSourceFile) { location := common.NewScriptLocation(nil, scriptID.Bytes()) sourceFile := pragmas.FilterByName(PragmaSourceFile).First().Argument() diff --git a/go.mod b/go.mod index 638ebb13..e22bfaa4 100644 --- a/go.mod +++ b/go.mod @@ -17,10 +17,10 @@ require ( 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.10 - github.com/onflow/flow-go-sdk v1.0.0-preview.54 + github.com/onflow/flow-go v0.38.0-preview.0 + github.com/onflow/flow-go-sdk v1.0.0-preview.55 github.com/onflow/flow-nft/lib/go/contracts v1.2.1 - github.com/onflow/flow/protobuf/go/flow v0.4.6 + github.com/onflow/flow/protobuf/go/flow v0.4.7 github.com/prometheus/client_golang v1.18.0 github.com/psiemens/graceland v1.0.0 github.com/psiemens/sconfig v0.1.0 diff --git a/go.sum b/go.sum index 2e6096ea..cefc9a6c 100644 --- a/go.sum +++ b/go.sum @@ -2059,18 +2059,18 @@ 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.10 h1:Nz2Gp63+0ubb9FuQaEZgCsXNXM5WsXq/j0ukC74N5Vw= -github.com/onflow/flow-go v0.37.10/go.mod h1:bfOCsCk0v1J93vXd+zrYkCmRIVOaL9oAXvNFWgVOujE= +github.com/onflow/flow-go v0.38.0-preview.0 h1:Nc4c1MucrCXDIdqadhuY5jlnxz0UURMVIoJ5hZ+HiQw= +github.com/onflow/flow-go v0.38.0-preview.0/go.mod h1:Gdqw1ptnAUuB0izif88PWMK8abe655Hr8iEkXXuUJl4= 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= +github.com/onflow/flow-go-sdk v1.0.0-preview.55 h1:tUM8K7GcWltM0YSzei/g2Gq4z3BwGFTdpq2QwvB6ubk= +github.com/onflow/flow-go-sdk v1.0.0-preview.55/go.mod h1:rBRNboXaTprn7M0MeO6/R1bxNpctbrx66I2FLp0V6fM= github.com/onflow/flow-nft/lib/go/contracts v1.2.1 h1:woAAS5z651sDpi7ihAHll8NvRS9uFXIXkL6xR+bKFZY= github.com/onflow/flow-nft/lib/go/contracts v1.2.1/go.mod h1:2gpbza+uzs1k7x31hkpBPlggIRkI53Suo0n2AyA2HcE= github.com/onflow/flow-nft/lib/go/templates v1.2.0 h1:JSQyh9rg0RC+D1930BiRXN8lrtMs+ubVMK6aQPon6Yc= github.com/onflow/flow-nft/lib/go/templates v1.2.0/go.mod h1:p+2hRvtjLUR3MW1NsoJe5Gqgr2eeH49QB6+s6ze00w0= github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231121210617-52ee94b830c2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= -github.com/onflow/flow/protobuf/go/flow v0.4.6 h1:KE/CsRVfyG5lGBtm1aNcjojMciQyS5GfPF3ixOWRfi0= -github.com/onflow/flow/protobuf/go/flow v0.4.6/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= +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/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=