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

chore(deps): bump vite from 5.4.3 to 5.4.6 #67

Closed
wants to merge 71 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
7e55c64
fix: use deployed contracts in token-vesting
friedger Mar 27, 2024
6724f81
feat: use pox-4
friedger Apr 23, 2024
1451a1e
chore: use mainnet addresses
friedger Apr 23, 2024
bdf3666
feat: add endpoint-v2-01
friedger Apr 23, 2024
db80af9
feat: disable auto-whitelist-mint-helper
friedger Apr 23, 2024
69821da
wip: testing
friedger Apr 23, 2024
4b56837
fix: update errors
friedger Apr 24, 2024
363fe67
feat: allow some finalize requests to fail
friedger Apr 25, 2024
cbd1c64
feat: add get-total-stx
friedger Apr 25, 2024
8c28de7
Merge branch 'main' into fix/vesting
fiftyeightandeight Apr 30, 2024
aa951d4
Merge pull request #42 from lisalab-io/fix/vesting
friedger May 2, 2024
fc962dd
Merge branch 'mainnet' into feat/pox-4-2
friedger May 2, 2024
eff3504
Merge pull request #49 from lisalab-io/feat/pox-4-2
friedger May 2, 2024
096709f
chore: upgrade deps
friedger May 2, 2024
363c4c9
Merge branch 'mainnet' of github.com:lisalab-io/liquid-stacking into …
friedger May 2, 2024
56e2663
chore: remove deployed folder
friedger May 2, 2024
755f0aa
chore: remove print statement, upgrade deps, create plan without boot
friedger May 3, 2024
4871787
feat: disable strategy-manager v1
friedger May 3, 2024
78f7e50
lip005
fiftyeightandeight May 15, 2024
656f873
mint and burn
fiftyeightandeight May 15, 2024
7d6f4db
Merge branch 'mainnet' into lip005
fiftyeightandeight May 15, 2024
c821c45
Merge pull request #51 from lisalab-io/lip005
fiftyeightandeight May 15, 2024
9e95334
fix: remove extra brackets
friedger May 15, 2024
1101dac
fix: remove extra line
friedger May 15, 2024
6536802
fix: mint more (WIP)
friedger May 18, 2024
487f006
feat: lip 006 (WIP)
friedger May 18, 2024
4c3c77b
chore: add replay txs
friedger May 18, 2024
2864ad1
chore: add more test
friedger May 19, 2024
108101c
chore: add more tests
friedger May 19, 2024
3b452c8
chore: remove unused code
friedger May 19, 2024
622120c
correct unminted-lqstx
fiftyeightandeight May 19, 2024
5ade526
feat: add simulation script
mhatal May 19, 2024
9db9299
chore: remove unused contracts, fix/clean tests
friedger May 19, 2024
f17bdfc
lip006
fiftyeightandeight May 27, 2024
1cdcc1e
Merge pull request #53 from lisalab-io/feat/lip006
fiftyeightandeight May 27, 2024
bc11c2b
lip007
fiftyeightandeight May 27, 2024
24edbfb
Merge branch 'mainnet' into feat/lip007
friedger May 27, 2024
239ccc2
chore: add test for lip007
friedger May 27, 2024
f3b95b3
feat: add strategy manager replacement
friedger May 27, 2024
489ad70
feat: add 2nd strategy manager
friedger May 27, 2024
a77a4c4
Merge pull request #54 from lisalab-io/feat/lip007
fiftyeightandeight May 30, 2024
b15a8dd
auto-alex-v3
fiftyeightandeight Jun 11, 2024
dc8e1e3
clarinet check passes
fiftyeightandeight Jun 12, 2024
9da517e
chore: revert back to 32 cycles for LiAlex
zhigang1992 Jun 12, 2024
5100aeb
chore: add more print
lighthx Jun 13, 2024
cf3d14b
chore: add more print
lighthx Jun 13, 2024
2c7d80f
Merge pull request #57 from lisalab-io/feat/li-alex-more-print
fiftyeightandeight Jun 13, 2024
e8e5103
auto-alex-v3_test.ts - working
fiftyeightandeight Jun 13, 2024
05727c1
Merge branch 'feat/li-alex' of https://github.com/lisalab-io/liquid-s…
fiftyeightandeight Jun 13, 2024
ab10448
lialex test added
fiftyeightandeight Jun 16, 2024
2010736
per comments
fiftyeightandeight Jun 17, 2024
da8551b
lisa-dao => deployed one
fiftyeightandeight Jun 17, 2024
c20040b
lip008
fiftyeightandeight Jun 17, 2024
3898903
chore: PR comments
fiftyeightandeight Jun 18, 2024
140e80b
Merge pull request #56 from lisalab-io/feat/li-alex
friedger Jun 19, 2024
d583969
lip009
fiftyeightandeight Jun 20, 2024
31e4efa
Merge pull request #58 from lisalab-io/feat/lip009
fiftyeightandeight Jun 20, 2024
c249ed6
lip010
fiftyeightandeight Aug 13, 2024
6f424db
fix: auto-alex-v3-endpoint
fiftyeightandeight Aug 31, 2024
d251542
manual rebasing
fiftyeightandeight Sep 5, 2024
2ef1a6d
working
fiftyeightandeight Sep 6, 2024
68da415
auto-alex-v3-endpoint-v2
fiftyeightandeight Sep 6, 2024
304fcf5
txtx added
fiftyeightandeight Sep 6, 2024
c786707
remove
fiftyeightandeight Sep 6, 2024
16e9396
fix: burn at claim
fiftyeightandeight Sep 8, 2024
0dd8e11
auto-alex-v3-endpoint-v2: staking optimisation added
fiftyeightandeight Sep 10, 2024
0b58320
Merge pull request #61 from lisalab-io/fix/auto-alex-v3-endpoint-burn…
fiftyeightandeight Sep 11, 2024
22274bc
auto-alex-v3-endpoint-v2-01
fiftyeightandeight Sep 13, 2024
a8c27ce
Merge pull request #62 from lisalab-io/chore/auto-alex-v3-endpoint-v2-01
fiftyeightandeight Sep 13, 2024
0b4c324
Merge pull request #60 from lisalab-io/fix/auto-alex-v3-endpoint
fiftyeightandeight Oct 16, 2024
f4c1dc2
chore(deps): bump vite from 5.4.3 to 5.4.6
dependabot[bot] Oct 16, 2024
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
Prev Previous commit
Next Next commit
feat: add get-total-stx
friedger committed Apr 25, 2024

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit cbd1c64aca9846437638b369f121a82dfefb8d93
15 changes: 9 additions & 6 deletions contracts/extensions/lqstx-mint-endpoint.clar
Original file line number Diff line number Diff line change
@@ -119,17 +119,20 @@
(define-read-only (is-whitelisted-or-mint-for-all (user principal))
(or (not (var-get use-whitelist)) (default-to false (map-get? whitelisted user))))

