backend: Use new sapphire-contracts SiweAuth

oasisprotocol · Nov 12, 2024 · 34d471c · 34d471c
1 parent 4bbab76
commit 34d471c
Show file tree

Hide file tree

Showing 11 changed files with 4,701 additions and 4,137 deletions.
diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml
@@ -24,7 +24,7 @@ jobs:
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory

diff --git a/backend/contracts/DateTime.sol b/backend/contracts/DateTime.sol
diff --git a/backend/contracts/MessageBox.sol b/backend/contracts/MessageBox.sol
@@ -1,14 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "./SiweAuth.sol";
+import "@oasisprotocol/sapphire-contracts/contracts/auth/SiweAuth.sol";
 
 contract MessageBox is SiweAuth {
     string private _message;
     address public author;
 
-    modifier _authorOnly(bytes calldata bearer) {
-        if (authMsgSender(bearer) != author) {
+
+    modifier isAuthor(bytes calldata bearer) {
+        // Use msg.sender for transactions and signed calls, fallback to
+        // checking bearer.
+        if (msg.sender != author && authMsgSender(bearer) != author) {
             revert("not allowed");
         }
         _;
@@ -22,7 +25,7 @@ contract MessageBox is SiweAuth {
         author = msg.sender;
     }
 
-    function message(bytes calldata bearer) external view _authorOnly(bearer) returns (string memory) {
-      return _message;
+    function message(bytes calldata bearer) external view isAuthor(bearer) returns (string memory) {
+        return _message;
     }
 }