Contract Upgrade

.github/workflows/ci.yaml

@@ -71,7 +71,7 @@ jobs:
           ./scripts/install-wasm-tools.sh
       - name: Build Contracts
         run: |
-          make build-test-contract
+          make build-test-contracts
           cp x/compute/internal/keeper/testdata/erc20.wasm .
       - uses: actions/upload-artifact@v3
         with:
@@ -81,6 +81,10 @@ jobs:
         with:
           name: contract.wasm
           path: cosmwasm/contracts/v010/compute-tests/test-compute-contract/contract.wasm
+      - uses: actions/upload-artifact@v3
+        with:
+          name: contract-v2.wasm
+          path: cosmwasm/contracts/v010/compute-tests/test-compute-contract-v2/contract-v2.wasm
       - uses: actions/upload-artifact@v3
         with:
           name: v1-contract.wasm
@@ -137,6 +141,9 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: contract.wasm
+      - uses: actions/download-artifact@v3
+        with:
+          name: contract-v2.wasm
       - uses: actions/download-artifact@v3
         with:
           name: v1-contract.wasm
@@ -162,6 +169,7 @@ jobs:
           # cp /opt/mount/librandom_api.so /usr/lib/librandom_api.so
           # cp /opt/mount/tendermint_enclave.signed.so /usr/lib/tendermint_enclave.signed.so
           cp contract.wasm ./x/compute/internal/keeper/testdata/contract.wasm
+          cp contract-v2.wasm ./x/compute/internal/keeper/testdata/contract-v2.wasm
           cp too-high-initial-memory.wasm ./x/compute/internal/keeper/testdata/too-high-initial-memory.wasm
           cp contract_with_floats.wasm ./x/compute/internal/keeper/testdata/contract_with_floats.wasm
           cp static-too-high-initial-memory.wasm ./x/compute/internal/keeper/testdata/static-too-high-initial-memory.wasm
@@ -276,7 +284,7 @@ jobs:
           build-args: |
             SECRET_NODE_TYPE=BOOTSTRAP
             CHAIN_ID=secretdev-1
-            FEATURES=debug-print,random
+            FEATURES=debug-print,random,light-client-validation
             SGX_MODE=SW
           target: build-localsecret
           cache-from: type=gha
@@ -341,7 +349,7 @@ jobs:
           make kill-localsecret # next step needs the localsecret ports
       - name: Run secret.js tests
         run: |
-          git clone --depth 1 --branch master https://github.com/scrtlabs/secret.js
+          git clone --depth 1 --branch contract-upgrade-v2 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

.vscode/settings.json

@@ -7,9 +7,13 @@
     "third_party/build/Cargo.toml",
     "cosmwasm/enclaves/Cargo.toml",
     "cosmwasm/contracts/v1/compute-tests/test-compute-contract/Cargo.toml",
+    "cosmwasm/contracts/v1/compute-tests/test-compute-contract-v2/Cargo.toml",
     "cosmwasm/contracts/v1/compute-tests/ibc-test-contract/Cargo.toml",
     "cosmwasm/contracts/v1/compute-tests/bench-contract/Cargo.toml",
     "cosmwasm/contracts/v010/compute-tests/test-compute-contract/Cargo.toml",
+    "cosmwasm/contracts/v010/compute-tests/test-compute-contract-v2/Cargo.toml",
+    "cosmwasm/contracts/v1/compute-tests/migration/contract-v1/Cargo.toml",
+    "cosmwasm/contracts/v1/compute-tests/migration/contract-v2/Cargo.toml",
     "integration-tests/contract-v1/Cargo.toml",
     "integration-tests/contract-v0.10/Cargo.toml",
     "go-cosmwasm/Cargo.toml",

CHANGELOG.md

@@ -3,12 +3,20 @@
 # 1.10.0 (Unreleased - WIP)
 
 - Added ibc-hooks middleware by Osmosis.
