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

dev #2

Open
wants to merge 162 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
162 commits
Select commit Hold shift + click to select a range
060386c
treasury.ride + test
ridev6 May 24, 2023
0815c17
proposalAllowBroadcast
ridev6 May 24, 2023
32c5881
fix verifier
ridev6 May 25, 2023
8da9c14
multisig 3/5
ridev6 May 25, 2023
08ed578
voteForTxId throw if allowed
ridev6 May 26, 2023
81d8b5c
fix verifier
ridev6 May 26, 2023
85c5b2e
factory, calculator draft
ridev6 May 26, 2023
214df75
some comments
ridev6 May 26, 2023
5aba734
initial investors tx
ridev6 May 31, 2023
b70516e
calculator in factory
ridev6 May 31, 2023
0b24930
claimLP
ridev6 May 31, 2023
8c3333c
rewardForOption in treasury
ridev6 May 31, 2023
51567b8
claimLP fix
ridev6 May 31, 2023
e4b2e3c
topUp params
ridev6 May 31, 2023
821a81a
comment + entries in factory for calculator
ridev6 Jun 1, 2023
5488f2a
functions templates
ridev6 Jun 1, 2023
a3987f8
move rewardForOption to calculator
ridev6 Jun 1, 2023
da57b27
calculator.md
ridev6 Jun 1, 2023
21097f8
test samples
ridev6 Jun 1, 2023
a2c1bff
invest draft
ridev6 Jun 2, 2023
8f0450a
withdraw draft
ridev6 Jun 2, 2023
40e17d9
cancelWithdraw
ridev6 Jun 2, 2023
f4caed7
claimWaves draft
ridev6 Jun 2, 2023
3cd20df
burn, reissue
ridev6 Jun 2, 2023
7da7abf
fix transfers
ridev6 Jun 2, 2023
4d7d77a
check caller in calculator functions
ridev6 Jun 5, 2023
ce8da63
price scale → scale8, finalize args checks
ridev6 Jun 5, 2023
75a918c
finalize draft update
ridev6 Jun 5, 2023
9cfc85d
processBlocks draft
ridev6 Jun 5, 2023
441c1fb
processBlocks draft
ridev6 Jun 5, 2023
ada145b
next block to process
ridev6 Jun 6, 2023
08b0c52
start height, period length
ridev6 Jun 6, 2023
32830b2
verify in calculator with sigVerify
ridev6 Jun 7, 2023
8a7eebb
do not process blocks not in current period
ridev6 Jun 7, 2023
d554c4c
finalize not implemented yet throw
ridev6 Jun 8, 2023
635a3c3
deploy script
ridev6 Jun 8, 2023
b30a0a9
factory ride 7
ridev6 Jun 8, 2023
68ca858
deploy confirm
ridev6 Jun 8, 2023
a25e15e
factory reentrantInvoke
ridev6 Jun 9, 2023
e4bc12d
processBlocks fix
ridev6 Jun 9, 2023
7209b4a
nothing to claim error
ridev6 Jun 9, 2023
370a798
blocks processing batch size key
ridev6 Jun 9, 2023
e54ea63
fix deploy
ridev6 Jun 9, 2023
45f5ff6
batch block processing
ridev6 Jun 9, 2023
c3709e6
batch block processing fix
ridev6 Jun 9, 2023
433b3e3
txs
ridev6 Jun 13, 2023
14c3a8b
reissue in block processing
ridev6 Jun 13, 2023
687620c
increase invested amount
ridev6 Jun 13, 2023
f41fce2
increase total withdrawal amount in withdraw
ridev6 Jun 13, 2023
b53708c
decrease total withdrawal amount
ridev6 Jun 13, 2023
319ff3f
calculator list format
ridev6 Jun 13, 2023
611e686
package.json test fix
ridev6 Jun 13, 2023
6a3ac03
dao address for custom network
ridev6 Jun 14, 2023
ea43b17
process blocks and claim
ridev6 Jun 14, 2023
9b8280f
tests + refactor
ridev6 Jun 15, 2023
e8f64f1
do not finalize if there are unprocessed blocks
ridev6 Jun 16, 2023
2f354be
burn total withdrawal amount
ridev6 Jun 16, 2023
b72fa36
cancelWithdraw checks update
ridev6 Jun 16, 2023
a227692
fix setScriptFromFile
ridev6 Jun 16, 2023
298e9da
finalize draft
ridev6 Jun 20, 2023
d31bc47
factory finalize implemented
ridev6 Jun 20, 2023
5d008ec
finalize fix
ridev6 Jun 20, 2023
dc46f59
finalize test draft
ridev6 Jun 20, 2023
dc277c7
finalize fixes + price check
ridev6 Jun 21, 2023
72ca5c9
remove daoAddress export
ridev6 Jun 21, 2023
e677475
fix factory verifier
ridev6 Jun 21, 2023
4f57cdc
finalize can invoke anyone
ridev6 Jun 21, 2023
d5c4c48
remove withdrawal in finalize
ridev6 Jun 21, 2023
0f78fc3
claim waves after finalization test
ridev6 Jun 21, 2023
19b7f42
check claimed waves amount in test
ridev6 Jun 21, 2023
9564a8d
finalize test
ridev6 Jun 21, 2023
aac8f07
save period start height in finalize
ridev6 Jun 21, 2023
78fef5b
issue tx fix
ridev6 Jun 22, 2023
1153c72
only treasury can finalize
ridev6 Jun 22, 2023
600a5c9
fix finalize payment validation
ridev6 Jun 22, 2023
864c381
decimals
ridev6 Jun 22, 2023
78c0cac
fix decimals
ridev6 Jun 22, 2023
c1b3d11
investedXtnAmountInWaves comment
ridev6 Jun 22, 2023
34f701c
txs
ridev6 Jun 22, 2023
7b3abe4
paymentAmountMin fix
ridev6 Jun 22, 2023
bf0245a
power dao config address
ridev6 Jun 22, 2023
6342459
add more data to processBlocks
ridev6 Jun 23, 2023
5aa3585
finalize, invest fix
ridev6 Jun 23, 2023
ca50519
lpAssetId in init tx
ridev6 Jun 23, 2023
0c6776d
invest test update + daoAddress func
ridev6 Jun 23, 2023
6966a42
finalize test update
ridev6 Jun 23, 2023
1a3ab49
withdraw test update
ridev6 Jun 23, 2023
49b3e21
gitignore fix
ridev6 Jun 23, 2023
5015d0f
cancel withdraw test update
ridev6 Jun 23, 2023
fba5ab9
cancel withdraw test fix
ridev6 Jun 23, 2023
1b9b92e
remove treasury balance validation from invest test
ridev6 Jun 23, 2023
960e0e6
estimated height of fearure 19 activation in init
ridev6 Jun 23, 2023
301fd89
Transfer reward funds to Feature Treasury
Jul 2, 2023
3ee688b
Changed donation to Waves
Jul 3, 2023
0e99d6a
Changed PWR bonus to amount in Waves
Jul 3, 2023
dd11787
Added featureTreasury disctribution test
Jul 3, 2023
decac5a
Renamed treasury variables and keys
Jul 3, 2023
1697ebd
Fixed LP double burn
Jul 4, 2023
a645d60
Removed XTN usage
Jul 4, 2023
a1d403b
Redundant transfer removed
Jul 4, 2023
aeb0868
Fixed invested amount calculation
Jul 4, 2023
62d67c7
Update tests
Jul 4, 2023
ad398ab
Changed verifiers
Jul 4, 2023
2f1b4fa
Rename variable
Jul 4, 2023
1a07450
Merge pull request #3 from wavesplatform/treasury-distribution
GIvanovWaves Jul 4, 2023
9d3aef9
Update init data
Jul 4, 2023
fcb5607
Merge pull request #4 from wavesplatform/treasury-distribution
GIvanovWaves Jul 4, 2023
7c8a565
More init data
Jul 4, 2023
5f1fa36
Merge pull request #5 from wavesplatform/treasury-distribution
GIvanovWaves Jul 4, 2023
3ca6a9b
Fixed donated amount update
Jul 5, 2023
caba909
Price cannot be 0 (zero)
Jul 5, 2023
e792e9f
Added invest amount update on withdraw
Jul 5, 2023
03d2ede
Merge pull request #6 from wavesplatform/treasury-distribution
GIvanovWaves Jul 5, 2023
484e54c
Added finalizeREADONLY function
Jul 6, 2023
6b1b5c2
Added comments
Jul 6, 2023
a904d4d
Changed paymentAmount validation
Jul 6, 2023
83e3581
Merge pull request #7 from wavesplatform/treasury-distribution
JunkiJay Jul 6, 2023
14dd977
Update specs
Jul 14, 2023
f0d0027
Added finalization spec
Jul 14, 2023
a1bf02d
Reworded
Jul 14, 2023
9b339ac
Merge pull request #8 from wavesplatform/spec-mds
GIvanovWaves Jul 14, 2023
aa48584
Reformat
Jul 14, 2023
254dbfc
Merge pull request #9 from wavesplatform/spec-mds
GIvanovWaves Jul 14, 2023
1d6ce7d
Update tests
Jul 14, 2023
ae10cea
Proxy Treasury test
Jul 14, 2023
dc6b190
feat: multi collateral
epicwavesrider Jul 20, 2023
1ea2838
feat: add lint npm run-script
epicwavesrider Jul 20, 2023
36ad554
feat: business treasury
epicwavesrider Jul 31, 2023
3e89b67
feat: claimCollateral
epicwavesrider Aug 3, 2023
78346ce
Merge pull request #10 from wavesplatform/multicollateral
JunkiJay Aug 7, 2023
04d6e45
Power Share
Aug 7, 2023
fe12995
Power Share and staking
Aug 15, 2023
0bc6a0c
Merge branch 'dev' of github.com:wavesplatform/waves-dao-ride into po…
Aug 15, 2023
2685b44
Removed unused key
Aug 15, 2023
9fc9be5
Removed unused key
Aug 15, 2023
c2c5ff1
Merge branch 'power-share' of github.com:wavesplatform/waves-dao-ride…
Aug 15, 2023
bc45891
Removed unused key
Aug 15, 2023
155c9c9
Merge branch 'power-share' of github.com:wavesplatform/waves-dao-ride…
Aug 15, 2023
baf27c7
New finalize arguments
Aug 17, 2023
43be539
feat: claimCollateral + investPeriod
epicwavesrider Aug 17, 2023
099f302
Merge pull request #13 from wavesplatform/investPeriod
epicwavesrider Aug 17, 2023
61614dc
Refactored finalize calculations
Aug 17, 2023
e98f89b
Merge branch 'dev' of github.com:wavesplatform/waves-dao-ride into fi…
Aug 17, 2023
1b15513
Merge branch 'dev' of github.com:wavesplatform/waves-dao-ride into po…
Aug 17, 2023
ceca0e4
Merge pull request #12 from wavesplatform/finalize-arguments-change
GIvanovWaves Aug 17, 2023
bde93b2
Merge branch 'dev' of github.com:wavesplatform/waves-dao-ride into po…
Aug 17, 2023
3c0b295
Fixed error with power swap and stake
Aug 18, 2023
21ac628
Changed reward split steps
Aug 18, 2023
3be0a8c
data tx
Aug 18, 2023
f22c0d0
Merge pull request #11 from wavesplatform/power-share
GIvanovWaves Aug 21, 2023
bec9584
Withdraw restrictions
Aug 22, 2023
a3898d9
Reduced processing blocks batch size
Aug 22, 2023
7640b10
Collateral claim test updates
Aug 22, 2023
ef4a9fe
feat: claimCollateral fix
epicwavesrider Aug 23, 2023
0680bc8
Test fixes
Aug 23, 2023
2bc8ae0
Merge pull request #14 from wavesplatform/withdraw-restrictions
GIvanovWaves Aug 23, 2023
0a473cc
l2mp finalization
Dec 6, 2023
fa3278f
Migration json files
Dec 8, 2023
2e7747d
Update migration
Dec 11, 2023
5252eea
Migration
Dec 11, 2023
fb800b7
Migration
Dec 11, 2023
ccd55f4
Merge pull request #15 from wavesplatform/l2mp-finalize
GIvanovWaves Dec 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
env:
es2021: true
node: true
mocha: true
extends: standard
overrides: []
parserOptions:
ecmaVersion: latest
sourceType: module
rules: {}
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
node_modules
.idea
.vscode
/scripts/data.js
package-lock.json
4 changes: 4 additions & 0 deletions .mocharc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
parallel: false
timeout: 5m
spec:
- 'contracts/**/*.spec.js'
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ARG NODE_TAG=latest
FROM wavesplatform/wavesnode:$NODE_TAG
COPY waves.custom.conf /etc/waves/waves.conf
5 changes: 5 additions & 0 deletions contracts/calculator/calculator.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
### Required state entries

| key | type | description |
| :------------ | :------- | :-------------- |
| `%s__factory` | `String` | Factory address |
Loading