Merge remote-tracking branch 'origin/master' into wasm3-cw1

# Conflicts:
#	deployment/ci/go-tests-bench.sh
#	third_party/incubator-teaclave-sgx-sdk

.github/workflows/release.yaml

@@ -19,8 +19,11 @@ jobs:
     env: # Or as an environment variable
       SPID: ${{ secrets.SPID_TESTNET }}
       API_KEY: ${{ secrets.API_KEY_TESTNET }}
+      DOCKER_BUILDKIT: 1
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
       - name: Declare Commit Variables
         id: vars
         shell: bash
@@ -36,11 +39,10 @@ jobs:
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
       - run: |
-          echo ${{ secrets.SPID_MAINNET }} > spid.txt; echo ${{ secrets.API_KEY_MAINNET }} > api_key.txt
+          echo ${{ secrets.SPID_TESTNET }} > spid.txt; echo ${{ secrets.API_KEY_TESTNET }} > api_key.txt
         name: "Save api keys"
       - name: Build testnet
         run: |
-          source "$HOME/.sgxsdk/sgxsdk/environment"
           VERSION=${{ steps.get_version.outputs.VERSION }} DB_BACKEND=${{ matrix.db_backend }} make build-testnet
           cp build/secretnetwork_${{ steps.get_version.outputs.VERSION }}_amd64.deb secretnetwork_${{ steps.get_version.outputs.VERSION }}_testnet_${{ matrix.db_backend }}_amd64.deb
       - uses: actions/upload-artifact@v3
@@ -59,8 +61,11 @@ jobs:
       API_KEY: ${{ secrets.API_KEY_MAINNET }}
       REGISTRY: ghcr.io
       IMAGE_NAME: scrtlabs/secret-network-node
+      DOCKER_BUILDKIT: 1
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
       - name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
@@ -132,8 +137,11 @@ jobs:
     env:
       REGISTRY: ghcr.io
       IMAGE_NAME: scrtlabs/localsecret
+      DOCKER_BUILDKIT: 1
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
       - name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
@@ -143,11 +151,6 @@ jobs:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Create temp files
-        shell: bash
-        run: |
-          echo "random data" > api_key.txt
-          echo "lol this is ignored" > spid.txt
       - name: Build dev docker image
         shell: bash
         run: |

CHANGELOG.md

@@ -1,5 +1,23 @@
 # CHANGELOG
 
