Merge pull request #22 from oasisprotocol/rube/issue-11-simplify-price-calculation

fix: update price calc and add contracts to ci-test

Author: rube-de

.github/workflows/ci-test.yml

@@ -1,16 +1,12 @@
 # NOTE: This name appears in GitHub's Checks API and in workflow's status badge.
 name: ci-test
 
-# Trigger the workflow when:
 on:
-  # A push occurs to one of the matched branches.
   push:
     branches:
       - main
       - master
       - stable/*
-  # Or when a pull request event occurs for a pull request against one of the
-  # matched branches.
   pull_request:
     branches:
       - main
@@ -26,6 +22,38 @@ env:
   CMAKE_POLICY_VERSION_MINIMUM: 3.5
 
 jobs:
+  test-contracts:
+    name: test-contracts
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Cache Bun dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.bun/install/cache
+            contracts/node_modules
+          key: ${{ runner.os }}-bun-${{ hashFiles('contracts/bun.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-bun-
+
+      - name: Install dependencies
+        working-directory: ./contracts
+        run: bun install --frozen-lockfile
+
+      - name: Compile contracts
+        working-directory: ./contracts
+        run: bun hardhat compile
+
+      - name: Run tests
+        working-directory: ./contracts
+        run: bun hardhat test
+
   test-paymaster-relayer:
     name: test-paymaster-relayer
     runs-on: ubuntu-latest
@@ -38,10 +66,11 @@ jobs:
         with:
           python-version: '3.12'
           enable-cache: true
+          cache-dependency-glob: "paymaster-relayer/uv.lock"
 
       - name: Install dependencies
         working-directory: ./paymaster-relayer
-        run: uv sync --dev
+        run: uv sync --dev --frozen
 
       - name: Run tests
         working-directory: ./paymaster-relayer

contracts/bun.lock

@@ -410,20 +410,16 @@ contract CrossChainPaymaster is
         uint8 tDec = tokenUsd.decimals();
         uint8 rDec = roseFeed.decimals();
 
-        // Normalize ROSE price to 18 decimals
-        uint256 normalizedRosePrice;
-        if (rDec < NORMALIZED_DECIMALS) {
-            normalizedRosePrice = uint256(rPrice) * (10 ** (NORMALIZED_DECIMALS - rDec));
-        } else if (rDec > NORMALIZED_DECIMALS) {
-            normalizedRosePrice = uint256(rPrice) / (10 ** (rDec - NORMALIZED_DECIMALS));
-        } else {
-            normalizedRosePrice = uint256(rPrice);
-        }
-
-        // roseAmount = tokenAmount * (tokenUsd / roseUsd) adjusted to 18 decimals
-        uint256 num = Math.mulDiv(tokenAmount, uint256(tPrice), 10 ** tokenDec);
-        num = Math.mulDiv(num, 10 ** NORMALIZED_DECIMALS, 10 ** tDec);
-        roseAmount = Math.mulDiv(num, 1e18, normalizedRosePrice);
+        // Convert token amount to USD value (normalized to 18 decimals)
+        // Note: Assumes tDec <= 18 
+        uint256 usdValue = Math.mulDiv(
+            tokenAmount,
+            uint256(tPrice) * (10 ** (NORMALIZED_DECIMALS - tDec)),
+            10 ** tokenDec
+        );
+
+        // Convert USD value to ROSE amount (result in 18 decimals)
+        roseAmount = Math.mulDiv(usdValue, 10 ** rDec, uint256(rPrice));
     }
 
     /// @notice Accepts ROSE funding