Update master branch

.github/workflows/build-ci-multiplatform.yml

@@ -2,10 +2,10 @@ name: Build CI multiplatform
 
 on:
  push:
- tags:
- - "*"
- # Allows you to run this workflow manually from the Actions tab
+ branches: [ develop, '**-release', 'feat/sdi-changes' ]
  workflow_dispatch:
+env:
+ BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 
 jobs:
@@ -25,7 +25,7 @@ jobs:
  path: build/swisstronikcli-linux-amd64
 
  macos-amd64:
- runs-on: macos-latest
+ runs-on: macos-13
  steps:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v4
@@ -40,7 +40,7 @@ jobs:
  path: build/swisstronikcli-macos-amd64
 
  macos-arm64:
- runs-on: macos-latest-xlarge
+ runs-on: macos-14
  steps:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v4

.github/workflows/build-deb.yml

@@ -2,18 +2,29 @@ name: Build Deb
 
 on:
  push:
- tags:
- - "*"
+ branches: [ develop, '**-release', 'release-**' ]
+ workflow_dispatch:
+env:
+ BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 jobs:
  build-deb:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
  env:
  SGX_MODE: HW
+ VERSION: "1.0.3"
+ PRODUCTION_MODE: true
  steps:
  - uses: actions/checkout@v3
  with:
  submodules: recursive
+ - name: Retrieve the secret and decode it to a file
+ env:
+ ENCLAVE_PK_BASE64: ${{ secrets.ENCLAVE_PK_BASE64 }}
+ run: |
+ rm sgxvm/Enclave_dev_private.pem || true
+ rm sgxvm/Enclave_private.pem || true
+ echo $ENCLAVE_PK_BASE64 | base64 --decode > sgxvm/Enclave_private.pem
  - name: Set up Docker Buildx
  uses: docker/setup-buildx-action@v2
 
@@ -40,12 +51,13 @@ jobs:
  build-args: |
  SGX_MODE=HW
  ENCLAVE_HOME="/usr/lib/"
+ PRODUCTION_MODE=true
  target: build-deb
  - name: Run .deb Package Image
  run: |
- docker run -e VERSION=${{ steps.get_version.outputs.version-without-v }} -v $GITHUB_WORKSPACE/build:/build deb_build
- cp build/swisstronik_${{ steps.get_version.outputs.version-without-v }}_amd64.deb swisstronik_${{ steps.get_version.outputs.version-without-v }}_amd64.deb
+ docker run -e VERSION=${{ env.VERSION }} -v $GITHUB_WORKSPACE/build:/build deb_build
+ cp build/swisstronik_${{ env.VERSION }}_amd64.deb swisstronik_${{ env.VERSION }}_amd64.deb
  - uses: actions/upload-artifact@v3
  with:
- name: swisstronik_${{ steps.get_version.outputs.version-without-v }}_amd64.deb
- path: swisstronik_${{ steps.get_version.outputs.version-without-v }}_amd64.deb
+ name: swisstronik_${{ env.VERSION }}_amd64.deb
+ path: swisstronik_${{ env.VERSION }}_amd64.deb

.gitignore

@@ -6,4 +6,12 @@ release/
 .DS_Store
 *swtr_seed
 build/
-.testnets/
+.testnets/
+**.uuid
+vendor
+**quote.dat
+sgxvm/Enclave_private.pem
+
+# Dynamic libraries
+**libsgx_wrapper**
+**libsgx_attestation_wrapper**

Makefile

@@ -1,13 +1,21 @@
-VERSION := v1.0.1
+VERSION := v1.0.3
 COMMIT := $(shell git log -1 --format='%H')
 ENCLAVE_HOME ?= $(HOME)/.swisstronik-enclave
+PRODUCTION_MODE ?= false
 
 ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=swisstronik \
  -X github.com/cosmos/cosmos-sdk/version.ServerName=swisstronikd \
  -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
  -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT)
 
