Skip to content

Commit 5fb1ba0

Browse files
jribbinkm-Peter
jribbink
authored and
m-Peter
committed
Update to Cadence v1.6.2 (#826)
1 parent b4e8fe6 commit 5fb1ba0

File tree

4 files changed

+27
-35
lines changed

4 files changed

+27
-35
lines changed

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ require (
1212
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
1313
github.com/improbable-eng/grpc-web v0.15.0
1414
github.com/logrusorgru/aurora v2.0.3+incompatible
15-
github.com/onflow/cadence v1.6.0
15+
github.com/onflow/cadence v1.6.2
1616
github.com/onflow/crypto v0.25.3
1717
github.com/onflow/flow-core-contracts/lib/go/templates v1.6.1
18-
github.com/onflow/flow-go v0.41.0-rc.1.0.20250612202352-c000365f7daf
19-
github.com/onflow/flow-go-sdk v1.6.0
18+
github.com/onflow/flow-go v0.41.0-rc.1.0.20250618213905-cfbf84027792
19+
github.com/onflow/flow-go-sdk v1.6.1
2020
github.com/onflow/flow-nft/lib/go/contracts v1.2.4
2121
github.com/onflow/flow/protobuf/go/flow v0.4.10
2222
github.com/prometheus/client_golang v1.20.5
@@ -213,7 +213,7 @@ require (
213213
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
214214
gonum.org/v1/gonum v0.16.0 // indirect
215215
google.golang.org/appengine v1.6.8 // indirect
216-
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e // indirect
216+
google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 // indirect
217217
google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 // indirect
218218
google.golang.org/protobuf v1.36.6 // indirect
219219
gopkg.in/ini.v1 v1.67.0 // indirect

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4
3636
cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
3737
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
3838
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
39-
cloud.google.com/go/iam v1.5.0 h1:QlLcVMhbLGOjRcGe6VTGGTyQib8dRLK2B/kYNV0+2xs=
40-
cloud.google.com/go/iam v1.5.0/go.mod h1:U+DOtKQltF/LxPEtcDLoobcsZMilSRwR7mgNL7knOpo=
39+
cloud.google.com/go/iam v1.5.2 h1:qgFRAGEmd8z6dJ/qyEchAuL9jpswyODjA2lS+w234g8=
40+
cloud.google.com/go/iam v1.5.2/go.mod h1:SE1vg0N81zQqLzQEwxL2WI6yhetBdbNQuTvIKCSkUHE=
4141
cloud.google.com/go/monitoring v1.24.0 h1:csSKiCJ+WVRgNkRzzz3BPoGjFhjPY23ZTcaenToJxMM=
4242
cloud.google.com/go/monitoring v1.24.0/go.mod h1:Bd1PRK5bmQBQNnuGwHBfUamAV1ys9049oEPHnn4pcsc=
4343
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
@@ -755,8 +755,8 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N
755755
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
756756
github.com/onflow/atree v0.10.0 h1:LFYlRgb0fjs8vezBW/N/tzi+ijLMssjHwIwoV4RwYaA=
757757
github.com/onflow/atree v0.10.0/go.mod h1:aqnnE8Os77JiBIeC7UcbeM7N1V3Ys5XWH0CykeMpym0=
758-
github.com/onflow/cadence v1.6.0 h1:nFHaEFvekL+9cXuO7w33w6Y7nC1X7PZZHQdSYfE8CvQ=
759-
github.com/onflow/cadence v1.6.0/go.mod h1:MBHOSmj81EtNEGjvYK3UEaFMMrN6jo5wt9U7jvDVLUw=
758+
github.com/onflow/cadence v1.6.2 h1:bzJmfAzEv+8dggmm3HwyH6PhsYLrXqfx6GcI+nPYJCU=
759+
github.com/onflow/cadence v1.6.2/go.mod h1:MBHOSmj81EtNEGjvYK3UEaFMMrN6jo5wt9U7jvDVLUw=
760760
github.com/onflow/crypto v0.25.3 h1:XQ3HtLsw8h1+pBN+NQ1JYM9mS2mVXTyg55OldaAIF7U=
761761
github.com/onflow/crypto v0.25.3/go.mod h1:+1igaXiK6Tjm9wQOBD1EGwW7bYWMUGKtwKJ/2QL/OWs=
762762
github.com/onflow/flow-core-contracts/lib/go/contracts v1.6.1 h1:n2NTsVT4iH7snqW6nkP1PnxHmgEMCh3XZpbdSIqweO4=
@@ -769,10 +769,10 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3
769769
github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
770770
github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
771771
github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
772-
github.com/onflow/flow-go v0.41.0-rc.1.0.20250612202352-c000365f7daf h1:IbyEGUMVFaab99olAASorfyqkeW6LWGPwInC78hNf4w=
773-
github.com/onflow/flow-go v0.41.0-rc.1.0.20250612202352-c000365f7daf/go.mod h1:AcJx8XBn+9mA8vXM5JRK4PoKRCRI8HSp087UX02LI+Q=
774-
github.com/onflow/flow-go-sdk v1.6.0 h1:rN5T5Icva4GjV+RPiUlFm2FMmm0IkQ9f/B8SDlZHRu8=
775-
github.com/onflow/flow-go-sdk v1.6.0/go.mod h1:EBcCMA9Bbjgp/A21i4qCthv9enV4CUYEVZoF8a68vMQ=
772+
github.com/onflow/flow-go v0.41.0-rc.1.0.20250618213905-cfbf84027792 h1:/uQrnD16PMPqYiMTqYNRKnmxw83S0Ejd6zhLtXzixFY=
773+
github.com/onflow/flow-go v0.41.0-rc.1.0.20250618213905-cfbf84027792/go.mod h1:vEpa6y5ef8QniyjpqXp0o1ohmTI3fYGwE7oGasivpa4=
774+
github.com/onflow/flow-go-sdk v1.6.1 h1:Gf+4fV2rvKN8jyubtcQfuJPpbeHmhPWbUv8YvhWnUqg=
775+
github.com/onflow/flow-go-sdk v1.6.1/go.mod h1:Ssf06IM5qZ2ctFe7NCBPQOxUashwm57N9AywghGyqfU=
776776
github.com/onflow/flow-nft/lib/go/contracts v1.2.4 h1:gWJgSSgIGo0qWOqr90+khQ69VoYF9vNlqzF+Yh6YYy4=
777777
github.com/onflow/flow-nft/lib/go/contracts v1.2.4/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
778778
github.com/onflow/flow-nft/lib/go/templates v1.2.1 h1:SAALMZPDw9Eb9p5kSLnmnFxjyig1MLiT4JUlLp0/bSE=
@@ -1532,8 +1532,8 @@ google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6D
15321532
google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
15331533
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb h1:ITgPrl429bc6+2ZraNSzMDk3I95nmQln2fuPstKwFDE=
15341534
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:sAo5UzpjUwgFBCzupwhcLcxHVDK7vG5IqI30YnwX2eE=
1535-
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e h1:UdXH7Kzbj+Vzastr5nVfccbmFsmYNygVLSPk1pEfDoY=
1536-
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e/go.mod h1:085qFyf2+XaZlRdCgKNCIZ3afY2p4HHZdoIRpId8F4A=
1535+
google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 h1:vPV0tzlsK6EzEDHNNH5sa7Hs9bd7iXR7B1tSiPepkV0=
1536+
google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:pKLAc5OolXC3ViWGI62vvC0n10CpwAtRcTNCFwTKBEw=
15371537
google.golang.org/genproto/googleapis/bytestream v0.0.0-20250428153025-10db94c68c34 h1:nfEb4Q4usCEhvyA4vmf47NmO3alop2ab5p5gupICWU4=
15381538
google.golang.org/genproto/googleapis/bytestream v0.0.0-20250428153025-10db94c68c34/go.mod h1:h6yxum/C2qRb4txaZRLDHK8RyS0H/o2oEDeKY4onY/Y=
15391539
google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 h1:h6p3mQqrmT1XkHVTfzLdNz1u7IhINeZkz67/xTbOuWs=

‎server/server.go

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,8 @@ func configureBlockchain(logger *zerolog.Logger, conf *Config, store storage.Sto
422422
emulator.WithTransactionFeesEnabled(conf.TransactionFeesEnabled),
423423
emulator.WithChainID(conf.ChainID),
424424
emulator.WithContractRemovalEnabled(conf.ContractRemovalEnabled),
425+
emulator.WithSetupEVMEnabled(conf.SetupEVMEnabled),
426+
emulator.WithSetupVMBridgeEnabled(conf.SetupVMBridgeEnabled),
425427
}
426428

427429
if conf.SkipTransactionValidation {
@@ -464,20 +466,6 @@ func configureBlockchain(logger *zerolog.Logger, conf *Config, store storage.Sto
464466
)
465467
}
466468

467-
if conf.SetupEVMEnabled {
468-
options = append(
469-
options,
470-
emulator.WithSetupEVMEnabled(true),
471-
)
472-
}
473-
474-
if conf.SetupVMBridgeEnabled {
475-
options = append(
476-
options,
477-
emulator.WithSetupVMBridgeEnabled(true),
478-
)
479-
}
480-
481469
emulatedBlockchain, err := emulator.New(options...)
482470
if err != nil {
483471
return nil, err

‎server/server_test.go

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestNoPersistence(t *testing.T) {
3636
os.RemoveAll(dbPath)
3737
defer os.RemoveAll(dbPath)
3838

39-
conf := &Config{DBPath: dbPath}
39+
conf := &Config{DBPath: dbPath, SetupEVMEnabled: true, SetupVMBridgeEnabled: true}
4040
server := NewEmulatorServer(&logger, conf)
4141
defer server.Stop()
4242

@@ -53,7 +53,7 @@ func TestPersistenceWithPersistFlag(t *testing.T) {
5353
os.RemoveAll(dbPath)
5454
defer os.RemoveAll(dbPath)
5555

56-
conf := &Config{Persist: true, DBPath: dbPath}
56+
conf := &Config{Persist: true, DBPath: dbPath, SetupEVMEnabled: true, SetupVMBridgeEnabled: true}
5757
server := NewEmulatorServer(&logger, conf)
5858
defer server.Stop()
5959

@@ -70,7 +70,7 @@ func TestPersistenceWithSnapshotFlag(t *testing.T) {
7070
os.RemoveAll(dbPath)
7171
defer os.RemoveAll(dbPath)
7272

73-
conf := &Config{Snapshot: true, DBPath: dbPath}
73+
conf := &Config{Snapshot: true, DBPath: dbPath, SetupEVMEnabled: true, SetupVMBridgeEnabled: true}
7474
server := NewEmulatorServer(&logger, conf)
7575
defer server.Stop()
7676

@@ -82,7 +82,7 @@ func TestPersistenceWithSnapshotFlag(t *testing.T) {
8282
func TestExecuteScript(t *testing.T) {
8383

8484
logger := zerolog.Nop()
85-
server := NewEmulatorServer(&logger, &Config{})
85+
server := NewEmulatorServer(&logger, &Config{SetupEVMEnabled: true, SetupVMBridgeEnabled: true})
8686
go server.Start()
8787
defer server.Stop()
8888

@@ -103,7 +103,9 @@ func TestExecuteScript(t *testing.T) {
103103

104104
func TestExecuteScriptImportingContracts(t *testing.T) {
105105
conf := &Config{
106-
WithContracts: true,
106+
WithContracts: true,
107+
SetupEVMEnabled: true,
108+
SetupVMBridgeEnabled: true,
107109
}
108110

109111
logger := zerolog.Nop()
@@ -133,8 +135,10 @@ func TestExecuteScriptImportingContracts(t *testing.T) {
133135
func TestCustomChainID(t *testing.T) {
134136

135137
conf := &Config{
136-
WithContracts: true,
137-
ChainID: "flow-sandboxnet",
138+
WithContracts: true,
139+
ChainID: "flow-sandboxnet",
140+
SetupEVMEnabled: true,
141+
SetupVMBridgeEnabled: true,
138142
}
139143
logger := zerolog.Nop()
140144
server := NewEmulatorServer(&logger, conf)

0 commit comments

Comments
 (0)