kylefang/liquid-stacking
1
0
Fork 0
mirror of https://github.com/zhigang1992/liquid-stacking.git synced 2026-01-12 17:23:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into chore/multisig-script-updates

Browse Source
This commit is contained in:
MarvinJanssen
2024-03-27 13:14:57 +01:00
parent 8c81aa860b 3f04c3913c
commit cb514d000c
12 changed files with 104 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Clarinet.toml
View File

@@ -45,6 +45,15 @@ contract_id = "SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.stx-transfer-proxy"
[[project.requirements]]
contract_id = "SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.public-pools-strategy"
[[project.requirements]]
contract_id = "SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint"
[[project.requirements]]
contract_id = "SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint-v1-01"
[[project.requirements]]
contract_id = "SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.proposal-trait"
# [contracts.lisa-dao]
# path = "contracts/lisa-dao.clar"
# epoch = 2.4
@@ -85,9 +94,9 @@ epoch = 2.4
path = "contracts/traits/extension-trait.clar"
epoch = 2.4
[contracts.proposal-trait]
path = "contracts/traits/proposal-trait.clar"
epoch = 2.4
# [contracts.proposal-trait]
# path = "contracts/traits/proposal-trait.clar"
# epoch = 2.4
[contracts.proxy-trait]
path = "contracts/traits/proxy-trait.clar"
@@ -217,13 +226,13 @@ epoch = 2.4
path = "contracts/extensions/lqstx-mint-endpoint.clar"
epoch = 2.4
[contracts.lqstx-mint-endpoint-v1-01]
path = "contracts/deployed/lqstx-mint-endpoint-v1-01.clar"
epoch = 2.4
# [contracts.lqstx-mint-endpoint-v1-01]
# path = "contracts/deployed/lqstx-mint-endpoint-v1-01.clar"
# epoch = 2.4
[contracts.lqstx-mint-endpoint]
path = "contracts/deployed/lqstx-mint-endpoint.clar"
epoch = 2.4
# [contracts.lqstx-mint-endpoint]
# path = "contracts/deployed/lqstx-mint-endpoint.clar"
# epoch = 2.4
# [contracts.lqstx-mint-registry]
# path = "contracts/aux/lqstx-mint-registry.clar"

24
README.md
View File

@@ -34,9 +34,8 @@ are in the form `(err uint)` and they are unique across all contracts.
### Error table
<!--errors-->
| Contract | Constant | Value | Description |
| ------------------------------- | -------------------------------- | ----------- | ----------- |
|---------------------------------|----------------------------------|-------------|-------------|
| lisa-dao | err-unauthorised | (err u1000) | |
| lqstx-mint-endpoint | err-unauthorised | (err u1000) | |
| lqstx-mint-endpoint-v1-01 | err-unauthorised | (err u1000) | |
@@ -86,24 +85,44 @@ are in the form `(err uint)` and they are unique across all contracts.
| pox-fast-pool-v2 | err-too-early | (err u500) | |
| pox-pools-1-cycle-v2 | err-non-positive-amount | (err u500) | |
| fastpool-member1 | err-unauthorised | (err u5000) | |
| fastpool-member1 | err-unauthorised | (err u5000) | |
| fastpool-member10 | err-unauthorised | (err u5000) | |
| fastpool-member10 | err-unauthorised | (err u5000) | |
| fastpool-member2 | err-unauthorised | (err u5000) | |
| fastpool-member2 | err-unauthorised | (err u5000) | |
| fastpool-member3 | err-unauthorised | (err u5000) | |
| fastpool-member3 | err-unauthorised | (err u5000) | |
| fastpool-member4 | err-unauthorised | (err u5000) | |
| fastpool-member4 | err-unauthorised | (err u5000) | |
| fastpool-member5 | err-unauthorised | (err u5000) | |
| fastpool-member5 | err-unauthorised | (err u5000) | |
| fastpool-member6 | err-unauthorised | (err u5000) | |
| fastpool-member6 | err-unauthorised | (err u5000) | |
| fastpool-member7 | err-unauthorised | (err u5000) | |
| fastpool-member7 | err-unauthorised | (err u5000) | |
| fastpool-member8 | err-unauthorised | (err u5000) | |
| fastpool-member8 | err-unauthorised | (err u5000) | |
| fastpool-member9 | err-unauthorised | (err u5000) | |
| fastpool-member9 | err-unauthorised | (err u5000) | |
| xverse-member1 | err-unauthorised | (err u5000) | |
| xverse-member1 | err-unauthorised | (err u5000) | |
| xverse-member10 | err-unauthorised | (err u5000) | |
| xverse-member10 | err-unauthorised | (err u5000) | |
| xverse-member2 | err-unauthorised | (err u5000) | |
| xverse-member2 | err-unauthorised | (err u5000) | |
| xverse-member3 | err-unauthorised | (err u5000) | |
| xverse-member3 | err-unauthorised | (err u5000) | |
| xverse-member4 | err-unauthorised | (err u5000) | |
| xverse-member4 | err-unauthorised | (err u5000) | |
| xverse-member5 | err-unauthorised | (err u5000) | |
| xverse-member5 | err-unauthorised | (err u5000) | |
| xverse-member6 | err-unauthorised | (err u5000) | |
| xverse-member6 | err-unauthorised | (err u5000) | |
| xverse-member7 | err-unauthorised | (err u5000) | |
| xverse-member7 | err-unauthorised | (err u5000) | |
| xverse-member8 | err-unauthorised | (err u5000) | |
| xverse-member8 | err-unauthorised | (err u5000) | |
| xverse-member9 | err-unauthorised | (err u5000) | |
| xverse-member9 | err-unauthorised | (err u5000) | |
| pox-pools-1-cycle-v2 | err-no-stacker-info | (err u501) | |
| pox-pools-1-cycle-v2 | err-no-user-info | (err u502) | |
@@ -136,7 +155,6 @@ are in the form `(err uint)` and they are unique across all contracts.
| token-vesting | err-event-not-vested | (err u9002) | |
| token-vesting | err-event-already-claimed | (err u9003) | |
| token-vesting | err-recipient-exists | (err u9004) | |
<!--errors-->
## References

