Enforce OCF schema field constraints

OpenCapTable-v34/daml.yaml

@@ -1,7 +1,7 @@
 sdk-version: 3.4.10
 name: OpenCapTable-v34
 source: daml
-version: 0.0.6
+version: 0.0.11
 build-options:
   - -Wno-crypto-text-is-alpha
   - --typecheck-upgrades=no

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/ConvertibleConversion.daml

@@ -6,7 +6,7 @@ module Fairmint.OpenCapTable.OCF.ConvertibleConversion where
 -- OCF: https://raw.githubusercontent.com/Open-Cap-Table-Coalition/Open-Cap-Format-OCF/main/schema/objects/transactions/conversion/ConvertibleConversion.schema.json
 
 import Fairmint.OpenCapTable.Types.Core (Context)
-import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray)
+import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray, validateUniqueStringsArray)
 import Fairmint.OpenCapTable.Types.Conversion (OcfCapitalizationDefinition, validateOcfCapitalizationDefinition)
 import Fairmint.Shared.TypeHelpers (validateOptionalText, validateOptionalDecimal)
 
@@ -75,4 +75,4 @@ validateConvertibleConversionOcfData d =
   -- Arrays element validation (resulting_security_ids required per Conversion base schema)
   validateNonEmptyStringsArray d.comments &&
   validateNonEmptyStringsArray d.resulting_security_ids &&
-  not (null d.resulting_security_ids)
+  validateUniqueStringsArray d.resulting_security_ids

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/ConvertibleIssuance.daml

@@ -5,7 +5,7 @@ import Fairmint.OpenCapTable.Types.Core (Context)
 import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray)
 import Fairmint.OpenCapTable.Types.Monetary (OcfMonetary, validateOcfMonetary)
 import Fairmint.OpenCapTable.Types.Stock (OcfSecurityExemption, validateOcfSecurityExemption)
-import Fairmint.OpenCapTable.Types.Conversion (OcfConvertibleType, OcfConversionTriggerType(..), OcfConvertibleConversionRight(..), validateOcfConvertibleConversionRight)
+import Fairmint.OpenCapTable.Types.Conversion (OcfConvertibleType, OcfConversionTriggerType(..), OcfConvertibleConversionRight(..), validateOcfConvertibleConversionRight, validateOcfConversionTriggerFields)
 import Fairmint.Shared.TypeHelpers (validateOptionalText)
 
 
@@ -124,17 +124,8 @@ data OcfConvertibleConversionTrigger = OcfConvertibleConversionTrigger
 
 validateOcfConvertibleConversionTrigger : OcfConvertibleConversionTrigger -> Bool
 validateOcfConvertibleConversionTrigger t =
-  let hasDate = case t.trigger_date of Some _ -> True; None -> False
-      hasCond = case t.trigger_condition of Some c -> c /= ""; None -> False
-   in t.trigger_id /= "" &&
+  t.trigger_id /= "" &&
       validateOptionalText t.nickname &&
       validateOptionalText t.trigger_description &&
-      validateOptionalText t.trigger_condition &&
       validateOcfConvertibleConversionRight t.conversion_right &&
-      case t.type_ of
-        OcfTriggerTypeTypeAutomaticOnDate -> hasDate
-        OcfTriggerTypeTypeAutomaticOnCondition -> hasCond
-        OcfTriggerTypeTypeElectiveOnCondition -> hasCond
-        OcfTriggerTypeTypeElectiveInRange -> True
-        OcfTriggerTypeTypeElectiveAtWill -> True
-        OcfTriggerTypeTypeUnspecified -> True
+      validateOcfConversionTriggerFields t.type_ t.start_date t.end_date t.trigger_condition t.trigger_date

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/ConvertibleTransfer.daml

@@ -6,7 +6,7 @@ module Fairmint.OpenCapTable.OCF.ConvertibleTransfer where
 -- OCF: https://raw.githubusercontent.com/Open-Cap-Table-Coalition/Open-Cap-Format-OCF/main/schema/objects/transactions/transfer/ConvertibleTransfer.schema.json
 
 import Fairmint.OpenCapTable.Types.Core (Context)
-import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray)
+import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray, validateNonEmptyUniqueStringsArray)
 import Fairmint.OpenCapTable.Types.Monetary (OcfMonetary, validateOcfMonetary)
 import Fairmint.Shared.TypeHelpers (validateOptionalText)
 
