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.

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

[EVM] Add bridging interface to EVM contract - stable cadence port #5716

Merged

Conversation

janezpodhostnik
Copy link
Contributor

original PR: #5677

@sisyphusSmiling sisyphusSmiling force-pushed the janez/add-pre-1-bridge-interface-stable-cadence branch from 1969ca7 to f617988 Compare April 18, 2024 18:00
@sisyphusSmiling
Copy link
Contributor

Looks like I'm still getting errors in bootstrap_test.go on expectedStateCommitment. @janezpodhostnik @ramtinms Would the updates to the EVM contract affect the genesis state commitment or do you think this issue is unrelated to the changes here?

@janezpodhostnik
Copy link
Contributor Author

Yes, the changes are expected due to the hash of the contract changing.

The test have to be adjusted to use the new state commitment.

@sisyphusSmiling
Copy link
Contributor

sisyphusSmiling commented Apr 18, 2024

Ah makes sense. How do I generate the new hash? I guess I could just copy the new actual, but that feels like it's not best practice

Update: Based on this Discord thread, I updated the state commitments on the new actual.

@sisyphusSmiling sisyphusSmiling marked this pull request as ready for review April 18, 2024 19:53
@turbolent
Copy link
Member

Is this separate PR needed? Once the feature landed on master (#5677 got merged), the usual sync of master into the Cadence 1.0 feature branch will bring it along anyways.

Happy to already merge it, more a note that in the future, we could save effort here.

@sisyphusSmiling
Copy link
Contributor

@turbolent I'm not certain as I'm not familiar with the processes to manage flow-go. What would you suggest here? I don't want this PR to create conflicts down the road.

@sideninja
Copy link
Contributor

sideninja commented Apr 19, 2024

Is this separate PR needed? Once the feature landed on master (#5677 got merged), the usual sync of master into the Cadence 1.0 feature branch will bring it along anyways.

Happy to already merge it, more a note that in the future, we could save effort here.

I agree, in the future is more clear to merge master. Also to do it regularly since the last time I was doing it after quite some time it was a bit painful.

@turbolent
Copy link
Member

#5767 is currently bringing this to feature/stable-cadence. Once it landed, we can update this branch and there shouldn't be really anything left

@janezpodhostnik
Copy link
Contributor Author

I update the PR and there are some things that are missing on stable cadence branch. @sisyphusSmiling can you check if we want to merge this (I think we do)

@sisyphusSmiling
Copy link
Contributor

@janezpodhostnik the contents look correct to me and CI is mostly passing with the exception of engine/execution unit tests

@janezpodhostnik
Copy link
Contributor Author

Should be good now

Copy link
Member

@turbolent turbolent left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

to: self.address(),
feeProvider: feeProvider
)
EVM.borrowBridgeAccessor().depositTokens(vault: <-vault, to: self.address(), feeProvider: feeProvider)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
EVM.borrowBridgeAccessor().depositTokens(vault: <-vault, to: self.address(), feeProvider: feeProvider)
EVM.borrowBridgeAccessor().depositTokens(
vault: <-vault,
to: self.address(),
feeProvider: feeProvider
)

@turbolent turbolent merged commit 1c413fc into feature/stable-cadence Apr 26, 2024
55 checks passed
@turbolent turbolent deleted the janez/add-pre-1-bridge-interface-stable-cadence branch April 26, 2024 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants