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

CAP-52 XDR #73

Merged
merged 2 commits into from
Jun 17, 2022
Merged

CAP-52 XDR #73

merged 2 commits into from
Jun 17, 2022

Conversation

jonjove
Copy link
Contributor

@jonjove jonjove commented Jun 14, 2022

What

Add the XDR for CAP-52, specifically InvokeHostFunctionOp.

Why

Required to support CAP-52 in stellar/rs-stellar-contract-env and stellar/stellar-core.

Known limitations

N/A

@leighmcculloch
Copy link
Member

leighmcculloch commented Jun 14, 2022

@jonjove Are you wanting to have this merged to the main branch? It looks like the XDR contained within isn't in stellar-core, because when I run make clean build the changes disappear. If you're not wanting this to be merged, could you convert the PR to be a draft?

@jonjove
Copy link
Contributor Author

jonjove commented Jun 14, 2022

@leighmcculloch it took me a while to get all the PRs open, but it corresponds to changes in stellar/stellar-core#3450 and stellar/rs-soroban-env#112. I don't know how we want to sequence these merges.

@leighmcculloch
Copy link
Member

leighmcculloch commented Jun 14, 2022

@jonjove I think if you want to be strict about it, you should break up stellar/stellar-core#3450 to be two PRs, one that modifies the XDR first, and then one that makes any changes that are dependent on the stellar-env-host crate having that XDR. Then the process would be:

  • Modify XDR.
  • Update rs-stellar-xdr.
  • Update rs-stellar-env-host.
  • Update stellar-core.

We may as well have the XDR in its own repo. cc @MonsieurNicolas

@graydon How did you do this recently?

@leighmcculloch
Copy link
Member

Until we figure this out I think it's fine if you merge this just before merging the stellar-core PR, assuming the .x files are identical.

Copy link
Contributor

@graydon graydon left a comment

Choose a reason for hiding this comment

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

I left a comment in the accompanying core XDR change that I think the return from the function should have an SCVal and so this would need to be regenerated to match if so. Otherwise ok.

@jonjove
Copy link
Contributor Author

jonjove commented Jun 15, 2022

@graydon I left a long comment explaining why I don't think we should have the SCVal.

@jonjove jonjove merged commit b2d367f into stellar:main Jun 17, 2022
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.

3 participants