+# 1.5.0
+
+- Fix IBC contracts bug ([#1199](https://github.com/scrtlabs/SecretNetwork/pull/1199))
+- Fix creating accounts using ICA ([#1215](https://github.com/scrtlabs/SecretNetwork/pull/1215))
+- Fix node registration ([#1221](https://github.com/scrtlabs/SecretNetwork/pull/1221))
+- Fix nested attributes in contracts reply ([#1241](https://github.com/scrtlabs/SecretNetwork/pull/1241))
+- Fix state sync ([#1243](https://github.com/scrtlabs/SecretNetwork/pull/1243))
+- Fix some protobuf type names ([256d9b](https://github.com/scrtlabs/SecretNetwork/commit/256d9b2184d923d5493b6ede3c89980d3028ce8f))
+- Update cosmos-sdk from v0.45.9 to v0.45.10
+- Update Tendermint from v0.34.21 to v0.34.22
+- Update ibc-go from v3.3.0 to v3.3.1
+
+# 1.4.1-patch.3
+
+- Patch againt the IBC Dragonberry vulnerability
+- Update cosmos-sdk from v0.45.5 to v0.45.9
+- Update Tendermint from v0.34.19 to v0.34.21
+
 # 1.4.0
 
 - CosmWasm v1
@@ -9,27 +27,27 @@
 - Support MetaMask pretty signing
 - Ledger support for x/authz & x/feegrant
 - Revert Chain of Secrets tombstone state and restore slashed funds
-- Updated ibc-go from v3.0.0 to v3.3.0
+- Update ibc-go from v3.0.0 to v3.3.0
 
 # 1.3.1
 
 - Use all available cores to serve queries.
 - Mainnet docker image with automatic node registration & state sync ([docs](https://docs.scrt.network/node-guides/full-node-docker.html)).
 - Mempool optimizations (Thanks @ValarDragon!). For more info see [this](https://github.com/scrtlabs/cosmos-sdk/pull/141#issuecomment-1136767411).
 - Fix missing `libsnappy1v5` dependency for rocksdb deb package.
-- Updated `${LCD_URL}/swagger/` for v1.3 and added `${LCD_URL}/openapi/`.
+- Update `${LCD_URL}/swagger/` for v1.3 and add `${LCD_URL}/openapi/`.
 
 # 1.3.0
 
 - Bug fix when calculating gas prices caused by queries. This is will increase gas prices for contracts that use external queries, and will more accurately reflect resources used
-- Updated cosmos-sdk from v0.44.5 to v0.45.4
+- Update cosmos-sdk from v0.44.5 to v0.45.4
   - Add the `secretd rollback` command
   - Add the `~/.secretd/.compute` directory to state sync
   - Full changelog: [`cosmos-sdk/v0.44.5...v0.45.4`](https://github.com/cosmos/cosmos-sdk/compare/v0.44.5...v0.45.4)
-- Updated tendermint from v0.34.16 to v0.34.19
+- Update tendermint from v0.34.16 to v0.34.19
 - Fix registration failure for Intel Xeon 23xx-series processors (icelake still unsupported)
 - Floating point checks no longer ran on execute (only on init)
-- Upgraded ibc-go from v1.1.5 to v3
+- Update ibc-go from v1.1.5 to v3.0.0
   - Added support for ICS27 - default host messages include voting, delegate/undelegate and voting
   - Full changelog: [`ibc-go/v1.1.5...v1.3.0`](https://github.com/cosmos/ibc-go/compare/v1.1.5...v1.3.0)
 - Backport API from CosmWasm v1:

Makefile

@@ -270,7 +270,7 @@ build-testnet: _docker_base
 
 build-mainnet-upgrade: _docker_base
 	@mkdir build 2>&3 || true
-	docker build --secret API_KEY=${API_KEY} --secret SPID=${SPID} --build-arg BUILD_VERSION=${VERSION} -f deployment/dockerfiles/mainnet-upgrade-release.Dockerfile -t build-release:latest .
+	docker build --build-arg BUILD_VERSION=${VERSION} -f deployment/dockerfiles/mainnet-upgrade-release.Dockerfile -t build-release:latest .
 	docker build --build-arg BUILD_VERSION=${VERSION} --build-arg SGX_MODE=HW -f deployment/dockerfiles/build-deb-mainnet.Dockerfile -t deb_build .
 	docker run -e VERSION=${VERSION} -v $(CUR_DIR)/build:/build deb_build
 	docker tag build-release ghcr.io/scrtlabs/secret-network-node:$(VERSION)

app/app.go

@@ -380,7 +380,7 @@ func NewSecretNetworkApp(
 
 	if manager := app.BaseApp.SnapshotManager(); manager != nil {
 		err := manager.RegisterExtensions(
-			compute.NewWasmSnapshotter(app.BaseApp.CommitMultiStore(), app.AppKeepers.ComputeKeeper),
+			compute.NewWasmSnapshotter(app.BaseApp.CommitMultiStore(), app.AppKeepers.ComputeKeeper, filepath.Join(homePath, ".compute", "wasm", "wasm")),
 		)
 		if err != nil {
 			panic(fmt.Errorf("failed to register snapshot extension: %s", err))

client/docs/config.json

@@ -39,6 +39,17 @@
         }
       }
     },
+    {
+      "url": "../../tmp-swagger-gen/cosmos/base/node/v1beta1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "../../tmp-swagger-gen/cosmos/base/node/v1beta1/query.swagger.jsonParams",
+          "Pool": "../../tmp-swagger-gen/cosmos/base/node/v1beta1/query.swagger.jsonPool",
+          "DelegatorValidators": "../../tmp-swagger-gen/cosmos/base/node/v1beta1/query.swagger.jsonDelegatorValidators",
+          "UpgradedConsensusState": "../../tmp-swagger-gen/cosmos/base/node/v1beta1/query.swagger.jsonUpgradedConsensusState"
+        }
+      }
+    },
     {
       "url": "../../tmp-swagger-gen/cosmos/base/tendermint/v1beta1/query.swagger.json",
       "operationIds": {