move read functions to be read-only

README.md

@@ -54,8 +54,8 @@ The `pyth-oracle-v2` contract is exposing the following method:
 
 ```clarity
 (define-public (read-price-feed
-    (price-feed-id (buff 32))
-    (pyth-storage-address <pyth-storage-trait>)))
+  (price-feed-id (buff 32))
+))
 ```
 
 That can be consumed with the following invocation:
@@ -65,7 +65,7 @@ That can be consumed with the following invocation:
     'SP2T5JKWWP3FYYX4YRK8GK5BG2YCNGEAEY2P2PKN0.pyth-oracle-v2                ;; Address of the helper contract
     read-price-feed
     0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43      ;; BTC-USD price identifier
-    'SP2T5JKWWP3FYYX4YRK8GK5BG2YCNGEAEY2P2PKN0.pyth-store-v1)
+    )
 ```
 
 The authenticity of the price feeds is verified during their ingestion, making the cost of queries as light as possible.

contracts/pyth-oracle-v2.clar

@@ -12,14 +12,11 @@
 ;; Balance insufficient for handling fee
 (define-constant ERR_BALANCE_INSUFFICIENT (err u402))
 
-(define-public (read-price-feed 
-    (price-feed-id (buff 32))
-    (pyth-storage-address <pyth-storage-trait>))
+(define-read-only (read-price-feed 
+    (price-feed-id (buff 32)))
   (begin
-    ;; Check execution flow
-    (try! (contract-call? .pyth-governance-v1 check-storage-contract pyth-storage-address))
     ;; Perform contract-call
-    (contract-call? pyth-storage-address read price-feed-id)))
+    (contract-call? .pyth-store-v1 read price-feed-id)))
 
 (define-public (verify-and-update-price-feeds 
     (price-feed-bytes (buff 8192))

contracts/pyth-store-v1.clar

@@ -21,7 +21,7 @@
 
 (define-map timestamps (buff 32) uint)
 
-(define-public (read (price-identifier (buff 32)))
+(define-read-only (read (price-identifier (buff 32)))
   (let ((entry (unwrap! (map-get? prices price-identifier) (err u404))))
     (ok entry)))
 

deployments/default.simnet-plan.yaml

@@ -82,6 +82,11 @@ plan:
             emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
             path: contracts/pyth-governance-v1.clar
             clarity-version: 3
+        - emulated-contract-publish:
+            contract-name: pyth-store-v1
+            emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
+            path: contracts/pyth-store-v1.clar
+            clarity-version: 3
         - emulated-contract-publish:
             contract-name: pyth-oracle-v2
             emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
@@ -92,11 +97,6 @@ plan:
             emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
             path: contracts/pyth-pnau-decoder-v1.clar
             clarity-version: 3
-        - emulated-contract-publish:
-            contract-name: pyth-store-v1
-            emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM
-            path: contracts/pyth-store-v1.clar
-            clarity-version: 3
         - emulated-contract-publish:
             contract-name: wormhole-core-v2
             emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM

example/cbtc/contracts/cbtc-pool.clar

@@ -69,6 +69,6 @@
   (read-price-from-pyth 0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43))
 
 (define-private (read-price-from-pyth (price-id (buff 32)))
-    (let ((feed (unwrap! (contract-call? 'ST2T5JKWWP3FYYX4YRK8GK5BG2YCNGEAEY1JKX06E.pyth-oracle-v2 read-price-feed price-id 'ST2T5JKWWP3FYYX4YRK8GK5BG2YCNGEAEY1JKX06E.pyth-store-v1) (err u0)))
+    (let ((feed (unwrap! (contract-call? 'ST2T5JKWWP3FYYX4YRK8GK5BG2YCNGEAEY1JKX06E.pyth-oracle-v2 read-price-feed price-id) (err u0)))
           (price (get price feed)))
       (ok (to-uint price))))

unit-tests/pyth/oracle.test.ts

@@ -68,12 +68,11 @@ describe("pyth-oracle-v2::decode-and-verify-price-feeds mainnet VAAs", () => {
     ).result;
     expect(res).toBeOk(Cl.list([priceUpdated]));
 
-    res = simnet.callPublicFn(
+    res = simnet.callReadOnlyFn(
       pythOracleContractName,
       "read-price-feed",
       [
         priceIdentifier,
-        Cl.contractPrincipal(simnet.deployer, pythStorageContractName),
       ],
       sender,
     ).result;

unit-tests/pyth/pnau.test.ts

@@ -271,12 +271,11 @@ describe("pyth-pnau-decoder-v1::decode-and-verify-price-feeds failures", () => {
   });
 
   it("should succeed updating prices once", () => {
-    let res = simnet.callPublicFn(
+    let res = simnet.callReadOnlyFn(
       pythOracleContractName,
       "read-price-feed",
       [
         Cl.buffer(pyth.BtcPriceIdentifier),
-        Cl.contractPrincipal(simnet.deployer, pythStorageContractName),
       ],
       sender,
     );
@@ -333,12 +332,11 @@ describe("pyth-pnau-decoder-v1::decode-and-verify-price-feeds failures", () => {
       sender,
     );
 
-    res = simnet.callPublicFn(
+    res = simnet.callReadOnlyFn(
       pythOracleContractName,
       "read-price-feed",
       [
         Cl.buffer(pyth.BtcPriceIdentifier),
-        Cl.contractPrincipal(simnet.deployer, pythStorageContractName),
       ],
       sender,
     );
@@ -394,12 +392,11 @@ describe("pyth-pnau-decoder-v1::decode-and-verify-price-feeds failures", () => {
       sender,
     );
 
-    res = simnet.callPublicFn(
+    res = simnet.callReadOnlyFn(
       pythOracleContractName,
       "read-price-feed",
       [
         Cl.buffer(pyth.BtcPriceIdentifier),
-        Cl.contractPrincipal(simnet.deployer, pythStorageContractName),
       ],
       sender,
     );

unit-tests/pyth/ptgm.test.ts

@@ -573,16 +573,15 @@ describe("pyth-governance-v1::update-pyth-store-contract", () => {
     );
     expect(res.result).toBeErr(Cl.uint(4004));
 
-    res = simnet.callPublicFn(
+    res = simnet.callReadOnlyFn(
       pythOracleContractName,
-      `read-price-feed`,
+      "read-price-feed",
       [
         Cl.bufferFromHex("00"),
-        Cl.contractPrincipal(deployer, pythStorageContractName),
       ],
       sender,
     );
-    expect(res.result).toBeErr(Cl.uint(4004));
+    expect(res.result).toBeErr(Cl.uint(404));
   });
 
   it("should fail if action mismatches", () => {