+ldflags_static = -X github.com/cosmos/cosmos-sdk/version.Name=swisstronik \
+ -X github.com/cosmos/cosmos-sdk/version.ServerName=swisstronikd \
+ -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
+ -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
+ -w -s -linkmode 'external' -extldflags=-static
+
 BUILD_FLAGS := -ldflags '$(ldflags)'
+BUILD_FLAGS_STATIC := -ldflags "$(ldflags_static)"
 DOCKER := $(shell which docker)
 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf
 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git) 
@@ -79,13 +87,26 @@ build: go.sum
  $(MAKE) -C go-sgxvm build
  go build -mod=mod $(BUILD_FLAGS) -tags osusergo,netgo -o build/swisstronikd ./cmd/swisstronikd
 
+build_d: go.sum
+ $(MAKE) -C go-sgxvm build_d
+ go build -mod=mod $(BUILD_FLAGS) -tags osusergo,netgo -o build/swisstronikd ./cmd/swisstronikd
+
+build_attestation_server: go.sum
+ AS_MODE=true $(MAKE) -C go-sgxvm build_AS
+
+build_attestation_server_d: go.sum
+ AS_MODE=true $(MAKE) -C go-sgxvm build_AS_d
+
 ###############################################################################
 ### Build commands for CLI (without SGX support) ###
 ###############################################################################
 
 build-cli: go.sum
  go build -mod=mod $(BUILD_FLAGS) -tags osusergo,netgo,nosgx -o build/$(BINARY_NAME) ./cmd/swisstronikd
 
+build-cli-linux-static: go.sum
+ CGO_ENABLED=1 go build -mod=mod $(BUILD_FLAGS_STATIC) -tags osusergo,netgo,nosgx -o build/$(BINARY_NAME) ./cmd/swisstronikd
+
 build-linux:
  GOOS=linux GOARCH=$(if $(findstring aarch64,$(shell uname -m)) || $(findstring arm64,$(shell uname -m)),arm64,amd64) $(MAKE) build
 
@@ -96,10 +117,10 @@ build-macos-cli-arm:
  BINARY_NAME=swisstronikcli-macos-arm64 GOOS=darwin GOARCH=arm64 $(MAKE) build-cli
 
 build-linux-cli-amd:
- BINARY_NAME=swisstronikcli-linux-amd64 GOOS=linux GOARCH=amd64 $(MAKE) build-cli
+ BINARY_NAME=swisstronikcli-linux-amd64 GOOS=linux GOARCH=amd64 $(MAKE) build-cli-linux-static
 
 build-linux-cli-arm:
- BINARY_NAME=swisstronikcli-linux-arm64 GOOS=linux GOARCH=arm64 $(MAKE) build-cli
+ BINARY_NAME=swisstronikcli-linux-arm64 GOOS=linux GOARCH=arm64 $(MAKE) build-cli-linux-static
 
 build-windows-cli:
  BINARY_NAME=swisstronikcli-windows GOOS=windows GOARCH=amd64 $(MAKE) build-cli

README.md

@@ -111,4 +111,9 @@ Update target with address of your node in `monitoring/prometheus.yml`. This wil
 You can start docker containers with prometheus and grafana using docker-compose. To do it, run:
 ```sh
 docker-compose run up -d
-```
+```
+
+
+## License
+
+GNU GPL v3, except for "x/compliance" module - please see separate included LICENSE file in "x/compliance" folder for details.

app/ante/ante.go

@@ -19,19 +19,16 @@ import (
  "fmt"
  "runtime/debug"
 
- tmlog "github.com/cometbft/cometbft/libs/log"
-
  errorsmod "cosmossdk.io/errors"
+ tmlog "github.com/cometbft/cometbft/libs/log"
+ "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
  "github.com/cosmos/cosmos-sdk/crypto/types/multisig"
  sdk "github.com/cosmos/cosmos-sdk/types"
  errortypes "github.com/cosmos/cosmos-sdk/types/errors"
  "github.com/cosmos/cosmos-sdk/types/tx/signing"
  authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
  authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-
  "swisstronik/crypto/ethsecp256k1"
-
- "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 )
 
 const (