;; public calls

(define-public (rebase)
(let (
(define-read-only (get-total-stx)
(let (
(available-stx (stx-get-balance 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-vault))
;; __IF_MAINNET__
(deployed-stx (unwrap-panic (contract-call? .public-pools-strategy-v2 get-amount-in-strategy)))
;; (deployed-stx (unwrap-panic (contract-call? .mock-strategy get-amount-in-strategy)))
;; __ENDIF__
(pending-stx (get-mint-requests-pending-amount))
(total-stx (- (+ available-stx deployed-stx) pending-stx)))
(pending-stx (get-mint-requests-pending-amount)))
(- (+ available-stx deployed-stx) pending-stx)))

;; public calls

(define-public (rebase)
(let ((total-stx (get-total-stx)))
(try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.token-lqstx set-reserve total-stx))
(ok total-stx)))

2 changes: 1 addition & 1 deletion deployments/default.simnet-plan.yaml
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ plan:
emulated-sender: SP3D6PV2ACBPEKYJTCMH7HEN02KP87QSP8KTEH335
path: "./.cache/requirements/SP3D6PV2ACBPEKYJTCMH7HEN02KP87QSP8KTEH335.commission-trait.clar"
clarity-version: 1
epoch: "2.1"
epoch: "2.0"
- id: 1
transactions:
- emulated-contract-publish: