dependency cleanup, naming consistency

Author: connorstake

stacks/Clarinet.toml

@@ -11,6 +11,7 @@ contract_id = 'SP1E0XBN9T4B10E9QMR7XMFJPMA19D77WY3KP2QKC.self-listing-helper-v3'
 path = 'contracts/executor-state.clar'
 clarity_version = 3
 epoch = 'latest'
+requirements = ['SP1E0XBN9T4B10E9QMR7XMFJPMA19D77WY3KP2QKC.self-listing-helper-v3']
 
 [contracts.executor]
 path = 'contracts/executor.clar'

stacks/contracts/executor-state.clar

@@ -10,29 +10,32 @@
 
 ;;;; Data maps
 
-;; Map to track relayer addresses for payments
+;; Map to track payee addresses for payments
 ;; Universal address is keccak256(stacks-principal-as-string)
-(define-map relayer-to-stacks
+(define-map universal-address-to-principal
   (buff 32) ;; Universal address (32-byte hash)
   principal ;; Stacks principal for STX payments
 )
 
 ;;;; Public functions
 
-;; @desc Register a relayer's Stacks address for their universal address
-;;       Anyone can call this to register themselves as a relayer
-(define-public (register-relayer (stacks-addr principal))
+;; @desc Register a payee's Stacks address for their universal address
+;;       Anyone can call this to register themselves as a payee
+(define-public (register-payee (stacks-addr principal))
   (let (
-      (p-as-string (principal-to-string stacks-addr))
+      (p-as-string (contract-call?
+        'SP1E0XBN9T4B10E9QMR7XMFJPMA19D77WY3KP2QKC.self-listing-helper-v3
+        principal-to-string stacks-addr
+      ))
       (universal-addr (keccak256 (string-ascii-to-buff p-as-string)))
     )
-    ;; Check if relayer already exists
-    (asserts! (is-none (relayer-to-stacks-get universal-addr))
+    ;; Check if payee already exists
+    (asserts! (is-none (universal-address-to-principal-get universal-addr))
       ERR_STATE_RELAYER_EXISTS
     )
 
     ;; Register the mapping
-    (map-set relayer-to-stacks universal-addr stacks-addr)
+    (map-set universal-address-to-principal universal-addr stacks-addr)
 
     ;; Return the universal address for confirmation
     (ok universal-addr)
@@ -41,11 +44,6 @@
 
 ;;;; Read-only functions
 
-;; @desc Convert universal address to Stacks principal
-(define-read-only (universal-addr-to-principal (universal-addr (buff 32)))
-  (relayer-to-stacks-get universal-addr)
-)
-
 ;; @desc Helper function to convert string to buffer for hashing
 ;;       Matches the exact implementation from Wormhole Core
 (define-read-only (string-ascii-to-buff (s (string-ascii 256)))
@@ -58,115 +56,8 @@
   )
 )
 
-;; principle to string conversion from https://explorer.hiro.so/txid/0xa0988bb5f2aa6179e61e7735b91f7276cf70106f05781a0c1c7dee663be5dc7c?chain=mainnet
-;; @desc Convert principal to string representation (C32 encoding)
-(define-read-only (principal-to-string (p principal))
-  (let (
-      (destructed (unwrap-panic (principal-destruct? p)))
-      (checksum (unwrap-panic (slice?
-        (sha256 (sha256 (concat (get version destructed) (get hash-bytes destructed))))
-        u0 u4
-      )))
-      (data (unwrap-panic (as-max-len? (concat (get hash-bytes destructed) checksum) u24)))
-      (result (concat
-        (concat "S"
-          (unwrap-panic (element-at? C32 (buff-to-uint-be (get version destructed))))
-        )
-        (append-leading-0 data (trim-leading-0 (hash-bytes-to-string data)))
-      ))
-    )
-    (match (get name destructed)
-      n (concat (concat result ".") n)
-      result
-    )
-  )
-)
-
-;; Constants and helpers for C32 encoding
-(define-constant C32 "0123456789ABCDEFGHJKMNPQRSTVWXYZ")
-(define-constant LIST_15 (list 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0))
-(define-constant LIST_24 (list 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0))
-(define-constant LIST_39 (concat LIST_24 LIST_15))
-
-(define-read-only (c32-to-string-iter
-    (idx int)
-    (it {
-      s: (string-ascii 39),
-      r: uint,
-    })
-  )
-  {
-    s: (unwrap-panic (as-max-len?
-      (concat (unwrap-panic (element-at? C32 (mod (get r it) u32))) (get s it))
-      u39
-    )),
-    r: (/ (get r it) u32),
-  }
-)
-
-(define-read-only (hash-bytes-to-string (data (buff 24)))
-  (let (
-      (low-part (get s
-        (fold c32-to-string-iter LIST_24 {
-          s: "",
-          r: (buff-to-uint-be (unwrap-panic (as-max-len? (unwrap-panic (slice? data u9 u24)) u16))),
-        })
-      ))
-      (high-part (get s
-        (fold c32-to-string-iter LIST_15 {
-          s: "",
-          r: (buff-to-uint-be (unwrap-panic (as-max-len? (unwrap-panic (slice? data u0 u9)) u16))),
-        })
-      ))
-    )
-    (unwrap-panic (as-max-len? (concat high-part low-part) u39))
-  )
-)
-
-(define-read-only (trim-leading-0-iter
-    (idx int)
-    (it (string-ascii 39))
-  )
-  (if (is-eq (element-at? it u0) (some "0"))
-    (unwrap-panic (slice? it u1 (len it)))
-    it
-  )
-)
-
-(define-read-only (trim-leading-0 (s (string-ascii 39)))
-  (fold trim-leading-0-iter LIST_39 s)
-)
-
-(define-read-only (append-leading-0-iter
-    (idx int)
-    (it {
-      hash-bytes: (buff 24),
-      address: (string-ascii 39),
-    })
-  )
-  (if (is-eq (element-at? (get hash-bytes it) u0) (some 0x00))
-    {
-      hash-bytes: (unwrap-panic (slice? (get hash-bytes it) u1 (len (get hash-bytes it)))),
-      address: (unwrap-panic (as-max-len? (concat "0" (get address it)) u39)),
-    }
-    it
-  )
-)
-
-(define-read-only (append-leading-0
-    (hash-bytes (buff 24))
-    (s (string-ascii 39))
-  )
-  (get address
-    (fold append-leading-0-iter LIST_24 {
-      hash-bytes: hash-bytes,
-      address: s,
-    })
-  )
-)
-
 ;;;; Map getters
 
-(define-read-only (relayer-to-stacks-get (universal-addr (buff 32)))
-  (map-get? relayer-to-stacks universal-addr)
+(define-read-only (universal-address-to-principal-get (universal-addr (buff 32)))
+  (map-get? universal-address-to-principal universal-addr)
 )

stacks/contracts/executor.clar

@@ -17,7 +17,7 @@
 (define-constant ERR-QUOTE-SRC-CHAIN-MISMATCH (err u1001))
 (define-constant ERR-QUOTE-DST-CHAIN-MISMATCH (err u1002))
 (define-constant ERR-QUOTE-EXPIRED (err u1003))
-(define-constant ERR-UNREGISTERED-RELAYER (err u1004))
+(define-constant ERR-UNREGISTERED-PAYEE (err u1004))
 (define-constant ERR-INVALID-PAYEE-ADDRESS (err u1005))
 (define-constant ERR-BUFFER-PARSE-ERROR (err u1006))
 ;;
@@ -50,25 +50,15 @@
         (asserts! (is-eq (len payee-universal-addr) u32)
           ERR-INVALID-PAYEE-ADDRESS
         )
-        (asserts!
-          (not (is-eq payee-universal-addr
-            0x0000000000000000000000000000000000000000000000000000000000000000
-          ))
-          ERR-INVALID-PAYEE-ADDRESS
-        )
 
-        ;; 2. Verify relayer is registered and get principal
-        (let ((payee-lookup-result (contract-call? .executor-state relayer-to-stacks-get
+        ;; 2. Verify payee is registered and get principal
+        (let ((payee-lookup-result (contract-call? .executor-state universal-address-to-principal-get
             payee-universal-addr
           )))
-          (asserts! (is-some payee-lookup-result) ERR-UNREGISTERED-RELAYER)
+          (asserts! (is-some payee-lookup-result) ERR-UNREGISTERED-PAYEE)
 
-          ;; 3. Extract the principal and validate it's not contract address
+          ;; 3. Extract the principal for payment
           (let ((payee-principal (unwrap-panic payee-lookup-result)))
-            (asserts! (not (is-eq payee-principal (as-contract tx-sender)))
-              ERR-INVALID-PAYEE-ADDRESS
-            )
-
             ;; 4. Perform the payment after all validations pass
             (try! (stx-transfer? payment tx-sender payee-principal))
 
@@ -83,8 +73,6 @@
               signed-quote: signed-quote-bytes,
               request-bytes: request-bytes,
               relay-instructions: relay-instructions,
-              block-height: stacks-block-height,
-              tx-sender: tx-sender,
             })
 
             (ok true)
@@ -166,10 +154,10 @@
       quote-dst-chain (match (extract-uint64-be signed-quote-bytes u60)
         expiry-time (if (is-eq quote-src-chain OUR-CHAIN)
           (if (is-eq quote-dst-chain dst-chain)
-            ;; Currently comparing Unix timestamp (expiry-time) with block height (stacks-block-height)
-            ;; Correct way is likely to do: (get-stacks-block-info? time stacks-block-height) which should return Unix timestamp
-            ;; Unable to write tests for it though as of now. 
-            (if (> expiry-time stacks-block-height)
+            ;; Compare Unix timestamp expiry-time with current block timestamp
+            (if (> expiry-time
+                (unwrap-panic (get-stacks-block-info? time stacks-block-height))
+              )
               (ok true)
               ERR-QUOTE-EXPIRED
             )
@@ -203,9 +191,11 @@
 )
 
 ;; Convert 32-byte universal address hash back to a Stacks principal
-;; Uses the executor-state contract's relayer registry
+;; Uses the executor-state contract's payee registry
 (define-read-only (universal-addr-to-principal (universal-addr (buff 32)))
-  (contract-call? .executor-state universal-addr-to-principal universal-addr)
+  (contract-call? .executor-state universal-address-to-principal-get
+    universal-addr
+  )
 )
 
 ;; Read-only functions for external access