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.

Sign up for GitHub

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

fix: use deployed contracts in token-vesting #42

Merged
merged 2 commits into from
May 2, 2024
Merged

fix: use deployed contracts in token-vesting #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e55c64
fix: use deployed contracts in token-vesting
friedger Mar 27, 2024
8c28de7
Merge branch 'main' into fix/vesting
fiftyeightandeight Apr 30, 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
10 changes: 7 additions & 3 deletions Clarinet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ contract_id = "SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.lqstx-mint-endpoint-v1-
[[project.requirements]]
contract_id = "SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.proposal-trait"

[[project.requirements]]
contract_id = "SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.token-lisa"


# [contracts.lisa-dao]
# path = "contracts/lisa-dao.clar"
# epoch = 2.4
Expand Down Expand Up @@ -254,9 +258,9 @@ epoch = 2.4
# path = "contracts/token-vlqstx.clar"
# epoch = 2.4

[contracts.token-lisa]
path = "contracts/token-lisa.clar"
epoch = 2.4
# [contracts.token-lisa]
# path = "contracts/token-lisa.clar"
# epoch = 2.4

[contracts.lisa-rebase]
path = "contracts/deployed/lisa-rebase.clar"
Expand Down
31 changes: 0 additions & 31 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ are in the form `(err uint)` and they are unique across all contracts.
| 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) | |
Expand All @@ -66,72 +64,43 @@ are in the form `(err uint)` and they are unique across all contracts.
| 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-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) | |
| 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) | |
Expand Down
2 changes: 1 addition & 1 deletion contracts/boot.clar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
(try! (contract-call? .public-pools-strategy-manager set-authorised-manager 'SP2G5X5HCJW31Q3Z71XGPV5S8FNBZMWW7PK45ZWG8 true))

;; Mint max LISA token supply (1bn)
(try! (contract-call? .token-lisa dao-mint-many (list
(try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.token-lisa dao-mint-many (list
{ recipient: .treasury, amount: u1000000000000000 }
)))

Expand Down
4 changes: 2 additions & 2 deletions contracts/extensions/token-vesting.clar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

;; SPDX-License-Identifier: BUSL-1.1

(use-trait proxy-trait .proxy-trait.proxy-trait)
(use-trait proxy-trait 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.proxy-trait.proxy-trait)

(define-constant err-unauthorised (err u1000))
(define-constant err-caller-not-recipient (err u9000))
Expand Down Expand Up @@ -72,7 +72,7 @@
)

(define-private (transfer-out (amount uint) (recipient principal))
(as-contract (contract-call? .token-lisa transfer amount tx-sender recipient none))
(as-contract (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.token-lisa transfer amount tx-sender recipient none))
)

(define-private (get-or-create-recipient-id (recipient principal))
Expand Down
2 changes: 1 addition & 1 deletion contracts/proxies/lisa-transfer-proxy.clar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@

(define-public (proxy-call (payload (buff 2048)))
(let ((decoded (unwrap! (from-consensus-buff? { amount: uint, recipient: principal, memo: (optional (buff 2048)) } payload) err-invalid-payload)))
(contract-call? .token-lisa transfer (get amount decoded) tx-sender (get recipient decoded) (get memo decoded))
(contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.token-lisa transfer (get amount decoded) tx-sender (get recipient decoded) (get memo decoded))
)
)
2 changes: 1 addition & 1 deletion contracts/simnet-boot.clar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
(try! (contract-call? .operators set-proposal-threshold 2))

;; Mint max LISA token supply (1bn)
(try! (contract-call? .token-lisa dao-mint-many (list
(try! (contract-call? 'SM26NBC8SFHNW4P1Y4DFH27974P56WN86C92HPEHH.token-lisa dao-mint-many (list
{ recipient: .treasury, amount: u1000000000000000 }
)))

Expand Down
Loading
Loading