@@ -64,9 +64,7 @@ validateConvertibleTransferOcfData d =
   -- Consistent with: StockTransfer (quantity > 0), WarrantTransfer (quantity > 0),
   -- EquityCompensationTransfer (quantity > 0), and ConvertibleCancellation (amount > 0)
   d.amount.amount > 0.0 &&
-  not (null d.resulting_security_ids) &&
-  validateNonEmptyStringsArray d.resulting_security_ids &&
+  validateNonEmptyUniqueStringsArray d.resulting_security_ids &&
   validateNonEmptyStringsArray d.comments &&
   validateOptionalText d.balance_security_id &&
   validateOptionalText d.consideration_text
-

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/Document.daml

@@ -54,10 +54,10 @@ validateOcfDocument d =
   validateOcfMd5 d.md5 &&
   validateOptionalText d.path &&
   validateOptionalText d.uri &&
-  ((case (d.path, d.uri) of
-      (Some _, _) -> True
-      (_, Some _) -> True
-      _ -> False)) &&
+  (case (d.path, d.uri) of
+      (Some _, None) -> True
+      (None, Some _) -> True
+      _ -> False) &&
   validateNonEmptyStringsArray d.comments &&
   all validateOcfObjectReference d.related_objects
 
@@ -95,4 +95,3 @@ data OcfObjectType =
   | OcfObjTxWarrantAcceptance | OcfObjTxWarrantCancellation | OcfObjTxWarrantExercise | OcfObjTxWarrantIssuance | OcfObjTxWarrantRetraction | OcfObjTxWarrantTransfer
   | OcfObjTxVestingAcceleration | OcfObjTxVestingStart | OcfObjTxVestingEvent
   deriving (Eq, Show)
-

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/EquityCompensationExercise.daml

@@ -2,7 +2,7 @@
 module Fairmint.OpenCapTable.OCF.EquityCompensationExercise where
 
 import Fairmint.OpenCapTable.Types.Core (Context)
-import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray)
+import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray, validateUniqueStringsArray)
 import Fairmint.Shared.TypeHelpers (validateOptionalText)
 
 
@@ -59,6 +59,7 @@ validateOcfEquityCompensationExerciseData d =
   -- Required numbers may be zero unless schema specifies otherwise
   -- Optional Text values, if present, must be non-empty
   validateOptionalText d.consideration_text &&
-  -- Arrays element validation (allow empty arrays where schema does not require minItems)
+  -- Arrays element validation
   validateNonEmptyStringsArray d.comments &&
-  validateNonEmptyStringsArray d.resulting_security_ids
+  validateNonEmptyStringsArray d.resulting_security_ids &&
+  validateUniqueStringsArray d.resulting_security_ids

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/EquityCompensationRelease.daml

@@ -2,7 +2,7 @@
 module Fairmint.OpenCapTable.OCF.EquityCompensationRelease where
 
 import Fairmint.OpenCapTable.Types.Core (Context)
-import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray)
+import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray, validateUniqueStringsArray)
 import Fairmint.OpenCapTable.Types.Monetary (OcfMonetary, validateOcfMonetary)
 import Fairmint.Shared.TypeHelpers (validateOptionalText)
 
@@ -62,7 +62,7 @@ validateEquityCompensationReleaseOcfData d =
   d.security_id /= "" &&
   d.quantity > 0.0 &&
   validateOcfMonetary d.release_price &&
-  not (null d.resulting_security_ids) &&
   validateNonEmptyStringsArray d.comments &&
   validateNonEmptyStringsArray d.resulting_security_ids &&
+  validateUniqueStringsArray d.resulting_security_ids &&
   validateOptionalText d.consideration_text

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/EquityCompensationTransfer.daml

@@ -6,7 +6,7 @@ module Fairmint.OpenCapTable.OCF.EquityCompensationTransfer where
 -- OCF: https://raw.githubusercontent.com/Open-Cap-Table-Coalition/Open-Cap-Format-OCF/main/schema/objects/transactions/transfer/EquityCompensationTransfer.schema.json
 
 import Fairmint.OpenCapTable.Types.Core (Context)
-import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray)
+import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray, validateNonEmptyUniqueStringsArray)
 import Fairmint.Shared.TypeHelpers (validateOptionalText)
 
 
@@ -59,9 +59,7 @@ validateEquityCompensationTransferOcfData d =
   d.id /= "" &&
   d.security_id /= "" &&
   d.quantity > 0.0 &&
