Merge pull request #9 from oasisprotocol/matevz/contracts/require-owner

contracts: Basic CI and require message owner

.github/workflows/ci-test.yaml

@@ -0,0 +1,59 @@
+name: ci-test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test-backend-frontend:
+    name: test-backend-frontend
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - uses: pnpm/[email protected]
+        name: Install pnpm
+        id: pnpm-install
+        with:
+          version: 8
+          run_install: false
+
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install dependencies
+        working-directory: backend
+        run: pnpm install
+
+      - name: Build backend
+        working-directory: backend
+        run: pnpm build
+
+      - name: Test backend
+        working-directory: backend
+        run: pnpm test
+
+      - name: Build frontend
+        working-directory: frontend
+        run: pnpm build

backend/contracts/MessageBox.sol

@@ -2,11 +2,18 @@
 pragma solidity ^0.8.0;
 
 contract MessageBox {
-    string public message;
+    string private _message;
     address public author;
 
     function setMessage(string calldata in_message) external {
-        message = in_message;
+        _message = in_message;
         author = msg.sender;
     }
+
+    function message() external view returns (string memory) {
+      if (msg.sender!=author) {
+        revert("not allowed");
+      }
+      return _message;
+    }
 }

backend/package.json

@@ -42,8 +42,8 @@
   },
   "devDependencies": {
     "@nomicfoundation/hardhat-ethers": "^3.0.5",
-    "@oasisprotocol/sapphire-contracts": "^0.2.6",
-    "@oasisprotocol/sapphire-hardhat": "^2.16.1",
+    "@oasisprotocol/sapphire-contracts": "^0.2.7",
+    "@oasisprotocol/sapphire-hardhat": "^2.19.4",
     "@typechain/ethers-v6": "^0.5.1",
     "@typechain/hardhat": "^9.1.0",
     "@types/chai": "^4.3.4",

backend/test/MessageBox.ts

@@ -9,7 +9,7 @@ describe("MessageBox", function () {
     return { messageBox };
   }
 
-  it("Should send message", async function () {
+  it("Should set message", async function () {
     const {messageBox} = await deployMessageBox();
 
     await messageBox.setMessage("hello world");

frontend/package.json

@@ -20,7 +20,7 @@
     "@metamask/detect-provider": "^2.0.0",
     "@metamask/jazzicon": "^2.0.0",
     "@oasisprotocol/demo-starter-backend": "workspace:^",
-    "@oasisprotocol/sapphire-paratime": "^1.2.2",
+    "@oasisprotocol/sapphire-paratime": "^1.3.2",
     "ethers": "^6.10.0",
     "pinia": "^2.0.28",
     "vue": "^3.2.45",

frontend/src/contracts.ts

@@ -5,7 +5,7 @@ import { type MessageBox, MessageBox__factory } from '@oasisprotocol/demo-starte
 export type { MessageBox } from '@oasisprotocol/demo-starter-backend';
 
 import { useEthereumStore } from './stores/ethereum';
-import { VoidSigner } from 'ethers';
+import { type ContractRunner, VoidSigner } from 'ethers';
 
 const addr = import.meta.env.VITE_MESSAGE_BOX_ADDR!;
 
@@ -23,7 +23,7 @@ export function useMessageBox(): ComputedRef<MessageBox | null> {
       return null;
     }
 
-    return MessageBox__factory.connect(addr, eth.signer);
+    return MessageBox__factory.connect(addr, eth.signer as ContractRunner);
   });
 }
 

frontend/src/stores/ethereum.ts

@@ -61,7 +61,7 @@ export function networkName(network?: Network): string {
 
 declare global {
   interface Window {
-    ethereum?: BrowserProvider & Eip1193Provider & sapphire.SapphireAnnex;
+    ethereum: BrowserProvider & Eip1193Provider & sapphire.SapphireAnnex;
   }
 }
 
@@ -91,7 +91,7 @@ export const useEthereumStore = defineStore('ethereum', () => {
       throw new MetaMaskNotInstalledError('MetaMask not installed!');
     }
 
-    return ethProvider;
+    return ethProvider as unknown as typeof window.ethereum;
   }
 
   async function init(addr: string, eth: Eip1193Provider) {

frontend/src/views/HomeView.vue

@@ -32,8 +32,8 @@ function handleError(error: Error, errorMessage: string) {
 }
 
 async function fetchMessage(): Promise<Message> {
-  const message = await uwMessageBox.value!.message();
-  const author = await uwMessageBox.value!.author();
+  const message = await messageBox.value!.message();
+  const author = await messageBox.value!.author();
 
   return { message, author };
 }