updated: min_charge

Author: kenlau666

packages/mesh-contract/src/crowdfund/aiken-workspace-v3/aiken-crowdfund/lib/utils.ak

@@ -1,7 +1,7 @@
 use aiken/collection/list
 use aiken/collection/pairs
 use cardano/address.{Address}
-use cardano/assets.{Value}
+use cardano/assets.{Lovelace, from_lovelace}
 use cardano/transaction.{Input, Output, Redeemer, ScriptPurpose, Spend}
 
 pub fn redeemer_with_input(
@@ -24,16 +24,16 @@ pub fn check_fundraise_target(
   }
 }
 
-pub fn output_at_with_value(
+pub fn outputs_at_with_lovelace(
   outputs: List<Output>,
   address: Address,
-  value: Value,
+  lovelace: Lovelace,
 ) -> List<Output> {
   list.filter(
     outputs,
     fn(output) {
-      let are_values_equal = output.value == value
-      are_values_equal && output.address == address
+      let is_lovelace_match = output.value == from_lovelace(lovelace)
+      is_lovelace_match && output.address == address
     },
   )
 }

packages/mesh-contract/src/crowdfund/aiken-workspace-v3/aiken-crowdfund/specs/3_crowdfund.md

@@ -3,6 +3,7 @@
 ## Parameter
 
 - `auth_token`: The policy id of `AuthToken`
+- `proposer_key_hash`: ByteArray
 
 ## Datum
 
@@ -30,7 +31,8 @@
 
 2. CompleteCrowdfund
 
-   - Any value in the current utxos - (`current_fundraised_amount` + `min_charge`) goes to `fee_address`
+   - `min_charge` goes to `fee_address`
+   - utxo value >= `min_charge` + `current_fundraised_amount`
    - `current_fundraised_amount` >= `fundraise_target`
    - `completion_script` withdrawal script is executed
    - `auth_token` from current input is burnt
@@ -48,3 +50,4 @@
    - `deadline` is passed
    - share token with token name `completion_script` burning in current tx == `current_fundraised_amount`
    - `auth_token` from current input is burnt
+   - signed by `proposer_key_hash`

packages/mesh-contract/src/crowdfund/aiken-workspace-v3/aiken-crowdfund/specs/user_action_doc.md

@@ -6,7 +6,7 @@
 
    - Validation: 2.1, 3.1
 
-2. Withdraw fund. Burning ``share_token``
+2. Withdraw fund. Burning `share_token`
 
    - Validation: 2.2, 3.3
 
@@ -20,10 +20,10 @@
 
    - Validation: 2.2, 3.3
 
-3. Complete Crowdfund. Sending `auth_token` and `fundraised_amount` to `1_spend` from `gov-aiken`
+3. Complete Crowdfund. Sending `auth_token` and `fundraised_amount` to `1_spend` from `gov-aiken`. Proposer is required to add `min_charge` to `auth_token` utxo
 
    - Validation: 3.2, 2.1 `Withdraw`, 2.1 `Mint` from `gov_crowdfund`
 
 4. Remove Crowdfund. Burning the `auth_token`
 
-   - Validation: 1.2, 2.2, 3.4
+   - Validation: 1.2, 2.2, 3.4

packages/mesh-contract/src/crowdfund/aiken-workspace-v3/aiken-crowdfund/validators/crowdfund/spend.ak

@@ -1,30 +1,34 @@
-use aiken/collection/list.{delete}
 use aiken/collection/pairs.{has_key}
 use cardano/address.{Credential, Script}
-use cardano/assets.{
-  PolicyId, from_lovelace, lovelace_of, merge, policies, restricted_to,
-}
+use cardano/assets.{PolicyId, lovelace_of}
 use cardano/transaction.{OutputReference, Transaction, find_input}
 use cocktail.{
-  inputs_at_with_policy, only_minted_token, output_inline_datum,
+  inputs_at_with_policy, key_signed, only_minted_token, output_inline_datum,
   outputs_at_with_policy, policy_only_minted_token, valid_after, valid_before,
   value_length,
 }
 use types.{
   CompleteCrowdfund, ContributeFund, ContributorWithdrawal, CrowdfundDatum,
   CrowdfundRedeemer, RemoveEmptyInstance,
 }
-use utils.{check_fundraise_target, output_at_with_value}
+use utils.{check_fundraise_target, outputs_at_with_lovelace}
 
-validator crowdfund(auth_token: PolicyId) {
+validator crowdfund(auth_token: PolicyId, proposer_key_hash: ByteArray) {
   spend(
     datum_opt: Option<CrowdfundDatum>,
     redeemer: CrowdfundRedeemer,
     input: OutputReference,
     self: Transaction,
   ) {
-    let Transaction { inputs, validity_range, mint, outputs, withdrawals, .. } =
-      self
+    let Transaction {
+      inputs,
+      validity_range,
+      mint,
+      outputs,
+      withdrawals,
+      extra_signatories,
+      ..
+    } = self
 
     expect Some(own_input) = find_input(inputs, input)
     expect Some(auth_input_datum) = datum_opt
@@ -87,31 +91,18 @@ validator crowdfund(auth_token: PolicyId) {
       }
 
       CompleteCrowdfund -> {
-        let fee_value =
-          from_lovelace(
-            lovelace_of(auth_input.output.value) - current_fundraised_amount - min_charge,
-          )
+        let input_lovelace_check =
+          lovelace_of(auth_input.output.value) >= min_charge + current_fundraised_amount
 
-        let other_policy =
-          policies(auth_input.output.value)
-            |> delete(auth_token)
-            |> delete("")
-        let other_value = restricted_to(auth_input.output.value, other_policy)
-
-        expect [_] =
-          output_at_with_value(
-            outputs,
-            fee_address,
-            merge(other_value, fee_value),
-          )
+        expect [_] = outputs_at_with_lovelace(outputs, fee_address, min_charge)
 
         let fundraise_check = current_fundraised_amount >= fundraise_target
         let completion_script_withdrawal_credential: Credential =
           Script(completion_script)
         let withdrawal_script_check =
           withdrawals
             |> has_key(completion_script_withdrawal_credential)
-        fundraise_check? && withdrawal_script_check? && policy_only_minted_token(
+        fundraise_check? && withdrawal_script_check? && input_lovelace_check? && policy_only_minted_token(
           mint,
           auth_token,
           completion_script,
@@ -171,7 +162,9 @@ validator crowdfund(auth_token: PolicyId) {
           } else {
             only_minted_token(mint, auth_token, completion_script, -1)?
           }
-        validity_check? && token_burnt_check?
+        let proposer_key_signed_check =
+          key_signed(extra_signatories, proposer_key_hash)
+        validity_check? && token_burnt_check? && proposer_key_signed_check?
       }
     }
   }