Merge pull request #272 from Anastasia-Labs/fix-witness-proof-endpoints

Fix Witness Proof Endpoints

Author: keyan-m

onchain/aiken/lib/midgard/user-events/witness.ak

@@ -7,15 +7,15 @@ use cardano/transaction.{Publish, Redeemer, ScriptPurpose}
 
 pub type PublishRedeemer {
   MintOrBurn { target_policy: PolicyId }
-  RegisterToProveNotRegistered { registration_redeemer_index: Int }
-  UnregisterToProveNotRegistered { registration_redeemer_index: Int }
+  RegisterToProveNotRegistered { registration_certificate_index: Int }
+  UnregisterToProveNotRegistered { registration_certificate_index: Int }
 }
 
 /// Witness script's prefix from its single CBOR encoded applied bytearray.
 /// TODO: This should probably be moved to `env` with a better generation
 ///       process.
 pub const witness_script_prefix: ByteArray =
-  #"5903f201010033232323232323223225333004323232323253323300a3001300b3754004264664464646464a666022600800226464a66602c60320040082c6eb8c05c004c04cdd50050a999808980180089919299980b180c8010020b1bad3017001301337540142a66602266e1d2004001132325333016301900200416375a602e00260266ea802858c044dd5004899191919299980998030008991919299980b1804800898040010a99980b1804000899b8700248004528180b1baa0093253330153007301637540022900009bad301a3017375400264a66602a600e602c6ea80045300103d87a8000132330010013756603660306ea8008894ccc068004530103d87a8000132333222533301b337220320062a66603666e3c06400c4cdd2a40006603e6ea00092f5c02980103d87a8000133006006001375c60320026eb4c068004c078008c070004c8cc004004dd5980d180d980d980d980d980b9baa00f22533301900114c103d87a8000132333222533301a3372200e0062a66603466e3c01c00c4cdd2a40006603c6e980092f5c02980103d87a8000133006006001375c60300026eacc064004c074008c06c004dd7180c180a9baa00c153330133005001132323232323253330193010301a3754002264a666034601a60366ea80044c94ccc06ccdd78010078a99980d9806980e1baa004132325333020302300213232533301f301630203754002264a666040602460426ea800454ccc080cdd7803181298111baa001153330203370e900218109baa003132325333025302800213370e00201e2c6eb4c098004c088dd50018b0b0b1812181298109baa00116301f009301f00816375a6042002603a6ea80105858c07cc070dd50008b180f180f980d9baa0011630190023019001301b002301a301b0013300437566006602c6ea8038004dd6980c180a9baa00c1325333014300630153754010264646464a666030601e60326ea80044c94ccc064c030c068dd50008a99980c99baf301e301b375400200a2a666032601660346ea800c4c8c94ccc078c0840084cdc38040008b1bad301f001301b37540062c2c2c603a603c60346ea800458c060008c060004c068cc014dd59802180b9baa00f0023019301637540102c6eb4c060c054dd500618099baa00b230173018301830183018301830183018301830180013001001222533301233712002900008010a99980a8010a5eb7bdb1804ccc00c00cc060008cdc0000a40026e1d2002370e90001bad301000130103011001300c37540046e1d200616300d300e003300c002300b002300b0013006375400229309b2b1bae0015734aae7555cf2ab9f5740ae855d12601225820"
+  #"59030601010033232323232323223225333004323232323253330093370e900318051baa00113233223232323253330103003001132325333015301800200416375c602c00260246ea802454ccc040c0100044c8c94ccc054c06000801058dd6980b00098091baa009153330103370e900200089919299980a980c0010020b1bad3016001301237540122c60206ea80204c8c8c8c94ccc048c0140044c8c8c94ccc054c0200044c02400854ccc054c0240044cdc3801240022940c054dd500499299980a1804180a9baa0011480004dd6980c980b1baa001325333014300830153754002298103d87a80001323300100137566034602e6ea8008894ccc064004530103d87a8000132333222533301a337220300062a66603466e3c06000c4cdd2a40006603c6ea00092f5c02980103d87a8000133006006001375c60300026eb4c064004c074008c06c004c8cc004004dd5980c980d180d180d180d180b1baa00e22533301800114c103d87a800013233322253330193372200e0062a66603266e3c01c00c4cdd2a40006603a6e980092f5c02980103d87a8000133006006001375c602e0026eacc060004c070008c068004dd7180b980a1baa00b153330123006001132323253330153375e0040142a66602a6010602c6ea80084c94ccc058c028c05cdd5001099baf001301b301837540042c6034602e6ea80085858c064c068008c060004cc00cdd61801180a1baa00c375a602e60286ea802c4c94ccc04cc01cc050dd500409919299980a9804180b1baa00113375e6034602e6ea800400858c064cc014dd61802180b1baa00e0023018301537540102c6eb4c05cc050dd500598091baa00a23016301730173017301730170013001001222533301133712002900008010a99980a0010a5eb804ccc00c00cc05c008cdc0000a40026e1d2000370e90011bad300f001300f3010001300b37540022c601a601c006601800460160046016002600c6ea800452613656375c002ae6955ceaab9e5573eae815d0aba24c1225820"
 
 pub fn validate_witness_redeemer(
   expected_witness_script_hash: ScriptHash,

onchain/aiken/plutus.json

@@ -1625,8 +1625,8 @@
           }
         }
       ],
