Remote attestations not working for app contract messages

[hu55a1n1]

Summary

Related: #57 & #48

RA verification for app contracts msgs is failing with user data mismatch. This seems like a regression but it is also possible this never worked.

[hu55a1n1]

The fix is to make sure that the attestation is hex encoded and not a bin array in the serialized JSON response of the enclave ->

(Full diff on dave/query-tx-msg; only fixes update msg and not query)

$ cat fix-atts.diff 
diff --git a/apps/transfers/contracts/Cargo.lock b/apps/transfers/contracts/Cargo.lock
index fb0ee58..d51a57a 100644
--- a/apps/transfers/contracts/Cargo.lock
+++ b/apps/transfers/contracts/Cargo.lock
@@ -1253,6 +1253,7 @@ dependencies = [
  "cw20-base",
  "getrandom",
  "quartz-cw",
+ "serde",
  "serde_json",
  "sha2 0.10.8",
  "thiserror",
diff --git a/apps/transfers/contracts/src/contract.rs b/apps/transfers/contracts/src/contract.rs
index db74cdb..aa777c2 100644
--- a/apps/transfers/contracts/src/contract.rs
+++ b/apps/transfers/contracts/src/contract.rs
@@ -60,10 +60,10 @@ pub fn execute(
 
         // Enclave msgs
         ExecuteMsg::Update(attested_msg) => {
-            attested_msg
+            let _ = attested_msg
                 .clone()
-                .handle_raw(deps.branch(), &env, &info).map_err(Into::into)
-            // update(deps, env, info, attested_msg.msg.0)
+                .handle_raw(deps.branch(), &env, &info)?;
+            update(deps, env, info, attested_msg.msg.0)
         }
         ExecuteMsg::QueryResponse(attested_msg) => {
             let _ = attested_msg
diff --git a/apps/transfers/enclave/Cargo.lock b/apps/transfers/enclave/Cargo.lock
index 9c94df4..aad382f 100644
--- a/apps/transfers/enclave/Cargo.lock
+++ b/apps/transfers/enclave/Cargo.lock
@@ -3931,6 +3931,7 @@ dependencies = [
  "cw20-base",
  "getrandom",
  "quartz-cw",
+ "serde",
  "serde_json",
  "sha2 0.10.8",
  "thiserror",
diff --git a/apps/transfers/enclave/quartz.manifest.template b/apps/transfers/enclave/quartz.manifest.template
index 53a82bf..512fae8 100644
--- a/apps/transfers/enclave/quartz.manifest.template
+++ b/apps/transfers/enclave/quartz.manifest.template
@@ -22,8 +22,8 @@ loader.env.GRAMINE_PORT = "{{ gramine_port }}"
 
 loader.argv = ["enclave",
                 "--chain-id", "testing",
-                "--trusted-height", "500000",
-                "--trusted-hash", "F8F5D053FAA9E09635620D8569AB49E3C205989A7B29E785B31304480094C61E"]
+                "--trusted-height", "1",
+                "--trusted-hash", "0B4F78C7668EE960AB86E7A5302CFEEF9A52A892C6211AF66FAA2167E12D9003"]
 
 fs.mounts = [
   { uri = "file:{{ gramine.runtimedir() }}", path = "/lib" },
diff --git a/apps/transfers/enclave/src/cli.rs b/apps/transfers/enclave/src/cli.rs
index f36fd6f..9c7dd1d 100644
--- a/apps/transfers/enclave/src/cli.rs
+++ b/apps/transfers/enclave/src/cli.rs
@@ -19,7 +19,7 @@ fn parse_trust_threshold(s: &str) -> Result<TrustThreshold> {
 #[command(author, version, about, long_about = None)]
 pub struct Cli {
     /// RPC server address
-    #[clap(long, default_value = "127.0.0.1:11091")]
+    #[clap(long, default_value = "127.0.0.1:11098")]
     pub rpc_addr: SocketAddr,
 
     /// Identifier of the chain
diff --git a/apps/transfers/enclave/src/transfers_server.rs b/apps/transfers/enclave/src/transfers_server.rs
index a83c4b9..80d48d1 100644
--- a/apps/transfers/enclave/src/transfers_server.rs
+++ b/apps/transfers/enclave/src/transfers_server.rs
@@ -214,10 +214,11 @@ where
         };
 
         // Attest to message
-        let attestation = self
+        let attestation: HexBinary = self
             .attestor
             .quote(msg.clone())
-            .map_err(|e| Status::internal(e.to_string()))?;
+            .map_err(|e| Status::internal(e.to_string()))?
+            .into();
 
         let attested_msg = RawAttested { msg, attestation };
         let message =
diff --git a/apps/transfers/scripts/handshake.sh b/apps/transfers/scripts/handshake.sh
index 94a0d10..0242166 100755
--- a/apps/transfers/scripts/handshake.sh
+++ b/apps/transfers/scripts/handshake.sh
@@ -85,7 +85,7 @@ echo "contract $CONTRACT"
 cargo run -vvv -- --chain-id testing \
     --primary "http://$NODE_URL" \
     --witnesses "http://$NODE_URL" \
-    --trusted-height 500000 \
+    --trusted-height 1 \
     --trusted-hash $TRUSTED_HASH \
     --contract-address $CONTRACT \
     --storage-key "quartz_session" \
diff --git a/apps/transfers/scripts/listen.sh b/apps/transfers/scripts/listen.sh
index 0b6dac5..be26436 100755
--- a/apps/transfers/scripts/listen.sh
+++ b/apps/transfers/scripts/listen.sh
@@ -58,7 +58,7 @@ REPORT_SIG_FILE="/tmp/${USER}_datareportsig"
         cd $ROOT/cycles-quartz/apps/transfers/enclave
 
         # # Get the update message from the gRPC response
-        # UPDATE_MSG=$(grpcurl -plaintext -import-path ./proto/ -proto transfers.proto -d "$REQUEST_MSG" '127.0.0.1:11091' transfers.Settlement/Run | jq -r '.message | fromjson | .msg')
+        # UPDATE_MSG=$(grpcurl -plaintext -import-path ./proto/ -proto transfers.proto -d "$REQUEST_MSG" '127.0.0.1:11098' transfers.Settlement/Run | jq -r '.message | fromjson | .msg')
 
         # # Create the UpdateMsg structure
         # export UPDATE=$(jq -n \
@@ -73,7 +73,7 @@ REPORT_SIG_FILE="/tmp/${USER}_datareportsig"
 
         # TODO - add back in once attestations are figured out
         echo "... executing transfer"
-        export ATTESTED_MSG=$(grpcurl -plaintext -import-path ./proto/ -proto transfers.proto -d "$REQUEST_MSG" '127.0.0.1:11091' transfers.Settlement/Run | jq .message | jq -R 'fromjson | fromjson' | jq -c )
+        export ATTESTED_MSG=$(grpcurl -plaintext -import-path ./proto/ -proto transfers.proto -d "$REQUEST_MSG" '127.0.0.1:11098' transfers.Settlement/Run | jq .message | jq -R 'fromjson | fromjson' | jq -c )
         echo "Atts msg"
         echo $ATTESTED_MSG
         # echo $UPDATE #| jq '.msg'
diff --git a/apps/transfers/scripts/start.sh b/apps/transfers/scripts/start.sh
index 9949a1b..7a224c2 100755
--- a/apps/transfers/scripts/start.sh
+++ b/apps/transfers/scripts/start.sh
@@ -20,7 +20,7 @@ cd "$DIR_QUARTZ_TM_PROVER"
 cargo run -- --chain-id testing \
 --primary "http://$NODE_URL" \
 --witnesses "http://$NODE_URL" \
---trusted-height 500000 \
+--trusted-height 1 \
 --trusted-hash "5237772462A41C0296ED688A0327B8A60DF310F08997AD760EB74A70D0176C27" \
 --contract-address "wasm14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9s0phg4d" \
 --storage-key "quartz_session" \
diff --git a/relayer/scripts/relay.sh b/relayer/scripts/relay.sh
index a26aa2b..2a27480 100755
--- a/relayer/scripts/relay.sh
+++ b/relayer/scripts/relay.sh
@@ -24,7 +24,7 @@ REQUEST_MSG=${2:-"{}"}
 rm -f "$QUOTE_FILE" "$REPORT_FILE" "$REPORT_SIG_FILE"
 
 # query the gRPC quartz enclave service
-ATTESTED_MSG=$(grpcurl -plaintext -import-path "$DIR_PROTO" -proto quartz.proto -d "$REQUEST_MSG" '127.0.0.1:11091' quartz.Core/"$REQUEST" | jq -c '.message | fromjson')
+ATTESTED_MSG=$(grpcurl -plaintext -import-path "$DIR_PROTO" -proto quartz.proto -d "$REQUEST_MSG" '127.0.0.1:11098' quartz.Core/"$REQUEST" | jq -c '.message | fromjson')
 
 # parse out the quote and the message
 QUOTE=$(echo "$ATTESTED_MSG" | jq -c '.quote')

[hu55a1n1]

Fixed by #96