Skip to content

Commit

Permalink
Merge #3997
Browse files Browse the repository at this point in the history 
3997: Update Cadence to v0.31.5-account-link-improvements r=turbolent a=turbolent

Diff: onflow/cadence@v0.31.5-account-link-pragma...v0.31.5-account-link-improvements

- Emit an event when an account is linked 
  - onflow/cadence#2370
  - onflow/cadence#2368
- Enforce account links to be private
  - onflow/cadence#2369
  - onflow/cadence#2366


Co-authored-by: Bastian Müller <[email protected]>
  • Loading branch information
@bors @turbolent
bors[bot] and turbolent authored Mar 6, 2023
2 parents 8772e25 + 61f5213 commit f2d8b48
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion fvm/fvm_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2264,7 +2264,7 @@ func TestAuthAccountCapabilities(t *testing.T) {
transaction {
prepare(acct: AuthAccount) {
acct.linkAccount(/public/foo)
acct.linkAccount(/private/foo)
}
}
`,
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ require (
github.com/multiformats/go-multiaddr-dns v0.3.1
github.com/multiformats/go-multihash v0.2.1
github.com/onflow/atree v0.4.0
github.com/onflow/cadence v0.31.5-account-link-pragma
github.com/onflow/cadence v0.31.5-account-link-improvements
github.com/onflow/flow v0.3.2
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20221216161720-c1b31d5a4722
github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20221216161720-c1b31d5a4722
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1223,8 +1223,8 @@ github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXW
github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/onflow/atree v0.4.0 h1:+TbNisavAkukAKhgQ4plWnvR9o5+SkwPIsi3jaeAqKs=
github.com/onflow/atree v0.4.0/go.mod h1:7Qe1xaW0YewvouLXrugzMFUYXNoRQ8MT/UsVAWx1Ndo=
github.com/onflow/cadence v0.31.5-account-link-pragma h1:e4ldX3uNdDJ1o5XNJI996vPYxoP2WtDbDaA2F1nzbXk=
github.com/onflow/cadence v0.31.5-account-link-pragma/go.mod h1:oRgWkvau1RH15m3NuDlZCPHFQzwvC72jEstCGu8OJ98=
github.com/onflow/cadence v0.31.5-account-link-improvements h1:41H9DwfKV7e6n76FhKl+6YF0IY6P6KprM+5CDE58Stc=
github.com/onflow/cadence v0.31.5-account-link-improvements/go.mod h1:oRgWkvau1RH15m3NuDlZCPHFQzwvC72jEstCGu8OJ98=
github.com/onflow/flow v0.3.2 h1:z3IuKOjM9Tvf0pXfloTbrLxM5nTunI47cklsDd+wxBE=
github.com/onflow/flow v0.3.2/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c=
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20221216161720-c1b31d5a4722 h1:fH5e7L9xFXNOd3WLvMaPNkP1m7BngRTDP751zMNndws=
Expand Down
2 changes: 1 addition & 1 deletion insecure/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ require (
github.com/multiformats/go-varint v0.0.6 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onflow/atree v0.4.0 // indirect
github.com/onflow/cadence v0.31.5-account-link-pragma // indirect
github.com/onflow/cadence v0.31.5-account-link-improvements // indirect
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20221216161720-c1b31d5a4722 // indirect
github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20221216161720-c1b31d5a4722 // indirect
github.com/onflow/flow-ft/lib/go/contracts v0.5.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions insecure/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1182,8 +1182,8 @@ github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXW
github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/onflow/atree v0.4.0 h1:+TbNisavAkukAKhgQ4plWnvR9o5+SkwPIsi3jaeAqKs=
github.com/onflow/atree v0.4.0/go.mod h1:7Qe1xaW0YewvouLXrugzMFUYXNoRQ8MT/UsVAWx1Ndo=
github.com/onflow/cadence v0.31.5-account-link-pragma h1:e4ldX3uNdDJ1o5XNJI996vPYxoP2WtDbDaA2F1nzbXk=
github.com/onflow/cadence v0.31.5-account-link-pragma/go.mod h1:oRgWkvau1RH15m3NuDlZCPHFQzwvC72jEstCGu8OJ98=
github.com/onflow/cadence v0.31.5-account-link-improvements h1:41H9DwfKV7e6n76FhKl+6YF0IY6P6KprM+5CDE58Stc=
github.com/onflow/cadence v0.31.5-account-link-improvements/go.mod h1:oRgWkvau1RH15m3NuDlZCPHFQzwvC72jEstCGu8OJ98=
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20221216161720-c1b31d5a4722 h1:fH5e7L9xFXNOd3WLvMaPNkP1m7BngRTDP751zMNndws=
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20221216161720-c1b31d5a4722/go.mod h1:9nrgjIF/noY2jJ7LP8bKLHTpcdHOa2yO0ryCKTQpxvs=
github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20221216161720-c1b31d5a4722 h1:vgNS6I+MM/74pciIoKb7ZBs8XGF1ONsSdkAec36B9iU=
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 @@ -16,7 +16,7 @@ require (
github.com/ipfs/go-datastore v0.6.0
github.com/ipfs/go-ds-badger2 v0.1.3
github.com/ipfs/go-ipfs-blockstore v1.2.0
github.com/onflow/cadence v0.31.5-account-link-pragma
github.com/onflow/cadence v0.31.5-account-link-improvements
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20221216161720-c1b31d5a4722
github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20221216161720-c1b31d5a4722
github.com/onflow/flow-emulator v0.38.1
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 @@ -1304,8 +1304,8 @@ github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXW
github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/onflow/atree v0.4.0 h1:+TbNisavAkukAKhgQ4plWnvR9o5+SkwPIsi3jaeAqKs=
github.com/onflow/atree v0.4.0/go.mod h1:7Qe1xaW0YewvouLXrugzMFUYXNoRQ8MT/UsVAWx1Ndo=
github.com/onflow/cadence v0.31.5-account-link-pragma h1:e4ldX3uNdDJ1o5XNJI996vPYxoP2WtDbDaA2F1nzbXk=
github.com/onflow/cadence v0.31.5-account-link-pragma/go.mod h1:oRgWkvau1RH15m3NuDlZCPHFQzwvC72jEstCGu8OJ98=
github.com/onflow/cadence v0.31.5-account-link-improvements h1:41H9DwfKV7e6n76FhKl+6YF0IY6P6KprM+5CDE58Stc=
github.com/onflow/cadence v0.31.5-account-link-improvements/go.mod h1:oRgWkvau1RH15m3NuDlZCPHFQzwvC72jEstCGu8OJ98=
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20221216161720-c1b31d5a4722 h1:fH5e7L9xFXNOd3WLvMaPNkP1m7BngRTDP751zMNndws=
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20221216161720-c1b31d5a4722/go.mod h1:9nrgjIF/noY2jJ7LP8bKLHTpcdHOa2yO0ryCKTQpxvs=
github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20221216161720-c1b31d5a4722 h1:vgNS6I+MM/74pciIoKb7ZBs8XGF1ONsSdkAec36B9iU=
Expand Down

0 comments on commit f2d8b48

Please sign in to comment.