Skip to content

Commit 4be05c3

Browse files
turbolentturbolent
authored
Merge pull request #955 from onflow/auto-update-onflow-cadence-v1.9.6
2 parents 9d2c425 + 26fc618 commit 4be05c3

6 files changed

Lines changed: 59 additions & 42 deletions

File tree

‎adapters/streaming_integration_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"testing"
2424
"time"
2525

26+
"github.com/onflow/flow-go-sdk/crypto"
2627
"github.com/onflow/flow-go/engine/access/subscription"
2728
accessmodel "github.com/onflow/flow-go/model/access"
2829
flowgo "github.com/onflow/flow-go/model/flow"
@@ -187,6 +188,12 @@ func TestStreamingTransactionStatuses_Integration(t *testing.T) {
187188
SetPayer(serviceAddress).
188189
AddAuthorizer(serviceAddress)
189190

191+
hasher, err := crypto.NewHasher(serviceKey.HashAlgo)
192+
require.NoError(t, err)
193+
194+
err = txBuilder.SignEnvelope(serviceAddress, serviceKey.Index, serviceKey.PrivateKey, hasher)
195+
require.NoError(t, err)
196+
190197
tx, err := txBuilder.Build()
191198
require.NoError(t, err)
192199

‎emulator/accounts_test.go‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"github.com/onflow/flow-go-sdk/crypto"
2828
"github.com/onflow/flow-go-sdk/templates"
2929
"github.com/onflow/flow-go-sdk/test"
30+
"github.com/onflow/flow-go/access/validator"
3031
fvmerrors "github.com/onflow/flow-go/fvm/errors"
3132
flowgo "github.com/onflow/flow-go/model/flow"
3233
"github.com/rs/zerolog"
@@ -999,18 +1000,9 @@ func TestUpdateAccountCode(t *testing.T) {
9991000
require.NoError(t, err)
10001001

10011002
err = adapter.SendTransaction(context.Background(), *tx)
1002-
assert.NoError(t, err)
1003-
1004-
result, err := b.ExecuteNextTransaction()
1005-
assert.NoError(t, err)
1006-
1007-
assert.True(t, fvmerrors.HasErrorCode(result.Error, fvmerrors.ErrCodeAccountAuthorizationError))
1003+
require.Error(t, err)
10081004

1009-
_, err = b.CommitBlock()
1010-
assert.NoError(t, err)
1011-
1012-
account, err = adapter.GetAccount(context.Background(), accountAddressB)
1013-
assert.NoError(t, err)
1005+
assert.IsType(t, validator.MissingSignatureError{}, err)
10141006

10151007
// code should not be updated
10161008
assert.Equal(t, codeA, string(account.Contracts["Test"]))

‎emulator/pragma_test.go‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ func TestSourceFilePragmaForTransaction(t *testing.T) {
6161
b, err := emulator.New(
6262
emulator.WithTransactionValidationEnabled(false),
6363
)
64+
require.NoError(t, err)
6465
b.EnableAutoMine()
6566

6667
require.NoError(t, err)
@@ -73,14 +74,22 @@ func TestSourceFilePragmaForTransaction(t *testing.T) {
7374
transaction{
7475
}
7576
`
77+
7678
tx := flowsdk.NewTransaction().
7779
SetScript([]byte(txCode)).
7880
SetComputeLimit(flowgo.DefaultMaxTransactionGasLimit).
7981
SetProposalKey(b.ServiceKey().Address, b.ServiceKey().Index, b.ServiceKey().SequenceNumber+1).
8082
SetPayer(b.ServiceKey().Address).
8183
AddAuthorizer(b.ServiceKey().Address)
8284

83-
txID, _ := hex.DecodeString(tx.ID().String())
85+
signer, err := b.ServiceKey().Signer()
86+
require.NoError(t, err)
87+
88+
err = tx.SignEnvelope(b.ServiceKey().Address, b.ServiceKey().Index, signer)
89+
require.NoError(t, err)
90+
91+
txID, err := hex.DecodeString(tx.ID().String())
92+
require.NoError(t, err)
8493

8594
err = adapter.SendTransaction(context.Background(), *tx)
8695
require.NoError(t, err)
@@ -95,6 +104,7 @@ func TestSourceFilePragmaForContract(t *testing.T) {
95104
b, err := emulator.New(
96105
emulator.WithTransactionValidationEnabled(false),
97106
)
107+
require.NoError(t, err)
98108
b.EnableAutoMine()
99109

100110
require.NoError(t, err)
@@ -116,6 +126,12 @@ func TestSourceFilePragmaForContract(t *testing.T) {
116126
SetProposalKey(b.ServiceKey().Address, b.ServiceKey().Index, b.ServiceKey().SequenceNumber+1).
117127
SetPayer(b.ServiceKey().Address)
118128

129+
signer, err := b.ServiceKey().Signer()
130+
require.NoError(t, err)
131+
132+
err = tx.SignEnvelope(b.ServiceKey().Address, b.ServiceKey().Index, signer)
133+
require.NoError(t, err)
134+
119135
err = adapter.SendTransaction(context.Background(), *tx)
120136
require.NoError(t, err)
121137

@@ -133,6 +149,7 @@ func TestSourceFileCommentedOutPragmaForContract(t *testing.T) {
133149
b, err := emulator.New(
134150
emulator.WithTransactionValidationEnabled(false),
135151
)
152+
require.NoError(t, err)
136153
b.EnableAutoMine()
137154

138155
require.NoError(t, err)
@@ -154,6 +171,12 @@ func TestSourceFileCommentedOutPragmaForContract(t *testing.T) {
154171
SetProposalKey(b.ServiceKey().Address, b.ServiceKey().Index, b.ServiceKey().SequenceNumber+1).
155172
SetPayer(b.ServiceKey().Address)
156173

174+
signer, err := b.ServiceKey().Signer()
175+
require.NoError(t, err)
176+
177+
err = tx.SignEnvelope(b.ServiceKey().Address, b.ServiceKey().Index, signer)
178+
require.NoError(t, err)
179+
157180
err = adapter.SendTransaction(context.Background(), *tx)
158181
require.NoError(t, err)
159182

‎emulator/transaction_test.go‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
"github.com/onflow/flow-go-sdk/crypto"
3737
"github.com/onflow/flow-go-sdk/templates"
3838
"github.com/onflow/flow-go-sdk/test"
39+
"github.com/onflow/flow-go/access/validator"
3940
fvmerrors "github.com/onflow/flow-go/fvm/errors"
4041
"github.com/onflow/flow-go/fvm/evm/stdlib"
4142
flowgo "github.com/onflow/flow-go/model/flow"
@@ -693,12 +694,9 @@ func TestSubmitTransaction_EnvelopeSignature(t *testing.T) {
693694
require.NoError(t, err)
694695

695696
err = adapter.SendTransaction(context.Background(), *tx)
696-
assert.NoError(t, err)
697-
698-
result, err := b.ExecuteNextTransaction()
699-
assert.NoError(t, err)
697+
require.Error(t, err)
700698

701-
assert.True(t, fvmerrors.HasErrorCode(result.Error, fvmerrors.ErrCodeAccountAuthorizationError))
699+
assert.IsType(t, validator.MissingSignatureError{}, err)
702700
})
703701

704702
t.Run("Invalid account", func(t *testing.T) {
@@ -932,12 +930,9 @@ func TestSubmitTransaction_PayloadSignatures(t *testing.T) {
932930
require.NoError(t, err)
933931

934932
err = adapter.SendTransaction(context.Background(), *tx)
935-
assert.NoError(t, err)
936-
937-
result, err := b.ExecuteNextTransaction()
938-
assert.NoError(t, err)
933+
require.Error(t, err)
939934

940-
assert.True(t, fvmerrors.HasErrorCode(result.Error, fvmerrors.ErrCodeAccountAuthorizationError))
935+
assert.IsType(t, validator.MissingSignatureError{}, err)
941936
})
942937

943938
t.Run("Multiple payload signers", func(t *testing.T) {

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/onflow/flow-emulator
22

3-
go 1.25.0
3+
go 1.25.1
44

55
require (
66
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2
@@ -12,11 +12,11 @@ require (
1212
github.com/hashicorp/golang-lru/v2 v2.0.7
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.9.5
16-
github.com/onflow/crypto v0.25.3
15+
github.com/onflow/cadence v1.9.6
16+
github.com/onflow/crypto v0.25.4
1717
github.com/onflow/flow-core-contracts/lib/go/templates v1.9.2
18-
github.com/onflow/flow-go v0.45.0-experimental-cadence-v1.8.7.0.20260115230052-18a46246a4d6
19-
github.com/onflow/flow-go-sdk v1.9.11
18+
github.com/onflow/flow-go v0.45.0-internal-rc.3.0.20260128181608-c85c51c544dd
19+
github.com/onflow/flow-go-sdk v1.9.12
2020
github.com/onflow/flow-nft/lib/go/contracts v1.3.0
2121
github.com/onflow/flow/protobuf/go/flow v0.4.19
2222
github.com/prometheus/client_golang v1.23.2
@@ -72,7 +72,7 @@ require (
7272
github.com/emicklei/dot v1.6.2 // indirect
7373
github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect
7474
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab // indirect
75-
github.com/ethereum/go-ethereum v1.16.7 // indirect
75+
github.com/ethereum/go-ethereum v1.16.8 // indirect
7676
github.com/ethereum/go-verkle v0.2.2 // indirect
7777
github.com/ferranbt/fastssz v0.1.4 // indirect
7878
github.com/fsnotify/fsnotify v1.6.0 // indirect

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l
100100
github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
101101
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
102102
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
103-
github.com/aws/aws-sdk-go-v2 v1.41.0 h1:tNvqh1s+v0vFYdA1xq0aOJH+Y5cRyZ5upu6roPgPKd4=
104-
github.com/aws/aws-sdk-go-v2 v1.41.0/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
103+
github.com/aws/aws-sdk-go-v2 v1.41.1 h1:ABlyEARCDLN034NhxlRUSZr4l71mh+T5KAeGh6cerhU=
104+
github.com/aws/aws-sdk-go-v2 v1.41.1/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
105105
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.5.1 h1:VGkV9KmhGqOQWnHyi4gLG98kE6OecT42fdrCGFWxJsc=
106106
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.5.1/go.mod h1:PLlnMiki//sGnCJiW+aVpvP/C8Kcm8mEj/IVm9+9qk4=
107107
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 h1:0ryTNEdJbzUCEWkVXEXoqlXV72J5keC1GvILMOuD00E=
108108
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4/go.mod h1:HQ4qwNZh32C3CBeO6iJLQlgtMzqeG17ziAA/3KDJFow=
109-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 h1:oHjJHeUy0ImIV0bsrX0X91GkV5nJAyv1l1CC9lnO0TI=
110-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16/go.mod h1:iRSNGgOYmiYwSCXxXaKb9HfOEj40+oTKn8pTxMlYkRM=
109+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 h1:RuNSMoozM8oXlgLG/n6WLaFGoea7/CddrCfIiSA+xdY=
110+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17/go.mod h1:F2xxQ9TZz5gDWsclCtPQscGpP0VUOc8RqgFM3vDENmU=
111111
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.7.0 h1:HWsM0YQWX76V6MOp07YuTYacm8k7h69ObJuw7Nck+og=
112112
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.7.0/go.mod h1:LKb3cKNQIMh+itGnEpKGcnL/6OIjPZqrtYah1w5f+3o=
113113
github.com/aws/aws-sdk-go-v2/service/s3 v1.15.0 h1:nPLfLPfglacc29Y949sDxpr3X/blaY40s3B85WT2yZU=
@@ -266,8 +266,8 @@ github.com/ethereum/c-kzg-4844/v2 v2.1.5 h1:aVtoLK5xwJ6c5RiqO8g8ptJ5KU+2Hdquf6G3
266266
github.com/ethereum/c-kzg-4844/v2 v2.1.5/go.mod h1:u59hRTTah4Co6i9fDWtiCjTrblJv0UwsqZKCc0GfgUs=
267267
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab h1:rvv6MJhy07IMfEKuARQ9TKojGqLVNxQajaXEp/BoqSk=
268268
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab/go.mod h1:IuLm4IsPipXKF7CW5Lzf68PIbZ5yl7FFd74l/E0o9A8=
269-
github.com/ethereum/go-ethereum v1.16.7 h1:qeM4TvbrWK0UC0tgkZ7NiRsmBGwsjqc64BHo20U59UQ=
270-
github.com/ethereum/go-ethereum v1.16.7/go.mod h1:Fs6QebQbavneQTYcA39PEKv2+zIjX7rPUZ14DER46wk=
269+
github.com/ethereum/go-ethereum v1.16.8 h1:LLLfkZWijhR5m6yrAXbdlTeXoqontH+Ga2f9igY7law=
270+
github.com/ethereum/go-ethereum v1.16.8/go.mod h1:Fs6QebQbavneQTYcA39PEKv2+zIjX7rPUZ14DER46wk=
271271
github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
272272
github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
273273
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -752,10 +752,10 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N
752752
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
753753
github.com/onflow/atree v0.12.0 h1:X7/UEPyCaaEQ1gCg11KDvfyEtEeQLhtRtxMHjAiH/Co=
754754
github.com/onflow/atree v0.12.0/go.mod h1:qdZcfLQwPirHcNpLiK+2t3KAo+SAb9Si6TqurE6pykE=
755-
github.com/onflow/cadence v1.9.5 h1:m82RsERxvrknL69J9YxzOEKFhiHARBQkvNIFTUATGNk=
756-
github.com/onflow/cadence v1.9.5/go.mod h1:MlJsCwhCZwdnAUd24XHzcsizZfG7a2leab1PztabUsE=
757-
github.com/onflow/crypto v0.25.3 h1:XQ3HtLsw8h1+pBN+NQ1JYM9mS2mVXTyg55OldaAIF7U=
758-
github.com/onflow/crypto v0.25.3/go.mod h1:+1igaXiK6Tjm9wQOBD1EGwW7bYWMUGKtwKJ/2QL/OWs=
755+
github.com/onflow/cadence v1.9.6 h1:Ya0y/Nzjyw9K3kvX+lGcYbng8ciorwYmECk1VaMLN8s=
756+
github.com/onflow/cadence v1.9.6/go.mod h1:MlJsCwhCZwdnAUd24XHzcsizZfG7a2leab1PztabUsE=
757+
github.com/onflow/crypto v0.25.4 h1:R615PWPdSoA5RATNb/j3cYaloBIZlSXVNgS7BjwHiwM=
758+
github.com/onflow/crypto v0.25.4/go.mod h1:DlkW/1SPUvLHYvUcjWa9PkLIRgSBKR4EDc3i+ATQKW4=
759759
github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRKS90=
760760
github.com/onflow/fixed-point v0.1.1/go.mod h1:gJdoHqKtToKdOZbvryJvDZfcpzC7d2fyWuo3ZmLtcGY=
761761
github.com/onflow/flow-core-contracts/lib/go/contracts v1.9.2 h1:mkd1NSv74+OnCHwrFqI2c5VETS1j06xf0ZuOto7gMio=
@@ -768,10 +768,10 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3
768768
github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
769769
github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
770770
github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
771-
github.com/onflow/flow-go v0.45.0-experimental-cadence-v1.8.7.0.20260115230052-18a46246a4d6 h1:tO69chmFcoLhD1QPki+bEdYaN1z7ZVZcZTf3K6EQtCk=
772-
github.com/onflow/flow-go v0.45.0-experimental-cadence-v1.8.7.0.20260115230052-18a46246a4d6/go.mod h1:7qfVA17NYB5akWHNujOz+MZ8mraBFQfzuIJwYsUwDH4=
773-
github.com/onflow/flow-go-sdk v1.9.11 h1:glzxLIV4cZv+/0NGRaP/PCX6iepYZIgU/M0CAAgxsAs=
774-
github.com/onflow/flow-go-sdk v1.9.11/go.mod h1:1xk5ZOC8VPv2ecN+1Zjgv6PZRjxuzz7EOq6PwAMQc2o=
771+
github.com/onflow/flow-go v0.45.0-internal-rc.3.0.20260128181608-c85c51c544dd h1:azRpEbhJtve8y7e+NQm29Ymc43oKOC5ncUiztha4XSQ=
772+
github.com/onflow/flow-go v0.45.0-internal-rc.3.0.20260128181608-c85c51c544dd/go.mod h1:hWMrl7vBsmYEEMTp5KDwScdb0Z0gvuVqJAYeTQB69Ok=
773+
github.com/onflow/flow-go-sdk v1.9.12 h1:TqliY0IYL7nguxdfJIpC1Cjv5m8B/qWD2C8NVR3BQf4=
774+
github.com/onflow/flow-go-sdk v1.9.12/go.mod h1:cjj404AICBSM7BWfMhFgQik4c1iFd3YytJNdgokAlXY=
775775
github.com/onflow/flow-nft/lib/go/contracts v1.3.0 h1:DmNop+O0EMyicZvhgdWboFG57xz5t9Qp81FKlfKyqJc=
776776
github.com/onflow/flow-nft/lib/go/contracts v1.3.0/go.mod h1:eZ9VMMNfCq0ho6kV25xJn1kXeCfxnkhj3MwF3ed08gY=
777777
github.com/onflow/flow-nft/lib/go/templates v1.3.0 h1:uGIBy4GEY6Z9hKP7sm5nA5kwvbvLWW4nWx5NN9Wg0II=

0 commit comments

Comments
 (0)