diff --git a/.gitignore b/.gitignore index cd665fd..443ab3a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ .cache/** history.txt node_modules -lcov.info \ No newline at end of file +lcov.info +.aider* +.env diff --git a/Clarinet.toml b/Clarinet.toml index 6f76cf8..88626b3 100644 --- a/Clarinet.toml +++ b/Clarinet.toml @@ -6,10 +6,13 @@ telemetry = true cache_dir = './.cache' [[project.requirements]] -contract_id = 'ST1NXBK3K5YYMD6FD41MVNP3JS1GABZ8TRVX023PT.nft-trait.nft-trait' +contract_id = 'SP2PABAF9FTAJYNFZH93XENAJ8FVY99RRM50D2JG9.nft-trait' [[project.requirements]] -contract_id = 'ST1NXBK3K5YYMD6FD41MVNP3JS1GABZ8TRVX023PT.sip-010-trait-ft-standard' +contract_id = 'SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE.sip-010-trait-ft-standard' + +[[project.requirements]] +contract_id = 'ST000000000000000000002AMW42H.pox-4' [contracts.aibtc001-bootstrap] path = 'contracts/dao/proposals/aibtc001-bootstrap.clar' diff --git a/contracts/dao/extensions/aibtcdev-treasury.clar b/contracts/dao/extensions/aibtcdev-treasury.clar index 5b9d576..f71c95d 100644 --- a/contracts/dao/extensions/aibtcdev-treasury.clar +++ b/contracts/dao/extensions/aibtcdev-treasury.clar @@ -6,10 +6,8 @@ ;; (impl-trait .aibtcdev-extension-trait.extension-trait) -;; MAINNET: 'SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE.sip-010-trait-ft-standard.sip-010-trait -(use-trait ft-trait 'ST1NXBK3K5YYMD6FD41MVNP3JS1GABZ8TRVX023PT.sip-010-trait-ft-standard.sip-010-trait) -;; MAINNET: 'SP2PABAF9FTAJYNFZH93XENAJ8FVY99RRM50D2JG9.nft-trait.nft-trait -(use-trait nft-trait 'ST1NXBK3K5YYMD6FD41MVNP3JS1GABZ8TRVX023PT.nft-trait.nft-trait) +(use-trait ft-trait 'SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE.sip-010-trait-ft-standard.sip-010-trait) +(use-trait nft-trait 'SP2PABAF9FTAJYNFZH93XENAJ8FVY99RRM50D2JG9.nft-trait.nft-trait) ;; constants ;; @@ -18,11 +16,6 @@ (define-constant ERR_UNKNOWN_ASSSET (err u2001)) (define-constant TREASURY (as-contract tx-sender)) -;; data vars -;; -(define-data-var poxContract principal 'SP000000000000000000002Q6VF78.pox-4) - - ;; data maps ;; @@ -83,7 +76,7 @@ ;; deposit FT to the treasury (define-public (deposit-ft (ft ) (amount uint)) (begin - (asserts! (is-allowed (contract-of ft)) ERR_UNKNOWN_ASSSET) + (asserts! (is-allowed-asset (contract-of ft)) ERR_UNKNOWN_ASSSET) (print { notification: "deposit-ft", payload: { @@ -101,7 +94,7 @@ ;; deposit NFT to the treasury (define-public (deposit-nft (nft ) (id uint)) (begin - (asserts! (is-allowed (contract-of nft)) ERR_UNKNOWN_ASSSET) + (asserts! (is-allowed-asset (contract-of nft)) ERR_UNKNOWN_ASSSET) (print { notification: "deposit-nft", payload: { @@ -137,7 +130,7 @@ (define-public (withdraw-ft (ft ) (amount uint) (recipient principal)) (begin (try! (is-dao-or-extension)) - (asserts! (is-allowed (contract-of ft)) ERR_UNKNOWN_ASSSET) + (asserts! (is-allowed-asset (contract-of ft)) ERR_UNKNOWN_ASSSET) (print { notification: "withdraw-ft", payload: { @@ -155,7 +148,7 @@ (define-public (withdraw-nft (nft ) (id uint) (recipient principal)) (begin (try! (is-dao-or-extension)) - (asserts! (is-allowed (contract-of nft)) ERR_UNKNOWN_ASSSET) + (asserts! (is-allowed-asset (contract-of nft)) ERR_UNKNOWN_ASSSET) (print { notification: "withdraw-nft", payload: { @@ -183,7 +176,7 @@ sender: tx-sender } }) - (match (as-contract (contract-call? (var-get poxContract) delegate-stx maxAmount to none none)) + (match (as-contract (contract-call? 'SP000000000000000000002Q6VF78.pox-4 delegate-stx maxAmount to none none)) success (ok success) err (err (to-uint err)) ) @@ -201,7 +194,7 @@ sender: tx-sender } }) - (match (as-contract (contract-call? (var-get poxContract) revoke-delegate-stx)) + (match (as-contract (contract-call? 'SP000000000000000000002Q6VF78.pox-4 revoke-delegate-stx)) success (begin (print success) (ok true)) err (err (to-uint err)) ) diff --git a/deployments/default.simnet-plan.yaml b/deployments/default.simnet-plan.yaml deleted file mode 100644 index 18d9ccd..0000000 --- a/deployments/default.simnet-plan.yaml +++ /dev/null @@ -1,130 +0,0 @@ ---- -id: 0 -name: "Simulated deployment, used as a default for `clarinet console`, `clarinet test` and `clarinet check`" -network: simnet -genesis: - wallets: - - name: deployer - address: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - balance: "100000000000000" - - name: faucet - address: STNHKEPYEPJ8ET55ZZ0M5A34J0R3N5FM2CMMMAZ6 - balance: "100000000000000" - - name: wallet_1 - address: ST1SJ3DTE5DN7X54YDH5D64R3BCB6A2AG2ZQ8YPD5 - balance: "100000000000000" - - name: wallet_2 - address: ST2CY5V39NHDPWSXMW9QDT3HC3GD6Q6XX4CFRK9AG - balance: "100000000000000" - - name: wallet_3 - address: ST2JHG361ZXG51QTKY2NQCVBPPRRE2KZB1HR05NNC - balance: "100000000000000" - - name: wallet_4 - address: ST2NEB84ASENDXKYGJPQW86YXQCEFEX2ZQPG87ND - balance: "100000000000000" - - name: wallet_5 - address: ST2REHHS5J3CERCRBEPMGH7921Q6PYKAADT7JP2VB - balance: "100000000000000" - - name: wallet_6 - address: ST3AM1A56AK2C1XAFJ4115ZSV26EB49BVQ10MGCS0 - balance: "100000000000000" - - name: wallet_7 - address: ST3PF13W7Z0RRM42A8VZRVFQ75SV1K26RXEP8YGKJ - balance: "100000000000000" - - name: wallet_8 - address: ST3NBRSFKX28FQ2ZJ1MAKX58HKHSDGNV5N7R21XCP - balance: "100000000000000" - contracts: - - costs - - pox - - pox-2 - - pox-3 - - pox-4 - - lockup - - costs-2 - - costs-3 - - cost-voting - - bns -plan: - batches: - - id: 0 - transactions: - - emulated-contract-publish: - contract-name: nft-trait - emulated-sender: SP2PABAF9FTAJYNFZH93XENAJ8FVY99RRM50D2JG9 - path: "./.cache/requirements/SP2PABAF9FTAJYNFZH93XENAJ8FVY99RRM50D2JG9.nft-trait.clar" - clarity-version: 1 - epoch: "2.0" - - id: 1 - transactions: - - emulated-contract-publish: - contract-name: aibtcdev-proposal-trait - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/dao/traits/aibtcdev-proposal-trait.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: aibtc001-bootstrap - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/dao/proposals/aibtc001-bootstrap.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: aibtcdev-airdrop-1 - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/aibtcdev-airdrop-1.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: aibtcdev-airdrop-2 - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/aibtcdev-airdrop-2.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: aibtcdev-bank-account - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/dao/extensions/aibtcdev-bank-account.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: aibtcdev-extension-trait - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/dao/traits/aibtcdev-extension-trait.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: aibtcdev-dao - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/dao/aibtcdev-dao.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: aibtcdev-messaging - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/dao/extensions/aibtcdev-messaging.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: aibtcdev-payment-traits - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/dao/traits/aibtcdev-payment-traits.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: aibtcdev-payments - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/dao/extensions/aibtcdev-payments.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: aibtcdev-treasury - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/dao/extensions/aibtcdev-treasury.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: proxy - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/test-proxy.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: test-proxy - emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - path: contracts/test-proxy.clar - clarity-version: 2 - - emulated-contract-publish: - contract-name: external-proxy - emulated-sender: ST1SJ3DTE5DN7X54YDH5D64R3BCB6A2AG2ZQ8YPD5 - path: contracts/test-proxy.clar - clarity-version: 2 - epoch: "2.5"