12
contracts/boot.clar
View File

@@ -1,13 +1,13 @@
;; SPDX-License-Identifier: BUSL-1.1
(impl-trait .proposal-trait.proposal-trait)
(impl-trait 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.proposal-trait.proposal-trait)
(define-public (execute (sender principal))
(begin
(try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lisa-dao set-extensions (list
{ extension: .lqstx-mint-endpoint, enabled: false }
{ extension: .lqstx-mint-endpoint-v1-01, enabled: true }
{ extension: 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint, enabled: false }
{ extension: 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint-v1-01, enabled: true }
{ extension: 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-vault, enabled: true }
{ extension: .treasury, enabled: true }
{ extension: .token-vesting, enabled: true }
@@ -41,8 +41,8 @@
)))
;; Enable whitelist
(try! (contract-call? .lqstx-mint-endpoint-v1-01 set-use-whitelist true))
(try! (contract-call? .lqstx-mint-endpoint-v1-01 set-whitelisted-many
(try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint-v1-01 set-use-whitelist true))
(try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint-v1-01 set-whitelisted-many
(list
'SP3BQ65DRM8DMTYDD5HWMN60EYC0JFS5NC2V5CWW7
'SP2VZBR9GCVM33BN0WXA05VJP6QV7CJ3Z3SQKJ5HH
@@ -57,7 +57,7 @@
true
true
)))
(try! (contract-call? .lqstx-mint-endpoint-v1-01 set-paused false))
(try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint-v1-01 set-paused false))
(ok true)
)
)

2
contracts/deployed/lisa-rebase.clar
View File

@@ -14,7 +14,7 @@
)
(define-public (rebase (strategies (list 20 <strategy-trait>)))
(let ((total-stx (- (+ (stx-get-balance 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-vault) (try! (fold sum-strategy-amounts strategies (ok u0)))) (contract-call? .lqstx-mint-endpoint-v1-01 get-mint-requests-pending-amount))))
(let ((total-stx (- (+ (stx-get-balance 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-vault) (try! (fold sum-strategy-amounts strategies (ok u0)))) (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint-v1-01 get-mint-requests-pending-amount))))
(try! (is-dao-or-extension))
(as-contract (try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.token-lqstx set-reserve total-stx)))
(ok total-stx)

6
contracts/deployed/rebase-1.clar
View File

@@ -13,14 +13,14 @@
(define-public (finalize-mint (request-id uint))
(begin
(try! (rebase))
(as-contract (try! (contract-call? .lqstx-mint-endpoint-v1-01 finalize-mint request-id)))
(as-contract (try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint-v1-01 finalize-mint request-id)))
(try! (rebase))
(ok true)))
(define-public (finalize-burn (request-id uint))
(begin
(try! (rebase))
(as-contract (try! (contract-call? .lqstx-mint-endpoint-v1-01 finalize-burn request-id)))
(as-contract (try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint-v1-01 finalize-burn request-id)))
(try! (rebase))
(ok true)))
@@ -28,7 +28,7 @@
(let (
(sender tx-sender)
(send-token (try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.token-lqstx transfer amount sender (as-contract tx-sender) none)))
(request-data (as-contract (try! (contract-call? .lqstx-mint-endpoint-v1-01 request-burn sender amount)))))
(request-data (as-contract (try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint-v1-01 request-burn sender amount)))))
(match (finalize-burn (get request-id request-data))
ok-value (ok { request-id: (get request-id request-data), status: FINALIZED })
err-value (ok request-data))))

2
contracts/extensions/operators.clar
View File

@@ -1,7 +1,7 @@
;; SPDX-License-Identifier: BUSL-1.1
(use-trait proposal-trait .proposal-trait.proposal-trait)
(use-trait proposal-trait 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.proposal-trait.proposal-trait)
(define-constant err-unauthorised (err u1000))
(define-constant err-not-operator (err u1001))

2
contracts/lisa-dao.clar
View File

@@ -3,7 +3,7 @@
;; lisa dao
(use-trait proposal-trait .proposal-trait.proposal-trait)
(use-trait proposal-trait 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.proposal-trait.proposal-trait)
(use-trait extension-trait .extension-trait.extension-trait)
(define-constant err-unauthorised (err u1000))

2
contracts/mocks/mock-proposal.clar
View File

