Merge branch 'master' into testnet

.devcontainer/Dockerfile

@@ -74,13 +74,13 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 RUN bash /tmp/library-scripts/rust-debian.sh "${CARGO_HOME}" "${RUSTUP_HOME}" "${USERNAME}" "true" "true"
 
 # Install Go
-#ADD https://go.dev/dl/go1.18.4.linux-amd64.tar.gz go1.18.4.linux-amd64.tar.gz
-#RUN tar -C /usr/local -xzf go1.18.4.linux-amd64.tar.gz
+#ADD https://go.dev/dl/go1.21.1.linux-amd64.tar.gz go.linux-amd64.tar.gz
+#RUN tar -C /usr/local -xzf go.linux-amd64.tar.gz
 #
 #RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" "$GOPATH/pkg" && chmod -R 777 "$GOPATH"
 #RUN chown ${USERNAME}:${USERNAME} /go -R
 
-RUN bash /tmp/library-scripts/go-debian.sh "1.18.4" "${GOROOT}" "${GOPATH}" "${USERNAME}" "true" "true" && \
+RUN bash /tmp/library-scripts/go-debian.sh "1.21.1" "${GOROOT}" "${GOPATH}" "${USERNAME}" "true" "true" && \
     go install github.com/jteeuwen/go-bindata/go-bindata@latest && go-bindata -version
 
 RUN apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts

.github/workflows/ci.yaml

@@ -105,7 +105,7 @@ jobs:
           submodules: recursive
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.19 # The Go version to download (if necessary) and use.
+          go-version: 1.21 # The Go version to download (if necessary) and use.
       - name: Install Intel's SGX SDK
         run: |
           mkdir -p "$HOME/.sgxsdk"
@@ -236,7 +236,7 @@ jobs:
           submodules: recursive
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.19 # The Go version to download (if necessary) and use.
+          go-version: 1.21 # The Go version to download (if necessary) and use.
       - name: Install xgo
         run: |
           go install github.com/crazy-max/[email protected]
@@ -270,8 +270,8 @@ jobs:
             FEATURES_U=debug-print,random,light-client-validation,go-tests
             SGX_MODE=SW
           target: build-localsecret
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          # cache-from: type=gha
+          # cache-to: type=gha,mode=max
           outputs: type=docker,dest=/tmp/localsecret.tar
       - name: Upload Image
         uses: actions/upload-artifact@v3
@@ -327,12 +327,13 @@ jobs:
         run: |
           cd integration-tests
           yarn
+          perl -i -pe 's/localsecret:.+?"/localsecret:v0.0.0"/' ../deployment/dockerfiles/ibc/docker-compose.yml
           docker compose -f ../deployment/dockerfiles/ibc/docker-compose.yml up -d > docker-compose.log 2>&1
           yarn test || { cat docker-compose.log; exit 1; }
           make kill-localsecret # next step needs the localsecret ports
       - name: Run secret.js tests
         run: |
-          git clone --depth 1 --branch contract-upgrade-v2 https://github.com/scrtlabs/secret.js
+          git clone --depth 1 --branch master https://github.com/scrtlabs/secret.js
           cd secret.js
           # Use the docker images that we built just a few steps above
           perl -i -pe 's/localsecret:.+?"/localsecret:v0.0.0"/' ./test/docker-compose.yml

.github/workflows/go-lint.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
       - uses: actions/checkout@v4
       - name: make bin-data-sw
         run: |

.github/workflows/release.yaml

@@ -151,7 +151,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.19 # The Go version to download (if necessary) and use.
+          go-version: 1.21 # The Go version to download (if necessary) and use.
       - name: Build CLI
         shell: bash
         run: |
@@ -168,7 +168,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.19 # The Go version to download (if necessary) and use.
+          go-version: 1.21 # The Go version to download (if necessary) and use.
       - name: Install xgo
         run: |
           go install github.com/crazy-max/[email protected]

CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+# 1.12.0 (WIP)
+
+- Fix the hardcoded admins feature
+- Add hardcoded admins according to proposals [269](https://dev.mintscan.io/secret/proposals/269) (Shillables) & [270](https://dev.mintscan.io/secret/proposals/270) (Sienna).
+- Fix PFM to stop dropping packets of IBC contracts.
+  - This has always been a bug in PFM. It was introduced in v1.9 and was missed because of a bug in our CI system.
+  - Fixed the bug in PFM and updated the dependency.
+  - For more info see https://github.com/cosmos/ibc-apps/pull/105.
+- Add `admin` to `WasmMsg::Instantiate` in cosmwasm-std (Thanks [@luca992](https://github.com/luca992)!).
+  - This allows contracts to specify an admin address when instantiating other contracts.
+  - See usage example [here](https://github.com/scrtlabs/SecretNetwork/blob/eedfac881/cosmwasm/contracts/v1/compute-tests/test-compute-contract/src/contract.rs#L245-L259).
+- Update IBC to v4.5.0
+
 # 1.11.0
 
 - Added ibc-hooks middleware by Osmosis.

client/docs/config.json

@@ -3,7 +3,7 @@
   "info": {
     "title": "Secret Network",
     "description": "A REST interface for queries and transactions",
-    "version": "v1.10"
+    "version": "v1.12"
   },
   "apis": [
     {

client/docs/static/openapi/openapi.yaml

@@ -2,7 +2,7 @@ openapi: 3.0.0
 info:
   title: Secret Network
   description: A REST interface for queries and transactions
-  version: v1.10
+  version: v1.12
 paths:
   /cosmos/auth/v1beta1/accounts:
     get:

client/docs/static/swagger/swagger.yaml

@@ -2,7 +2,7 @@ swagger: '2.0'
 info:
   title: Secret Network
   description: A REST interface for queries and transactions
-  version: v1.10
+  version: v1.12
 paths:
   /cosmos/auth/v1beta1/accounts:
     get: