Update to stable Cadence #4567

SupunS · 2023-07-18T18:29:06Z

Feature branch for stable cadence updates to integrate the new token standards, core contracts, and other features of stable cadence

Depends on #4655

github-actions · 2023-07-19T15:12:43Z

FVM Benchstat comparison

This branch with compared with the base branch onflow:feature/stable-cadence commit cc67154

The command (for i in {1..7}; do go test ./fvm ./engine/execution/computation --bench . --tags relic -shuffle=on --benchmem --run ^$; done) was used.

Collapsed results for better readability

…/stable-cadence

codecov-commenter · 2023-07-19T22:33:32Z

Codecov Report

Merging #4567 (d8230fb) into feature/stable-cadence (c422431) will increase coverage by 0.08%.
The diff coverage is 79.48%.

@@                    Coverage Diff                     @@
##           feature/stable-cadence    #4567      +/-   ##
==========================================================
+ Coverage                   54.66%   54.75%   +0.08%     
==========================================================
  Files                         917      917              
  Lines                       85633    85537      -96     
==========================================================
+ Hits                        46808    46832      +24     
+ Misses                      35231    35113     -118     
+ Partials                     3594     3592       -2

Flag	Coverage Δ
unittests	`54.75% <79.48%> (+0.08%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed	Coverage Δ
cmd/util/ledger/reporters/account_reporter.go	`0.00% <0.00%> (ø)`
fvm/environment/account_key_updater.go	`23.50% <ø> (+4.01%)`	⬆️
fvm/environment/meter.go	`77.27% <ø> (ø)`
fvm/meter/memory_meter.go	`88.88% <ø> (ø)`
utils/unittest/execution_state.go	`31.81% <0.00%> (ø)`
utils/unittest/fixtures.go	`0.00% <0.00%> (ø)`
fvm/bootstrap.go	`88.54% <96.87%> (+0.14%)`	⬆️

... and 14 files with indirect coverage changes

…/stable-cadence

into supun/stable-cadence

…/stable-cadence

…t key API and access(all)

…/stable-cadence

SupunS · 2023-08-24T19:06:24Z

There are some tests failing that seem to be unrelated to the cadence change. Can someone with more context have a look please?

turbolent

Nice!

turbolent · 2023-08-24T20:27:50Z

cmd/util/cmd/common/transactions.go

@@ -10,7 +10,7 @@ import (
 const (
 	getInfoForProposedNodesScript = `
 		import FlowIDTableStaking from 0x%s
