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

Contract data #3439

Merged
merged 7 commits into from
Jun 12, 2022
Merged

Contract data #3439

merged 7 commits into from
Jun 12, 2022

Conversation

graydon
Copy link
Contributor

@graydon graydon commented May 24, 2022

This is a consolidated branch including changes for CAP-0047 and 0053 (covering CONFIG_SETTING and CONTRACT_DATA ledger entries, and all support code).

@graydon graydon force-pushed the contract-data branch 2 times, most recently from 7a974e5 to d26901d Compare May 25, 2022 22:19
@graydon graydon force-pushed the contract-data branch 2 times, most recently from 78fcbd3 to 098369c Compare May 31, 2022 05:34
@graydon graydon force-pushed the contract-data branch 2 times, most recently from 270551f to d2be27e Compare June 3, 2022 03:57
Copy link
Contributor

@jonjove jonjove left a comment

Choose a reason for hiding this comment

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

This is almost mergeable. I'd really like if we could clean up the history a bit, because it will make things easier to understand when we thoroughly review everything before we release.

@graydon graydon force-pushed the contract-data branch 2 times, most recently from 892ae2f to e1160f2 Compare June 8, 2022 03:29
@graydon graydon force-pushed the contract-data branch 5 times, most recently from 9022dcc to b2e8e17 Compare June 9, 2022 06:38
@graydon graydon force-pushed the contract-data branch 3 times, most recently from cb6fc79 to 807a3cf Compare June 10, 2022 00:19
@graydon graydon marked this pull request as ready for review June 10, 2022 00:46
@graydon graydon requested a review from jonjove June 10, 2022 00:46
return true;
#endif
Copy link
Contributor

Choose a reason for hiding this comment

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

which code path ends up calling this for Jump Cannon?

@graydon graydon force-pushed the contract-data branch 3 times, most recently from dde6a17 to 81ce755 Compare June 10, 2022 05:36
@graydon graydon changed the title WIP: Contract data Contract data Jun 10, 2022
@graydon
Copy link
Contributor Author

graydon commented Jun 10, 2022

I believe I've now addressed all review comments and have updated the graydon/rs-stellar-xdr/contract-data and stellar/rs-stellar-contract-env/contract-data branches that depend on this (and that this depends on cyclically).

@jonjove @jayz22 @leighmcculloch @MonsieurNicolas could you please mark comments as resolved that have been resolved?

(and if there's nothing else really critical, can someone r+?)

Copy link
Contributor

@MonsieurNicolas MonsieurNicolas left a comment

Choose a reason for hiding this comment

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

resolved most comments, I only have one left

return true;
#endif
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's actually more conservative to do what we do for LIQUIDITY_POOL here (and throw): we should not have any dependency on "SponsorshipUtils" from Jump Cannon.

@jayz22
Copy link
Contributor

jayz22 commented Jun 10, 2022

I don't have the permission to resolve comments, but feel free to resolve them yourself. They are minor and you've clarified them both.

Copy link
Contributor

@jonjove jonjove left a comment

Choose a reason for hiding this comment

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

Three very minor comments then let's get this merged.

@@ -114,6 +115,10 @@ computeMultiplier(LedgerEntry const& le)
case OFFER:
case DATA:
return 1;
#ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
case CONTRACT_DATA:
return 1;
Copy link
Contributor

Choose a reason for hiding this comment

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

Given that @MonsieurNicolas wants to have no dependency between jump cannon and sponsorships, should we throw on this case as well?

Copy link
Contributor

Choose a reason for hiding this comment

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

@graydon think you missed this one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, fixed.

@graydon
Copy link
Contributor Author

graydon commented Jun 10, 2022

Pushed update containing all review comments from @jonjove and @MonsieurNicolas today.

@MonsieurNicolas
Copy link
Contributor

r+ f013c99

@latobarita latobarita merged commit 5836548 into stellar:master Jun 12, 2022
@graydon graydon deleted the contract-data branch July 4, 2022 23:29
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.

6 participants