Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Setup txs with application for EVM #74

Merged
merged 40 commits into from
Feb 23, 2024
Merged

Setup txs with application for EVM #74

merged 40 commits into from
Feb 23, 2024

Conversation

chasefleming
Copy link
Member

@chasefleming chasefleming commented Feb 22, 2024 •
edited
Loading

Issue: #69

  • Targeted PR against main branch
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work
  • Code follows the standards mentioned here
  • Updated relevant documentation
  • Re-reviewed Files changed in the Github PR explorer
  • Added appropriate labels

sisyphusSmiling and others added 30 commits February 13, 2024 16:16
@sisyphusSmiling
refactor contracts for Cadence 1.0
d940912
@sisyphusSmiling
add EVM contract
ae508ed
@sisyphusSmiling
update FUSD for emulator FungibleToken conformance
42be8c3
@sisyphusSmiling
add FlowPassthrough.sol contract
12fb1c7
@sisyphusSmiling
add FlowEVMPassthrough.cdc contract & update flow.json
fa585cf
@sisyphusSmiling
add evm scripts
6b58373
@sisyphusSmiling
add evm transactions
35ac424
@sisyphusSmiling
update all transactions for Cadence 1.0 compatibility
f2ac15a
@sisyphusSmiling
update flow.json with crescendo aliases
67a13d8
@sisyphusSmiling
update FlowEVMPassthrough pre-condition syntax
5901ff1
@sisyphusSmiling
add CryptoUtils contract & name in flow.json & env.example
12fa01b
@sisyphusSmiling
add env vars to publicConfig.ts
9a9aed5
@sisyphusSmiling
update lib cadence to 1.0
7ccb0cb
@sisyphusSmiling
fix fund.ts Cadence
8cfa6b0
@sisyphusSmiling
update flow.json
7e00886
@sisyphusSmiling
add contract alias info to fclConfig.ts
fd30f59
@sisyphusSmiling
fix flow.json
1464d87
@sisyphusSmiling
rename coa creation transaction
1210192
@sisyphusSmiling
fix account.ts Cadence
28296e1
@sisyphusSmiling
update evm transactions
c4779d2
@sisyphusSmiling
update dev-deploy-contracts command
10b0256
@sisyphusSmiling
remove passthrough Cadence & solidity contracts
24c4f82
@sisyphusSmiling
add EVM funding & COA transactions
6450b22
@sisyphusSmiling
remove CryptoUtils
352fec4
@sisyphusSmiling
update npm run dev-deploy-contracts command
a037f9e
@sisyphusSmiling
update ts formatting
399f0d5
@sisyphusSmiling
update ts formatting & add ci EVM contract env alias
d94652a
@sisyphusSmiling
add contractEVM to PublicConfig
70b5e50
@chasefleming
Merge branch 'main' into chasefleming/update-evm-branch
4409076
@chasefleming
Merge pull request #73 from onflow/chasefleming/update-evm-branch
b08a0ab 
Update EVM Branch with Main
@vercel Vercel
Copy link

vercel bot commented Feb 22, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
flow-faucet-crescendo ❌ Failed (Inspect) Feb 23, 2024 10:33pm
flow-faucet-testnet ❌ Failed (Inspect) Feb 23, 2024 10:33pm

@chasefleming chasefleming marked this pull request as ready for review February 22, 2024 19:23
@chasefleming chasefleming marked this pull request as draft February 22, 2024 19:27
@chasefleming chasefleming marked this pull request as ready for review February 23, 2024 22:35
@chasefleming chasefleming merged commit fcd2d57 into evm-enabled Feb 23, 2024
3 of 5 checks passed
@chasefleming chasefleming deleted the cf/fund-evm branch February 23, 2024 22:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jribbink jribbink Awaiting requested review from jribbink

@ianthpun ianthpun Awaiting requested review from ianthpun

@bthaile bthaile Awaiting requested review from bthaile

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@chasefleming @sisyphusSmiling