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

Merge pull request #37 from lisalab-io/chore/lip001-helper

Browse Source 
chore: endpoint-whitelist-helper added; lip001 updated
This commit is contained in:
fiftyeightandeight
2024-03-27 15:34:04 +08:00
committed by GitHub
parent b3424d80a0 bf1e14438f
commit 4cdffca615
5 changed files with 167 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Clarinet.toml
View File

@@ -305,6 +305,10 @@ path = "contracts_modules/alex_v1/traits/trait-sip-010.clar"
path = "contracts/proposals/lip001.clar"
epoch = 2.4
[contracts.endpoint-whitelist-helper-v1-02]
path = "contracts/aux/endpoint-whitelist-helper.clar"
epoch = 2.4
# [repl.analysis]
# passes = ["check_checker"]
# check_checker = { trusted_sender = false, trusted_caller = false, callee_filter = false }

201
README.md
View File

@@ -30,106 +30,107 @@ 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) | |
| lqstx-mint-registry | err-unauthorised | (err u1000) | |
| lqstx-vault | err-unauthorised | (err u1000) | |
| operators | err-unauthorised | (err u1000) | |
| token-vesting | err-unauthorised | (err u1000) | |
| token-wlqstx | err-not-authorized | (err u1000) | |
| treasury | err-unauthorised | (err u1000) | |
| lisa-dao | err-already-executed | (err u1001) | |
| lqstx-mint-endpoint | err-paused | (err u1001) | |
| lqstx-mint-endpoint-v1-01 | err-paused | (err u1001) | |
| operators | err-not-operator | (err u1001) | |
| lisa-dao | err-invalid-extension | (err u1002) | |
| operators | err-already-signalled | (err u1002) | |
| operators | err-proposal-expired | (err u1003) | |
| operators | err-unknown-proposal | (err u1004) | |
| operators | err-reused-proposal | (err u1005) | |
| lqstx-mint-endpoint | err-request-pending | (err u1006) | |
| lqstx-mint-endpoint-v1-01 | err-request-pending | (err u1006) | |
| lqstx-mint-endpoint | err-request-finalized-or-revoked | (err u1007) | |
| lqstx-mint-endpoint-v1-01 | err-request-finalized-or-revoked | (err u1007) | |
| lqstx-mint-endpoint | err-not-whitelisted | (err u1008) | |
| lqstx-mint-endpoint-v1-01 | err-not-whitelisted | (err u1008) | |
| lqstx-mint-registry | err-unknown-request-id | (err u1008) | |
| public-pools-strategy | err-not-vault-caller | (err u2000) | |
| public-pools-strategy | err-invalid-payload | (err u2001) | |
| li-stx-burn-nft | err-unauthorised | (err u3000) | |
| li-stx-mint-nft | err-unauthorised | (err u3000) | |
| lisa-rebase | err-unauthorised | (err u3000) | |
| lqstx-mint-endpoint-v1-02 | err-unauthorised | (err u3000) | |
| public-pools-strategy-manager | err-unauthorised | (err u3000) | |
| token-lisa | err-unauthorised | (err u3000) | |
| token-lqstx | err-unauthorised | (err u3000) | |
| token-vlqstx | err-unauthorised | (err u3000) | |
| token-wlqstx | err-transfer-failed | (err u3000) | |
| token-lqstx | err-invalid-amount | (err u3001) | |
| token-lisa | err-not-token-owner | (err u4) | |
| lisa-transfer-proxy | err-invalid-payload | (err u4000) | |
| lqstx-transfer-proxy | err-invalid-payload | (err u4000) | |
| stx-transfer-many-proxy | err-invalid-payload | (err u4000) | |
| stx-transfer-proxy | err-invalid-payload | (err u4000) | |
| pox-fast-pool-v2 | err-unauthorized | (err u401) | |
| pox-fast-pool-v2 | err-forbidden | (err u403) | |
| pox-pools-1-cycle-v2 | err-not-found | (err u404) | |
| 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-member10 | err-unauthorised | (err u5000) | |
| fastpool-member2 | err-unauthorised | (err u5000) | |
| fastpool-member3 | err-unauthorised | (err u5000) | |
| fastpool-member4 | err-unauthorised | (err u5000) | |
| fastpool-member5 | err-unauthorised | (err u5000) | |
| fastpool-member6 | err-unauthorised | (err u5000) | |
| fastpool-member7 | err-unauthorised | (err u5000) | |
| fastpool-member8 | err-unauthorised | (err u5000) | |
| fastpool-member9 | err-unauthorised | (err u5000) | |
| xverse-member1 | err-unauthorised | (err u5000) | |
| xverse-member10 | err-unauthorised | (err u5000) | |
| xverse-member2 | err-unauthorised | (err u5000) | |
| xverse-member3 | err-unauthorised | (err u5000) | |
| xverse-member4 | err-unauthorised | (err u5000) | |
| xverse-member5 | err-unauthorised | (err u5000) | |
| xverse-member6 | err-unauthorised | (err u5000) | |
| xverse-member7 | err-unauthorised | (err u5000) | |
| xverse-member8 | 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) | |
| pox-fast-pool-v2 | err-decrease-forbidden | (err u503) | |
| pox-pools-1-cycle-v2 | err-decrease-forbidden | (err u503) | |
| pox-fast-pool-v2 | err-pox-address-deactivated | (err u504) | |
| token-wlqstx | err-mint-failed | (err u6002) | |
| token-wlqstx | err-burn-failed | (err u6003) | |
| token-wlqstx | err-not-supported | (err u6004) | |
| pox-fast-pool-v2 | err-already-stacking | (err u603) | |
| pox-pools-1-cycle-v2 | err-already-stacking | (err u603) | |
| pox-fast-pool-v2 | err-stacking-permission-denied | (err u609) | |
| pox-pools-1-cycle-v2 | err-stacking-permission-denied | (err u609) | |
| lqstx-mint-endpoint-v1-02 | err-paused | (err u7001) | |
| lqstx-mint-endpoint-v1-02 | err-request-pending | (err u7006) | |
| lqstx-mint-endpoint-v1-02 | err-request-finalized-or-revoked | (err u7007) | |
| lqstx-mint-endpoint-v1-02 | err-not-whitelisted | (err u7008) | |
| li-stx-mint-nft | err-not-authorized | (err u8000) | |
| li-stx-mint-nft | err-listing | (err u8001) | |
| li-stx-mint-nft | err-wrong-commission | (err u8002) | |
| li-stx-mint-nft | err-not-found | (err u8003) | |
| li-stx-mint-nft | err-metadata-frozen | (err u8004) | |
| li-stx-burn-nft | err-not-authorized | (err u8100) | |
| li-stx-burn-nft | err-listing | (err u8101) | |
| li-stx-burn-nft | err-wrong-commission | (err u8102) | |
| li-stx-burn-nft | err-not-found | (err u8103) | |
| li-stx-burn-nft | err-metadata-frozen | (err u8104) | |
| token-vesting | err-caller-not-recipient | (err u9000) | |
| token-vesting | err-unknown-vesting-id | (err u9001) | |
| token-vesting | err-event-not-vested | (err u9002) | |
| token-vesting | err-event-already-claimed | (err u9003) | |
| token-vesting | err-recipient-exists | (err u9004) | |
| 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) | |
| lqstx-mint-registry | err-unauthorised | (err u1000) | |
| lqstx-vault | err-unauthorised | (err u1000) | |
| operators | err-unauthorised | (err u1000) | |
| token-vesting | err-unauthorised | (err u1000) | |
| token-wlqstx | err-not-authorized | (err u1000) | |
| treasury | err-unauthorised | (err u1000) | |
| lisa-dao | err-already-executed | (err u1001) | |
| lqstx-mint-endpoint | err-paused | (err u1001) | |
| lqstx-mint-endpoint-v1-01 | err-paused | (err u1001) | |
| operators | err-not-operator | (err u1001) | |
| lisa-dao | err-invalid-extension | (err u1002) | |
| operators | err-already-signalled | (err u1002) | |
| operators | err-proposal-expired | (err u1003) | |
| operators | err-unknown-proposal | (err u1004) | |
| operators | err-reused-proposal | (err u1005) | |
| lqstx-mint-endpoint | err-request-pending | (err u1006) | |
| lqstx-mint-endpoint-v1-01 | err-request-pending | (err u1006) | |
| lqstx-mint-endpoint | err-request-finalized-or-revoked | (err u1007) | |
| lqstx-mint-endpoint-v1-01 | err-request-finalized-or-revoked | (err u1007) | |
| lqstx-mint-endpoint | err-not-whitelisted | (err u1008) | |
| lqstx-mint-endpoint-v1-01 | err-not-whitelisted | (err u1008) | |
| lqstx-mint-registry | err-unknown-request-id | (err u1008) | |
| public-pools-strategy | err-not-vault-caller | (err u2000) | |
| public-pools-strategy | err-invalid-payload | (err u2001) | |
| endpoint-whitelist-helper-v1-02 | err-unauthorised | (err u3000) | |
| li-stx-burn-nft | err-unauthorised | (err u3000) | |
| li-stx-mint-nft | err-unauthorised | (err u3000) | |
| lisa-rebase | err-unauthorised | (err u3000) | |
| lqstx-mint-endpoint-v1-02 | err-unauthorised | (err u3000) | |
| public-pools-strategy-manager | err-unauthorised | (err u3000) | |
| token-lisa | err-unauthorised | (err u3000) | |
| token-lqstx | err-unauthorised | (err u3000) | |
| token-vlqstx | err-unauthorised | (err u3000) | |
| token-wlqstx | err-transfer-failed | (err u3000) | |
| token-lqstx | err-invalid-amount | (err u3001) | |
| token-lisa | err-not-token-owner | (err u4) | |
| lisa-transfer-proxy | err-invalid-payload | (err u4000) | |
| lqstx-transfer-proxy | err-invalid-payload | (err u4000) | |
| stx-transfer-many-proxy | err-invalid-payload | (err u4000) | |
| stx-transfer-proxy | err-invalid-payload | (err u4000) | |
| pox-fast-pool-v2 | err-unauthorized | (err u401) | |
| pox-fast-pool-v2 | err-forbidden | (err u403) | |
| pox-pools-1-cycle-v2 | err-not-found | (err u404) | |
| 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-member10 | err-unauthorised | (err u5000) | |
| fastpool-member2 | err-unauthorised | (err u5000) | |
| fastpool-member3 | err-unauthorised | (err u5000) | |
| fastpool-member4 | err-unauthorised | (err u5000) | |
| fastpool-member5 | err-unauthorised | (err u5000) | |
| fastpool-member6 | err-unauthorised | (err u5000) | |
| fastpool-member7 | err-unauthorised | (err u5000) | |
| fastpool-member8 | err-unauthorised | (err u5000) | |
| fastpool-member9 | err-unauthorised | (err u5000) | |
| xverse-member1 | err-unauthorised | (err u5000) | |
| xverse-member10 | err-unauthorised | (err u5000) | |
| xverse-member2 | err-unauthorised | (err u5000) | |
| xverse-member3 | err-unauthorised | (err u5000) | |
| xverse-member4 | err-unauthorised | (err u5000) | |
| xverse-member5 | err-unauthorised | (err u5000) | |
| xverse-member6 | err-unauthorised | (err u5000) | |
| xverse-member7 | err-unauthorised | (err u5000) | |
| xverse-member8 | 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) | |
| pox-fast-pool-v2 | err-decrease-forbidden | (err u503) | |
| pox-pools-1-cycle-v2 | err-decrease-forbidden | (err u503) | |
| pox-fast-pool-v2 | err-pox-address-deactivated | (err u504) | |
| token-wlqstx | err-mint-failed | (err u6002) | |
| token-wlqstx | err-burn-failed | (err u6003) | |
| token-wlqstx | err-not-supported | (err u6004) | |
| pox-fast-pool-v2 | err-already-stacking | (err u603) | |
| pox-pools-1-cycle-v2 | err-already-stacking | (err u603) | |
| pox-fast-pool-v2 | err-stacking-permission-denied | (err u609) | |
| pox-pools-1-cycle-v2 | err-stacking-permission-denied | (err u609) | |
| lqstx-mint-endpoint-v1-02 | err-paused | (err u7001) | |
| lqstx-mint-endpoint-v1-02 | err-request-pending | (err u7006) | |
| lqstx-mint-endpoint-v1-02 | err-request-finalized-or-revoked | (err u7007) | |
| lqstx-mint-endpoint-v1-02 | err-not-whitelisted | (err u7008) | |
| li-stx-mint-nft | err-not-authorized | (err u8000) | |
| li-stx-mint-nft | err-listing | (err u8001) | |
| li-stx-mint-nft | err-wrong-commission | (err u8002) | |
| li-stx-mint-nft | err-not-found | (err u8003) | |
| li-stx-mint-nft | err-metadata-frozen | (err u8004) | |
| li-stx-burn-nft | err-not-authorized | (err u8100) | |
| li-stx-burn-nft | err-listing | (err u8101) | |
| li-stx-burn-nft | err-wrong-commission | (err u8102) | |
| li-stx-burn-nft | err-not-found | (err u8103) | |
| li-stx-burn-nft | err-metadata-frozen | (err u8104) | |
| token-vesting | err-caller-not-recipient | (err u9000) | |
| token-vesting | err-unknown-vesting-id | (err u9001) | |
| 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

32
contracts/aux/endpoint-whitelist-helper.clar Normal file
View File

@@ -0,0 +1,32 @@
(define-constant err-unauthorised (err u3000))
(define-map authorised-operators principal bool)
(map-set authorised-operators tx-sender true)
(define-read-only (is-dao-or-extension)
(ok (asserts! (or (is-eq tx-sender .lisa-dao) (contract-call? .lisa-dao is-extension contract-caller)) err-unauthorised))
)
(define-read-only (is-authorised-operator (who principal))
(default-to false (map-get? authorised-operators who))
)
;; governance calls
(define-public (set-authorised-operator (who principal) (enabled bool))
(begin
(try! (is-dao-or-extension))
(ok (map-set authorised-operators who enabled))
)
)
;; priviliged calls
(define-public (set-use-whitelist (enabled bool))
(begin
(asserts! (is-authorised-operator tx-sender) err-unauthorised)
(contract-call? .lqstx-mint-endpoint-v1-02 set-use-whitelist enabled)))
(define-public (set-whitelisted-many (addresses (list 1000 principal)) (enabled (list 1000 bool)))
(begin
(asserts! (is-authorised-operator tx-sender) err-unauthorised)
(contract-call? .lqstx-mint-endpoint-v1-02 set-whitelisted-many addresses enabled)))

