Use core-contracts templates that use Environment

[joshuahannan]

Uses the changes in this PR to make the getter functions for the core contracts less brittle by using lib/go/templates.Environment for the arguments instead of individual addresses

Uses the latest version of the core-contracts that keeps the LockedTokens.LockedAccountInfo interface

Also updates state commitments

[janezpodhostnik]

Looks good.
Great change, thank you!

[turbolent]

Pushed the merge in 666a58f, but TestCadenceValuesMigration fails:

• ee82856bf20e2aa6.FungibleToken:

  Parsing failed:
  error: missing digits
    --> :34:26
     |
  34 | import ViewResolver from 0x
     |                           ^
  

• 0ae53cb6e3f42a79.FlowToken:

  Parsing failed:
  error: unexpected token: identifier
   --> :3:7
    |
  3 | import FungibleTokenMetadataViews from
    |        ^
  

[joshuahannan]

I'll pull the branch down and fix the issue

[codecov-commenter]

Codecov Report

Attention: Patch coverage is 84.56376% with 23 lines in your changes are missing coverage. Please review.

Project coverage is 56.37%. Comparing base (97775ab) to head (d6ae039).

Files	Patch %	Lines
cmd/util/cmd/epochs/cmd/deploy.go	0.00%	7 Missing ⚠️
...edger/migrations/change_contract_code_migration.go	78.12%	7 Missing ⚠️
fvm/systemcontracts/system_contracts.go	0.00%	7 Missing ⚠️
utils/unittest/execution_state.go	0.00%	2 Missing ⚠️

Additional details and impacted files

@@                    Coverage Diff                     @@
##           feature/stable-cadence    #5401      +/-   ##
==========================================================
- Coverage                   56.37%   56.37%   -0.01%     
==========================================================
  Files                        1032     1032              
  Lines                      100711   100648      -63     
==========================================================
- Hits                        56775    56737      -38     
+ Misses                      39628    39603      -25     
  Partials                     4308     4308              

Flag	Coverage Δ
unittests	56.37% <84.56%> (-0.01%)	⬇️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[turbolent]

Looks good! Thanks for cleaning this up 👍

[turbolent]

I think the integration tests need an updated Emulator, because that one is still using old contracts, e.g. TestWithEmulator errors with import RandomBeaconHistory from 0xRANDOMBEACONHISTORYADDRESS

[joshuahannan]

Do you mean like a version that we currently have? Okay to use v1.0.0-M7?

[turbolent]

@joshuahannan That version doesn't have the updated imports yet, does it?

I'll open a PR and update this one

[turbolent]

I opened onflow/flow-emulator#582, but even there the tests importing the random beacon contract fail: https://github.com/onflow/flow-emulator/actions/runs/8058034335/job/22010193181?pr=582

@joshuahannan it looks like some imports still need to be updated from the old 0xCONTRACT to the new "Contract" import scheme

[turbolent]

Fixed by onflow/flow-emulator@2ec5974

[joshuahannan]

Let me know if you need anything else!

[turbolent]

@joshuahannan Did you get a chance to look at unifying the versions that are used for the contracts and templates modules?

[turbolent]

For some reason the integration test TestLoadTypes/token-transfer fails. I think what happens is that some import that used to be 0xCONTRACT is now "Contract", and then isn't replaced properly with an address, leaving the import as "Contract", which is a string location instead of an address location.

[turbolent]

@joshuahannan You updated tokenTransferTransaction.cdc, but also need to update TokenTransferTransaction

[joshuahannan]

I think I found one of them. I'm fixing. yep, it is TokenTransferTransaction

[turbolent]

Nice!