Catch up with TAIP-17/18 renames and add TAIP-20 memo helpers

CHANGELOG.md

@@ -9,6 +9,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+#### TAIP Spec Catch-Up (tap-msg, tap-ts)
+- TAIP-17 `Lock` message type (renamed from `Escrow`); `Capture` and the `EscrowAgent` role string unchanged. `Escrow` retained as a `pub type` alias for `Lock`.
+- TAIP-18 `Rfq` message type (renamed from `Exchange`); `Quote` unchanged. `Exchange` retained as a `pub type` alias for `Rfq`.
+- TAIP-20 on-chain memo-hash helpers in `tap_msg::utils::memo_hash`: `tap_memo_hash`, `encode_text_memo`, `encode_binary_memo`, `verify_text_memo`, `verify_binary_memo`. Implements the canonical `tap:1:<64-hex>` text profile and 32-byte binary profile per `SHA-256(transfer_id)`.
+- `TapMessage::from_plain_message` now accepts both legacy and new URIs (`#Escrow` and `#Lock` → `TapMessage::Lock`; `#Exchange` and `#RFQ` → `TapMessage::Rfq`).
+- `tap-ts`: bumped `@taprsvp/types` from `^1.9.0` to `^2.1.0`. Added `Lock`/`RFQ` exports alongside `Escrow`/`Exchange` aliases. New `createRfqMessage` helper; `createExchangeMessage` retained as an alias.
+
+### Changed
+- Outgoing `Lock` and `Rfq` messages emit the new canonical URIs (`#Lock` / `#RFQ`).
+- Internal clippy fix: `tap-agent::verification` matches now use match guards instead of nested `if` to satisfy `clippy::collapsible-match` on newer rustc.
+
 #### External Secret Helper for Key Management (tap-agent, tap-cli, tap-http, tap-mcp)
 - Git-like secret helper pattern for retrieving private keys from external stores (HashiCorp Vault, AWS KMS, 1Password)
 - `get_private_key(did)` method on `AgentKeyManager` and `KeyManager` trait

Cargo.toml

@@ -12,7 +12,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 authors = ["Pelle Braendgaard <pelle@notabene.id>"]
 description = "Rust implementation of the Transaction Authorization Protocol (TAP)"

README.md

@@ -2,6 +2,14 @@
 
 This repository contains a Rust implementation of the Transaction Authorization Protocol (TAP), a decentralized protocol for securely authorizing blockchain transactions before they are submitted on-chain. TAP-RS targets payment-related use cases, Travel Rule compliance, and secure transaction coordination.
 
+**New in v0.7.0**:
+- TAIP-17 `Lock` (renamed from `Escrow`) and TAIP-18 `Rfq` (renamed from `Exchange`); old type names retained as aliases and legacy URIs accepted on the wire
+- TAIP-20 on-chain memo-hash helpers (`tap_msg::utils::memo_hash`) for `SHA-256(transfer_id)` settlement correlation
+- `tap-ts` upgraded to `@taprsvp/types` v2.1
+- External secret helper (Vault / AWS KMS / 1Password) for private key retrieval in `tap-agent`, `tap-cli`, `tap-http`, `tap-mcp`
+- Flattened JWS serialization for Veramo compatibility
+- X25519 JWE anoncrypt support
+
 **New in v0.6.0**:
 - External decision executable support for pluggable authorization workflows
 - Poll mode for decision management via MCP tools

tap-agent/Cargo.toml

@@ -9,8 +9,8 @@ license.workspace = true
 readme = "README.md"
 
 [dependencies]
-tap-msg = { version = "0.6.0", path = "../tap-msg" }
-tap-caip = { version = "0.6.0", path = "../tap-caip" }
+tap-msg = { version = "0.7.0", path = "../tap-msg" }
+tap-caip = { version = "0.7.0", path = "../tap-caip" }
 async-trait = { workspace = true }
 thiserror = "1.0"
 serde = { workspace = true }

tap-agent/src/verification.rs

@@ -162,13 +162,11 @@ fn verify_eddsa(
         } => {
             // Decode the multibase key
             match multibase::decode(public_key_multibase) {
-                Ok((Base::Base58Btc, key_data)) => {
-                    // Skip the multicodec prefix (0xed01 for Ed25519)
-                    if key_data.len() >= 34 && key_data[0] == 0xed && key_data[1] == 0x01 {
-                        key_data[2..].to_vec()
-                    } else {
-                        return false;
-                    }
+                // Skip the multicodec prefix (0xed01 for Ed25519)
+                Ok((Base::Base58Btc, key_data))
+                    if key_data.len() >= 34 && key_data[0] == 0xed && key_data[1] == 0x01 =>
+                {
+                    key_data[2..].to_vec()
                 }
                 _ => return false,
             }
@@ -214,13 +212,11 @@ fn verify_es256(
         } => {
             // Decode the multibase key
             match multibase::decode(public_key_multibase) {
-                Ok((Base::Base58Btc, key_data)) => {
-                    // Skip the multicodec prefix (0x1200 for P-256)
-                    if key_data.len() >= 67 && key_data[0] == 0x12 && key_data[1] == 0x00 {
-                        key_data[2..].to_vec()
-                    } else {
-                        return false;
-                    }
+                // Skip the multicodec prefix (0x1200 for P-256)
+                Ok((Base::Base58Btc, key_data))
+                    if key_data.len() >= 67 && key_data[0] == 0x12 && key_data[1] == 0x00 =>
+                {
+                    key_data[2..].to_vec()
                 }
                 _ => return false,
             }
@@ -265,13 +261,11 @@ fn verify_es256k(
         } => {
             // Decode the multibase key
             match multibase::decode(public_key_multibase) {
-                Ok((Base::Base58Btc, key_data)) => {
-                    // Skip the multicodec prefix (0xe701 for secp256k1)
-                    if key_data.len() >= 67 && key_data[0] == 0xe7 && key_data[1] == 0x01 {
-                        key_data[2..].to_vec()
-                    } else {
-                        return false;
-                    }
+                // Skip the multicodec prefix (0xe701 for secp256k1)
+                Ok((Base::Base58Btc, key_data))
+                    if key_data.len() >= 67 && key_data[0] == 0xe7 && key_data[1] == 0x01 =>
+                {
+                    key_data[2..].to_vec()
                 }
                 _ => return false,
             }

tap-agent/tests/test_vectors_validation.rs

@@ -34,7 +34,7 @@ use std::fs;
 use std::path::Path;
 use tap_msg::didcomm::PlainMessage;
 use tap_msg::message::{
-    AuthorizationRequired, Cancel, ConfirmRelationship, Connect, DIDCommPresentation, Escrow,
+    AuthorizationRequired, Cancel, ConfirmRelationship, Connect, DIDCommPresentation, Lock,
     Payment, RemoveAgent, ReplaceAgent, Revert, UpdateParty, UpdatePolicies,
 };
 use tap_msg::{
@@ -298,17 +298,17 @@ fn validate_tap_message(message: &PlainMessage) -> Result<(), String> {
                     .map_err(|e| format!("Failed to parse AuthorizationRequired: {}", e))?;
             auth_required.validate().map_err(|e| e.to_string())
         }
-        "https://tap.rsvp/schema/1.0#Escrow" => {
-            // Create a more lenient Escrow parsing by fixing agents
+        // TAIP-17 was renamed Escrow → Lock; both URIs dispatch to `Lock`.
+        "https://tap.rsvp/schema/1.0#Lock" | "https://tap.rsvp/schema/1.0#Escrow" => {
+            // Test vectors sometimes omit `for` on the EscrowAgent; default it
+            // to the agent's own DID before parsing.
             let mut clean_body = body_with_thread_id.clone();
             if let Some(obj) = clean_body.as_object_mut() {
-                // Fix agents by adding missing 'for' field if needed
                 if let Some(agents) = obj.get_mut("agents") {
                     if let Some(agents_array) = agents.as_array_mut() {
                         for agent in agents_array.iter_mut() {
                             if let Some(agent_obj) = agent.as_object_mut() {
                                 if !agent_obj.contains_key("for") {
-                                    // For escrow agents, default to acting for themselves
                                     if let Some(agent_id) = agent_obj.get("@id") {
                                         agent_obj.insert("for".to_string(), agent_id.clone());
                                     }
@@ -319,9 +319,9 @@ fn validate_tap_message(message: &PlainMessage) -> Result<(), String> {
                 }
             }
 
-            let escrow: Escrow = serde_json::from_value(clean_body)
-                .map_err(|e| format!("Failed to parse Escrow: {}", e))?;
-            escrow.validate().map_err(|e| e.to_string())
+            let lock: Lock = serde_json::from_value(clean_body)
+                .map_err(|e| format!("Failed to parse Lock: {}", e))?;
+            lock.validate().map_err(|e| e.to_string())
         }
         "https://didcomm.org/out-of-band/2.0/invitation" => {
             // Out-of-band messages must have a goal_code starting with "tap."

tap-cli/Cargo.toml

@@ -19,10 +19,10 @@ path = "src/lib.rs"
 
 [dependencies]
 # TAP ecosystem dependencies
-tap-node = { version = "0.6.0", path = "../tap-node" }
-tap-agent = { version = "0.6.0", path = "../tap-agent" }
-tap-msg = { version = "0.6.0", path = "../tap-msg" }
-tap-caip = { version = "0.6.0", path = "../tap-caip" }
+tap-node = { version = "0.7.0", path = "../tap-node" }
+tap-agent = { version = "0.7.0", path = "../tap-agent" }
+tap-msg = { version = "0.7.0", path = "../tap-msg" }
+tap-caip = { version = "0.7.0", path = "../tap-caip" }
 
 # Async runtime and I/O
 tokio = { version = "1.0", features = ["full"] }

tap-http/Cargo.toml

@@ -9,10 +9,10 @@ description = "HTTP server for the Transaction Authorization Protocol (TAP)"
 readme = "README.md"
 
 [dependencies]
-tap-msg = { version = "0.6.0", path = "../tap-msg" }
-tap-node = { version = "0.6.0", path = "../tap-node", features = ["storage"] }
-tap-agent = { version = "0.6.0", path = "../tap-agent" }
-tap-caip = { version = "0.6.0", path = "../tap-caip" }
+tap-msg = { version = "0.7.0", path = "../tap-msg" }
+tap-node = { version = "0.7.0", path = "../tap-node", features = ["storage"] }
+tap-agent = { version = "0.7.0", path = "../tap-agent" }
+tap-caip = { version = "0.7.0", path = "../tap-caip" }
 warp = "0.3"
 tokio = { workspace = true, features = ["full"] }
 serde = { workspace = true }
@@ -36,7 +36,7 @@ base64 = { workspace = true }
 multibase = { workspace = true }
 dirs = "6.0"
 
-tap-mcp = { version = "0.6.0", path = "../tap-mcp" }
+tap-mcp = { version = "0.7.0", path = "../tap-mcp" }
 tracing-subscriber = "0.3"
 
 [dev-dependencies]

tap-ivms101/Cargo.toml

@@ -16,7 +16,7 @@ chrono = { version = "0.4", features = ["serde"] }
 thiserror = "1.0"
 iso_currency = "0.4"
 regex = "1.5"
-tap-msg = { version = "0.6.0", path = "../tap-msg" }
+tap-msg = { version = "0.7.0", path = "../tap-msg" }
 
 [dev-dependencies]
 tokio = { version = "1.39", features = ["full"] }

tap-mcp/Cargo.toml

@@ -19,10 +19,10 @@ path = "src/main.rs"
 
 [dependencies]
 # TAP ecosystem dependencies
-tap-node = { version = "0.6.0", path = "../tap-node" }
-tap-agent = { version = "0.6.0", path = "../tap-agent" }
-tap-msg = { version = "0.6.0", path = "../tap-msg" }
-tap-caip = { version = "0.6.0", path = "../tap-caip" }
+tap-node = { version = "0.7.0", path = "../tap-node" }
+tap-agent = { version = "0.7.0", path = "../tap-agent" }
+tap-msg = { version = "0.7.0", path = "../tap-msg" }
+tap-caip = { version = "0.7.0", path = "../tap-caip" }
 
 # Async runtime and I/O
 tokio = { version = "1.0", features = ["full"] }

tap-msg/Cargo.toml

@@ -14,7 +14,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 # Chain Agnostic Identifiers
-tap-caip = { version = "0.6.0", path = "../tap-caip" }
+tap-caip = { version = "0.7.0", path = "../tap-caip" }
 
 # Date and time
 chrono = { workspace = true }
@@ -36,7 +36,7 @@ uuid = { workspace = true }
 tracing = { workspace = true }
 
 # Derive macro for TAP messages
-tap-msg-derive = { version = "0.6.0", path = "../tap-msg-derive" }
+tap-msg-derive = { version = "0.7.0", path = "../tap-msg-derive" }
 
 # WASM support
 wasm-bindgen = { workspace = true, optional = true }