Skip to content

Commit 2fb02da

Browse files
authored
Merge branch 'master' into bastian/debug-tx-tracing
2 parents d11758a + baaf232 commit 2fb02da

File tree

6 files changed

+18
-9
lines changed

6 files changed

+18
-9
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
github.com/multiformats/go-multiaddr-dns v0.4.1
4949
github.com/multiformats/go-multihash v0.2.3
5050
github.com/onflow/atree v0.10.1
51-
github.com/onflow/cadence v1.7.0-preview.2
51+
github.com/onflow/cadence v1.7.0-preview.3
5252
github.com/onflow/crypto v0.25.3
5353
github.com/onflow/flow v0.3.4
5454
github.com/onflow/flow-core-contracts/lib/go/contracts v1.7.4-0.20250825173510-91e6f28b0224
@@ -270,6 +270,7 @@ require (
270270
github.com/multiformats/go-varint v0.0.7 // indirect
271271
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
272272
github.com/olekukonko/tablewriter v0.0.5 // indirect
273+
github.com/onflow/fixed-point v0.1.1 // indirect
273274
github.com/onflow/flow-ft/lib/go/contracts v1.0.1 // indirect
274275
github.com/onflow/flow-ft/lib/go/templates v1.0.1 // indirect
275276
github.com/onflow/flow-nft/lib/go/contracts v1.2.4 // indirect

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -939,10 +939,12 @@ github.com/onflow/atree v0.10.1 h1:8sixWP3l3LitcyuKkVepbIsLbfr7JN3cCB/iA1j2JD8=
939939
github.com/onflow/atree v0.10.1/go.mod h1:+BuiL0XuIigHJqwkdIuDNzxXvyDx1jYUog/w+iZhcE8=
940940
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483 h1:LpiQhTAfM9CAmNVEs0n//cBBgCg+vJSiIxTHYUklZ84=
941941
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
942-
github.com/onflow/cadence v1.7.0-preview.2 h1:9gmKIeP51x43zk1Jy0z6XM5sY396GeMWA7xdgQEMMHs=
943-
github.com/onflow/cadence v1.7.0-preview.2/go.mod h1:vUPS9e8Ng1ev320CiaSYKDOmzmAlP1KA5weVvb7WwBQ=
942+
github.com/onflow/cadence v1.7.0-preview.3 h1:BbvETVNr8AyApTZIjZE2iZnXj2cze5R4NBRNiWsQofU=
943+
github.com/onflow/cadence v1.7.0-preview.3/go.mod h1:1lKdLNVHIoO0jEjkRPMtOmBWYCG1An9TXSoiCuGIIpo=
944944
github.com/onflow/crypto v0.25.3 h1:XQ3HtLsw8h1+pBN+NQ1JYM9mS2mVXTyg55OldaAIF7U=
945945
github.com/onflow/crypto v0.25.3/go.mod h1:+1igaXiK6Tjm9wQOBD1EGwW7bYWMUGKtwKJ/2QL/OWs=
946+
github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRKS90=
947+
github.com/onflow/fixed-point v0.1.1/go.mod h1:gJdoHqKtToKdOZbvryJvDZfcpzC7d2fyWuo3ZmLtcGY=
946948
github.com/onflow/flow v0.3.4 h1:FXUWVdYB90f/rjNcY0Owo30gL790tiYff9Pb/sycXYE=
947949
github.com/onflow/flow v0.3.4/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c=
948950
github.com/onflow/flow-core-contracts/lib/go/contracts v1.7.4-0.20250825173510-91e6f28b0224 h1:YKdTSG+6uu+dZpKCB2fmNWOmKGLn7+0MxFbtUFZdBjc=

insecure/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,8 @@ require (
214214
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
215215
github.com/olekukonko/tablewriter v0.0.5 // indirect
216216
github.com/onflow/atree v0.10.1 // indirect
217-
github.com/onflow/cadence v1.7.0-preview.2 // indirect
217+
github.com/onflow/cadence v1.7.0-preview.3 // indirect
218+
github.com/onflow/fixed-point v0.1.1 // indirect
218219
github.com/onflow/flow-core-contracts/lib/go/contracts v1.7.4-0.20250825173510-91e6f28b0224 // indirect
219220
github.com/onflow/flow-core-contracts/lib/go/templates v1.7.2-0.20250825173510-91e6f28b0224 // indirect
220221
github.com/onflow/flow-evm-bridge v0.1.0 // indirect

insecure/go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -889,10 +889,12 @@ github.com/onflow/atree v0.10.1 h1:8sixWP3l3LitcyuKkVepbIsLbfr7JN3cCB/iA1j2JD8=
889889
github.com/onflow/atree v0.10.1/go.mod h1:+BuiL0XuIigHJqwkdIuDNzxXvyDx1jYUog/w+iZhcE8=
890890
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483 h1:LpiQhTAfM9CAmNVEs0n//cBBgCg+vJSiIxTHYUklZ84=
891891
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
892-
github.com/onflow/cadence v1.7.0-preview.2 h1:9gmKIeP51x43zk1Jy0z6XM5sY396GeMWA7xdgQEMMHs=
893-
github.com/onflow/cadence v1.7.0-preview.2/go.mod h1:vUPS9e8Ng1ev320CiaSYKDOmzmAlP1KA5weVvb7WwBQ=
892+
github.com/onflow/cadence v1.7.0-preview.3 h1:BbvETVNr8AyApTZIjZE2iZnXj2cze5R4NBRNiWsQofU=
893+
github.com/onflow/cadence v1.7.0-preview.3/go.mod h1:1lKdLNVHIoO0jEjkRPMtOmBWYCG1An9TXSoiCuGIIpo=
894894
github.com/onflow/crypto v0.25.3 h1:XQ3HtLsw8h1+pBN+NQ1JYM9mS2mVXTyg55OldaAIF7U=
895895
github.com/onflow/crypto v0.25.3/go.mod h1:+1igaXiK6Tjm9wQOBD1EGwW7bYWMUGKtwKJ/2QL/OWs=
896+
github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRKS90=
897+
github.com/onflow/fixed-point v0.1.1/go.mod h1:gJdoHqKtToKdOZbvryJvDZfcpzC7d2fyWuo3ZmLtcGY=
896898
github.com/onflow/flow-core-contracts/lib/go/contracts v1.7.4-0.20250825173510-91e6f28b0224 h1:YKdTSG+6uu+dZpKCB2fmNWOmKGLn7+0MxFbtUFZdBjc=
897899
github.com/onflow/flow-core-contracts/lib/go/contracts v1.7.4-0.20250825173510-91e6f28b0224/go.mod h1:/Yne6g7V2Fy1sm/vE78us221bYvVvL5cA8cOzN/uTCI=
898900
github.com/onflow/flow-core-contracts/lib/go/templates v1.7.2-0.20250825173510-91e6f28b0224 h1:6ZBTrqPQIbnek7mdtJwbQux87qcJPTz82DDgGhpsHzI=

integration/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/ipfs/go-ds-badger2 v0.1.4
2222
github.com/ipfs/go-ds-pebble v0.5.0
2323
github.com/libp2p/go-libp2p v0.38.2
24-
github.com/onflow/cadence v1.7.0-preview.2
24+
github.com/onflow/cadence v1.7.0-preview.3
2525
github.com/onflow/crypto v0.25.3
2626
github.com/onflow/flow-core-contracts/lib/go/contracts v1.7.4-0.20250825173510-91e6f28b0224
2727
github.com/onflow/flow-core-contracts/lib/go/templates v1.7.2-0.20250825173510-91e6f28b0224
@@ -255,6 +255,7 @@ require (
255255
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
256256
github.com/olekukonko/tablewriter v0.0.5 // indirect
257257
github.com/onflow/atree v0.10.1 // indirect
258+
github.com/onflow/fixed-point v0.1.1 // indirect
258259
github.com/onflow/flow-evm-bridge v0.1.0 // indirect
259260
github.com/onflow/flow-ft/lib/go/contracts v1.0.1 // indirect
260261
github.com/onflow/flow-ft/lib/go/templates v1.0.1 // indirect

integration/go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -761,10 +761,12 @@ github.com/onflow/atree v0.10.1 h1:8sixWP3l3LitcyuKkVepbIsLbfr7JN3cCB/iA1j2JD8=
761761
github.com/onflow/atree v0.10.1/go.mod h1:+BuiL0XuIigHJqwkdIuDNzxXvyDx1jYUog/w+iZhcE8=
762762
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483 h1:LpiQhTAfM9CAmNVEs0n//cBBgCg+vJSiIxTHYUklZ84=
763763
github.com/onflow/boxo v0.0.0-20240201202436-f2477b92f483/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
764-
github.com/onflow/cadence v1.7.0-preview.2 h1:9gmKIeP51x43zk1Jy0z6XM5sY396GeMWA7xdgQEMMHs=
765-
github.com/onflow/cadence v1.7.0-preview.2/go.mod h1:vUPS9e8Ng1ev320CiaSYKDOmzmAlP1KA5weVvb7WwBQ=
764+
github.com/onflow/cadence v1.7.0-preview.3 h1:BbvETVNr8AyApTZIjZE2iZnXj2cze5R4NBRNiWsQofU=
765+
github.com/onflow/cadence v1.7.0-preview.3/go.mod h1:1lKdLNVHIoO0jEjkRPMtOmBWYCG1An9TXSoiCuGIIpo=
766766
github.com/onflow/crypto v0.25.3 h1:XQ3HtLsw8h1+pBN+NQ1JYM9mS2mVXTyg55OldaAIF7U=
767767
github.com/onflow/crypto v0.25.3/go.mod h1:+1igaXiK6Tjm9wQOBD1EGwW7bYWMUGKtwKJ/2QL/OWs=
768+
github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRKS90=
769+
github.com/onflow/fixed-point v0.1.1/go.mod h1:gJdoHqKtToKdOZbvryJvDZfcpzC7d2fyWuo3ZmLtcGY=
768770
github.com/onflow/flow-core-contracts/lib/go/contracts v1.7.4-0.20250825173510-91e6f28b0224 h1:YKdTSG+6uu+dZpKCB2fmNWOmKGLn7+0MxFbtUFZdBjc=
769771
github.com/onflow/flow-core-contracts/lib/go/contracts v1.7.4-0.20250825173510-91e6f28b0224/go.mod h1:/Yne6g7V2Fy1sm/vE78us221bYvVvL5cA8cOzN/uTCI=
770772
github.com/onflow/flow-core-contracts/lib/go/templates v1.7.2-0.20250825173510-91e6f28b0224 h1:6ZBTrqPQIbnek7mdtJwbQux87qcJPTz82DDgGhpsHzI=

0 commit comments

Comments
 (0)