resolve timestamp check issue

Author: connorstake

stacks/Clarinet.toml

@@ -5,13 +5,10 @@ authors = []
 telemetry = false
 cache_dir = './.cache'
 
-[[project.requirements]]
-contract_id = 'SP1E0XBN9T4B10E9QMR7XMFJPMA19D77WY3KP2QKC.self-listing-helper-v3'
 [contracts.executor-state]
 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

@@ -23,10 +23,7 @@
 ;;       Anyone can call this to register themselves as a payee
 (define-public (register-payee (stacks-addr principal))
   (let (
-      (p-as-string (contract-call?
-        'SP1E0XBN9T4B10E9QMR7XMFJPMA19D77WY3KP2QKC.self-listing-helper-v3
-        principal-to-string stacks-addr
-      ))
+      (p-as-string (principal-to-string stacks-addr))
       (universal-addr (keccak256 (string-ascii-to-buff p-as-string)))
     )
     ;; Check if payee already exists
@@ -44,6 +41,54 @@
 
 ;;;; Read-only functions
 
+;; Constants for principal-to-string conversion (extracted from self-listing-helper-v3)
+(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))
+
+;; @desc Convert principal to string representation
+;;       Extracted from self-listing-helper-v3 to eliminate external dependencies
+(define-read-only (principal-to-string (p principal))
+  (let (
+      (destructed (match (principal-destruct? p) ok-value ok-value err-value err-value))
+      (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)
+  )
+)
+
+;; Helper functions for principal-to-string conversion
+(define-private (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-private (hash-bytes-to-string (data (buff 24)))
+  (let (
+      ;; fixed-length: 8 * 15 / 5 = 24
+      (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)))})))
+      ;; fixed-length: ceil(8 * 9 / 5) = 15
+      (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-private (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-private (trim-leading-0 (s (string-ascii 39)))
+  (fold trim-leading-0-iter LIST_39 s))
+
+(define-private (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-private (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 })))
+
 ;; @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)))

stacks/contracts/executor.clar

@@ -20,6 +20,7 @@
 (define-constant ERR-UNREGISTERED-PAYEE (err u1004))
 (define-constant ERR-INVALID-PAYEE-ADDRESS (err u1005))
 (define-constant ERR-BUFFER-PARSE-ERROR (err u1006))
+(define-constant ERR-STACKS-TIMESTAMP (err u1007))
 ;;
 
 ;; data vars
@@ -154,12 +155,12 @@
       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)
-            ;; Compare Unix timestamp expiry-time with current block timestamp
-            (if (> expiry-time
-                (unwrap-panic (get-stacks-block-info? time stacks-block-height))
+            ;; Get previous block's timestamp for reliable comparison
+            (let ((current-time (unwrap! (get-stacks-block-info? time (- stacks-block-height u1)) ERR-STACKS-TIMESTAMP)))
+              (if (> expiry-time current-time)
+                (ok true)
+                ERR-QUOTE-EXPIRED
               )
-              (ok true)
-              ERR-QUOTE-EXPIRED
             )
             ERR-QUOTE-DST-CHAIN-MISMATCH
           )

stacks/tests/executor.test.ts

@@ -57,7 +57,7 @@ describe("Executor Contract Tests", () => {
   });
 
   describe("validate-quote-header", () => {
-    it.skip("should validate a correct quote header", () => {
+    it("should validate a correct quote header", () => {
       // Create a valid quote buffer
       const validQuote = createSignedQuoteBuffer({
         srcChain: 1,    // OUR-CHAIN = 1  
@@ -109,20 +109,20 @@ describe("Executor Contract Tests", () => {
       expect(result).toBeErr(Cl.uint(1002)); // ERR-QUOTE-DST-CHAIN-MISMATCH
     });
 
-    it.skip("should reject expired quote", () => {
+    it("should reject expired quote", () => {
       const expiredQuote = createSignedQuoteBuffer({
         srcChain: 1,
         dstChain: 2,
         expiryTime: 1000000000 // Past timestamp placeholder // 1 hour ago (expired)
       });
-      
+
       const { result } = simnet.callReadOnlyFn(
         "executor",
         "validate-quote-header",
         [Cl.buffer(expiredQuote), Cl.uint(2)],
         address1
       );
-      
+
       expect(result).toBeErr(Cl.uint(1003)); // ERR-QUOTE-EXPIRED
     });
 
@@ -629,7 +629,7 @@ describe("Executor Contract Tests", () => {
       return (result as any).value;
     }
 
-    it.skip("should execute successfully with valid quote and registered relayer", () => {
+    it("should execute successfully with valid quote and registered relayer", () => {
       // Register a relayer first
       const relayerAddr = accounts.get("wallet_2")!;
       const universalAddr = registerTestPayee(relayerAddr);
@@ -724,7 +724,7 @@ describe("Executor Contract Tests", () => {
       expect(result).toBeErr(Cl.uint(1002)); // ERR-QUOTE-DST-CHAIN-MISMATCH
     });
 
-    it.skip("should fail with expired quote", () => {
+    it("should fail with expired quote", () => {
       const relayerAddr = accounts.get("wallet_2")!;
       const universalAddr = registerTestPayee(relayerAddr);
 
@@ -753,7 +753,7 @@ describe("Executor Contract Tests", () => {
       expect(result).toBeErr(Cl.uint(1003)); // ERR-QUOTE-EXPIRED
     });
 
-    it.skip("should fail with unregistered relayer", () => {
+    it("should fail with unregistered relayer", () => {
       // Create quote with unregistered payee address
       const unregisteredPayee = new Uint8Array(32);
       unregisteredPayee.fill(0xFF); // Address that's not registered
@@ -783,7 +783,7 @@ describe("Executor Contract Tests", () => {
       expect(result).toBeErr(Cl.uint(1004)); // ERR-UNREGISTERED-RELAYER
     });
 
-    it.skip("should emit correct event data", () => {
+    it("should emit correct event data", () => {
       const relayerAddr = accounts.get("wallet_3")!;
       const universalAddr = registerTestPayee(relayerAddr);