-      "compiledCode": "5903cb0101003232323232323223225333004323232323253323300a3001300b3754004264664464646464a666022600800226464a66602c60320040082c6eb8c05c004c04cdd50050a999808980180089919299980b180c8010020b1bad3017001301337540142a66602266e1d2004001132325333016301900200416375a602e00260266ea802858c044dd5004899191919299980998030008991919299980b1804800898040010a99980b1804000899b8700248004528180b1baa0093253330153007301637540022900009bad301a3017375400264a66602a600e602c6ea8004530103d87a8000132330010013756603660306ea8008894ccc068004530103d87a8000132333222533301b337220320062a66603666e3c06400c4cdd2a40006603e6ea00092f5c02980103d87a8000133006006001375c60320026eb4c068004c078008c070004c8cc004004dd5980d180d980d980d980d980b9baa00f22533301900114c103d87a8000132333222533301a3372200e0062a66603466e3c01c00c4cdd2a40006603c6e980092f5c02980103d87a8000133006006001375c60300026eacc064004c074008c06c004dd7180c180a9baa00c153330133005001132323232323253330193010301a3754002264a666034601a60366ea80044c94ccc06ccdd78010078a99980d9806980e1baa004132325333020302300213232533301f301630203754002264a666040602460426ea800454ccc080cdd7803181298111baa001153330203370e900218109baa003132325333025302800213370e00201e2c6eb4c098004c088dd50018b0b0b1812181298109baa00116301f009301f00816375a6042002603a6ea80105858c07cc070dd50008b180f180f980d9baa0011630190023019001301b002301a301b0013300437566006602c6ea8038004dd6980c180a9baa00c1325333014300630153754010264646464a666030601e60326ea80044c94ccc064c030c068dd50008a99980c99baf301e301b375400200a2a666032601660346ea800c4c8c94ccc078c0840084cdc38040008b1bad301f001301b37540062c2c2c603a603c60346ea800458c060008c060004c068cc014dd59802180b9baa00f0023019301637540102c6eb4c060c054dd500618099baa00b230173018301830183018301830183018301830180013001001222533301233712002900008010a99980a8010a5eb7bdb1804ccc00c00cc060008cdc0000a40026e1d2002370e90001bad301000130103011001300c37540046e1d200616300d300e003300c002300b002300b0013006375400229309b2b1bae0015734aae7555cf2ab9f5740ae855d101",
-      "hash": "9f6c9b2d8d8db928cfd28f9598b740c75729b3e366b44748ea289853"
+      "compiledCode": "5902e00101003232323232323223225333004323232323253330093370e900318051baa00113233223232323253330103003001132325333015301800200416375c602c00260246ea802454ccc040c0100044c8c94ccc054c06000801058dd6980b00098091baa009153330103370e900200089919299980a980c0010020b1bad3016001301237540122c60206ea80204c8c8c8c94ccc048c0140044c8c8c94ccc054c0200044c02400854ccc054c0240044cdc3801240022940c054dd500499299980a1804180a9baa0011480004dd6980c980b1baa0013253330143008301537540022980103d87a80001323300100137566034602e6ea8008894ccc064004530103d87a8000132333222533301a337220300062a66603466e3c06000c4cdd2a40006603c6ea00092f5c02980103d87a8000133006006001375c60300026eb4c064004c074008c06c004c8cc004004dd5980c980d180d180d180d180b1baa00e22533301800114c103d87a800013233322253330193372200e0062a66603266e3c01c00c4cdd2a40006603a6e980092f5c02980103d87a8000133006006001375c602e0026eacc060004c070008c068004dd7180b980a1baa00b153330123006001132323253330153375e0040142a66602a6010602c6ea80084c94ccc058c028c05cdd5001099baf001301b301837540042c6034602e6ea80085858c064c068008c060004cc00cdd61801180a1baa00c375a602e60286ea802c4c94ccc04cc01cc050dd500409919299980a9804180b1baa00113375e6034602e6ea800400858c064cc014dd61802180b1baa00e0023018301537540102c6eb4c05cc050dd500598091baa00a23016301730173017301730170013001001222533301133712002900008010a99980a0010a5eb804ccc00c00cc05c008cdc0000a40026e1d2000370e90011bad300f001300f3010001300b37540022c601a601c006601800460160046016002600c6ea800452613656375c002ae6955ceaab9e5573eae815d0aba21",
+      "hash": "0e2bee18bfffe25c20b3cb5facff269482ad81b7594585d8e34df4f1"
     },
     {
       "title": "user_events/witness.main.else",
@@ -1641,8 +1641,8 @@
           }
         }
       ],
