From 28a162485d9a211cf3a02687b96eb580dd6ae201 Mon Sep 17 00:00:00 2001 From: friedger Date: Sat, 16 Mar 2024 17:15:16 +0100 Subject: [PATCH 1/3] chore: remove sip-10-trait --- Clarinet.toml | 4 --- contracts/aux/lqstx-mint-registry.clar | 2 +- contracts/deployed/lqstx-mint-endpoint.clar | 2 +- contracts/extensions/lqstx-mint-endpoint.clar | 2 +- contracts/mocks/token-wlqstx.clar | 2 +- contracts/token-lisa.clar | 2 +- contracts/traits/sip-010-trait.clar | 27 ------------------- deployments/default.simnet-plan.yaml | 17 +++++------- 8 files changed, 11 insertions(+), 47 deletions(-) delete mode 100644 contracts/traits/sip-010-trait.clar diff --git a/Clarinet.toml b/Clarinet.toml index dd4d4ad..64b4b32 100644 --- a/Clarinet.toml +++ b/Clarinet.toml @@ -151,10 +151,6 @@ epoch = 2.4 path = "contracts/strategies/public-pools/xverse-member.clar" epoch = 2.4 -[contracts.sip-010-trait] -path = "contracts/traits/sip-010-trait.clar" -epoch = 2.4 - [contracts.rebase-strategy-trait] path = "contracts/deployed/rebase-strategy-trait.clar" epoch = 2.4 diff --git a/contracts/aux/lqstx-mint-registry.clar b/contracts/aux/lqstx-mint-registry.clar index 8b076f1..ae4b603 100644 --- a/contracts/aux/lqstx-mint-registry.clar +++ b/contracts/aux/lqstx-mint-registry.clar @@ -5,7 +5,7 @@ ;; lqstx-mint-registry ;; -(use-trait sip-010-trait .sip-010-trait.sip-010-trait) +(use-trait sip-010-trait 'SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE.sip-010-trait-ft-standard.sip-010-trait) (define-constant err-unauthorised (err u1000)) (define-constant err-unknown-request-id (err u1008)) diff --git a/contracts/deployed/lqstx-mint-endpoint.clar b/contracts/deployed/lqstx-mint-endpoint.clar index 16f79b1..f8356e1 100644 --- a/contracts/deployed/lqstx-mint-endpoint.clar +++ b/contracts/deployed/lqstx-mint-endpoint.clar @@ -4,7 +4,7 @@ ;; ;; lqstx-mint-endpoint ;; -(use-trait sip-010-trait .sip-010-trait.sip-010-trait) +(use-trait sip-010-trait 'SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE.sip-010-trait-ft-standard.sip-010-trait) (use-trait rebase-strategy-trait .rebase-strategy-trait.rebase-strategy-trait) (define-constant err-unauthorised (err u1000)) diff --git a/contracts/extensions/lqstx-mint-endpoint.clar b/contracts/extensions/lqstx-mint-endpoint.clar index ab3bbe8..ea295bf 100644 --- a/contracts/extensions/lqstx-mint-endpoint.clar +++ b/contracts/extensions/lqstx-mint-endpoint.clar @@ -4,7 +4,7 @@ ;; ;; lqstx-mint-endpoint-v1-01 ;; -(use-trait sip-010-trait .sip-010-trait.sip-010-trait) +(use-trait sip-010-trait 'SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE.sip-010-trait-ft-standard.sip-010-trait) (define-constant err-unauthorised (err u1000)) (define-constant err-paused (err u1001)) diff --git a/contracts/mocks/token-wlqstx.clar b/contracts/mocks/token-wlqstx.clar index 1497b3a..c157d36 100644 --- a/contracts/mocks/token-wlqstx.clar +++ b/contracts/mocks/token-wlqstx.clar @@ -1,7 +1,7 @@ ;; SPDX-License-Identifier: BUSL-1.1 -(impl-trait .trait-sip-010.sip-010-trait) +(impl-trait 'SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE.sip-010-trait-ft-standard.sip-010-trait) (define-fungible-token wlqstx) diff --git a/contracts/token-lisa.clar b/contracts/token-lisa.clar index 37885d5..9dd4931 100644 --- a/contracts/token-lisa.clar +++ b/contracts/token-lisa.clar @@ -1,7 +1,7 @@ ;; SPDX-License-Identifier: BUSL-1.1 -(impl-trait .sip-010-trait.sip-010-trait) +(impl-trait 'SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE.sip-010-trait-ft-standard.sip-010-trait) (define-constant err-unauthorised (err u3000)) (define-constant err-not-token-owner (err u4)) diff --git a/contracts/traits/sip-010-trait.clar b/contracts/traits/sip-010-trait.clar deleted file mode 100644 index e5db26f..0000000 --- a/contracts/traits/sip-010-trait.clar +++ /dev/null @@ -1,27 +0,0 @@ - -;; SPDX-License-Identifier: BUSL-1.1 - -(define-trait sip-010-trait - ( - ;; Transfer from the caller to a new principal - (transfer (uint principal principal (optional (buff 2048))) (response bool uint)) - - ;; the human readable name of the token - (get-name () (response (string-ascii 32) uint)) - - ;; the ticker symbol, or empty if none - (get-symbol () (response (string-ascii 32) uint)) - - ;; the number of decimals used, e.g. 6 would mean 1_000_000 represents 1 token - (get-decimals () (response uint uint)) - - ;; the balance of the passed principal - (get-balance (principal) (response uint uint)) - - ;; the current total supply (which does not need to be a constant) - (get-total-supply () (response uint uint)) - - ;; an optional URI that represents metadata of this token - (get-token-uri () (response (optional (string-utf8 256)) uint)) - ) -) \ No newline at end of file diff --git a/deployments/default.simnet-plan.yaml b/deployments/default.simnet-plan.yaml index 1266e18..8e09895 100644 --- a/deployments/default.simnet-plan.yaml +++ b/deployments/default.simnet-plan.yaml @@ -127,11 +127,6 @@ plan: emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM path: contracts/lisa-dao.clar clarity-version: 2 - - emulated-contract-publish: - contract-name: sip-010-trait - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/traits/sip-010-trait.clar - clarity-version: 2 - emulated-contract-publish: contract-name: lqstx-mint-registry emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM @@ -227,14 +222,14 @@ plan: emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM path: contracts/strategies/public-pools/fastpool-member.clar clarity-version: 2 - epoch: "2.4" - - id: 2 - transactions: - emulated-contract-publish: contract-name: xverse-member1 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM path: contracts/strategies/public-pools/xverse-member.clar clarity-version: 2 + epoch: "2.4" + - id: 2 + transactions: - emulated-contract-publish: contract-name: xverse-member10 emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM @@ -355,14 +350,14 @@ plan: emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM path: contracts/traits/rebase-strategy-trait.clar clarity-version: 2 - epoch: "2.4" - - id: 3 - transactions: - emulated-contract-publish: contract-name: regtest-boot emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM path: contracts/regtest-boot.clar clarity-version: 2 + epoch: "2.4" + - id: 3 + transactions: - emulated-contract-publish: contract-name: simnet-boot emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM From 4af7eb70939dfe34f7a32a367094d9d947bea73e Mon Sep 17 00:00:00 2001 From: friedger Date: Sat, 16 Mar 2024 17:22:13 +0100 Subject: [PATCH 2/3] chore: lower case error constants --- contracts/mocks/token-wlqstx.clar | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contracts/mocks/token-wlqstx.clar b/contracts/mocks/token-wlqstx.clar index c157d36..b8abe7e 100644 --- a/contracts/mocks/token-wlqstx.clar +++ b/contracts/mocks/token-wlqstx.clar @@ -14,8 +14,8 @@ (define-data-var contract-owner principal tx-sender) ;; errors -(define-constant ERR-NOT-AUTHORIZED (err u1000)) -(define-constant ERR-MINT-FAILED (err u6002)) +(define-constant err-not-authorized (err u1000)) +(define-constant err-mint-failed (err u6002)) (define-constant ERR-BURN-FAILED (err u6003)) (define-constant ERR-TRANSFER-FAILED (err u3000)) (define-constant ERR-NOT-SUPPORTED (err u6004)) @@ -32,7 +32,7 @@ ) (define-private (check-is-owner) - (ok (asserts! (is-eq tx-sender (var-get contract-owner)) ERR-NOT-AUTHORIZED)) + (ok (asserts! (is-eq tx-sender (var-get contract-owner)) err-not-authorized)) ) (define-public (set-name (new-name (string-ascii 32))) @@ -118,7 +118,7 @@ ;; @returns (response bool uint)/ error (define-public (transfer (amount uint) (sender principal) (recipient principal) (memo (optional (buff 2048)))) (begin - (asserts! (or (is-eq tx-sender sender) (is-eq contract-caller sender)) ERR-NOT-AUTHORIZED) + (asserts! (or (is-eq tx-sender sender) (is-eq contract-caller sender)) err-not-authorized) (contract-call? .token-lqstx transfer (/ (* amount (pow u10 (unwrap-panic (get-base-decimals)))) (pow-decimals)) sender recipient memo) ) ) @@ -172,7 +172,7 @@ ) (define-public (mint (amount uint) (recipient principal)) - ERR-MINT-FAILED + err-mint-failed ) (define-public (burn (amount uint) (sender principal)) From 1a6074839e712474e6e0fbd70d7bdb516d6cf432 Mon Sep 17 00:00:00 2001 From: friedger Date: Sat, 16 Mar 2024 17:22:41 +0100 Subject: [PATCH 3/3] chore: lower case error constants --- contracts/mocks/token-wlqstx.clar | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contracts/mocks/token-wlqstx.clar b/contracts/mocks/token-wlqstx.clar index b8abe7e..407b634 100644 --- a/contracts/mocks/token-wlqstx.clar +++ b/contracts/mocks/token-wlqstx.clar @@ -16,9 +16,9 @@ ;; errors (define-constant err-not-authorized (err u1000)) (define-constant err-mint-failed (err u6002)) -(define-constant ERR-BURN-FAILED (err u6003)) -(define-constant ERR-TRANSFER-FAILED (err u3000)) -(define-constant ERR-NOT-SUPPORTED (err u6004)) +(define-constant err-burn-failed (err u6003)) +(define-constant err-transfer-failed (err u3000)) +(define-constant err-not-supported (err u6004)) (define-read-only (get-contract-owner) (ok (var-get contract-owner)) @@ -71,7 +71,7 @@ ;; @returns (response uint) (define-read-only (get-total-supply) ;; least authority Issue D - ERR-NOT-SUPPORTED + err-not-supported ) ;; @desc get-name @@ -150,7 +150,7 @@ ;; @returns (response uint) (define-read-only (get-total-supply-fixed) ;; least authority Issue D - ERR-NOT-SUPPORTED + err-not-supported ) ;; @desc get-balance-fixed @@ -176,7 +176,7 @@ ) (define-public (burn (amount uint) (sender principal)) - ERR-BURN-FAILED + err-burn-failed ) (define-public (mint-fixed (amount uint) (recipient principal)) @@ -204,7 +204,7 @@ ) (define-private (transfer-from-tuple (recipient { to: principal, amount: uint })) - (ok (unwrap! (transfer-fixed (get amount recipient) tx-sender (get to recipient) none) ERR-TRANSFER-FAILED)) + (ok (unwrap! (transfer-fixed (get amount recipient) tx-sender (get to recipient) none) err-transfer-failed)) ) (define-public (send-many (recipients (list 200 { to: principal, amount: uint})))