-  - WASM Hooks: allows ICS-20 token transfers to initiate contract calls, serving various use cases.
+  - WASM hooks: allows ICS-20 token transfers to initiate contract calls, serving various use cases.
     - Example: Sending tokens to Secret and immediately wrapping them as SNIP-20 token. For example, `ATOM on Hub -> ATOM on Secret -> sATOMS on Secret` (2 transactions on 2 chains) now becomes `ATOM on Hub -> sATOM on Secret` (1 transaction).
     - Example: Cross-chain swaps. Using IBC Hooks, an AMM on Secret can atomically swap tokens that originated on a different chain and are headed to Secret. The AMM can also send those tokens back to the originating chain.
     - [Axelar GMP](https://docs.axelar.dev/dev/general-message-passing/overview): Using IBC Hooks, a contract on Ethereum can call a contract on Secret and get a response back.
   - Ack callbacks: allow non-IBC contracts that send an `IbcMsg::Transfer` to listen for the ack/timeout of the token transfer. This allows these contracts to definitively know whether the transfer was successful or not and act accordingly (refund if failed, continue if succeeded). See usage example [here](https://github.com/scrtlabs/secret.js/blob/4293219/test/ibc-hooks-contract/src/contract.rs#L47-L91).
-- Added and optional `memo` field to `IbcMsg::Transfer`, to ease to use of the IBC Hooks ack callbacks feature. See usage example [here](https://github.com/scrtlabs/secret.js/blob/4293219/test/ibc-hooks-contract/src/contract.rs#L60-L63).
+- Added an optional `memo` field to `IbcMsg::Transfer`, to ease to use of the IBC Hooks ack callbacks feature. See usage example [here](https://github.com/scrtlabs/secret.js/blob/4293219/test/ibc-hooks-contract/src/contract.rs#L60-L63).
+- Added contract upgrade feature.
+  - On init, the creator can specify an admin address.
+  - The admin can migrate the contract to a new code ID.
+  - The admin can update or clear the admin address.
+  - The admins of contracts that were instantiated before v1.10 are hardcoded according to [proposal TODO](https://www.mintscan.io/secret/proposals/TODO).
+  - Hardcoded admins can only be updated/cleared with a future gov proposal.
+  - When the new MsgMigrateContract is invoked, the `migrate()` function is being called on the new contract code, where the new contract can optionally perform state migrations. See usage example [here](https://github.com/scrtlabs/SecretNetwork/blob/139a0eb18/cosmwasm/contracts/v1/compute-tests/migration/contract-v2/src/contract.rs#L37-L43).
+- Fixed a scenario where the enclave's light client might fail a valid node registration transaction.
 
 # 1.9.3
 

Makefile

@@ -244,7 +244,7 @@ clean:
 
 localsecret:
 	DOCKER_BUILDKIT=1 docker build \
-			--build-arg FEATURES="${FEATURES},debug-print,random" \
+			--build-arg FEATURES="${FEATURES},debug-print,random,light-client-validation" \
 			--build-arg FEATURES_U=${FEATURES_U} \
 			--secret id=API_KEY,src=.env.local \
 			--secret id=SPID,src=.env.local \
@@ -416,24 +416,57 @@ build-bench-contract:
 	$(MAKE) -C $(TEST_CONTRACT_V1_PATH)/bench-contract
 	cp $(TEST_CONTRACT_V1_PATH)/bench-contract/*.wasm $(TEST_COMPUTE_MODULE_PATH)/
 
-build-test-contract:
+build-test-contracts:
 	# echo "" | sudo add-apt-repository ppa:hnakamur/binaryen
 	# sudo apt update
 	# sudo apt install -y binaryen
 	$(MAKE) -C $(TEST_CONTRACT_V010_PATH)/test-compute-contract
-	cp $(TEST_CONTRACT_V010_PATH)/test-compute-contract/*.wasm $(TEST_COMPUTE_MODULE_PATH)/
+
+	rm -f $(TEST_COMPUTE_MODULE_PATH)/contract.wasm
+	cp $(TEST_CONTRACT_V010_PATH)/test-compute-contract/contract.wasm $(TEST_COMPUTE_MODULE_PATH)/contract.wasm
+
+	rm -f $(TEST_COMPUTE_MODULE_PATH)/contract_with_floats.wasm
+	cp $(TEST_CONTRACT_V010_PATH)/test-compute-contract/contract_with_floats.wasm $(TEST_COMPUTE_MODULE_PATH)/contract_with_floats.wasm
+
+	rm -f $(TEST_COMPUTE_MODULE_PATH)/static-too-high-initial-memory.wasm
+	cp $(TEST_CONTRACT_V010_PATH)/test-compute-contract/static-too-high-initial-memory.wasm $(TEST_COMPUTE_MODULE_PATH)/static-too-high-initial-memory.wasm
+
+	rm -f $(TEST_COMPUTE_MODULE_PATH)/too-high-initial-memory.wasm
+	cp $(TEST_CONTRACT_V010_PATH)/test-compute-contract/too-high-initial-memory.wasm $(TEST_COMPUTE_MODULE_PATH)/too-high-initial-memory.wasm
+
+	$(MAKE) -C $(TEST_CONTRACT_V010_PATH)/test-compute-contract-v2
+
+	rm -f $(TEST_COMPUTE_MODULE_PATH)/contract-v2.wasm
+	cp $(TEST_CONTRACT_V010_PATH)/test-compute-contract-v2/contract-v2.wasm $(TEST_COMPUTE_MODULE_PATH)/contract-v2.wasm
+
 	$(MAKE) -C $(TEST_CONTRACT_V1_PATH)/test-compute-contract
-	cp $(TEST_CONTRACT_V1_PATH)/test-compute-contract/*.wasm $(TEST_COMPUTE_MODULE_PATH)/
+	rm -f $(TEST_COMPUTE_MODULE_PATH)/v1-contract.wasm
+	cp $(TEST_CONTRACT_V1_PATH)/test-compute-contract/v1-contract.wasm $(TEST_COMPUTE_MODULE_PATH)/v1-contract.wasm
+
+	$(MAKE) -C $(TEST_CONTRACT_V1_PATH)/test-compute-contract-v2
+	rm -f $(TEST_COMPUTE_MODULE_PATH)/v1-contract-v2.wasm
+	cp $(TEST_CONTRACT_V1_PATH)/test-compute-contract-v2/v1-contract-v2.wasm $(TEST_COMPUTE_MODULE_PATH)/v1-contract-v2.wasm
+
 	$(MAKE) -C $(TEST_CONTRACT_V1_PATH)/ibc-test-contract
-	cp $(TEST_CONTRACT_V1_PATH)/ibc-test-contract/*.wasm $(TEST_COMPUTE_MODULE_PATH)/
+	rm -f $(TEST_COMPUTE_MODULE_PATH)/ibc.wasm
+	cp $(TEST_CONTRACT_V1_PATH)/ibc-test-contract/ibc.wasm $(TEST_COMPUTE_MODULE_PATH)/ibc.wasm
+
+	$(MAKE) -C $(TEST_CONTRACT_V1_PATH)/migration/contract-v1
+	rm -f $(TEST_COMPUTE_MODULE_PATH)/migrate_contract_v1.wasm
+	cp $(TEST_CONTRACT_V1_PATH)/migration/contract-v1/migrate_contract_v1.wasm $(TEST_COMPUTE_MODULE_PATH)/migrate_contract_v1.wasm
+
+	$(MAKE) -C $(TEST_CONTRACT_V1_PATH)/migration/contract-v2
+	rm -f $(TEST_COMPUTE_MODULE_PATH)/migrate_contract_v2.wasm
+	cp $(TEST_CONTRACT_V1_PATH)/migration/contract-v2/migrate_contract_v2.wasm $(TEST_COMPUTE_MODULE_PATH)/migrate_contract_v2.wasm
+
 
-prep-go-tests: build-test-contract bin-data-sw
+prep-go-tests: build-test-contracts bin-data-sw
 	# empty BUILD_PROFILE means debug mode which compiles faster
 	SGX_MODE=SW $(MAKE) build-linux
 	cp ./$(EXECUTE_ENCLAVE_PATH)/librust_cosmwasm_enclave.signed.so ./x/compute/internal/keeper
 	cp ./$(EXECUTE_ENCLAVE_PATH)/librust_cosmwasm_enclave.signed.so .
 
-go-tests: build-test-contract bin-data-sw
+go-tests: build-test-contracts bin-data-sw
 	SGX_MODE=SW $(MAKE) build-linux
 	cp ./$(EXECUTE_ENCLAVE_PATH)/librust_cosmwasm_enclave.signed.so ./x/compute/internal/keeper
 	cp ./$(EXECUTE_ENCLAVE_PATH)/librust_cosmwasm_enclave.signed.so .
@@ -442,7 +475,7 @@ go-tests: build-test-contract bin-data-sw
 	mkdir -p ./x/compute/internal/keeper/.sgx_secrets
 	GOMAXPROCS=8 SGX_MODE=SW SCRT_SGX_STORAGE='./' go test -count 1 -failfast -timeout 90m -v ./x/compute/internal/... $(GO_TEST_ARGS)
 
-go-tests-hw: build-test-contract bin-data
+go-tests-hw: build-test-contracts bin-data
 	# empty BUILD_PROFILE means debug mode which compiles faster
 	SGX_MODE=HW $(MAKE) build-linux
 	cp ./$(EXECUTE_ENCLAVE_PATH)/librust_cosmwasm_enclave.signed.so ./x/compute/internal/keeper
@@ -457,7 +490,7 @@ go-tests-hw: build-test-contract bin-data
 enclave-tests:
 	$(MAKE) -C cosmwasm/enclaves/test run
 
-build-all-test-contracts: build-test-contract
+build-all-test-contracts: build-test-contracts
 	cd $(CW_CONTRACTS_V010_PATH)/gov && RUSTFLAGS='-C link-arg=-s' cargo build --release --target wasm32-unknown-unknown --locked
 	wasm-opt -Os $(CW_CONTRACTS_V010_PATH)/gov/target/wasm32-unknown-unknown/release/gov.wasm -o $(TEST_CONTRACT_PATH)/gov.wasm
 
@@ -483,7 +516,7 @@ build-all-test-contracts: build-test-contract
 	wasm-opt -Os .$(CW_CONTRACTS_V010_PATH)/hackatom/target/wasm32-unknown-unknown/release/hackatom.wasm -o $(TEST_CONTRACT_PATH)/contract.wasm
 	cat $(TEST_CONTRACT_PATH)/contract.wasm | gzip > $(TEST_CONTRACT_PATH)/contract.wasm.gzip
 
-build-erc20-contract: build-test-contract
+build-erc20-contract: build-test-contracts
 	cd .$(CW_CONTRACTS_V010_PATH)/erc20 && RUSTFLAGS='-C link-arg=-s' cargo build --release --target wasm32-unknown-unknown --locked
 	wasm-opt -Os .$(CW_CONTRACTS_V010_PATH)/erc20/target/wasm32-unknown-unknown/release/cw_erc20.wasm -o ./erc20.wasm
 

client/docs/config.json

@@ -3,7 +3,7 @@
   "info": {
     "title": "Secret Network",
     "description": "A REST interface for queries and transactions",
-    "version": "v1.8"
+    "version": "v1.10"
   },
   "apis": [
     {
@@ -171,6 +171,17 @@
         }
       }
     },
+    {
+      "url": "../../tmp-swagger-gen/ibc/applications/fee/v1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "../../tmp-swagger-gen/ibc/applications/fee/v1/query.swagger.jsonParams",
+          "Pool": "../../tmp-swagger-gen/ibc/applications/fee/v1/query.swagger.jsonPool",
+          "DelegatorValidators": "../../tmp-swagger-gen/ibc/applications/fee/v1/query.swagger.jsonDelegatorValidators",
+          "UpgradedConsensusState": "../../tmp-swagger-gen/ibc/applications/fee/v1/query.swagger.jsonUpgradedConsensusState"
+        }
+      }
+    },
     {
       "url": "../../tmp-swagger-gen/ibc/applications/interchain_accounts/controller/v1/query.swagger.json",
       "operationIds": {
@@ -193,6 +204,17 @@
         }
       }
     },
+    {
+      "url": "../../tmp-swagger-gen/ibc/applications/packetforward/v1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "../../tmp-swagger-gen/ibc/applications/packetforward/v1/query.swagger.jsonParams",
+          "Pool": "../../tmp-swagger-gen/ibc/applications/packetforward/v1/query.swagger.jsonPool",
+          "DelegatorValidators": "../../tmp-swagger-gen/ibc/applications/packetforward/v1/query.swagger.jsonDelegatorValidators",
+          "UpgradedConsensusState": "../../tmp-swagger-gen/ibc/applications/packetforward/v1/query.swagger.jsonUpgradedConsensusState"
+        }
+      }
+    },
     {
       "url": "../../tmp-swagger-gen/ibc/applications/transfer/v1/query.swagger.json",
       "operationIds": {
@@ -248,6 +270,17 @@
         }
       }
     },
+    {
+      "url": "../../tmp-swagger-gen/secret/emergencybutton/v1beta1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "../../tmp-swagger-gen/secret/emergencybutton/v1beta1/query.swagger.jsonParams",
+          "Pool": "../../tmp-swagger-gen/secret/emergencybutton/v1beta1/query.swagger.jsonPool",
+          "DelegatorValidators": "../../tmp-swagger-gen/secret/emergencybutton/v1beta1/query.swagger.jsonDelegatorValidators",
+          "UpgradedConsensusState": "../../tmp-swagger-gen/secret/emergencybutton/v1beta1/query.swagger.jsonUpgradedConsensusState"
+        }
+      }
+    },
     {
       "url": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.json",
       "operationIds": {