diff --git a/contracts/name-faktory-dex.clar b/contracts/name-faktory-dex.clar index 70e575b..1711234 100644 --- a/contracts/name-faktory-dex.clar +++ b/contracts/name-faktory-dex.clar @@ -20,8 +20,6 @@ (define-constant FAKTORY 'STTWD9SPRQVD3P733V89SV0P8RZRZNQADG034F0A) (define-constant ORIGINATOR 'STTWD9SPRQVD3P733V89SV0P8RZRZNQADG034F0A) (define-constant DEX-TOKEN .name-faktory) - (define-constant PRE-CONTRACT .name-pre-faktory) - (define-constant SBTC .sbtc-token) ;; token constants (define-constant TARGET_STX u5000000) @@ -55,10 +53,10 @@ (new-stx (get new-stx in-info)) (ft-receiver tx-sender) ) - (try! (contract-call? SBTC transfer (- fee pre-fee) tx-sender FEE-RECEIVER none)) - (try! (contract-call? SBTC transfer pre-fee tx-sender PRE-CONTRACT none)) - (try! (as-contract (contract-call? PRE-CONTRACT create-fees-receipt pre-fee))) - (try! (contract-call? SBTC transfer stx-in tx-sender (as-contract tx-sender) none)) + (try! (contract-call? .sbtc-token transfer (- fee pre-fee) tx-sender FEE-RECEIVER none)) + (try! (contract-call? .sbtc-token transfer pre-fee tx-sender .name-pre-faktory none)) + (try! (as-contract (contract-call? .name-pre-faktory create-fees-receipt pre-fee))) + (try! (contract-call? .sbtc-token transfer stx-in tx-sender (as-contract tx-sender) none)) (try! (as-contract (contract-call? ft transfer tokens-out tx-sender ft-receiver none))) (if (>= new-stx TARGET_STX) (let ((premium-amount (/ (* new-ft (var-get premium)) u100)) @@ -75,18 +73,18 @@ ;; 'ST295MNE41DC74QYCPRS8N37YYMC06N6Q3VQDZ6G1.xyk-core-v-1-2 ;; create-pool ;; 'STV9K21TBFAK4KNRJXF5DFP8N7W46G4V9RJ5XDY2.xyk-pool-sbtc-name-v-1-1 - ;; SBTC + ;; 'STV9K21TBFAK4KNRJXF5DFP8N7W46G4V9RJ5XDY2.sbtc-token ;; ft ;; amm-ustx ;; amm-amount ;; xyk-burn-amount ;; u10 u40 u10 u40 ;; 'ST27Q7Z7P5MTJN2B3M9Q406XPCDB1VFZJ3KWX3CES xyk-pool-uri true))) - (try! (as-contract (contract-call? SBTC transfer GRAD-FEE tx-sender G-RECEIVER none))) + (try! (as-contract (contract-call? .sbtc-token transfer GRAD-FEE tx-sender G-RECEIVER none))) (var-set open false) (var-set stx-balance u0) (var-set ft-balance u0) - (try! (as-contract (contract-call? PRE-CONTRACT toggle-bonded))) + (try! (as-contract (contract-call? .name-pre-faktory toggle-bonded))) (print {type: "buy", ft: (contract-of ft), tokens-out: tokens-out, ustx: ubtc, premium-amount: premium-amount, amm-amount: amm-amount, amm-ustx: amm-ustx, stx-balance: u0, ft-balance: u0, @@ -149,10 +147,10 @@ ) (asserts! (>= total-stx stx-out) ERR-STX-BALANCE-TOO-LOW) (try! (contract-call? ft transfer amount tx-sender (as-contract tx-sender) none)) - (try! (as-contract (contract-call? SBTC transfer stx-to-receiver tx-sender stx-receiver none))) - (try! (as-contract (contract-call? SBTC transfer (- fee pre-fee) tx-sender FEE-RECEIVER none))) - (try! (contract-call? SBTC transfer pre-fee tx-sender PRE-CONTRACT none)) - (try! (as-contract (contract-call? PRE-CONTRACT create-fees-receipt pre-fee))) ;; this address could be a multi-sig + (try! (as-contract (contract-call? .sbtc-token transfer stx-to-receiver tx-sender stx-receiver none))) + (try! (as-contract (contract-call? .sbtc-token transfer (- fee pre-fee) tx-sender FEE-RECEIVER none))) + (try! (contract-call? .sbtc-token transfer pre-fee tx-sender .name-pre-faktory none)) + (try! (as-contract (contract-call? .name-pre-faktory create-fees-receipt pre-fee))) ;; this address could be a multi-sig (var-set stx-balance new-stx) (var-set ft-balance new-ft) (print {type: "sell", ft: (contract-of ft), amount: amount, stx-to-receiver: stx-to-receiver, maker: tx-sender, @@ -189,7 +187,7 @@ (ok (var-get open))) (define-public (open-market) - (let ((is-prelaunch-allowing (unwrap-panic (contract-call? PRE-CONTRACT is-market-open)))) + (let ((is-prelaunch-allowing (unwrap-panic (contract-call? .name-pre-faktory is-market-open)))) (asserts! is-prelaunch-allowing ERR-MARKET-CLOSED) (var-set open true) (ok true)) diff --git a/contracts/name-pre-faktory.clar b/contracts/name-pre-faktory.clar index 37723a3..2ab783c 100644 --- a/contracts/name-pre-faktory.clar +++ b/contracts/name-pre-faktory.clar @@ -70,7 +70,6 @@ ;; Determined after multi-sig creation (define-constant TOKEN-DAO .name-faktory) ;; param (define-constant DEX-DAO .name-faktory-dex) ;; param -(define-constant SBTC .sbtc-token) ;; Helper vars (define-data-var target-owner principal 'STTWD9SPRQVD3P733V89SV0P8RZRZNQADG034F0A) ;; 'SP000000000000000000002Q6VF78 @@ -171,7 +170,7 @@ (asserts! (< current-seats SEATS) ERR-NO-SEATS-LEFT) ;; Process payment - (match (contract-call? SBTC transfer (* PRICE-PER-SEAT actual-seats) tx-sender (as-contract tx-sender) none) + (match (contract-call? .sbtc-token transfer (* PRICE-PER-SEAT actual-seats) tx-sender (as-contract tx-sender) none) success (begin (if (is-eq user-seats u0) @@ -211,7 +210,7 @@ (var-set target-owner tx-sender) ;; Process refund - (match (as-contract (contract-call? SBTC transfer (* PRICE-PER-SEAT user-seats) tx-sender seat-owner none)) + (match (as-contract (contract-call? .sbtc-token transfer (* PRICE-PER-SEAT user-seats) tx-sender seat-owner none)) success (let ((is-removed (unwrap! (remove-seat-holder) ERR-REMOVING-HOLDER))) (map-delete seats-owned tx-sender) @@ -354,9 +353,9 @@ (begin (var-set market-open true) (var-set governance-active true) ;; jason: in core/action proposal, checks from create proposal, deadlocks anything happening - (try! (as-contract (contract-call? SBTC transfer DEX-AMOUNT tx-sender DEX-DAO none))) ;; 0.00250000 BTC to DEX - (try! (as-contract (contract-call? SBTC transfer MULTI-SIG-AMOUNT tx-sender FAKTORY1 none))) ;; 0.00010000 BTC -> covers contract deployment gaz fees - (try! (as-contract (contract-call? SBTC transfer FEE-AMOUNT tx-sender FAKTORY1 none))) ;; 0.00140000 BTC fees -> covers ordinals bot, xlink and faktory + (try! (as-contract (contract-call? .sbtc-token transfer DEX-AMOUNT tx-sender DEX-DAO none))) ;; 0.00250000 BTC to DEX + (try! (as-contract (contract-call? .sbtc-token transfer MULTI-SIG-AMOUNT tx-sender FAKTORY1 none))) ;; 0.00010000 BTC -> covers contract deployment gaz fees + (try! (as-contract (contract-call? .sbtc-token transfer FEE-AMOUNT tx-sender FAKTORY1 none))) ;; 0.00140000 BTC fees -> covers ordinals bot, xlink and faktory (var-set distribution-height burn-block-height) (var-set last-airdrop-height (some burn-block-height)) (var-set ft-balance FT-INITIALIZED-BALANCE) ;; 40M tokens @@ -456,7 +455,7 @@ ;; Only distribute if the user's share is greater than zero (if (> user-share u0) - (match (as-contract (contract-call? SBTC transfer user-share tx-sender holder none)) + (match (as-contract (contract-call? .sbtc-token transfer user-share tx-sender holder none)) success (begin (print {