-  not (null d.resulting_security_ids) &&
-  validateNonEmptyStringsArray d.resulting_security_ids &&
+  validateNonEmptyUniqueStringsArray d.resulting_security_ids &&
   validateNonEmptyStringsArray d.comments &&
   validateOptionalText d.balance_security_id &&
   validateOptionalText d.consideration_text
-

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/Issuer.daml

@@ -6,12 +6,11 @@ module Fairmint.OpenCapTable.OCF.Issuer where
 -- OCF: https://raw.githubusercontent.com/Open-Cap-Table-Coalition/Open-Cap-Format-OCF/main/schema/objects/Issuer.schema.json
 
 import Fairmint.OpenCapTable.Types.Core (Context)
-import Fairmint.OpenCapTable.Types.Validation (validateOcfCountryCode, validateNonEmptyStringsArray)
+import Fairmint.OpenCapTable.Types.Validation (validateOcfCountryCode, validateOcfCountrySubdivisionCode, validateNonEmptyStringsArray)
 import Fairmint.OpenCapTable.Types.Contact (OcfEmail, OcfPhone, validateOcfEmail, validateOcfPhone)
 import Fairmint.OpenCapTable.Types.Monetary (OcfAddress, OcfTaxID, validateOcfAddress, validateOcfTaxID)
 import Fairmint.OpenCapTable.Types.Stock (OcfInitialSharesAuthorized(..))
 import Fairmint.Shared.TypeHelpers (validateOptionalText)
-import qualified DA.Text as Text
 
 template Issuer
   with
@@ -65,12 +64,6 @@ data IssuerOcfData = IssuerOcfData
     phone: Optional OcfPhone
   deriving (Eq, Show)
 
-validateOcfCountrySubdivisionCode : Text -> Bool
-validateOcfCountrySubdivisionCode subdivisionCode =
-  subdivisionCode /= "" &&
-  Text.length subdivisionCode >= 1 &&
-  Text.length subdivisionCode <= 3
-
 validateOcfLegalName : Text -> Bool
 validateOcfLegalName name =
   name /= ""

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/StockConsolidation.daml

@@ -6,7 +6,7 @@ module Fairmint.OpenCapTable.OCF.StockConsolidation where
 -- OCF: https://raw.githubusercontent.com/Open-Cap-Table-Coalition/Open-Cap-Format-OCF/main/schema/objects/transactions/consolidation/StockConsolidation.schema.json
 
 import Fairmint.OpenCapTable.Types.Core (Context)
-import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray, validateUniqueStringsArray)
+import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray, validateNonEmptyUniqueStringsArray)
 import Fairmint.Shared.TypeHelpers (validateOptionalText)
 
 
@@ -61,6 +61,5 @@ validateStockConsolidationOcfData d =
   validateOptionalText d.reason_text &&
   -- Arrays element validation (security_ids required per Consolidation base schema)
   validateNonEmptyStringsArray d.comments &&
-  validateNonEmptyStringsArray d.security_ids &&
-  validateUniqueStringsArray d.security_ids &&
+  validateNonEmptyUniqueStringsArray d.security_ids &&
   not (null d.security_ids)

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/StockConversion.daml

@@ -6,7 +6,7 @@ module Fairmint.OpenCapTable.OCF.StockConversion where
 -- OCF: https://raw.githubusercontent.com/Open-Cap-Table-Coalition/Open-Cap-Format-OCF/main/schema/objects/transactions/conversion/StockConversion.schema.json
 
 import Fairmint.OpenCapTable.Types.Core (Context)
-import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray)
+import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray, validateUniqueStringsArray)
 import Fairmint.Shared.TypeHelpers (validateOptionalText)
 
 
@@ -63,4 +63,4 @@ validateStockConversionOcfData d =
   -- Arrays element validation (resulting_security_ids required per Conversion base schema)
   validateNonEmptyStringsArray d.comments &&
   validateNonEmptyStringsArray d.resulting_security_ids &&
-  not (null d.resulting_security_ids)
+  validateUniqueStringsArray d.resulting_security_ids

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/StockIssuance.daml

@@ -4,7 +4,7 @@ module Fairmint.OpenCapTable.OCF.StockIssuance where
 import Fairmint.OpenCapTable.Types.Core (Context)
 import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray)
 import Fairmint.OpenCapTable.Types.Monetary (OcfMonetary, validateOcfMonetary)
