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

[3.4 -> Main] Merge Tokenonmics Updates into Main #96

Merged
merged 56 commits into from
Aug 12, 2024

Conversation

ericpassmore
Copy link
Contributor

Merge the Tokenomics changes, essentially the EOS System Contracts release v3.4, into reference-contracts Main branch.

DenisCarriere and others added 30 commits May 2, 2024 16:22
@nsjames
Copy link
Contributor

nsjames commented Jun 4, 2024

There are two more PRs into this branch that are expected, please hold off on merging this until then

@ericpassmore
Copy link
Contributor Author

ericpassmore commented Jun 5, 2024

There are two more PRs into this branch that are expected, please hold off on merging this until then

We should merge now, we are already in production with this code. Without a merge we don't get continuous integration testing. We are using another branch with v3.4.0 system contract code, we aren't merging tokenomics branch directly.

@ericpassmore ericpassmore requested a review from nsjames June 5, 2024 23:50
@nsjames
Copy link
Contributor

nsjames commented Jun 6, 2024

No problem, let's do it 👍

@spoonincode
Copy link
Member

This merge ends at 917d722 but the tokenomics branch continues on another 8 commits through 1a603bb. Should we have those 8 commits as part of the merge?

@arhag arhag merged commit 7718066 into main Aug 12, 2024
1 check passed
@arhag arhag deleted the merge-savanna-tokenonmics branch August 12, 2024 18:40
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