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

make modifications for transferAllocation function #41

Merged
merged 34 commits into from
Mar 3, 2024

Conversation

divine-comedian
Copy link
Contributor

change logic of cancelAllocation to add allocation balance instead of overwriting it.

contracts/ModifiedTokenDistro.sol Outdated Show resolved Hide resolved
contracts/ModifiedTokenDistro.sol Outdated Show resolved Hide resolved
contracts/ModifiedTokenDistro.sol Outdated Show resolved Hide resolved
contracts/ModifiedTokenDistro.sol Outdated Show resolved Hide resolved
@divine-comedian
Copy link
Contributor Author

@jainkrati - this one needs a review to unblock me

Copy link

@jainkrati jainkrati left a comment

Choose a reason for hiding this comment

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

Pls dm me once comments are resolved

Copy link

@jainkrati jainkrati left a comment

Choose a reason for hiding this comment

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

Looks good. just 1 comment

@jainkrati
Copy link

Also can we make the Slither Analysis pass before we merge?

contracts/ModifiedTokenDistro.sol Outdated Show resolved Hide resolved
contracts/ModifiedTokenDistro.sol Outdated Show resolved Hide resolved
contracts/ModifiedTokenDistro.sol Outdated Show resolved Hide resolved
contracts/ModifiedTokenDistro.sol Outdated Show resolved Hide resolved
contracts/ModifiedTokenDistro.sol Outdated Show resolved Hide resolved
contracts/ModifiedTokenDistro.sol Outdated Show resolved Hide resolved
contracts/ModifiedTokenDistro.sol Outdated Show resolved Hide resolved
Copy link
Member

@aminlatifi aminlatifi left a comment

Choose a reason for hiding this comment

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

Thanks @divine-comedian
Looks good, just a simple small change suggested

contracts/ModifiedTokenDistro.sol Outdated Show resolved Hide resolved
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0

pragma solidity =0.8.10;
pragma solidity ^0.8.10;

Check warning

Code scanning / Slither

Incorrect versions of Solidity Warning

Pragma version^0.8.10 allows old versions
@aminlatifi
Copy link
Member

@divine-comedian @jainkrati I did move the changes under the same contract name TokenDistro, since it's not trivial to change the contract name in the upgrade process.
Also, made #43 to push latest version of production to develop branch, I think it's better to merge it first to the develop and then do the final comparison.
BTW, I think the code is in good state now, just deleted an extra empty line.

@aminlatifi
Copy link
Member

Thanks @divine-comedian for fixing the slither action, I just did a little change to make it work.

@divine-comedian
Copy link
Contributor Author

@aminlatifi thanks! I reviewed this one, can you approve it then?

@aminlatifi
Copy link
Member

@aminlatifi thanks! I reviewed this one, can you approve it then?

Approved

@divine-comedian divine-comedian merged commit 1d0643e into develop Mar 3, 2024
4 checks passed
@divine-comedian divine-comedian deleted the modify-allocation-functions branch March 3, 2024 15:30
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