-		pub fun main(): [FlowIDTableStaking.NodeInfo] {
+		access(all) fun main(): [FlowIDTableStaking.NodeInfo] {


Maybe add line breaks after access modifiers, as they are now quite long, making the function signature hard to read

idk, I feel like that makes the code looks pretty awkward

I will update the tests where necessary in a follow-up PR.

turbolent · 2023-08-24T20:29:47Z

integration/utils/templates/create-and-setup-node.cdc

@@ -1,7 +1,7 @@
 import Crypto
 import FungibleToken from 0xFUNGIBLETOKENADDRESS
 import FlowToken from 0xFLOWTOKENADDRESS
-import FlowIDTableStaking from 0xIDENTITYTABLEADDRESS
+import FlowIDTableStaking from "FlowIDTableStaking"


Can the other 0xFOO "addresses" in the other imports also be replaced to the string literal?

yeah, I'm working on it. I won't be able to get to it in this PR, but maybe in the next one

SupunS · 2023-08-25T15:47:20Z

There is still ~~two~~ one test failing:

TestPassThrough/TestSealingAndVerificationPassThrough in Integration Tests (make -C integration bft-tests)
~~TestFullGossipSubConnectivityAmongHonestNodesWithMaliciousMajority in Unit Tests (network)~~

Don't have much clue on why they are failing / how to fix.

…/stable-cadence

SupunS · 2023-08-28T19:38:56Z

bors merge

4567: Update to Cadence v0.39.13-stable-cadence r=SupunS a=SupunS Feature branch for stable cadence updates to integrate the new token standards, core contracts, and other features of stable cadence Depends on #4655 Co-authored-by: Yahya <yhassanzadeh13@ku.edu.tr> Co-authored-by: Yahya Hassanzadeh, Ph.D <yhassanzadeh@ieee.org> Co-authored-by: Yahya Hassanzadeh <yhassanzadeh13@ku.edu.tr> Co-authored-by: Yahya Hassanzadeh, Ph.D <yhassanzadeh13@ku.edu.tr> Co-authored-by: Supun Setunga <supun.setunga@gmail.com> Co-authored-by: Misha <misha@gomisha.com> Co-authored-by: Kay-Zee <kan@axiomzen.co> Co-authored-by: Josh Hannan <hannanjoshua19@gmail.com> Co-authored-by: Kan Zhang <kan@axiomzen.co> Co-authored-by: Misha <misha.rybalov@dapperlabs.com>

SupunS · 2023-08-28T19:41:29Z

bors cancel

bors · 2023-08-28T19:41:31Z

Canceled.

…ow-go into supun/stable-cadence

Update to Cadence v0.39.13-stable-cadence

c33a0ee

SupunS force-pushed the supun/stable-cadence branch from 8d387cb to c33a0ee Compare July 18, 2023 18:31

SupunS and others added 2 commits July 18, 2023 11:41

Generate mocks

750220b

use stable cadence and new token standards for bootstrap

036ea29

go mod tidy

147f129

SupunS self-assigned this Jul 19, 2023

SupunS added 2 commits July 19, 2023 15:15

Update to stable cadence 3311f5f8189b5cea1409e161d08d40cbf5926425

2384aa8

Merge branch 'master' of https://github.com/onflow/flow-go into supun…

5574f08

…/stable-cadence

SupunS and others added 7 commits July 19, 2023 16:16

Add entitlement related memory weights

2b160cc

update fungibletoken deployment

237eaff

Merge branch 'master' of https://github.com/onflow/flow-go into supun…

22cd8e7

…/stable-cadence

Merge branch 'supun/stable-cadence' of https://github.com/onflow/flow-go

4733f40

into supun/stable-cadence

go mod tidy

8dba968

Merge branch 'master' of https://github.com/onflow/flow-go into supun…

5c95df4

…/stable-cadence

Update emulator version

1dfd5a4

SupunS force-pushed the supun/stable-cadence branch from 7196ea4 to 1dfd5a4 Compare July 25, 2023 14:56

joshuahannan and others added 6 commits July 28, 2023 15:19

update core contracts dependencies to working versions and use correc…

524259e

…t key API and access(all)

Merge remote-tracking branch 'origin/master' into supun/stable-cadence

13985d1

update key api version

d417d91

finish integrating stable cadence changes into the fvm tests

85890d2

Update emulator version

b805d5f

Update access modifiers

323afbb

SupunS force-pushed the supun/stable-cadence branch from 51666b8 to ad8666c Compare August 1, 2023 19:51

Update usages of FungibleToken.Vault to {FungibleToken.Vault}

e456fca

SupunS force-pushed the supun/stable-cadence branch from ad8666c to e456fca Compare August 1, 2023 20:07

joshuahannan and others added 3 commits August 8, 2023 17:04

update core contracts dependencies

440c45a

Merge branch 'master' of https://github.com/onflow/flow-go into supun…

5073f3b

…/stable-cadence

update fungible token address and dependencies

725d883

SupunS closed this Aug 24, 2023

SupunS reopened this Aug 24, 2023

Bootstrap MultipleNFT contract

9247b4d

SupunS force-pushed the supun/stable-cadence branch from e20ce9a to 9247b4d Compare August 24, 2023 18:22

SupunS marked this pull request as ready for review August 24, 2023 19:05

SupunS requested review from gomisha, yhassanzadeh13, ramtinms, janezpodhostnik and peterargue as code owners August 24, 2023 19:05

SupunS requested review from turbolent and joshuahannan August 24, 2023 19:06

turbolent approved these changes Aug 24, 2023

View reviewed changes

joshuahannan approved these changes Aug 24, 2023

View reviewed changes

Update state commitment hash

fba09f8

SupunS force-pushed the supun/stable-cadence branch from e886424 to 3ab158e Compare August 25, 2023 00:44

Fix tests

8e7a31c

SupunS force-pushed the supun/stable-cadence branch from 3ab158e to 8e7a31c Compare August 25, 2023 15:00

Merge branch 'master' of https://github.com/onflow/flow-go into supun…

09c1887

…/stable-cadence

Merge branch 'feature/stable-cadence' of https://github.com/onflow/fl…

d8230fb

…ow-go into supun/stable-cadence

SupunS changed the title ~~Update to Cadence v0.39.13-stable-cadence~~ Update to stable Cadence Aug 29, 2023

SupunS merged commit a08b365 into feature/stable-cadence Aug 29, 2023
36 of 37 checks passed

SupunS deleted the supun/stable-cadence branch August 29, 2023 18:12

janezpodhostnik mentioned this pull request May 7, 2024

Merge Cadence 1.0 feature branch to master #5856

Merged

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to stable Cadence #4567

Update to stable Cadence #4567

SupunS commented Jul 18, 2023 •

edited

Loading

github-actions bot commented Jul 19, 2023 •

edited

Loading

codecov-commenter commented Jul 19, 2023 •

edited

Loading

SupunS commented Aug 24, 2023

turbolent left a comment

turbolent Aug 24, 2023

joshuahannan Aug 24, 2023

SupunS Aug 29, 2023

turbolent Aug 24, 2023

joshuahannan Aug 24, 2023

SupunS commented Aug 25, 2023 •

edited

Loading

SupunS commented Aug 28, 2023

SupunS commented Aug 28, 2023

bors bot commented Aug 28, 2023

Update to stable Cadence #4567

Update to stable Cadence #4567

Conversation

SupunS commented Jul 18, 2023 • edited Loading

github-actions bot commented Jul 19, 2023 • edited Loading

FVM Benchstat comparison

codecov-commenter commented Jul 19, 2023 • edited Loading

Codecov Report

SupunS commented Aug 24, 2023

turbolent left a comment

Choose a reason for hiding this comment

turbolent Aug 24, 2023

Choose a reason for hiding this comment

joshuahannan Aug 24, 2023

Choose a reason for hiding this comment

SupunS Aug 29, 2023

Choose a reason for hiding this comment

turbolent Aug 24, 2023

Choose a reason for hiding this comment

joshuahannan Aug 24, 2023

Choose a reason for hiding this comment

SupunS commented Aug 25, 2023 • edited Loading

SupunS commented Aug 28, 2023

SupunS commented Aug 28, 2023

bors bot commented Aug 28, 2023

SupunS commented Jul 18, 2023 •

edited

Loading

github-actions bot commented Jul 19, 2023 •

edited

Loading

codecov-commenter commented Jul 19, 2023 •

edited

Loading

SupunS commented Aug 25, 2023 •

edited

Loading