More fun with parentheses.

Author: a3slade

core-contracts/contracts/multi-miner.clar

@@ -92,34 +92,34 @@
 ;; are for the function by that name on this fork
 (define-private (check-registration (signatures (list 9 (buff 65)))
                     (data {principal: principal, deposit-fn-name: (string-ascii 45), height: uint}) )
-    (let ((registration-hash make-registration-hash data)
-          (signer-principals (try! (fold verify-sign-helper signatures (ok { hash: registration-hash, signers: (list) })))) )
+    (let ((registration-hash (make-registration-hash data))
+          (signer-principals (try! (fold verify-sign-helper signatures (ok { hash: registration-hash, signers: (list) })))))
            ;; TODO: perform checks on height?
            ;; TODO: should we pass around the block-id as well to provide a meaningful error?
            ;; check that the caller is a direct caller!
-           (asserts! (is-eq tx-sender contract-caller) (err ERR_UNAUTHORIZED_CONTRACT_CALLER)))
+           (asserts! (is-eq tx-sender contract-caller) (err ERR_UNAUTHORIZED_CONTRACT_CALLER))
            ;; check that we have enough signatures
-           (check-miners (append (get signers signer-principals) tx-sender)))
+           (check-miners (append (get signers signer-principals) tx-sender))))
 
 ;; TODO: this needs to be ensure that the miner can't call it directly with an earlier height
 ;; so it either needs to be private or we could check that the height is recent
 (define-private (make-registration-hash (data {principal: principal, deposit-fn-name: (string-ascii 45), height: uint}))
-    (let ((block-id (get-block-info? id-header-hash (get hash-height data)))
-          (data-buff (unwrap-panic (to-consensus-buff (merge data { block-id: block-id, multi-contract: CONTRACT_ADDRESS }))))
+    (let ((block-id (get-block-info? id-header-hash (get height data)))
+          (data-buff (unwrap-panic (to-consensus-buff? (merge data { block-id: block-id, multi-contract: CONTRACT_ADDRESS }))))
           (data-hash (sha256 data-buff))
           (structured-hash (sha256 (concat sip18-data-prefix data-hash))))
           structured-hash))
 
 (define-read-only (make-ft-registration-hash (ft-contract <ft-trait>) (deposit-fn-name (string-ascii 45)))
     (let ((contract_principal (contract-of ft-contract))
-          (structured-hash make-registration-hash
-              {principal: contract_principal, deposit-fn-name: deposit-fn-name, height: block-height}))
+          (structured-hash (make-registration-hash
+              {principal: contract_principal, deposit-fn-name: deposit-fn-name, height: block-height})))
           {height: block-height, hash: structured-hash}))
 
 (define-read-only (make-nft-registration-hash (nft-contract <nft-trait>) (deposit-fn-name (string-ascii 45)))
     (let ((contract_principal (contract-of nft-contract))
-          (structured-hash make-registration-hash
-              {principal: contract_principal, deposit-fn-name: deposit-fn-name, height: block-height}))
+          (structured-hash (make-registration-hash
+              {principal: contract_principal, deposit-fn-name: deposit-fn-name, height: block-height})))
           {height: block-height, hash: structured-hash}))
 
 ;; height is the block-height when the hash was created that was signed
@@ -128,20 +128,20 @@
 ;; deposit-fn-name is on the L2
 (define-public (register-new-ft-contract (ft-contract <ft-trait>) (deposit-fn-name (string-ascii 45) )
                               (height uint) (signatures (list 9 (buff 65))) )
-    (let (contract_principal (contract-of ft-contract))
+    (let ((contract_principal (contract-of ft-contract)))
          (try! (check-registration signatures
-             {principal: contract_principal, deposit-fn-name: deposit-fn-name, height: height})))
+             {principal: contract_principal, deposit-fn-name: deposit-fn-name, height: height}))
          ;; execute the registration
-         (as-contract (contract-call? .subnet register-new-ft-contract ft-contract deposit-fn-name)) )
+         (as-contract (contract-call? .subnet register-new-ft-contract ft-contract deposit-fn-name)) ))
 
 ;; height is the block-height when the hash was created that was signed
 ;; the purpose of this is to ensure that this is the same fork
 ;; nft-contract is on the L1
 ;; deposit-fn-name is on the L2
 (define-public (register-new-nft-contract (nft-contract <nft-trait>) (deposit-fn-name (string-ascii 45) )
                               (height uint) (signatures (list 9 (buff 65))) )
-    (let (contract_principal (contract-of nft-contract))
+    (let ((contract_principal (contract-of nft-contract)))
          (try! (check-registration signatures
-             {principal: contract_principal, deposit-fn-name: deposit-fn-name, height: height})))
+             {principal: contract_principal, deposit-fn-name: deposit-fn-name, height: height}))
          ;; execute the registration
-         (as-contract (contract-call? .subnet register-new-nft-contract nft-contract deposit-fn-name)) )
+         (as-contract (contract-call? .subnet register-new-nft-contract nft-contract deposit-fn-name)) ))