-      "compiledCode": "5903cb0101003232323232323223225333004323232323253323300a3001300b3754004264664464646464a666022600800226464a66602c60320040082c6eb8c05c004c04cdd50050a999808980180089919299980b180c8010020b1bad3017001301337540142a66602266e1d2004001132325333016301900200416375a602e00260266ea802858c044dd5004899191919299980998030008991919299980b1804800898040010a99980b1804000899b8700248004528180b1baa0093253330153007301637540022900009bad301a3017375400264a66602a600e602c6ea8004530103d87a8000132330010013756603660306ea8008894ccc068004530103d87a8000132333222533301b337220320062a66603666e3c06400c4cdd2a40006603e6ea00092f5c02980103d87a8000133006006001375c60320026eb4c068004c078008c070004c8cc004004dd5980d180d980d980d980d980b9baa00f22533301900114c103d87a8000132333222533301a3372200e0062a66603466e3c01c00c4cdd2a40006603c6e980092f5c02980103d87a8000133006006001375c60300026eacc064004c074008c06c004dd7180c180a9baa00c153330133005001132323232323253330193010301a3754002264a666034601a60366ea80044c94ccc06ccdd78010078a99980d9806980e1baa004132325333020302300213232533301f301630203754002264a666040602460426ea800454ccc080cdd7803181298111baa001153330203370e900218109baa003132325333025302800213370e00201e2c6eb4c098004c088dd50018b0b0b1812181298109baa00116301f009301f00816375a6042002603a6ea80105858c07cc070dd50008b180f180f980d9baa0011630190023019001301b002301a301b0013300437566006602c6ea8038004dd6980c180a9baa00c1325333014300630153754010264646464a666030601e60326ea80044c94ccc064c030c068dd50008a99980c99baf301e301b375400200a2a666032601660346ea800c4c8c94ccc078c0840084cdc38040008b1bad301f001301b37540062c2c2c603a603c60346ea800458c060008c060004c068cc014dd59802180b9baa00f0023019301637540102c6eb4c060c054dd500618099baa00b230173018301830183018301830183018301830180013001001222533301233712002900008010a99980a8010a5eb7bdb1804ccc00c00cc060008cdc0000a40026e1d2002370e90001bad301000130103011001300c37540046e1d200616300d300e003300c002300b002300b0013006375400229309b2b1bae0015734aae7555cf2ab9f5740ae855d101",
-      "hash": "9f6c9b2d8d8db928cfd28f9598b740c75729b3e366b44748ea289853"
+      "compiledCode": "5902e00101003232323232323223225333004323232323253330093370e900318051baa00113233223232323253330103003001132325333015301800200416375c602c00260246ea802454ccc040c0100044c8c94ccc054c06000801058dd6980b00098091baa009153330103370e900200089919299980a980c0010020b1bad3016001301237540122c60206ea80204c8c8c8c94ccc048c0140044c8c8c94ccc054c0200044c02400854ccc054c0240044cdc3801240022940c054dd500499299980a1804180a9baa0011480004dd6980c980b1baa0013253330143008301537540022980103d87a80001323300100137566034602e6ea8008894ccc064004530103d87a8000132333222533301a337220300062a66603466e3c06000c4cdd2a40006603c6ea00092f5c02980103d87a8000133006006001375c60300026eb4c064004c074008c06c004c8cc004004dd5980c980d180d180d180d180b1baa00e22533301800114c103d87a800013233322253330193372200e0062a66603266e3c01c00c4cdd2a40006603a6e980092f5c02980103d87a8000133006006001375c602e0026eacc060004c070008c068004dd7180b980a1baa00b153330123006001132323253330153375e0040142a66602a6010602c6ea80084c94ccc058c028c05cdd5001099baf001301b301837540042c6034602e6ea80085858c064c068008c060004cc00cdd61801180a1baa00c375a602e60286ea802c4c94ccc04cc01cc050dd500409919299980a9804180b1baa00113375e6034602e6ea800400858c064cc014dd61802180b1baa00e0023018301537540102c6eb4c05cc050dd500598091baa00a23016301730173017301730170013001001222533301133712002900008010a99980a0010a5eb804ccc00c00cc05c008cdc0000a40026e1d2000370e90011bad300f001300f3010001300b37540022c601a601c006601800460160046016002600c6ea800452613656375c002ae6955ceaab9e5573eae815d0aba21",
+      "hash": "0e2bee18bfffe25c20b3cb5facff269482ad81b7594585d8e34df4f1"
     }
   ],
   "definitions": {
@@ -4250,7 +4250,7 @@
           "index": 1,
           "fields": [
             {
-              "title": "registration_redeemer_index",
+              "title": "registration_certificate_index",
               "$ref": "#/definitions/Int"
             }
           ]
@@ -4261,7 +4261,7 @@
           "index": 2,
           "fields": [
             {
-              "title": "registration_redeemer_index",
+              "title": "registration_certificate_index",
               "$ref": "#/definitions/Int"
             }
           ]

onchain/aiken/validators/user-events/witness.ak

@@ -2,7 +2,7 @@ use aiken/collection/list
 use aiken/crypto.{Blake2b_256, Hash}
 use cardano/assets
 use cardano/certificate.{Certificate, RegisterCredential, UnregisterCredential}
-use cardano/transaction.{Publish, Transaction}
+use cardano/transaction.{Transaction}
 use midgard/common/parameter_validation
 use midgard/user_events/witness.{
   MintOrBurn, PublishRedeemer, RegisterToProveNotRegistered,
@@ -28,62 +28,36 @@ validator main(nonce: Hash<Blake2b_256, ByteArray>) {
               _ -> False
             }
           }
-          RegisterToProveNotRegistered { registration_redeemer_index } -> {
-            // 1. The registration redeemer must be immediately followed by the
-            //    unregistration counterpart.
-            expect [registration_pair,
-              unregistration_pair, ..] =
-              tx.redeemers |> list.drop(registration_redeemer_index)
+          RegisterToProveNotRegistered { registration_certificate_index } -> {
+            // 1. The registration certificate must be immediately followed by
+            //    the unregistration counterpart.
+            expect [reg_cert,
+              unreg_cert, ..] =
+              tx.certificates |> list.drop(registration_certificate_index)
 
-            expect Pair(Publish {
-              certificate: RegisterCredential { credential: reg_cred, .. } as reg_cert,
-              ..
-            },
-            reg_redeemer_data) = registration_pair
-
-            // 2. Ensure correctness of the provided redeemer index.
+            // 2. Ensure correctness of the provided certificate index.
             expect reg_cert == cert
-            expect RegisterToProveNotRegistered { .. } = reg_redeemer_data
 
-            expect Pair(Publish {
-              certificate: UnregisterCredential { credential: unreg_cred, .. },
-              ..
-            },
-            unreg_redeemer_data) = unregistration_pair
+            expect RegisterCredential { credential: reg_cred, .. } = reg_cert
 
-            // 3. The unregistration redeemer must invoke the same script.
-            expect reg_cred == unreg_cred
+            expect UnregisterCredential { credential: unreg_cred, .. } =
+              unreg_cert
 
-            // 4. The index carried in the unregistration redeemer must match
-            //    the index from the registration redeemer.
-            expect UnregisterToProveNotRegistered {
-              registration_redeemer_index: index_from_unregistration,
-            } = unreg_redeemer_data
-            index_from_unregistration == registration_redeemer_index
+            // 3. The unregistration certificate must be of the same script.
+            reg_cred == unreg_cred
           }
-          UnregisterToProveNotRegistered { registration_redeemer_index } -> {
+          UnregisterToProveNotRegistered { registration_certificate_index } -> {
             // 1. Current certificate must be an `UnregisterCredential`.
             expect UnregisterCredential { credential: unreg_cred, .. } = cert
 
-            // 2. The provided index must point to a registration endpoint.
-            expect [registration_pair, ..] =
-              tx.redeemers |> list.drop(registration_redeemer_index)
-            expect Pair(Publish {
-              certificate: RegisterCredential { credential: reg_cred, .. },
-              ..
-            },
-            reg_redeemer_data) = registration_pair
+            // 2. The provided index must point to a registration certificate.
+            expect [reg_cert, ..] =
+              tx.certificates |> list.drop(registration_certificate_index)
+            expect RegisterCredential { credential: reg_cred, .. } = reg_cert
 
-            // 3. Credential from the registration endpoint must match the
+            // 3. Credential from the registration certificate must match the
             //    current credential.
-            expect reg_cred == unreg_cred
-
-            // 4. Index from the registration endpoint must be equal to the
-            //    index from the current endpoint.
-            expect RegisterToProveNotRegistered {
-              registration_redeemer_index: index_from_registration,
-            } = reg_redeemer_data
-            registration_redeemer_index == index_from_registration
+            reg_cred == unreg_cred
           }
         }
       },