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

Feature/naming and small issues #147

Merged
merged 24 commits into from
Sep 7, 2022
Merged

Feature/naming and small issues #147

merged 24 commits into from
Sep 7, 2022

Conversation

o-tsaruk
Copy link
Contributor

@o-tsaruk o-tsaruk commented Jul 5, 2022 •
edited
Loading

Renamed all _mint to _mint_to;
Added PSP22Capped extension;
Added _switch_pause for PSP22Pausable;
Updated documentation for PSP22Capped.

@o-tsaruk o-tsaruk linked an issue Jul 5, 2022 that may be closed by this pull request
Unification of naming and small issues #130
Closed
@o-tsaruk o-tsaruk self-assigned this Jul 5, 2022
coreggon11
coreggon11 reviewed Jul 6, 2022
View reviewed changes
docs/docs/smart-contracts/PSP22/Extensions/capped.md Outdated Show resolved Hide resolved
tests/psp22_capped.rs Outdated Show resolved Hide resolved
tests/psp35_metadata.rs Outdated Show resolved Hide resolved
xgreenx
xgreenx reviewed Jul 6, 2022
View reviewed changes
contracts/src/token/psp34/extensions/metadata.rs Outdated Show resolved Hide resolved
examples/psp22_extensions/capped/lib.rs Outdated Show resolved Hide resolved
examples/psp34_extensions/metadata/lib.rs Outdated Show resolved Hide resolved
contracts/src/token/psp22/extensions/capped.rs Outdated Show resolved Hide resolved
o-tsaruk added 7 commits July 6, 2022 22:14
@o-tsaruk
Revert "fix LoanContract"
74e98f5 
This reverts commit 86917f1.
@o-tsaruk
Revert "fix example"
768f0cb 
This reverts commit d857fa2.
@o-tsaruk
Revert "use slices in metadata extensions"
29ff09d 
This reverts commit 092ab89.
@o-tsaruk
refactor capped extension
51be8b9
@o-tsaruk
Merge branch 'main' into feature/naming-and-small-issues
a697097 
# Conflicts:
#	contracts/derive/lib.rs
#	docs/docs/smart-contracts/PSP22/Extensions/capped.md
#	docs/docs/smart-contracts/PSP22/psp22.md
#	examples/psp22_extensions/capped/lib.rs
@o-tsaruk
refactoring
7645668
@o-tsaruk
update documentation
4dcdfd5
xgreenx
xgreenx reviewed Jul 18, 2022
View reviewed changes
contracts/src/security/pausable/mod.rs Outdated Show resolved Hide resolved
docs/docs/smart-contracts/PSP22/Extensions/capped.md Outdated Show resolved Hide resolved
examples/psp22_extensions/capped/lib.rs Outdated Show resolved Hide resolved
contracts/src/token/psp22/extensions/capped.rs Show resolved Hide resolved
@o-tsaruk o-tsaruk changed the title Feature/naming and small issues [NOT FOR MERGE] Feature/naming and small issues Jul 18, 2022
@o-tsaruk o-tsaruk changed the title [NOT FOR MERGE] Feature/naming and small issues Feature/naming and small issues Jul 18, 2022
@github-actions
Copy link

github-actions bot commented Aug 21, 2022 •
edited
Loading

Contract Name main feature/naming-and-small-issues Difference
diamond_caller 4841 4841 0
flash_borrower 3802 3802 0
flip_on_me 2101 2101 0
ink_diamond 7332 7332 0
lending_contract 42031 41934 -97
loan_contract 24187 24253 66
my_access_control 19613 19600 -13
my_access_control_enumerable 9597 9583 -14
my_diamond 15736 15745 9
my_flipper_guard 3792 3790 -2
my_ownable 19787 19799 12
my_pausable 3612 3612 0
my_payment_splitter 12256 12239 -17
my_proxy 5435 5436 1
my_psp22 13283 13281 -2
my_psp22_burnable 13593 13569 -24
my_psp22_capped 13148 13164 16
my_psp22_facet_v1 12653 12599 -54
my_psp22_facet_v2 13052 13002 -50
my_psp22_flashmint 16777 16747 -30
my_psp22_metadata 13531 13531 0
my_psp22_metadata_facet 5734 5734 0
my_psp22_metadata_upgradeable 15989 15985 -4
my_psp22_mintable 12361 12415 54
my_psp22_pallet 12332 12354 22
my_psp22_pallet_burnable 13838 13814 -24
my_psp22_pallet_metadata 13699 13772 73
my_psp22_pallet_mintable 12507 12516 9
my_psp22_pausable 12643 12641 -2
my_psp22_token_timelock 6435 6437 2
my_psp22_upgradeable 13663 13639 -24
my_psp22_wrapper 15806 15826 20
my_psp34 15604 15605 1
my_psp34_burnable 15107 15116 9
my_psp34_enumerable 17762 17758 -4
my_psp34_metadata 16176 16176 0
my_psp34_mintable 14559 14561 2
my_psp37 16755 16742 -13
my_psp37_batch 18869 18871 2
my_psp37_burnable 18056 18069 13
my_psp37_enumerable 22265 22270 5
my_psp37_metadata 16142 16210 68
my_psp37_mintable 17128 17141 13
my_timelock_controller 22783 22900 117
psp22_receiver 3540 3540 0
psp34_receiver 4019 4019 0
psp37_receiver 5242 5242 0
rust_diamond 6346 6346 0
shares_contract 16158 16160 2
stable_coin_contract 14028 13978 -50

@o-tsaruk o-tsaruk merged commit 7e3324b into main Sep 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xgreenx xgreenx xgreenx left review comments

@coreggon11 coreggon11 coreggon11 approved these changes

@Artemka374 Artemka374 Awaiting requested review from Artemka374

Assignees

@o-tsaruk o-tsaruk

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Unification of naming and small issues
3 participants
@o-tsaruk @xgreenx @coreggon11