-import Fairmint.OpenCapTable.Types.Stock (OcfSecurityExemption, OcfShareNumberRange, validateOcfSecurityExemption, validateOcfShareNumberRange)
+import Fairmint.OpenCapTable.Types.Stock (OcfSecurityExemption, OcfShareNumberRange, validateOcfSecurityExemption, validateOcfShareNumberRangesForQuantity)
 import Fairmint.OpenCapTable.Types.Vesting (OcfVesting, validateOcfVesting)
 import Fairmint.Shared.TypeHelpers (validateOptionalText)
 
@@ -90,13 +90,14 @@ validateOcfStockIssuanceData d =
   d.stock_class_id /= "" &&
   -- Arrays element validation (allow empty arrays where schema does not require minItems)
   all validateOcfSecurityExemption d.security_law_exemptions &&
-  all validateOcfShareNumberRange d.share_numbers_issued &&
+  validateOcfShareNumberRangesForQuantity d.quantity d.share_numbers_issued &&
   all validateOcfVesting d.vestings &&
   validateNonEmptyStringsArray d.comments &&
   -- Arrays per schema: schema requires at least 1 legend, but we allow empty
   validateNonEmptyStringsArray d.stock_legend_ids &&
   -- Required amounts
   validateOcfMonetary d.share_price &&
+  optional True validateOcfMonetary d.cost_basis &&
   d.quantity > (0.0) &&
   -- Optional Text values, if present, must be non-empty
   validateOptionalText d.consideration_text &&
@@ -108,5 +109,3 @@ validateOcfStockIssuanceData d =
 -- OCF: https://raw.githubusercontent.com/Open-Cap-Table-Coalition/Open-Cap-Format-OCF/main/schema/enums/StockIssuanceType.schema.json
 data OcfStockIssuanceType = OcfStockIssuanceRSA | OcfStockIssuanceFounders
   deriving (Eq, Show)
-
-

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/StockReissuance.daml

@@ -6,7 +6,7 @@ module Fairmint.OpenCapTable.OCF.StockReissuance where
 -- OCF: https://raw.githubusercontent.com/Open-Cap-Table-Coalition/Open-Cap-Format-OCF/main/schema/objects/transactions/reissuance/StockReissuance.schema.json
 
 import Fairmint.OpenCapTable.Types.Core (Context)
-import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray)
+import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray, validateUniqueStringsArray)
 import Fairmint.Shared.TypeHelpers (validateOptionalText)
 
 
@@ -63,4 +63,4 @@ validateStockReissuanceOcfData d =
   -- Arrays element validation (resulting_security_ids required per Reissuance base schema)
   validateNonEmptyStringsArray d.comments &&
   validateNonEmptyStringsArray d.resulting_security_ids &&
-  not (null d.resulting_security_ids)
+  validateUniqueStringsArray d.resulting_security_ids

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/StockTransfer.daml

@@ -6,7 +6,7 @@ module Fairmint.OpenCapTable.OCF.StockTransfer where
 -- OCF: https://raw.githubusercontent.com/Open-Cap-Table-Coalition/Open-Cap-Format-OCF/main/schema/objects/transactions/transfer/StockTransfer.schema.json
 
 import Fairmint.OpenCapTable.Types.Core (Context)
-import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray)
+import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray, validateNonEmptyUniqueStringsArray)
 import Fairmint.Shared.TypeHelpers (validateOptionalText)
 
 
@@ -59,9 +59,7 @@ validateStockTransferOcfData d =
   d.id /= "" &&
   d.security_id /= "" &&
   d.quantity > 0.0 &&
-  not (null d.resulting_security_ids) &&
-  validateNonEmptyStringsArray d.resulting_security_ids &&
+  validateNonEmptyUniqueStringsArray d.resulting_security_ids &&
   validateNonEmptyStringsArray d.comments &&
   validateOptionalText d.balance_security_id &&
   validateOptionalText d.consideration_text
-

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/WarrantExercise.daml

@@ -6,7 +6,7 @@ module Fairmint.OpenCapTable.OCF.WarrantExercise where
 -- OCF: https://raw.githubusercontent.com/Open-Cap-Table-Coalition/Open-Cap-Format-OCF/main/schema/objects/transactions/exercise/WarrantExercise.schema.json
 
 import Fairmint.OpenCapTable.Types.Core (Context)
