Skip to content

Commit

Permalink
Merge #2499
Browse files Browse the repository at this point in the history 
2499: Upgrade Cadence to secure-cadence-m8 r=janezpodhostnik a=janezpodhostnik

A simple bump in cadence version to [secure-cadence-m8](https://github.com/onflow/cadence/releases/tag/secure-cadence-m8)

Co-authored-by: Janez Podhostnik <janez.podhostnik@gmail.com>
  • Loading branch information
@bors @janezpodhostnik
bors[bot] and janezpodhostnik committed May 27, 2022
2 parents 05748ae + 342782d commit e50ac5f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
4 changes: 3 additions & 1 deletion fvm/fvm_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,9 @@ func TestBlockContext_DeployContract(t *testing.T) {
err = vm.Run(ctx, tx, ledger, programs.NewEmptyPrograms())
require.NoError(t, err)

assert.NoError(t, tx.Err)
var parsingCheckingError *runtime.ParsingCheckingError
assert.ErrorAs(t, tx.Err, &parsingCheckingError)
assert.ErrorContains(t, tx.Err, "program too ambiguous, local replay limit of 64 tokens exceeded")
})

t.Run("account update with set code fails if not signed by service account", func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ require (
github.com/multiformats/go-multiaddr-dns v0.3.1
github.com/multiformats/go-multihash v0.1.0
github.com/onflow/atree v0.3.1-0.20220519142403-b0077ba343ec
github.com/onflow/cadence v0.21.3-0.20220520204606-7b9689d79a2d
github.com/onflow/cadence v0.21.3-0.20220524232221-b4a37c41632f
github.com/onflow/flow v0.3.0
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20220513155751-c4c1f8d59f83
github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20220513155751-c4c1f8d59f83
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1398,8 +1398,8 @@ github.com/onflow/cadence v0.20.1/go.mod h1:7mzUvPZUIJztIbr9eTvs+fQjWWHTF8veC+yk
github.com/onflow/cadence v0.21.3-0.20220419065337-d5202c162010/go.mod h1:vNIxF13e1Ty50KnkQSm6LVwvxGGLTQ4kpldvTL+2S6s=
github.com/onflow/cadence v0.21.3-0.20220511225809-808fe14141df/go.mod h1:vNIxF13e1Ty50KnkQSm6LVwvxGGLTQ4kpldvTL+2S6s=
github.com/onflow/cadence v0.21.3-0.20220513161637-08b93d4bb7b9/go.mod h1:vNIxF13e1Ty50KnkQSm6LVwvxGGLTQ4kpldvTL+2S6s=
github.com/onflow/cadence v0.21.3-0.20220520204606-7b9689d79a2d h1:awygOtrnwFSURPyGjTmnULme4tjSFFjPbJ/04RWez8s=
github.com/onflow/cadence v0.21.3-0.20220520204606-7b9689d79a2d/go.mod h1:MfEvTq9dvGhnoyqUqsKBsZBM5V4SytllHMqHM+6Lki0=
github.com/onflow/cadence v0.21.3-0.20220524232221-b4a37c41632f h1:QDuneQdHDebIwvHOlfFgUc/QR6kv3QUPjBFvXvOcD80=
github.com/onflow/cadence v0.21.3-0.20220524232221-b4a37c41632f/go.mod h1:MfEvTq9dvGhnoyqUqsKBsZBM5V4SytllHMqHM+6Lki0=
github.com/onflow/flow v0.2.4/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c=
github.com/onflow/flow v0.2.5/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c=
github.com/onflow/flow v0.3.0 h1:qDKHFXh5HVZRxw+MpHdENXrqA2gVhmCq0CRW7X3ObLA=
Expand Down
2 changes: 1 addition & 1 deletion integration/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/docker/go-connections v0.4.0
github.com/go-yaml/yaml v2.1.0+incompatible
github.com/jedib0t/go-pretty v4.3.0+incompatible
github.com/onflow/cadence v0.21.3-0.20220520204606-7b9689d79a2d
github.com/onflow/cadence v0.21.3-0.20220524232221-b4a37c41632f
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20220513155751-c4c1f8d59f83
github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20220513155751-c4c1f8d59f83
github.com/onflow/flow-emulator v0.31.2-0.20220513151845-ef7513cb1cd0
Expand Down
4 changes: 2 additions & 2 deletions integration/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1489,8 +1489,8 @@ github.com/onflow/cadence v0.15.0/go.mod h1:KMzDF6cIv6nb5PJW9aITaqazbmJX8MMeibFc
github.com/onflow/cadence v0.21.3-0.20220419065337-d5202c162010/go.mod h1:vNIxF13e1Ty50KnkQSm6LVwvxGGLTQ4kpldvTL+2S6s=
github.com/onflow/cadence v0.21.3-0.20220511225809-808fe14141df/go.mod h1:vNIxF13e1Ty50KnkQSm6LVwvxGGLTQ4kpldvTL+2S6s=
github.com/onflow/cadence v0.21.3-0.20220513161637-08b93d4bb7b9/go.mod h1:vNIxF13e1Ty50KnkQSm6LVwvxGGLTQ4kpldvTL+2S6s=
github.com/onflow/cadence v0.21.3-0.20220520204606-7b9689d79a2d h1:awygOtrnwFSURPyGjTmnULme4tjSFFjPbJ/04RWez8s=
github.com/onflow/cadence v0.21.3-0.20220520204606-7b9689d79a2d/go.mod h1:MfEvTq9dvGhnoyqUqsKBsZBM5V4SytllHMqHM+6Lki0=
github.com/onflow/cadence v0.21.3-0.20220524232221-b4a37c41632f h1:QDuneQdHDebIwvHOlfFgUc/QR6kv3QUPjBFvXvOcD80=
github.com/onflow/cadence v0.21.3-0.20220524232221-b4a37c41632f/go.mod h1:MfEvTq9dvGhnoyqUqsKBsZBM5V4SytllHMqHM+6Lki0=
github.com/onflow/flow v0.3.0/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c=
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20220513155751-c4c1f8d59f83 h1:mpJirFu/JWMLV0IhKDZleVrVdN5B8QERV4gSXDef5bA=
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20220513155751-c4c1f8d59f83/go.mod h1:T6yhM+kWrFxiP6F3hh8lh9DcocHfmv48P4ITnjLhKSk=
Expand Down

0 comments on commit e50ac5f

Please sign in to comment.