Merge pull request #944 from scrtlabs/port-v0.10-test-contract-to-v1

Port v0.10 test contract to v1
scrtlabs · Jul 5, 2022 · 9721e2f · 9721e2f
2 parents c399e85 + 542ea74
commit 9721e2f
Show file tree

Hide file tree

Showing 10 changed files with 3,421 additions and 1,764 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   Enclave-Unit-Tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Install Intel's SGX SDK
@@ -35,7 +35,7 @@ jobs:
         run: |
           cargo --version
           rustc --version  
-          cargo +stable install xargo
+          cargo +stable install xargo --version 0.3.25
           xargo --version
       - name: Download sccache
         run: |
@@ -51,7 +51,7 @@ jobs:
           make clean-enclave
 
   Build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
@@ -85,7 +85,7 @@ jobs:
         run: |
           cargo --version
           rustc --version  
-          cargo +stable install xargo
+          cargo +stable install xargo --version 0.3.25
           xargo --version
       - name: Download sccache
         run: |
@@ -150,7 +150,7 @@ jobs:
           path: ./x/compute/internal/keeper/testdata/test-contract/static-too-high-initial-memory.wasm
 
   Go-Tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: Build
     steps:
       - uses: actions/checkout@v2
@@ -208,7 +208,7 @@ jobs:
           LOG_LEVEL=ERROR go test -p 1 -timeout 20m -v ./x/compute/internal/...
 
   Clippy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Install Intel's SGX SDK
@@ -239,7 +239,7 @@ jobs:
         run: |
           cargo --version
           rustc --version  
-          cargo +stable install xargo
+          cargo +stable install xargo --version 0.3.25
           xargo --version
       - name: Download sccache
         run: |
@@ -255,7 +255,7 @@ jobs:
           SGX_MODE=HW make clippy
 
   XBuild-CLI:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
@@ -271,7 +271,7 @@ jobs:
         run: make build_windows_cli
 
   Integration-Tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Build docker testnet

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         db_backend: [rocksdb, goleveldb]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env: # Or as an environment variable
       SPID_TESTNET: ${{ secrets.SPID_TESTNET }}
       API_KEY_TESTNET: ${{ secrets.API_KEY_TESTNET }}
@@ -55,7 +55,7 @@ jobs:
       - run: rustup component add rust-src clippy
       - name: Install xargo
         run: |
-          cargo +stable install xargo
+          cargo +stable install xargo --version 0.3.25
           xargo --version
       - name: Download sccache
         run: |
@@ -80,7 +80,7 @@ jobs:
           path: secretnetwork_${{ steps.get_version.outputs.VERSION }}_testnet_${{ matrix.db_backend }}_amd64.deb
 
   build-deb-mainnet:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -125,7 +125,7 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-20.04, windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v3
       - name: Build CLI
@@ -139,7 +139,7 @@ jobs:
           path: secretcli-${{runner.os}}
 
   x-build-cli:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v2
@@ -160,7 +160,7 @@ jobs:
           path: secretcli-MacOS-arm64
 
   publish-localsecret:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       REGISTRY: ghcr.io
       IMAGE_NAME: scrtlabs/localsecret
@@ -189,7 +189,7 @@ jobs:
 
   Release:
     needs: [native-build-cli, build-deb-testnet, build-deb-mainnet, x-build-cli]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Get the version

diff --git a/deployment/ci/docker-compose.ci.yaml b/deployment/ci/docker-compose.ci.yaml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   aesm:
-    image: enigmampc/aesm
+    image: fortanix/aesmd:2.13.103.1-1
     devices:
       - /dev/sgx/enclave
       - /dev/sgx/provision
@@ -20,8 +20,9 @@ services:
       - aesm
     devices:
       - /dev/sgx/enclave
+      - /dev/sgx/provision
     volumes:
-      - /var/run/aesmd:/var/run/aesmd
+      - /tmp/aesmd:/var/run/aesmd
       - /tmp/secretd:/root/.secretd
       - /tmp/secretcli:/root/.secretcli
     stdin_open: true
@@ -39,8 +40,9 @@ services:
       - aesm
     devices:
       - /dev/sgx/enclave
+      - /dev/sgx/provision
     volumes:
-      - /var/run/aesmd:/var/run/aesmd
+      - /tmp/aesmd:/var/run/aesmd
       - /tmp/secretd:/root/.secretd
       # - /tmp/secretcli:/root/.secretcli
     stdin_open: true
@@ -58,8 +60,9 @@ services:
       - bootstrap
     devices:
       - /dev/sgx/enclave
+      - /dev/sgx/provision
     volumes:
-      - /var/run/aesmd:/var/run/aesmd
+      - /tmp/aesmd:/var/run/aesmd
       - /tmp/secretd:/tmp/.secretd
       # - /tmp/secretcli:/root/.secretcli
     stdin_open: true
@@ -74,8 +77,9 @@ services:
       - aesm
     devices:
       - /dev/sgx/enclave
+      - /dev/sgx/provision
     volumes:
-      - /var/run/aesmd:/var/run/aesmd
+      - /tmp/aesmd:/var/run/aesmd
       - /tmp/secretd:/tmp/.secretd
       - /tmp/secretcli:/root/.secretcli
     stdin_open: true