Merge pull request #396 from ZigaMr/ZigaMr/sapphirepy/signed-queries

Add signed data/leash/signature to eth_call data

.github/workflows/ci-test.yaml

@@ -86,3 +86,46 @@ jobs:
 
       - name: Test JS client
         run: pnpm test:unit
+
+  test-client-py:
+    name: test-client-py
+    runs-on: ubuntu-latest
+    services:
+      sapphire-localnet-ci:
+        image: ghcr.io/oasisprotocol/sapphire-localnet:latest
+        ports:
+          - 8545:8545
+        options: >-
+          --rm
+          --health-cmd="test -f /CONTAINER_READY"
+          --health-start-period=90s
+    defaults:
+      run:
+        working-directory: ./clients/py
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.12'
+
+      - name: Build sapphirepy .whl file
+        run: |
+          pip3 install --user -r requirements.txt
+          pip3 install --user -r requirements.dev.txt
+          make
+
+      - name: Install sapphirepy .whl file
+        run: |
+          pip3 install --user -r requirements.txt
+          pip3 install --user dist/sapphire.py-0.3.0-py3-none-any.whl
+
+      - name: Python client tests
+        working-directory: clients/py
+        run: |
+          python3 -mpip install --user -r requirements.txt
+          python3 -mpip install --user -r requirements.dev.txt
+          python3 -munittest discover
+          pytest sapphirepy/tests/

.github/workflows/contracts-test.yaml

@@ -28,11 +28,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Install jq
         run: sudo apt install -y jq
-      - name: Python client tests
-        working-directory: clients/py
-        run: |
-          python3 -mpip install --user -r requirements.txt
-          python3 -munittest discover
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:

clients/py/requirements.dev.txt

@@ -2,3 +2,5 @@ py-solc-x
 mypy
 pylint
 ruff
+setuptools
+pytest

clients/py/sapphirepy/envelope.py

@@ -97,6 +97,19 @@ def encrypt(self, plaintext: bytes):
         }
         return cbor2.dumps(envelope, canonical=True)
 
+    def make_envelope(self, plaintext: bytes):
+        ciphertext, nonce = self._encrypt_calldata(plaintext)
+        envelope = {
+            'body': {
+                'pk': self.ephemeral_pubkey,
+                'data': ciphertext,
+                'nonce': nonce,
+                'epoch': self.epoch
+            },
+            'format': FORMAT_ENCRYPTED_X25519DEOXYSII
+        }
+        return envelope
+
     def _decode_inner(self, plaintext:bytes) -> bytes:
         inner_result = cast(ResultInner, cbor2.loads(plaintext))
         if inner_result.get('ok', None) is not None: