StargateQuery (and more)

.github/workflows/ci.yaml

@@ -221,7 +221,7 @@ jobs:
           echo "not_a_key" > ias_keys/develop/spid.txt
           echo "not_a_key" > ias_keys/develop/api_key.txt
           LOG_LEVEL=ERROR go test -v ./x/compute/client/...
-          LOG_LEVEL=ERROR go test -p 1 -timeout 20m -v ./x/compute/internal/...
+          LOG_LEVEL=ERROR go test -p 1 -timeout 40m -v ./x/compute/internal/...
 
   Clippy:
     runs-on: ubuntu-20.04
@@ -294,15 +294,21 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: Build docker testnet
+      - name: Build LocalSecret
         run: |
           echo not_a_key | tee {api_key,spid}.txt
           DOCKER_TAG=v0.0.0 make build-localsecret
+      - name: Run integration tests
+        run: |
+          cd integration-tests
+          yarn
+          docker run -d -p 9091:9091 --name localsecret ghcr.io/scrtlabs/localsecret:v0.0.0
+          sleep 30
+          docker logs localsecret
+          yarn test
       - name: Run secret.js tests
         run: |
           git clone --depth 1 https://github.com/scrtlabs/secret.js
-          # Copy v1 contract to tests directory
-          cp ./target/wasm32-unknown-unknown/release/v1_sanity_contract.wasm ./secret.js/test/test_contract_v1.wasm
           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/*

.vscode/launch.json

@@ -10,6 +10,7 @@
       "request": "launch",
       "mode": "debug",
       "program": "${file}",
+      "cwd": "${workspaceFolder}/x/compute/internal/keeper",
       "env": { "SGX_MODE": "SW", "RUST_BACKTRACE": "1" },
       "args": [
         "test",

.vscode/settings.json

@@ -1,9 +1,12 @@
 {
   "rust-analyzer.linkedProjects": [
-    "./cosmwasm/Cargo.toml",
-    "./cosmwasm/enclaves/Cargo.toml",
-    "./x/compute/internal/keeper/testdata/v1-sanity-contract/Cargo.toml",
-    "./x/compute/internal/keeper/testdata/test-contract/Cargo.toml"
+    "cosmwasm/Cargo.toml",
+    "cosmwasm/enclaves/Cargo.toml",
+    "x/compute/internal/keeper/testdata/v1-sanity-contract/Cargo.toml",
+    "x/compute/internal/keeper/testdata/test-contract/Cargo.toml",
+    "integration-tests/contract-v1/Cargo.toml",
+    "integration-tests/contract-v0.10/Cargo.toml",
+    "go-cosmwasm/Cargo.toml"
   ],
   "rust-analyzer.diagnostics.experimental.enable": true,
   "rust-analyzer.rustfmt.rangeFormatting.enable": true,
@@ -20,7 +23,6 @@
   "go.useLanguageServer": true,
   "go.lintTool": "golangci-lint",
   "go.lintOnSave": "workspace",
-  "go.buildTags": "secretcli",
   "gopls": {
     "formatting.gofumpt": true
   },

Makefile

@@ -361,7 +361,7 @@ go-tests: build-test-contract
 	cp ./cosmwasm/enclaves/execute/librust_cosmwasm_enclave.signed.so ./x/compute/internal/keeper
 	rm -rf ./x/compute/internal/keeper/.sgx_secrets
 	mkdir -p ./x/compute/internal/keeper/.sgx_secrets
-	GOMAXPROCS=8 SGX_MODE=SW SCRT_SGX_STORAGE='./' go test -failfast -timeout 2400s -v ./x/compute/internal/... $(GO_TEST_ARGS)
+	GOMAXPROCS=8 SGX_MODE=SW SCRT_SGX_STORAGE='./' go test -failfast -timeout 40m -v ./x/compute/internal/... $(GO_TEST_ARGS)
 
 go-tests-hw: build-test-contract
 	# empty BUILD_PROFILE means debug mode which compiles faster

app/app.go

@@ -399,7 +399,6 @@ func NewSecretNetworkApp(
 		AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.ibcKeeper.ClientKeeper))
 
 	// Just re-use the full router - do we want to limit this more?
-	computeRouter := app.Router()
 	regRouter := app.Router()
 
 	// Replace with bootstrap flag when we figure out how to test properly and everything works
@@ -419,7 +418,7 @@ func NewSecretNetworkApp(
 
 	// The last arguments can contain custom message handlers, and custom query handlers,
 	// if we want to allow any custom callbacks
-	supportedFeatures := "staking"
+	supportedFeatures := "staking,stargate,ibc3"
 
 	app.computeKeeper = compute.NewKeeper(
 		appCodec,
@@ -435,7 +434,9 @@ func NewSecretNetworkApp(
 		app.ibcKeeper.PortKeeper,
 		app.transferKeeper,
 		app.ibcKeeper.ChannelKeeper,
-		computeRouter,
+		app.Router(),
+		app.MsgServiceRouter(),
+		app.GRPCQueryRouter(),
 		computeDir,
 		computeConfig,
 		supportedFeatures,

cosmwasm/enclaves/shared/contract-engine/src/contract_operations.rs

@@ -200,7 +200,7 @@ pub fn redact_custom_events(reply: &mut Reply) {
                     }
                 }
 
-                if new_ev.attributes.len() > 0 {
+                if !new_ev.attributes.is_empty() {
                     events.push(new_ev);
                 }
             }

cosmwasm/enclaves/shared/contract-engine/src/contract_validation.rs

@@ -63,7 +63,7 @@ pub fn extract_contract_key(env: &Env) -> Result<[u8; CONTRACT_KEY_LENGTH], Encl
     let contract_key =
         base64::decode(env.contract_key.as_ref().unwrap().as_bytes()).map_err(|err| {
             warn!(
-                "got an error while trying to deserialize output bytes into json {:?}: {}",
+                "got an error while trying to decode contract key {:?}: {}",
                 env, err
             );
             EnclaveError::FailedContractAuthentication
@@ -243,6 +243,7 @@ pub fn verify_params(
         .verify_bytes(
             sig_info.sign_bytes.as_slice(),
             sig_info.signature.as_slice(),
+            sig_info.sign_mode,
         )
         .map_err(|err| {
             warn!("Signature verification failed: {:?}", err);
@@ -290,7 +291,7 @@ fn get_signer_and_messages(
 
             Ok((sender_public_key.clone(), sign_doc.body.messages))
         }
-        SIGN_MODE_LEGACY_AMINO_JSON => {
+        SIGN_MODE_LEGACY_AMINO_JSON | SIGN_MODE_EIP_191 => {
             use protobuf::well_known_types::Any as AnyProto;
             use protobuf::Message;
 

cosmwasm/enclaves/shared/contract-engine/src/io.rs

@@ -385,7 +385,7 @@ pub fn encrypt_output(
                 Some(_) => {
                     let mut events: Vec<Event> = vec![];
 
-                    if ok.attributes.len() > 0 {
+                    if !ok.attributes.is_empty() {
                         events.push(Event {
                             ty: "wasm".to_string(),
                             attributes: ok.attributes.clone(),

cosmwasm/enclaves/shared/cosmos-proto/src/tx/signing.rs

@@ -1156,6 +1156,7 @@ pub enum SignMode {
     SIGN_MODE_DIRECT = 1,
     SIGN_MODE_TEXTUAL = 2,
     SIGN_MODE_LEGACY_AMINO_JSON = 127,
+    SIGN_MODE_EIP_191 = 191
 }
 
 impl ::protobuf::ProtobufEnum for SignMode {
@@ -1169,6 +1170,7 @@ impl ::protobuf::ProtobufEnum for SignMode {
             1 => ::std::option::Option::Some(SignMode::SIGN_MODE_DIRECT),
             2 => ::std::option::Option::Some(SignMode::SIGN_MODE_TEXTUAL),
             127 => ::std::option::Option::Some(SignMode::SIGN_MODE_LEGACY_AMINO_JSON),
+            191 => ::std::option::Option::Some(SignMode::SIGN_MODE_EIP_191),
             _ => ::std::option::Option::None
         }
     }
@@ -1179,6 +1181,7 @@ impl ::protobuf::ProtobufEnum for SignMode {
             SignMode::SIGN_MODE_DIRECT,
             SignMode::SIGN_MODE_TEXTUAL,
             SignMode::SIGN_MODE_LEGACY_AMINO_JSON,
+            SignMode::SIGN_MODE_EIP_191,
         ];
         values
     }

cosmwasm/enclaves/shared/cosmos-types/src/multisig.rs

@@ -6,7 +6,7 @@ use crate::types::CosmosPubKey;
 
 use enclave_crypto::traits::VerifyingKey;
 
-use cosmos_proto::crypto::multisig::multisig::MultiSignature;
+use cosmos_proto::{crypto::multisig::multisig::MultiSignature, tx::signing::SignMode};
 
 use super::traits::CosmosAminoPubkey;
 
@@ -94,7 +94,12 @@ impl CosmosAminoPubkey for MultisigThresholdPubKey {
 }
 
 impl VerifyingKey for MultisigThresholdPubKey {
-    fn verify_bytes(&self, bytes: &[u8], sig: &[u8]) -> Result<(), CryptoError> {
+    fn verify_bytes(
+        &self,
+        bytes: &[u8],
+        sig: &[u8],
+        sign_mode: SignMode,
+    ) -> Result<(), CryptoError> {
         debug!("verifying multisig");
         trace!("Sign bytes are: {:?}", bytes);
         let signatures = decode_multisig_signature(sig)?;
@@ -122,7 +127,7 @@ impl VerifyingKey for MultisigThresholdPubKey {
             for (i, current_signer) in signers.iter().enumerate() {
                 trace!("Checking pubkey: {:?}", current_signer);
                 // This technically support that one of the multisig signers is a multisig itself
-                let result = current_signer.verify_bytes(bytes, current_sig);
+                let result = current_signer.verify_bytes(bytes, current_sig, sign_mode);
 
                 if result.is_ok() {
                     signer_pos = Some(i);

cosmwasm/enclaves/shared/cosmos-types/src/types.rs

@@ -1,6 +1,7 @@
 use log::*;
 
 use enclave_ffi_types::EnclaveError;
+use proto::tx::signing::SignMode;
 use protobuf::Message;
 use serde::{Deserialize, Serialize};
 
@@ -120,10 +121,15 @@ impl CosmosAminoPubkey for CosmosPubKey {
 }
 
 impl VerifyingKey for CosmosPubKey {
-    fn verify_bytes(&self, bytes: &[u8], sig: &[u8]) -> Result<(), CryptoError> {
+    fn verify_bytes(
+        &self,
+        bytes: &[u8],
+        sig: &[u8],
+        sign_mode: SignMode,
+    ) -> Result<(), CryptoError> {
         match self {
-            CosmosPubKey::Secp256k1(pubkey) => pubkey.verify_bytes(bytes, sig),
-            CosmosPubKey::Multisig(pubkey) => pubkey.verify_bytes(bytes, sig),
+            CosmosPubKey::Secp256k1(pubkey) => pubkey.verify_bytes(bytes, sig, sign_mode),
+            CosmosPubKey::Multisig(pubkey) => pubkey.verify_bytes(bytes, sig, sign_mode),
         }
     }
 }
@@ -139,6 +145,7 @@ pub enum SignModeDef {
     SIGN_MODE_DIRECT = 1,
     SIGN_MODE_TEXTUAL = 2,
     SIGN_MODE_LEGACY_AMINO_JSON = 127,
+    SIGN_MODE_EIP_191 = 191,
 }
 
 #[allow(non_camel_case_types)]

cosmwasm/enclaves/shared/cosmwasm-v010-types/src/query.rs

@@ -17,6 +17,34 @@ pub enum QueryRequest {
     Dist(DistQuery),
     Mint(MintQuery),
     Gov(GovQuery),
+    Ibc(IbcQuery),
+    Stargate { path: String, data: Binary },
+}
+
+/// These are queries to the various IBC modules to see the state of the contract's
+/// IBC connection. These will return errors if the contract is not "ibc enabled"
+#[non_exhaustive]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[serde(rename_all = "snake_case")]
+pub enum IbcQuery {
+    /// Gets the Port ID the current contract is bound to.
+    ///
+    /// Returns a `PortIdResponse`.
+    PortId {},
+    /// Lists all channels that are bound to a given port.
+    /// If `port_id` is omitted, this list all channels bound to the contract's port.
+    ///
+    /// Returns a `ListChannelsResponse`.
+    ListChannels { port_id: Option<String> },
+    /// Lists all information for a (portID, channelID) pair.
+    /// If port_id is omitted, it will default to the contract's own channel.
+    /// (To save a PortId{} call)
+    ///
+    /// Returns a `ChannelResponse`.
+    Channel {
+        channel_id: String,
+        port_id: Option<String>,
+    },
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
@@ -97,6 +125,8 @@ pub enum WasmQuery {
         /// Key is the raw key used in the contracts Storage
         key: Binary,
     },
+    /// returns a ContractInfoResponse with metadata on the contract from the runtime
+    ContractInfo { contract_addr: String },
 }
 
 impl From<GovQuery> for QueryRequest {
@@ -153,6 +183,19 @@ pub enum StakingQuery {
     Validators {},
     /// Returns all the unbonding delegations by the delegator
     UnbondingDelegations { delegator: HumanAddr },
+
+    /// Returns all validators in the currently active validator set.
+    ///
+    /// The query response type is `AllValidatorsResponse`.
+    AllValidators {},
+    /// Returns the validator at the given address. Returns None if the validator is
+    /// not part of the currently active validator set.
+    ///
+    /// The query response type is `ValidatorResponse`.
+    Validator {
+        /// The validator's address (e.g. (e.g. cosmosvaloper1...))
+        address: String,
+    },
 }
 
 /// Delegation is basic (cheap to query) data about a delegation