14
contracts/proposals/lip001.clar
View File

@@ -6,12 +6,12 @@
(define-public (execute (sender principal))
(begin
(try! (contract-call? .lisa-dao set-extensions (list
{ extension: .lqstx-mint-endpoint, enabled: false }
{ extension: .lqstx-mint-endpoint-v1-01, enabled: false }
{ extension: .lqstx-mint-endpoint-v1-02, enabled: true }
{ extension: .lisa-rebase, enabled: false }
{ extension: .rebase-1, enabled: false }
{ extension: .lisa-rebase-v1-02, enabled: true }
{ extension: .rebase-1-v1-02, enabled: true }
{ extension: .endpoint-whitelist-helper-v1-02, enabled: true }
)))
(try! (contract-call? .token-lqstx dao-set-name "LiSTX"))
@@ -39,7 +39,17 @@
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? .lqstx-mint-endpoint-v1-02 set-paused false))
(try! (contract-call? .endpoint-whitelist-helper-v1-02 set-authorised-operator 'SP3BQ65DRM8DMTYDD5HWMN60EYC0JFS5NC2V5CWW7 true))
(try! (contract-call? .endpoint-whitelist-helper-v1-02 set-authorised-operator 'SP2VZBR9GCVM33BN0WXA05VJP6QV7CJ3Z3SQKJ5HH true))
(try! (contract-call? .endpoint-whitelist-helper-v1-02 set-authorised-operator 'SP12BFYTH3NJ6N63KE0S50GHSYV0M91NGQND2B704 true))
(try! (contract-call? .endpoint-whitelist-helper-v1-02 set-authorised-operator 'SPGAB1P3YV109E22KXFJYM63GK0G21BYX50CQ80B true))
(try! (contract-call? .endpoint-whitelist-helper-v1-02 set-authorised-operator 'SPFJVM9Y1A4KJ31T8ZBDESZH36YGPDAZ9WXEFC53 true))
(try! (contract-call? .endpoint-whitelist-helper-v1-02 set-authorised-operator 'SPHFAXDZVFHMY8YR3P9J7ZCV6N89SBET203ZAY25 true))
(ok true)
)
)

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

@@ -328,6 +328,21 @@ plan:
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/extensions/lqstx-mint-endpoint.clar
clarity-version: 2
- emulated-contract-publish:
contract-name: endpoint-whitelist-helper-v1-02
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/aux/endpoint-whitelist-helper.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
@@ -343,16 +358,6 @@ plan:
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/proxies/lisa-transfer-proxy.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: lqstx-transfer-proxy
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
@@ -363,14 +368,14 @@ plan:
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/mocks/mock-proposal.clar
clarity-version: 2
epoch: "2.4"
- id: 4
transactions:
- emulated-contract-publish:
contract-name: mock-strategy
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
path: contracts/mocks/mock-strategy.clar
clarity-version: 2
epoch: "2.4"
- id: 4
transactions:
- emulated-contract-publish:
contract-name: mock-strategy-manager
emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM