feat: support clarity 3 (#1465)

* feat: handle clarity 3 * chore: handle clarity 3 keywords * refactor: improve manifest parsing * chore: update cargo.lock * chore: update cargo.lock * chore: update stacks core dependencies * chore: update stacks core dependencies
hirosystems · Jun 7, 2024 · 2c92bef · 2c92bef
1 parent 343a01a
commit 2c92bef
Show file tree

Hide file tree

Showing 15 changed files with 276 additions and 267 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/clarinet-deployments/src/requirements.rs b/components/clarinet-deployments/src/requirements.rs
@@ -81,6 +81,7 @@ pub async fn retrieve_contract(
     let clarity_version = match contract.clarity_version {
         Some(1) => ClarityVersion::Clarity1,
         Some(2) => ClarityVersion::Clarity2,
+        Some(3) => ClarityVersion::Clarity3,
         Some(_) => {
             return Err("unable to parse clarity_version (can either be '1' or '2'".to_string())
         }

diff --git a/components/clarinet-deployments/src/types.rs b/components/clarinet-deployments/src/types.rs
@@ -501,8 +501,13 @@ impl ContractPublishSpecification {
                     Ok(ClarityVersion::Clarity1)
                 } else if clarity_version.eq(&2) {
                     Ok(ClarityVersion::Clarity2)
+                } else if clarity_version.eq(&3) {
+                    Ok(ClarityVersion::Clarity3)
                 } else {
-                    Err("unable to parse clarity_version (can either be '1' or '2'".to_string())
+                    Err(
+                        "unable to parse clarity_version, it can either be '1', '2', or '3'"
+                            .to_string(),
+                    )
                 }
             }
             _ => Ok(DEFAULT_CLARITY_VERSION),
@@ -661,6 +666,7 @@ pub mod clarity_version_serde {
         match clarity_version {
             ClarityVersion::Clarity1 => s.serialize_i64(1),
             ClarityVersion::Clarity2 => s.serialize_i64(2),
+            ClarityVersion::Clarity3 => s.serialize_i64(3),
         }
     }
 
@@ -672,6 +678,7 @@ pub mod clarity_version_serde {
         match cv {
             1 => Ok(ClarityVersion::Clarity1),
             2 => Ok(ClarityVersion::Clarity2),
+            3 => Ok(ClarityVersion::Clarity3),
             _ => Err(serde::de::Error::custom(INVALID_CLARITY_VERSION)),
         }
     }
@@ -743,8 +750,13 @@ impl RequirementPublishSpecification {
                     Ok(ClarityVersion::Clarity1)
                 } else if clarity_version.eq(&2) {
                     Ok(ClarityVersion::Clarity2)
+                } else if clarity_version.eq(&3) {
+                    Ok(ClarityVersion::Clarity3)
                 } else {
-                    Err("unable to parse clarity_version (can either be '1' or '2'".to_string())
+                    Err(
+                        "unable to parse clarity_version, it can either be '1', '2', or '3'"
+                            .to_string(),
+                    )
                 }
             }
             _ => Ok(DEFAULT_CLARITY_VERSION),
@@ -867,8 +879,13 @@ impl EmulatedContractPublishSpecification {
                     Ok(ClarityVersion::Clarity1)
                 } else if clarity_version.eq(&2) {
                     Ok(ClarityVersion::Clarity2)
+                } else if clarity_version.eq(&3) {
+                    Ok(ClarityVersion::Clarity3)
                 } else {
-                    Err("unable to parse clarity_version (can either be '1' or '2'".to_string())
+                    Err(
+                        "unable to parse clarity_version, it can either be '1', '2', or '3'"
+                            .to_string(),
+                    )
                 }
             }
             _ => Ok(DEFAULT_CLARITY_VERSION),
@@ -1380,6 +1397,7 @@ impl TransactionPlanSpecification {
                                 clarity_version: match tx.clarity_version {
                                     ClarityVersion::Clarity1 => Some(1),
                                     ClarityVersion::Clarity2 => Some(2),
+                                    ClarityVersion::Clarity3 => Some(3),
                                 },
                             },
                         )
@@ -1405,6 +1423,7 @@ impl TransactionPlanSpecification {
                                 clarity_version: match tx.clarity_version {
                                     ClarityVersion::Clarity1 => Some(1),
                                     ClarityVersion::Clarity2 => Some(2),
+                                    ClarityVersion::Clarity3 => Some(3),
                                 },
                             },
                         )
@@ -1426,6 +1445,7 @@ impl TransactionPlanSpecification {
                                 clarity_version: match tx.clarity_version {
                                     ClarityVersion::Clarity1 => Some(1),
                                     ClarityVersion::Clarity2 => Some(2),
+                                    ClarityVersion::Clarity3 => Some(3),
                                 },
                             },
                         )