-import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray)
+import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray, validateUniqueStringsArray)
 import Fairmint.Shared.TypeHelpers (validateOptionalText, validateOptionalDecimal)
 
 
@@ -67,4 +67,4 @@ validateWarrantExerciseOcfData d =
   -- Arrays element validation (resulting_security_ids required per Exercise base schema)
   validateNonEmptyStringsArray d.comments &&
   validateNonEmptyStringsArray d.resulting_security_ids &&
-  not (null d.resulting_security_ids)
+  validateUniqueStringsArray d.resulting_security_ids

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/WarrantIssuance.daml

@@ -92,6 +92,7 @@ validateOcfWarrantIssuanceDataTx d =
   -- Required amounts and lists
   -- quantity is optional per schema; exercise_price is optional per schema
   validateOcfMonetary d.purchase_price &&
+  optional True validateOcfMonetary d.exercise_price &&
   validateOptionalText d.consideration_text &&
   -- exercise_triggers: OCF schema requires array but no minItems, so empty array is valid
   all validateOcfConversionTrigger d.exercise_triggers &&

OpenCapTable-v34/daml/Fairmint/OpenCapTable/OCF/WarrantTransfer.daml

@@ -6,7 +6,7 @@ module Fairmint.OpenCapTable.OCF.WarrantTransfer where
 -- OCF: https://raw.githubusercontent.com/Open-Cap-Table-Coalition/Open-Cap-Format-OCF/main/schema/objects/transactions/transfer/WarrantTransfer.schema.json
 
 import Fairmint.OpenCapTable.Types.Core (Context)
-import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray)
+import Fairmint.OpenCapTable.Types.Validation (validateNonEmptyStringsArray, validateNonEmptyUniqueStringsArray)
 import Fairmint.Shared.TypeHelpers (validateOptionalText)
 
 
@@ -59,9 +59,7 @@ validateWarrantTransferOcfData d =
   d.id /= "" &&
   d.security_id /= "" &&
   d.quantity > 0.0 &&
-  not (null d.resulting_security_ids) &&
-  validateNonEmptyStringsArray d.resulting_security_ids &&
+  validateNonEmptyUniqueStringsArray d.resulting_security_ids &&
   validateNonEmptyStringsArray d.comments &&
   validateOptionalText d.balance_security_id &&
   validateOptionalText d.consideration_text
-

OpenCapTable-v34/daml/Fairmint/OpenCapTable/Types/Contact.daml

@@ -31,7 +31,42 @@ data OcfPhone = OcfPhone
   deriving (Eq, Show)
 
 validateOcfPhone : OcfPhone -> Bool
-validateOcfPhone phone = validateRequiredText phone.phone_number
+validateOcfPhone phone = validateOcfPhoneNumber phone.phone_number
+
+validDigitsBetween : Int -> Int -> Text -> Bool
+validDigitsBetween minLength maxLength digits =
+  let n = Text.length digits in
+  n >= minLength && n <= maxLength && all Text.isDigit (Text.explode digits)
+
+validDigitsAtLeast : Int -> Text -> Bool
+validDigitsAtLeast minLength digits =
+  Text.length digits >= minLength && all Text.isDigit (Text.explode digits)
+
+validPhoneCountryCode : Text -> Bool
+validPhoneCountryCode country =
+  case Text.stripPrefix "+" country of
+    Some digits -> validDigitsBetween 1 3 digits
+    None -> False
+
+validateOcfPhoneNumberParts : [Text] -> Bool
+validateOcfPhoneNumberParts parts =
+  case parts of
+    [country, area, exchange, line] ->
+      validPhoneCountryCode country &&
+      validDigitsBetween 2 3 area &&
+      validDigitsBetween 2 3 exchange &&
+      validDigitsBetween 4 4 line
+    [country, area, exchange, line, extensionMarker, extension] ->
+      validateOcfPhoneNumberParts [country, area, exchange, line] &&
+      (extensionMarker == "ext." || extensionMarker == "extension") &&
+      validDigitsAtLeast 1 extension
+    -- Empty parts from consecutive spaces are intentionally rejected here.
+    _ -> False
+
+validateOcfPhoneNumber : Text -> Bool
+validateOcfPhoneNumber phoneNumber =
+  validateRequiredText phoneNumber &&
+  validateOcfPhoneNumberParts (Text.splitOn " " phoneNumber)
 
 -- Enum - Email Type
 -- Type of e-mail address