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

Enable mint vtSQToken in Vesting Contract #297

Merged
merged 18 commits into from
Dec 19, 2023
Merged

Enable mint vtSQToken in Vesting Contract #297

merged 18 commits into from
Dec 19, 2023

Conversation

mzxyz
Copy link
Member

@mzxyz mzxyz commented Dec 12, 2023

Changes

  • Mint vtSQT when allocating vesting token.

Todo

  • Update test for Vesting contract
  • Update contract deployment and sdk

contracts/root/Vesting.sol Outdated Show resolved Hide resolved
contracts/root/Vesting.sol Outdated Show resolved Hide resolved
contracts/root/Vesting.sol Outdated Show resolved Hide resolved
@mzxyz mzxyz marked this pull request as ready for review December 18, 2023 09:17
@mzxyz mzxyz requested a review from ianhe8x December 18, 2023 09:19
hardhat.config.ts Outdated Show resolved Hide resolved
@mzxyz mzxyz merged commit ea07ddc into develop Dec 19, 2023
2 checks passed
@mzxyz mzxyz deleted the feat/vesting-mint branch January 14, 2024 23:42
ianhe8x added a commit that referenced this pull request Jan 16, 2024
* Update Vesting contract to support mint vtToken

* Update token names

* Update `Vesting Contract`

* Update mint account

* Remove unused revert code

* Add `vtSQToken` to contract deployment flow

* Resolve Vesting test issues

* Add more test

* Add clean cache to PR pipeline

* Fix contract file name

* Delete contracts/root/VTSQtoken.sol

* Remove `mint` when deposit token

* Add vtSQToken balance check for deposit and withdraw action

* add rootSdk to support vesting

* remove totalSupply and publish

* improve tests

---------

Co-authored-by: Ian He <[email protected]>
ianhe8x added a commit that referenced this pull request Jan 19, 2024
* Add RewardRunning contract

* Reward send to latest era

* Remove projectype share

* Add booster staking

* Change last time when add

* rewards booster

* * add collect allocation rewards
* apply query reward ratio
* support add allocation

* update

* query rewards per booster

* Reward booster handles over allocation (#322)

* pull changes from reward-booster-allocation

* remove alpha, clean up

* Fix contracts & add tests for allocation

* Fix test in booster

---------

Co-authored-by: Neo Sun <[email protected]>

* Enable mint `vtSQToken` in Vesting Contract (#297)

* Update Vesting contract to support mint vtToken

* Update token names

* Update `Vesting Contract`

* Update mint account

* Remove unused revert code

* Add `vtSQToken` to contract deployment flow

* Resolve Vesting test issues

* Add more test

* Add clean cache to PR pipeline

* Fix contract file name

* Delete contracts/root/VTSQtoken.sol

* Remove `mint` when deposit token

* Add vtSQToken balance check for deposit and withdraw action

* add rootSdk to support vesting

* remove totalSupply and publish

---------

Co-authored-by: Ian He <[email protected]>

* transfer fee to treasury instead of burn (#314)

* transfer fee to treasury instead of burn

* deploy upgrades to testnet

* deploy upgrade of state channel to testnet

* skip commission unbond when commission is 0 (#321)

* allow controller to manage allocation
more events
pull sqt from treasury for allocation rewards

* move token approval into _collectAllocationReward()

* remove seperated accRewardsForDeploymentSnapshot

* Add fundRewards to sc (#324)

* Add refund back to rewards

* implement spendQueryRewards & refundQueryRewards

---------

Co-authored-by: Ian He <[email protected]>

* update namings (#325)

* Add event for allocation & booster

---------

Co-authored-by: Neo Sun <[email protected]>
Co-authored-by: Ian He <[email protected]>
Co-authored-by: neooo <[email protected]>
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.

2 participants