Allow delegate to withdraw rewards.

CardanoSolutions · Sep 17, 2024 · 40f61f5 · 40f61f5
1 parent 2ddb5a3
commit 40f61f5
Show file tree

Hide file tree

Showing 5 changed files with 227 additions and 13 deletions.
diff --git a/aiken.lock b/aiken.lock
@@ -35,4 +35,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/fuzz@v2" = [{ secs_since_epoch = 1726502893, nanos_since_epoch = 747424000 }, "34ffec10cce786bf823c7505589a3b5e0663792ef8efd31f870d7bcc37e0f593"]
+"aiken-lang/fuzz@v2" = [{ secs_since_epoch = 1726578692, nanos_since_epoch = 99170000 }, "34ffec10cce786bf823c7505589a3b5e0663792ef8efd31f870d7bcc37e0f593"]
diff --git a/aiken.toml b/aiken.toml
@@ -1,6 +1,6 @@
 name = "cardanosolutions/proxy-dreps"
 version = "0.0.0"
-compiler = "v1.1.1"
+compiler = "v1.1.2"
 plutus = "v3"
 license = "MPL-2.0"
 description = "Aiken contracts for project 'cardanosolutions/proxy-dreps'"
@@ -26,13 +26,9 @@ version = "v2"
 source = "github"
 
 [config.default]
-threshold = 1 # How many administrors signatories are required to approve actions
+quorum = 1 # How many administrators signatories are required to approve actions
 
-# List of administators (verification key hashes)
+# List of administrators (verification key hashes)
 [[config.default.administrators]]
-bytes = "00000000000000000000000000000000000000000000000000000000"
-encoding = "base16"
-
-[[config.default.administrators]]
-bytes = "00000000000000000000000000000000000000000000000000000001"
+bytes = "491512406d99b03de5fa4d03ddd2b7f047eeb6681731916fb803f23d"
 encoding = "base16"
diff --git a/plutus.json b/plutus.json
diff --git a/validators/proxy.ak b/validators/proxy.ak
@@ -18,7 +18,7 @@ use sundae/multisig.{MultisigScript}
 
 const administrator: MultisigScript =
   multisig.AtLeast {
-    required: config.threshold,
+    required: config.quorum,
     scripts: list.map(config.administrators, multisig.Signature),
   }
 
@@ -39,7 +39,7 @@ validator direct_proxy {
             RegisterDelegateRepresentative {
               delegate_representative: credential,
               ..
-            } | 
+            } |
             UnregisterDelegateRepresentative {
               delegate_representative: credential,
               ..
@@ -79,8 +79,18 @@ validator direct_proxy {
   }
 
   // Withdrawal of rewards must be approved by the delegate
-  withdraw(_redeemer: Data, _account: Credential, self: Transaction) {
-    must_be_approved_by_administrator(self, administrator)
+  withdraw(
+    redeemer: Data<MultisigScript>,
+    account: Credential,
+    self: Transaction,
+  ) {
+    or {
+      must_be_approved_by_administrator(self, administrator)?,
+      {
+        expect rules: MultisigScript = redeemer
+        must_be_approved_by_delegate(self, rules, account, Governance)?
+      },
+    }
   }
 
   publish(

diff --git a/validators/proxy.test.ak b/validators/proxy.test.ak
@@ -147,6 +147,8 @@ test prop_proxy_drep_ko(
   )
 }
 
+// ------------------------------------------------------------- post-conditions
+
 // ------------------------------------------------------------------ generators
 
 // TODO: Voting
-Original file line number
+Diff line change
@@ Expand Up / @@ -147,6 +147,8 @@ test prop_proxy_drep_ko( @@
       )
     }
+    // ------------------------------------------------------------- post-conditions
     // ------------------------------------------------------------------ generators
     // TODO: Voting
@@ Expand Down @@