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

feat: add mana cost everywhere #8202

Merged
merged 26 commits into from
Mar 21, 2024
Merged

feat: add mana cost everywhere #8202

merged 26 commits into from
Mar 21, 2024

Conversation

cpl121
Copy link
Member

@cpl121 cpl121 commented Mar 13, 2024 •
edited
Loading

Closes #8199
Closes #8143

Do Claim rewards in #8196

Summary

Please summarize your changes, describing what they are and why they were made.

...

Changelog

- Please write a list of changes

Testing

Platforms

Please select any platforms where your changes have been tested.

  • Desktop
    • MacOS
    • Linux
    • Windows

Instructions

Please describe the specific instructions, configurations, and/or test cases necessary to test and verify that your changes work as intended.

...

Checklist

Please tick the following boxes that are relevant to your changes.

  • I have followed the contribution guidelines for this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or modified tests that prove my changes work as intended
  • I have verified that new and existing unit tests pass locally with my changes
  • I have verified that my latest changes pass CI workflows for testing and linting
  • I have made corresponding changes to the documentation

cpl121 and others added 10 commits March 6, 2024 15:16
@cpl121
feat: implement logic to allow tx or not based on mana cost for the X…
ff44d76 
… slots
@marc2332
fixes and clean up
46aa693
@cpl121
Merge branch 'develop-iota2.0' into feat/add-buffer-to-show-mana-cost
357cedd
@cpl121
Merge branch 'develop-iota2.0' into feat/add-buffer-to-show-mana-cost
0c25980
@marc2332
Merge branch 'develop-iota2.0' into feat/add-buffer-to-show-mana-cost
24899df
@cpl121
Merge branch 'develop-iota2.0' into feat/add-buffer-to-show-mana-cost
37dfe97
@cpl121
Merge branch 'develop-iota2.0' into feat/add-buffer-to-show-mana-cost
f327b18
@cpl121
Merge branch 'develop-iota2.0' into feat/add-buffer-to-show-mana-cost
9f959e7
@cpl121
Merge branches 'feat/add-buffer-to-show-mana-cost' and 'develop-iota2…
5b3ce04 
….0' of github.com:iotaledger/firefly into feat/add-buffer-to-show-mana-cost
@cpl121
feat: add mana cost to mint, burn, send and implicitTransition
719d742
This was linked to issues Mar 13, 2024
[Task]: Add mana cost to mint, burn, send, claim, delegate and claim rewards #8199
Closed
[Task Tracker]: Apply mana cost block preparation to all block issuing actions #8143
Closed
@cpl121 cpl121 changed the base branch from develop-iota2.0 to feat/add-buffer-to-show-mana-cost March 14, 2024 10:19
@cpl121 cpl121 marked this pull request as ready for review March 14, 2024 10:20
@cpl121 cpl121 requested a review from marc2332 March 14, 2024 10:20
@cpl121 cpl121 requested a review from evavirseda March 18, 2024 16:39
@cpl121
Merge branches 'feat/add-mana-cost-everywhere' and 'feat/add-buffer-t…
b40de0c 
…o-show-mana-cost' of github.com:iotaledger/firefly into feat/add-mana-cost-everywhere
evavirseda
evavirseda requested changes Mar 19, 2024
View reviewed changes
Copy link
Collaborator

@evavirseda evavirseda left a comment

Choose a reason for hiding this comment

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

minor comments 🙏

packages/desktop/components/popups/ActivityDetailsPopup.svelte Outdated Show resolved Hide resolved
packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte Outdated Show resolved Hide resolved
packages/desktop/components/popups/CreateDelegationPopup.svelte Outdated Show resolved Hide resolved
packages/desktop/components/popups/send/SendConfirmationPopup.svelte Outdated Show resolved Hide resolved
packages/desktop/components/popups/send/SendConfirmationPopup.svelte Outdated Show resolved Hide resolved
...views/dashboard/wallet/views/implicit-account-creation-multistep/FundConfirmationView.svelte Show resolved Hide resolved
Base automatically changed from feat/add-buffer-to-show-mana-cost to develop-iota2.0 March 19, 2024 10:39
@cpl121 cpl121 requested a review from evavirseda March 19, 2024 13:12
@cpl121
Merge branches 'feat/add-mana-cost-everywhere' and 'develop-iota2.0' …
1e7af29 
…of github.com:iotaledger/firefly into feat/add-mana-cost-everywhere
evavirseda
evavirseda approved these changes Mar 20, 2024
View reviewed changes
Copy link
Collaborator

@evavirseda evavirseda left a comment

Choose a reason for hiding this comment

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

nice job sisar 🚀

@cpl121 cpl121 merged commit ee06e13 into develop-iota2.0 Mar 21, 2024
3 of 4 checks passed
@cpl121 cpl121 deleted the feat/add-mana-cost-everywhere branch March 21, 2024 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@begonaalvarezd begonaalvarezd begonaalvarezd approved these changes

@evavirseda evavirseda evavirseda approved these changes

@marc2332 marc2332 Awaiting requested review from marc2332

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@cpl121 @begonaalvarezd @evavirseda @marc2332