@@ -1,7 +1,7 @@
;; SPDX-License-Identifier: BUSL-1.1
(impl-trait .proposal-trait.proposal-trait)
(impl-trait 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.proposal-trait.proposal-trait)
(define-public (execute (sender principal))
(begin

6
contracts/proposals/lip001.clar
View File

@@ -1,7 +1,7 @@
;; SPDX-License-Identifier: BUSL-1.1
(impl-trait .proposal-trait.proposal-trait)
(impl-trait 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.proposal-trait.proposal-trait)
(define-public (execute (sender principal))
(begin
@@ -39,8 +39,8 @@
true
true
)))
(try! (contract-call? .lqstx-mint-endpoint set-paused true))
(try! (contract-call? .lqstx-mint-endpoint-v1-01 set-paused true))
(try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint set-paused true))
(try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint-v1-01 set-paused true))
(try! (contract-call? .lqstx-mint-endpoint-v1-02 set-paused false))
(try! (contract-call? .endpoint-whitelist-helper-v1-02 set-authorised-operator 'SP3BQ65DRM8DMTYDD5HWMN60EYC0JFS5NC2V5CWW7 true))

2
contracts/regtest-boot.clar
View File

@@ -1,7 +1,7 @@
;; SPDX-License-Identifier: BUSL-1.1
(impl-trait .proposal-trait.proposal-trait)
(impl-trait 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.proposal-trait.proposal-trait)
(define-public (execute (sender principal))
(begin

2
contracts/simnet-boot.clar
View File

@@ -1,7 +1,7 @@
;; SPDX-License-Identifier: BUSL-1.1
(impl-trait .proposal-trait.proposal-trait)
(impl-trait 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.proposal-trait.proposal-trait)
(define-public (execute (sender principal))
(begin

91
deployments/default.simnet-plan.yaml
View File

@@ -64,6 +64,9 @@ plan:
emulated-sender: SP3D6PV2ACBPEKYJTCMH7HEN02KP87QSP8KTEH335
path: "./.cache/requirements/SP3D6PV2ACBPEKYJTCMH7HEN02KP87QSP8KTEH335.commission-trait.clar"
clarity-version: 1
epoch: "2.0"
- id: 1
transactions:
- emulated-contract-publish:
contract-name: trait-sip-010
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
@@ -109,8 +112,8 @@ plan:
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts_modules/alex_v1/traits/trait-vault.clar
clarity-version: 1
epoch: "2.1"
- id: 1
epoch: "2.05"
- id: 2
transactions:
- emulated-contract-publish:
contract-name: extension-trait
@@ -202,11 +205,44 @@ plan:
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
path: "./.cache/requirements/SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-vault.clar"
clarity-version: 2
- emulated-contract-publish:
contract-name: rebase-strategy-trait
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
path: "./.cache/requirements/SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.rebase-strategy-trait.clar"
clarity-version: 2
- emulated-contract-publish:
contract-name: stx-transfer-proxy
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
path: "./.cache/requirements/SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.stx-transfer-proxy.clar"
clarity-version: 2
- emulated-contract-publish:
contract-name: token-lqstx
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
path: "./.cache/requirements/SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.token-lqstx.clar"
clarity-version: 2
- emulated-contract-publish:
contract-name: token-vlqstx
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
path: "./.cache/requirements/SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.token-vlqstx.clar"
clarity-version: 2
- emulated-contract-publish:
contract-name: lqstx-mint-endpoint
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
path: "./.cache/requirements/SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint.clar"
clarity-version: 2
- emulated-contract-publish:
contract-name: lqstx-mint-endpoint-v1-01
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
path: "./.cache/requirements/SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint-v1-01.clar"
clarity-version: 2
- emulated-contract-publish:
contract-name: pox-pools-1-cycle-v2
emulated-sender: SP001SFSMC2ZY76PD4M68P3WGX154XCH7NE3TYMX
path: "./.cache/requirements/SP001SFSMC2ZY76PD4M68P3WGX154XCH7NE3TYMX.pox-pools-1-cycle-v2.clar"
clarity-version: 2
epoch: "2.4"
- id: 3
transactions:
- emulated-contract-publish:
contract-name: xverse-member1
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
@@ -237,9 +273,6 @@ plan:
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
path: "./.cache/requirements/SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.xverse-member5.clar"
clarity-version: 2
epoch: "2.4"
- id: 2
transactions:
- emulated-contract-publish:
contract-name: xverse-member6
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
@@ -265,31 +298,6 @@ plan:
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
path: "./.cache/requirements/SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.public-pools-strategy.clar"
clarity-version: 2
- emulated-contract-publish:
contract-name: stx-transfer-proxy
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
path: "./.cache/requirements/SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.stx-transfer-proxy.clar"
clarity-version: 2
- emulated-contract-publish:
contract-name: token-lqstx
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
path: "./.cache/requirements/SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.token-lqstx.clar"
clarity-version: 2
- emulated-contract-publish:
contract-name: token-vlqstx
emulated-sender: SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH
path: "./.cache/requirements/SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.token-vlqstx.clar"
clarity-version: 2
- emulated-contract-publish:
contract-name: lqstx-mint-endpoint-v1-01
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/deployed/lqstx-mint-endpoint-v1-01.clar
clarity-version: 2
- emulated-contract-publish:
contract-name: proposal-trait
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/traits/proposal-trait.clar
clarity-version: 2
- emulated-contract-publish:
contract-name: operators
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
@@ -360,14 +368,14 @@ plan:
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/strategies/public-pools/fastpool-member.clar
clarity-version: 2
epoch: "2.4"
- id: 4
transactions:
- emulated-contract-publish:
contract-name: fastpool-member4
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/strategies/public-pools/fastpool-member.clar
clarity-version: 2
epoch: "2.4"
- id: 3
transactions:
- emulated-contract-publish:
contract-name: fastpool-member5
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
@@ -393,16 +401,6 @@ plan:
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/strategies/public-pools/fastpool-member.clar
clarity-version: 2
- emulated-contract-publish:
contract-name: rebase-strategy-trait
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/deployed/rebase-strategy-trait.clar
clarity-version: 2
- emulated-contract-publish:
contract-name: lqstx-mint-endpoint
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/deployed/lqstx-mint-endpoint.clar
clarity-version: 2
- emulated-contract-publish:
contract-name: lip001
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
@@ -453,6 +451,11 @@ plan:
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/deployed/rebase-1.clar
clarity-version: 2
- emulated-contract-publish:
contract-name: rebase-strategy-trait
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/deployed/rebase-strategy-trait.clar
clarity-version: 2
- emulated-contract-publish:
contract-name: rebase-strategy-trait-v1-01
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
@@ -494,7 +497,7 @@ plan:
path: contracts/extensions/token-vesting.clar
clarity-version: 2
epoch: "2.4"
- id: 4
- id: 5
transactions:
- emulated-contract-publish:
contract-name: token-wlqstx