diff --git a/emulator/blockchain.go b/emulator/blockchain.go index 733fb4a1..41425191 100644 --- a/emulator/blockchain.go +++ b/emulator/blockchain.go @@ -374,7 +374,7 @@ type Blockchain struct { conf config - coverageReportedRuntime *CoverageReportedRuntime + runtime runtime.Runtime sourceFileMap map[common.Location]string @@ -519,7 +519,7 @@ func (b *Blockchain) Ping() error { } func (b *Blockchain) Runtime() runtime.Runtime { - return b.coverageReportedRuntime + return b.runtime } func (b *Blockchain) GetChain() flowgo.Chain { @@ -633,16 +633,12 @@ func configureFVM(blockchain *Blockchain, conf config, blocks *blocks) (*fvm.Vir Debugger: blockchain.debugger, CoverageReport: conf.CoverageReport, } - coverageReportedRuntime := &CoverageReportedRuntime{ - Runtime: runtime.NewRuntime(runtimeConfig), - CoverageReport: conf.CoverageReport, - Environment: runtime.NewBaseInterpreterEnvironment(runtimeConfig), - } + rt := runtime.NewRuntime(runtimeConfig) customRuntimePool := reusableRuntime.NewCustomReusableCadenceRuntimePool( 1, runtimeConfig, func(config runtime.Config) runtime.Runtime { - return coverageReportedRuntime + return rt }, ) @@ -673,7 +669,7 @@ func configureFVM(blockchain *Blockchain, conf config, blocks *blocks) (*fvm.Vir fvmOptions..., ) - blockchain.coverageReportedRuntime = coverageReportedRuntime + blockchain.runtime = rt return vm, ctx, nil } @@ -1713,7 +1709,7 @@ func (b *Blockchain) EndDebugging() { } func (b *Blockchain) CoverageReport() *runtime.CoverageReport { - return b.coverageReportedRuntime.CoverageReport + return b.conf.CoverageReport } func (b *Blockchain) ComputationReport() *ComputationReport { @@ -1721,7 +1717,7 @@ func (b *Blockchain) ComputationReport() *ComputationReport { } func (b *Blockchain) ResetCoverageReport() { - b.coverageReportedRuntime.Reset() + b.conf.CoverageReport.Reset() } func (b *Blockchain) GetTransactionsByBlockID(blockID flowgo.Identifier) ([]*flowgo.TransactionBody, error) { diff --git a/emulator/coverage_report_test.go b/emulator/coverage_report_test.go index 7cbfee34..3391ed77 100644 --- a/emulator/coverage_report_test.go +++ b/emulator/coverage_report_test.go @@ -46,6 +46,7 @@ func TestCoverageReport(t *testing.T) { require.NoError(t, err) coverageReport.Reset() + logger := zerolog.Nop() adapter := adapters.NewSDKAdapter(&logger, b) diff --git a/emulator/coverage_reported_runtime.go b/emulator/coverage_reported_runtime.go deleted file mode 100644 index 98c12035..00000000 --- a/emulator/coverage_reported_runtime.go +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Flow Emulator - * - * Copyright Flow Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package emulator - -import ( - "github.com/onflow/cadence" - "github.com/onflow/cadence/common" - "github.com/onflow/cadence/interpreter" - "github.com/onflow/cadence/runtime" - "github.com/onflow/cadence/sema" -) - -type CoverageReportedRuntime struct { - runtime.Runtime - runtime.Environment - *runtime.CoverageReport -} - -func (crr CoverageReportedRuntime) NewScriptExecutor( - script runtime.Script, - context runtime.Context, -) runtime.Executor { - context.CoverageReport = crr.CoverageReport - return crr.Runtime.NewScriptExecutor(script, context) -} - -func (crr CoverageReportedRuntime) ExecuteScript( - script runtime.Script, - context runtime.Context, -) ( - cadence.Value, - error, -) { - context.CoverageReport = crr.CoverageReport - return crr.Runtime.ExecuteScript(script, context) -} - -func (crr CoverageReportedRuntime) NewTransactionExecutor( - script runtime.Script, - context runtime.Context, -) runtime.Executor { - context.CoverageReport = crr.CoverageReport - return crr.Runtime.NewTransactionExecutor(script, context) -} - -func (crr CoverageReportedRuntime) ExecuteTransaction( - script runtime.Script, - context runtime.Context, -) error { - context.CoverageReport = crr.CoverageReport - return crr.Runtime.ExecuteTransaction(script, context) -} - -func (crr CoverageReportedRuntime) NewContractFunctionExecutor( - contractLocation common.AddressLocation, - functionName string, - arguments []cadence.Value, - argumentTypes []sema.Type, - context runtime.Context, -) runtime.Executor { - context.CoverageReport = crr.CoverageReport - return crr.Runtime.NewContractFunctionExecutor( - contractLocation, - functionName, - arguments, - argumentTypes, - context, - ) -} - -func (crr CoverageReportedRuntime) InvokeContractFunction( - contractLocation common.AddressLocation, - functionName string, - arguments []cadence.Value, - argumentTypes []sema.Type, - context runtime.Context, -) ( - cadence.Value, - error, -) { - context.CoverageReport = crr.CoverageReport - return crr.Runtime.InvokeContractFunction( - contractLocation, - functionName, - arguments, - argumentTypes, - context, - ) -} - -func (crr CoverageReportedRuntime) ParseAndCheckProgram( - source []byte, - context runtime.Context, -) ( - *interpreter.Program, - error, -) { - context.CoverageReport = crr.CoverageReport - return crr.Runtime.ParseAndCheckProgram(source, context) -} - -func (crr CoverageReportedRuntime) ReadStored( - address common.Address, - path cadence.Path, - context runtime.Context, -) ( - cadence.Value, - error, -) { - context.CoverageReport = crr.CoverageReport - return crr.Runtime.ReadStored(address, path, context) -} - -func (crr CoverageReportedRuntime) Storage( - context runtime.Context, -) ( - *runtime.Storage, - *interpreter.Interpreter, - error, -) { - context.CoverageReport = crr.CoverageReport - return crr.Runtime.Storage(context) -} diff --git a/go.mod b/go.mod index b0c0bdff..cdf58119 100644 --- a/go.mod +++ b/go.mod @@ -12,11 +12,11 @@ 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.7.1 + github.com/onflow/cadence v1.8.1 github.com/onflow/crypto v0.25.3 github.com/onflow/flow-core-contracts/lib/go/templates v1.9.0 - github.com/onflow/flow-go v0.43.1-rc.5-pr8007.0.20251007165614-c6967df18fa9 - github.com/onflow/flow-go-sdk v1.8.4 + github.com/onflow/flow-go v0.43.3-0.20251020174348-b36af5491350 + github.com/onflow/flow-go-sdk v1.9.0 github.com/onflow/flow-nft/lib/go/contracts v1.3.0 github.com/onflow/flow/protobuf/go/flow v0.4.16 github.com/prometheus/client_golang v1.23.2 @@ -53,7 +53,7 @@ require ( github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/consensys/gnark-crypto v0.18.0 // indirect github.com/coreos/go-semver v0.3.0 // indirect - github.com/crate-crypto/go-eth-kzg v1.3.0 // indirect + github.com/crate-crypto/go-eth-kzg v1.4.0 // indirect github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect @@ -68,13 +68,13 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/ef-ds/deque v1.0.4 // indirect github.com/emicklei/dot v1.6.2 // indirect - github.com/ethereum/c-kzg-4844/v2 v2.1.0 // indirect - github.com/ethereum/go-ethereum v1.16.3 // indirect + github.com/ethereum/c-kzg-4844/v2 v2.1.3 // indirect + github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab // indirect + github.com/ethereum/go-ethereum v1.16.4 // indirect github.com/ethereum/go-verkle v0.2.2 // indirect github.com/ferranbt/fastssz v0.1.4 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/fxamacker/circlehash v0.3.0 // indirect - github.com/fxamacker/golang-lru/v2 v2.0.0-20250716153046-22c8d17dc4ee // indirect github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect @@ -87,6 +87,7 @@ require ( github.com/golang/glog v1.2.5 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e // indirect + github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.3 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect @@ -143,7 +144,7 @@ require ( github.com/multiformats/go-varint v0.0.7 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/onflow/atree v0.10.1 // indirect + github.com/onflow/atree v0.11.0 // indirect github.com/onflow/fixed-point v0.1.1 // indirect github.com/onflow/flow-core-contracts/lib/go/contracts v1.9.0 // indirect github.com/onflow/flow-evm-bridge v0.1.0 // indirect @@ -184,7 +185,7 @@ require ( github.com/spf13/viper v1.15.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.4.2 // indirect - github.com/supranational/blst v0.3.14 // indirect + github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe // indirect github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect @@ -210,7 +211,7 @@ require ( golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect golang.org/x/net v0.43.0 // indirect golang.org/x/sync v0.16.0 // indirect - golang.org/x/sys v0.35.0 // indirect + golang.org/x/sys v0.36.0 // indirect golang.org/x/term v0.34.0 // indirect golang.org/x/text v0.28.0 // indirect golang.org/x/time v0.12.0 // indirect diff --git a/go.sum b/go.sum index 7111e191..21bb54da 100644 --- a/go.sum +++ b/go.sum @@ -202,8 +202,8 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= -github.com/crate-crypto/go-eth-kzg v1.3.0 h1:05GrhASN9kDAidaFJOda6A4BEvgvuXbazXg/0E3OOdI= -github.com/crate-crypto/go-eth-kzg v1.3.0/go.mod h1:J9/u5sWfznSObptgfa92Jq8rTswn6ahQWEuiLHOjCUI= +github.com/crate-crypto/go-eth-kzg v1.4.0 h1:WzDGjHk4gFg6YzV0rJOAsTK4z3Qkz5jd4RE3DAvPFkg= +github.com/crate-crypto/go-eth-kzg v1.4.0/go.mod h1:J9/u5sWfznSObptgfa92Jq8rTswn6ahQWEuiLHOjCUI= github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a h1:W8mUrRp6NOVl3J+MYp5kPMoUZPp7aOYHtaua31lwRHg= github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a/go.mod h1:sTwzHBvIzm2RfVCGNEBZgRyjwK40bVoun3ZnGOCafNM= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -261,10 +261,12 @@ github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8= github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU= -github.com/ethereum/c-kzg-4844/v2 v2.1.0 h1:gQropX9YFBhl3g4HYhwE70zq3IHFRgbbNPw0Shwzf5w= -github.com/ethereum/c-kzg-4844/v2 v2.1.0/go.mod h1:TC48kOKjJKPbN7C++qIgt0TJzZ70QznYR7Ob+WXl57E= -github.com/ethereum/go-ethereum v1.16.3 h1:nDoBSrmsrPbrDIVLTkDQCy1U9KdHN+F2PzvMbDoS42Q= -github.com/ethereum/go-ethereum v1.16.3/go.mod h1:Lrsc6bt9Gm9RyvhfFK53vboCia8kpF9nv+2Ukntnl+8= +github.com/ethereum/c-kzg-4844/v2 v2.1.3 h1:DQ21UU0VSsuGy8+pcMJHDS0CV1bKmJmxsJYK8l3MiLU= +github.com/ethereum/c-kzg-4844/v2 v2.1.3/go.mod h1:fyNcYI/yAuLWJxf4uzVtS8VDKeoAaRM8G/+ADz/pRdA= +github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab h1:rvv6MJhy07IMfEKuARQ9TKojGqLVNxQajaXEp/BoqSk= +github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab/go.mod h1:IuLm4IsPipXKF7CW5Lzf68PIbZ5yl7FFd74l/E0o9A8= +github.com/ethereum/go-ethereum v1.16.4 h1:H6dU0r2p/amA7cYg6zyG9Nt2JrKKH6oX2utfcqrSpkQ= +github.com/ethereum/go-ethereum v1.16.4/go.mod h1:P7551slMFbjn2zOQaKrJShZVN/d8bGxp4/I6yZVlb5w= github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8= github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -446,8 +448,8 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg= -github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 h1:xhMrHhTJ6zxu3gA4enFM9MLn9AY7613teCdFnlUVbSQ= +github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0= github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM= @@ -747,10 +749,10 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/onflow/atree v0.10.1 h1:8sixWP3l3LitcyuKkVepbIsLbfr7JN3cCB/iA1j2JD8= -github.com/onflow/atree v0.10.1/go.mod h1:+BuiL0XuIigHJqwkdIuDNzxXvyDx1jYUog/w+iZhcE8= -github.com/onflow/cadence v1.7.1 h1:VpPiC13e4qrdpyqaagd+dpHtQwfJ/djr97FgT3SovWA= -github.com/onflow/cadence v1.7.1/go.mod h1:1lKdLNVHIoO0jEjkRPMtOmBWYCG1An9TXSoiCuGIIpo= +github.com/onflow/atree v0.11.0 h1:NrGHb7l3pKvFPFAdYfEyezg6D7xBNcMSwQHliOHtZug= +github.com/onflow/atree v0.11.0/go.mod h1:uZE/bzDfMLXJH9BYL8HxNisw9pHZGyc+mDLuSMeUAVY= +github.com/onflow/cadence v1.8.1 h1:nWx+USGs/+NIVHd5RYlzEulzsqYQp0uSKDqVYBub3w4= +github.com/onflow/cadence v1.8.1/go.mod h1:08FmLMsBjhRTgE9tmiSJjFNJrjcuTUawQFFUQq8J1Y4= github.com/onflow/crypto v0.25.3 h1:XQ3HtLsw8h1+pBN+NQ1JYM9mS2mVXTyg55OldaAIF7U= github.com/onflow/crypto v0.25.3/go.mod h1:+1igaXiK6Tjm9wQOBD1EGwW7bYWMUGKtwKJ/2QL/OWs= github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRKS90= @@ -765,10 +767,10 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3 github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A= github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM= github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE= -github.com/onflow/flow-go v0.43.1-rc.5-pr8007.0.20251007165614-c6967df18fa9 h1:PPIDrvyHEzkegSn8sYvQxmnegsiwdwmIrYJBNLSqaGw= -github.com/onflow/flow-go v0.43.1-rc.5-pr8007.0.20251007165614-c6967df18fa9/go.mod h1:pRsxdt8GYriAfP4RjUsCJ505MQcAZgyZq7K4DuWxrXI= -github.com/onflow/flow-go-sdk v1.8.4 h1:WHtVjryOU6ZJx0jUSjBPOrWoGqGDr+eEejyIkfbiBCE= -github.com/onflow/flow-go-sdk v1.8.4/go.mod h1:Jli9sI78LAnoC3OVGeAs0ngOezoLTfE/GrKOAB9TbTw= +github.com/onflow/flow-go v0.43.3-0.20251020174348-b36af5491350 h1:iNea1ILZJOtYo1USv35XDvUHgMEB0SLVQMxgEZXmK1s= +github.com/onflow/flow-go v0.43.3-0.20251020174348-b36af5491350/go.mod h1:vQVi9g5rzW1mYPvCj33qSI9Ug4B+wvrtD8a64cXU9QQ= +github.com/onflow/flow-go-sdk v1.9.0 h1:VzIF38lO09LM2Sb4RxdWUf7QR4fEyDXg70vUNOQXYgQ= +github.com/onflow/flow-go-sdk v1.9.0/go.mod h1:YwYB4z96zR4IspPvXYTCtE+TsQ/mZECgQfns0Sa7mw8= github.com/onflow/flow-nft/lib/go/contracts v1.3.0 h1:DmNop+O0EMyicZvhgdWboFG57xz5t9Qp81FKlfKyqJc= github.com/onflow/flow-nft/lib/go/contracts v1.3.0/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY= github.com/onflow/flow-nft/lib/go/templates v1.3.0 h1:uGIBy4GEY6Z9hKP7sm5nA5kwvbvLWW4nWx5NN9Wg0II= @@ -1020,8 +1022,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/supranational/blst v0.3.14 h1:xNMoHRJOTwMn63ip6qoWJ2Ymgvj7E2b9jY2FAwY+qRo= -github.com/supranational/blst v0.3.14/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= +github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe h1:nbdqkIGOGfUAD54q1s2YBcBz/WcsxCO9HUQ4aGV5hUw= +github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c h1:HelZ2kAFadG0La9d+4htN4HzQ68Bm2iM9qKMSMES6xg= @@ -1353,8 +1355,8 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= -golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= diff --git a/server/debugger/debugsession.go b/server/debugger/debugsession.go index 9f9442ce..eb03daa0 100644 --- a/server/debugger/debugsession.go +++ b/server/debugger/debugsession.go @@ -205,7 +205,7 @@ func (s *session) handleVariablesRequest(request *dap.VariablesRequest) { value := variable.GetValue(inter) - cadenceValue, err := runtime.ExportValue(value, inter, interpreter.EmptyLocationRange) + cadenceValue, err := runtime.ExportValue(value, inter) if err != nil { // panic(err) continue @@ -638,7 +638,7 @@ func (s *session) convertInterpreterValueToDAPVariables( inter *interpreter.Interpreter, value interpreter.Value, ) []dap.Variable { - cadenceValue, err := runtime.ExportValue(value, inter, interpreter.EmptyLocationRange) + cadenceValue, err := runtime.ExportValue(value, inter) if err != nil { panic(err) } @@ -659,7 +659,7 @@ func (s *session) convertStorageMapToDAPVariables( break } - cadenceValue, err := runtime.ExportValue(value, inter, interpreter.EmptyLocationRange) + cadenceValue, err := runtime.ExportValue(value, inter) if err != nil { panic(err) }