diff --git a/api/debug.go b/api/debug.go index ca618c2f4..f415c66ce 100644 --- a/api/debug.go +++ b/api/debug.go @@ -4,7 +4,6 @@ import ( "context" "errors" "fmt" - "math/big" "strings" "github.com/goccy/go-json" @@ -218,18 +217,18 @@ func (d *DebugAPI) TraceCall( } // Override account balance. if account.Balance != nil { - opts = append(opts, query.WithStateOverrideBalance(addr, (*big.Int)(*account.Balance))) + opts = append(opts, query.WithStateOverrideBalance(addr, account.Balance.ToInt())) } if account.State != nil && account.StateDiff != nil { return nil, fmt.Errorf("account %s has both 'state' and 'stateDiff'", addr.Hex()) } // Replace entire state if caller requires. if account.State != nil { - opts = append(opts, query.WithStateOverrideState(addr, *account.State)) + opts = append(opts, query.WithStateOverrideState(addr, account.State)) } // Apply state diff into specified accounts. if account.StateDiff != nil { - opts = append(opts, query.WithStateOverrideStateDiff(addr, *account.StateDiff)) + opts = append(opts, query.WithStateOverrideStateDiff(addr, account.StateDiff)) } } } diff --git a/go.mod b/go.mod index e71785739..132dde1eb 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/onflow/atree v0.9.0 github.com/onflow/cadence v1.3.3 - github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250310185932-da0779039232 + github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250314124202-6e06cf084313 github.com/onflow/flow-go-sdk v1.3.3 - github.com/onflow/go-ethereum v1.14.7 + github.com/onflow/go-ethereum v1.14.8-0.20250313102023-d74083dc74d3 github.com/prometheus/client_golang v1.20.5 github.com/rs/cors v1.8.0 github.com/rs/zerolog v1.33.0 @@ -94,7 +94,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect - github.com/holiman/uint256 v1.3.0 // indirect + github.com/holiman/uint256 v1.3.1 // indirect github.com/huandu/go-clone v1.6.0 // indirect github.com/huandu/go-clone/generic v1.7.2 // indirect github.com/huin/goupnp v1.3.0 // indirect diff --git a/go.sum b/go.sum index 1143561e8..81d7c9f4e 100644 --- a/go.sum +++ b/go.sum @@ -189,8 +189,6 @@ github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 h1:KrE8I4reeV github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0/go.mod h1:D9AJLVXSyZQXJQVk8oh1EwjISE+sJTn2duYIZC0dy3w= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA= -github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= @@ -375,8 +373,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= -github.com/holiman/uint256 v1.3.0 h1:4wdcm/tnd0xXdu7iS3ruNvxkWwrb4aeBQv19ayYn8F4= -github.com/holiman/uint256 v1.3.0/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= +github.com/holiman/uint256 v1.3.1 h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs= +github.com/holiman/uint256 v1.3.1/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= @@ -578,8 +576,8 @@ 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.39.3-unsafe-cdp.0.0.20250310185932-da0779039232 h1:+IB58xC+XNdi1O06eDwbfpWS+TTKYXAusoicl3xP1Tw= -github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250310185932-da0779039232/go.mod h1:2803MDj6lkXyz+N4EmfeMEyH+bOT3SGfb6h6jAqis68= +github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250314124202-6e06cf084313 h1:U3yI0ZIljN51lQh4BuHtIYf8YqKrbsdQQNs1vejCMlU= +github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250314124202-6e06cf084313/go.mod h1:QLk1KsI50qEl29wXP2rm3FWqya4sB9t02habN/J8kgE= github.com/onflow/flow-go-sdk v1.3.3 h1:wj7llql3wesQYBePh3lEFI+jk3Df1sa13bRsL139JDo= github.com/onflow/flow-go-sdk v1.3.3/go.mod h1:tSLvYIac9DlmUEqKHSHbVRyv4mSB0va4AuiV3XB9ENc= github.com/onflow/flow-nft/lib/go/contracts v1.2.3 h1:4ju20g1xgDKWBT63rOj5f/Sa4Lc+naCSWT4p31x9yQk= @@ -588,8 +586,8 @@ github.com/onflow/flow-nft/lib/go/templates v1.2.1 h1:SAALMZPDw9Eb9p5kSLnmnFxjyi github.com/onflow/flow-nft/lib/go/templates v1.2.1/go.mod h1:W6hOWU0xltPqNpv9gQX8Pj8Jtf0OmRxc1XX2V0kzJaI= github.com/onflow/flow/protobuf/go/flow v0.4.10 h1:CGEO3n96XZQd/k5HtkZyb90ouem9G+8fNcKyt8s2fvs= github.com/onflow/flow/protobuf/go/flow v0.4.10/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/go-ethereum v1.14.8-0.20250313102023-d74083dc74d3 h1:NLADEo3oIi7QWt0Nz5hg0EJkSjJI/BmT/FotrUIhICM= +github.com/onflow/go-ethereum v1.14.8-0.20250313102023-d74083dc74d3/go.mod h1:FDpxDaSZWa4OaYKeHqbY0wMyGNQYkVwC3wo8WCVCqhk= github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 h1:sxyWLqGm/p4EKT6DUlQESDG1ZNMN9GjPCm1gTq7NGfc= github.com/onflow/nft-storefront/lib/go/contracts v1.0.0/go.mod h1:kMeq9zUwCrgrSojEbTUTTJpZ4WwacVm2pA7LVFr+glk= github.com/onflow/sdks v0.6.0-preview.1 h1:mb/cUezuqWEP1gFZNAgUI4boBltudv4nlfxke1KBp9k= diff --git a/tests/go.mod b/tests/go.mod index 2ae73f1ab..8948594f6 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -6,11 +6,11 @@ require ( github.com/goccy/go-json v0.10.2 github.com/onflow/cadence v1.3.3 github.com/onflow/crypto v0.25.2 - github.com/onflow/flow-emulator v1.2.1-0.20250314224016-04620ca53b38 + github.com/onflow/flow-emulator v1.2.1-0.20250314161500-c55d0b34c1dc github.com/onflow/flow-evm-gateway v0.0.0-20240201154855-4d4d3d3f19c7 - github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250310185932-da0779039232 + github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250314124202-6e06cf084313 github.com/onflow/flow-go-sdk v1.3.3 - github.com/onflow/go-ethereum v1.14.7 + github.com/onflow/go-ethereum v1.14.8-0.20250313102023-d74083dc74d3 github.com/rs/zerolog v1.33.0 github.com/stretchr/testify v1.10.0 ) @@ -100,7 +100,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect - github.com/holiman/uint256 v1.3.0 // indirect + github.com/holiman/uint256 v1.3.1 // indirect github.com/huandu/go-clone v1.6.0 // indirect github.com/huandu/go-clone/generic v1.7.2 // indirect github.com/huin/goupnp v1.3.0 // indirect diff --git a/tests/go.sum b/tests/go.sum index 300eba839..c97e64bde 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -269,8 +269,6 @@ github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0/go.mod h1:D9A github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA= -github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= @@ -526,8 +524,8 @@ github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6w github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= -github.com/holiman/uint256 v1.3.0 h1:4wdcm/tnd0xXdu7iS3ruNvxkWwrb4aeBQv19ayYn8F4= -github.com/holiman/uint256 v1.3.0/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= +github.com/holiman/uint256 v1.3.1 h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs= +github.com/holiman/uint256 v1.3.1/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= @@ -798,14 +796,14 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v1.6.0 h1:zbJaqR3bHicNz68 github.com/onflow/flow-core-contracts/lib/go/contracts v1.6.0/go.mod h1:ufT77Epq1gfXAHQQk13WcAHWEv+Aarecn5PMnljWJ1A= github.com/onflow/flow-core-contracts/lib/go/templates v1.6.0 h1:hVlyGbZ+gkeX0mTxTC4D65HulJCUbbVFgOvVWdMfRI8= github.com/onflow/flow-core-contracts/lib/go/templates v1.6.0/go.mod h1:pN768Al/wLRlf3bwugv9TyxniqJxMu4sxnX9eQJam64= -github.com/onflow/flow-emulator v1.2.1-0.20250314224016-04620ca53b38 h1:B6qqvBPK+0f0cXkn32eaZkZkmi1KGs6codYAPht7CN4= -github.com/onflow/flow-emulator v1.2.1-0.20250314224016-04620ca53b38/go.mod h1:UDdaUBoBMysFdeyKuJbDbyaRnss9NnegwIUtZ0PbgEo= +github.com/onflow/flow-emulator v1.2.1-0.20250314161500-c55d0b34c1dc h1:gOR/VPujtK4Q4zrDgT6swMDWrWlhSsUZCnIYAYwXrZw= +github.com/onflow/flow-emulator v1.2.1-0.20250314161500-c55d0b34c1dc/go.mod h1:UDdaUBoBMysFdeyKuJbDbyaRnss9NnegwIUtZ0PbgEo= github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3SsEftzXG2JlmSe24= 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.39.3-unsafe-cdp.0.0.20250310185932-da0779039232 h1:+IB58xC+XNdi1O06eDwbfpWS+TTKYXAusoicl3xP1Tw= -github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250310185932-da0779039232/go.mod h1:2803MDj6lkXyz+N4EmfeMEyH+bOT3SGfb6h6jAqis68= +github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250314124202-6e06cf084313 h1:U3yI0ZIljN51lQh4BuHtIYf8YqKrbsdQQNs1vejCMlU= +github.com/onflow/flow-go v0.39.3-unsafe-cdp.0.0.20250314124202-6e06cf084313/go.mod h1:QLk1KsI50qEl29wXP2rm3FWqya4sB9t02habN/J8kgE= github.com/onflow/flow-go-sdk v1.3.3 h1:wj7llql3wesQYBePh3lEFI+jk3Df1sa13bRsL139JDo= github.com/onflow/flow-go-sdk v1.3.3/go.mod h1:tSLvYIac9DlmUEqKHSHbVRyv4mSB0va4AuiV3XB9ENc= github.com/onflow/flow-nft/lib/go/contracts v1.2.3 h1:4ju20g1xgDKWBT63rOj5f/Sa4Lc+naCSWT4p31x9yQk= @@ -814,8 +812,8 @@ github.com/onflow/flow-nft/lib/go/templates v1.2.1 h1:SAALMZPDw9Eb9p5kSLnmnFxjyi github.com/onflow/flow-nft/lib/go/templates v1.2.1/go.mod h1:W6hOWU0xltPqNpv9gQX8Pj8Jtf0OmRxc1XX2V0kzJaI= github.com/onflow/flow/protobuf/go/flow v0.4.10 h1:CGEO3n96XZQd/k5HtkZyb90ouem9G+8fNcKyt8s2fvs= github.com/onflow/flow/protobuf/go/flow v0.4.10/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/go-ethereum v1.14.8-0.20250313102023-d74083dc74d3 h1:NLADEo3oIi7QWt0Nz5hg0EJkSjJI/BmT/FotrUIhICM= +github.com/onflow/go-ethereum v1.14.8-0.20250313102023-d74083dc74d3/go.mod h1:FDpxDaSZWa4OaYKeHqbY0wMyGNQYkVwC3wo8WCVCqhk= github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 h1:sxyWLqGm/p4EKT6DUlQESDG1ZNMN9GjPCm1gTq7NGfc= github.com/onflow/nft-storefront/lib/go/contracts v1.0.0/go.mod h1:kMeq9zUwCrgrSojEbTUTTJpZ4WwacVm2pA7LVFr+glk= github.com/onflow/sdks v0.6.0-preview.1 h1:mb/cUezuqWEP1gFZNAgUI4boBltudv4nlfxke1KBp9k=