Merge pull request #241 from logical-mechanism/240-updated-stdlib-to-300

240 updated stdlib to 300

Author: logicalmechanism

seedelf-contracts/aiken.toml

@@ -12,7 +12,7 @@ platform = "github"
 
 [[dependencies]]
 name = "aiken-lang/stdlib"
-version = "v2.2.0"
+version = "v3.0.0"
 source = "github"
 
 [config]

seedelf-contracts/contracts/wallet_contract.plutus

@@ -1,5 +1,5 @@
 {
   "type": "PlutusScriptV3",
   "description": "Generated by Aiken",
-  "cborHex": "59027f59027c0101003229800aba4aba2aba1aba0aab9faab9eaab9dab9a4888888896600264653001300800198041804800cc0200092225980099b8748008c01cdd500144ca60026018003300c300d0019b874800122259800980098059baa00789919194c004dd71809000cdd71809001cdd718090012444b300130160048acc004c01cc044dd500444cc8966002005159800980498099baa0028992cc00400600513259800800c00e007003801c4cc89660020030058992cc00400600d006803401a264b3001301e0038992cc00660024603e604000323259800acc004cdc4a40000031337100029041404040707ffffffffdeff2ffdfc0d27de755405df442445873ccc1d4efe754d34ef6df0745282036899ba548000cc07cdd4000a5eb82298103d87a8000406c66f2928800cdd7180f180d9baa0099bae301e301b375402c91114c004dd71802180f9baa00d9bae3004301f37540353003001488966002602e60426ea8006264b300130183022375400313377266ee0dd6981318119baa002377600c66ed8ddd80199bb8375a604c60466ea8004ddd80245902118031bc83371466e28cdc50028010019bae30083022375403b16408044c8cc88cc008008004896600200314a115980099b8f375c604200200714a31330020023022001407080f8dd6180f98101810181018101810181018101810180e1baa015375c600260366ea805a29410191180f180f980f800c01d01b1bae0014078603600280c8dd7000980d00120363018001405860286ea800a0028092003001800c005019180a98091baa00814a314a280822c80986024002602200260186ea801e2c805060106ea800a2c8030601000260066ea802629344d959001130010544acabcafe0001"
+  "cborHex": "59022259021f0101003229800aba4aba2aba1aab9faab9eaab9dab9a488888896600264653001300700198039804000cc01c0092225980099b8748008c01cdd500144ca60026016003300b300c0019b874800122259800980098059baa00789919194c004dd71808800cdd71808801cdd718088012444b300130150048acc004c01cc044dd500444cc8966002005159800980498099baa0028992cc00400600513259800800c00e007003801c4cc89660020030058992cc00400600d006803401a264b3001301d0038992cc00660024603c603e00323370c66f2928800a4105010101c1fffffffff7bfcbff7f0349f79d550177d1091161cf330753bf9d534d3bdb7c1d375c603a60366ea80266eb8c074c06cdd500b24444664466ee4cddc18028019bbb0043376c6eec004cddc18029bc83371466e28cdc50020008011bae3007302137540386eec008dd71802180f9baa00d375c6008603e6ea80691323322330020020012259800800c528456600266e3cdd71810000801c528c4cc008008c08400501c203e3758603c603e603e603e603e603e603e603e603e60386ea8054dd71800980d9baa0168a5040644603a603c603c003007406c6eb800501d180d000a032375c002603200480d0c05c005016180a1baa002800a024800c0060030014060602860246ea8020528c528a0208b20261808800980800098061baa0078b201418041baa0028b200c180380098019baa0088a4d1365640044c010544acabcafe0001"
 }

seedelf-contracts/hashes/wallet.hash

@@ -1 +1 @@
-f2c354195ef789c1292d76f24632c82c2cf4ef4e78d83641e217bf3b
+101571e5a0a7a295196e39aa243ba21fed207f54dea49eb443fa6082

seedelf-contracts/lib/schnorr.ak

@@ -2,6 +2,7 @@
 ////
 
 use aiken/crypto.{VerificationKeyHash}
+use aiken/crypto/bitwise.{State}
 use aiken/crypto/bls12_381/g1
 use aiken/crypto/bls12_381/scalar.{Scalar}
 use aiken/primitive/bytearray
@@ -61,7 +62,7 @@ test real_fiat_shamir_transform() {
 }
 
 /// Internal Use Only
-fn randomize(datum: Register, s: Scalar) -> Register {
+fn randomize(datum: Register, s: State<Scalar>) -> Register {
   // decompress the generator and public value
   let g: G1Element = g1.decompress(datum.generator)
   let u: G1Element = g1.decompress(datum.public_value)
@@ -106,13 +107,13 @@ pub fn verify(
   //                        = g^r * (g^x)^c
   //                        = g^r * u^c
   //
-  expect Some(z): Option<Scalar> = scalar.from_bytearray_big_endian(z_b)
+  let z: State<Scalar> = scalar.from_bytes(z_b)
   let g_z: G1Element = generator |> g1.decompress |> g1.scale(z)
   //
   // use the fiat-shamir heuristic to calculate the challenge then convert it to an scalar
-  expect Some(c): Option<Scalar> =
+  let c: State<Scalar> =
     fiat_shamir_heuristic(generator, g_r_b, public_value, bound)
-      |> scalar.from_bytearray_big_endian()
+      |> scalar.from_bytes
   //
   // the u^c computation: u^c = (g^x)^c = g^(x * c)
   let u_c: G1Element = public_value |> g1.decompress |> g1.scale(c)
@@ -124,8 +125,8 @@ pub fn verify(
 
 test valid_schnorr_proof() {
   // some secret x 
-  expect Some(x): Option<Scalar> =
-    scalar.new(
+  let x: State<Scalar> =
+    scalar.from_int(
       42435875175126190479447740508185965837690552500527637822603658699938581184513,
     )
   // the datum register using the g1 generator and the public value for x
@@ -135,8 +136,8 @@ test valid_schnorr_proof() {
       public_value: g1.generator |> g1.scale(x) |> g1.compress,
     }
   // a random number
-  expect Some(r): Option<Scalar> =
-    scalar.new(
+  let r: State<Scalar> =
+    scalar.from_int(
       32435875175126190479447740508185965837690552500527637822603658699938581184513,
     )
   // the bound, something unique from the tx
@@ -148,10 +149,10 @@ test valid_schnorr_proof() {
   // the challenge number using a fiat shamir transform
   let c_b: ByteArray =
     fiat_shamir_heuristic(datum.generator, g_r_b, datum.public_value, bound)
-  expect Some(c): Option<Scalar> = scalar.from_bytearray_big_endian(c_b)
+  let c: State<Scalar> = scalar.from_bytes(c_b)
   // the z value
-  let z: Scalar = scalar.mul(c, x) |> scalar.add(r)
-  let z_b: ByteArray = scalar.to_bytearray_big_endian(z, 0)
+  let z: State<Scalar> = scalar.mul(c, x) |> scalar.add(r)
+  let z_b: ByteArray = scalar.to_bytes(z)
   // trace datum.generator
   // trace datum.public_value
   // trace z_b
@@ -162,8 +163,8 @@ test valid_schnorr_proof() {
 
 test randomized_valid_schnorr_proof() {
   // some secret x 
-  expect Some(x): Option<Scalar> =
-    scalar.new(
+  let x: State<Scalar> =
+    scalar.from_int(
       12435875175126190479447740508185965837690552500527637822603658699938581184513,
     )
   // the datum register using the g1 generator and the public value for x
@@ -173,13 +174,13 @@ test randomized_valid_schnorr_proof() {
       public_value: g1.generator |> g1.scale(x) |> g1.compress,
     }
   // a random number
-  expect Some(r): Option<Scalar> =
-    scalar.new(
+  let r: State<Scalar> =
+    scalar.from_int(
       32435875175126190479447740508185965837690552500527637822603658699938581184513,
     )
   // another random number
-  expect Some(d): Option<Scalar> =
-    scalar.new(
+  let d: State<Scalar> =
+    scalar.from_int(
       12435875175126190479447740508185965837690552500527637822603658699938581184513,
     )
   // rerandomize the a0 register
@@ -198,10 +199,10 @@ test randomized_valid_schnorr_proof() {
       datum_rng.public_value,
       bound,
     )
-  expect Some(c): Option<Scalar> = scalar.from_bytearray_big_endian(c_b)
+  let c: State<Scalar> = scalar.from_bytes(c_b)
   // the z value
-  let z: Scalar = scalar.mul(c, x) |> scalar.add(r)
-  let z_b: ByteArray = scalar.to_bytearray_big_endian(z, 0)
+  let z: State<Scalar> = scalar.mul(c, x) |> scalar.add(r)
+  let z_b: ByteArray = scalar.to_bytes(z)
   // trace datum_rng.generator
   // trace datum_rng.public_value
   // trace z_b
@@ -212,8 +213,8 @@ test randomized_valid_schnorr_proof() {
 
 test invalid_schnorr_proof() fail {
   // some secret x 
-  expect Some(x): Option<Scalar> =
-    scalar.new(
+  let x: State<Scalar> =
+    scalar.from_int(
       42435875175126190479447740508185965837690552500527637822603658699938581184513,
     )
   // the datum register using the g1 generator and the public value for x
@@ -223,8 +224,8 @@ test invalid_schnorr_proof() fail {
       public_value: g1.generator |> g1.scale(x) |> g1.compress,
     }
   // a random number
-  expect Some(r): Option<Scalar> =
-    scalar.new(
+  let r: State<Scalar> =
+    scalar.from_int(
       32435875175126190479447740508185965837690552500527637822603658699938581184513,
     )
   // the bound, something unique from the tx
@@ -236,25 +237,25 @@ test invalid_schnorr_proof() fail {
   // the challenge number using a fiat shamir transform
   let c_b: ByteArray =
     fiat_shamir_heuristic(datum.generator, g_r_b, datum.public_value, bound)
-  expect Some(c): Option<Scalar> = scalar.from_bytearray_big_endian(c_b)
+  let c: State<Scalar> = scalar.from_bytes(c_b)
   // the bad z value, it assumes the secret is the challenge
-  let z: Scalar = scalar.mul(c, c) |> scalar.add(r)
-  let z_b: ByteArray = scalar.to_bytearray_big_endian(z, 0)
+  let z: State<Scalar> = scalar.mul(c, c) |> scalar.add(r)
+  let z_b: ByteArray = scalar.to_bytes(z)
   verify(datum.generator, datum.public_value, z_b, g_r_b, bound)
 }
 
 // shows how it is constant time
 test simple_schnorr_proof() {
   // some secret x 
-  expect Some(x): Option<Scalar> = scalar.new(44203)
+  let x: State<Scalar> = scalar.from_int(44203)
   // the datum register using the g1 generator and the public value for x
   let datum: Register =
     Register {
       generator: g1.generator |> g1.compress,
       public_value: g1.generator |> g1.scale(x) |> g1.compress,
     }
   // a random number
-  expect Some(r): Option<Scalar> = scalar.new(1337)
+  let r: State<Scalar> = scalar.from_int(1337)
   // the bound, something unique from the tx
   let bound: ByteArray = #"acab"
   // calculate the g^r term
@@ -264,16 +265,16 @@ test simple_schnorr_proof() {
   // the challenge number using a fiat shamir transform
   let c_b: ByteArray =
     fiat_shamir_heuristic(datum.generator, g_r_b, datum.public_value, bound)
-  expect Some(c): Option<Scalar> = scalar.from_bytearray_big_endian(c_b)
+  let c: State<Scalar> = scalar.from_bytes(c_b)
   // the z value
-  let z: Scalar = scalar.mul(c, x) |> scalar.add(r)
-  let z_b: ByteArray = scalar.to_bytearray_big_endian(z, 0)
+  let z: State<Scalar> = scalar.mul(c, x) |> scalar.add(r)
+  let z_b: ByteArray = scalar.to_bytes(z)
   verify(datum.generator, datum.public_value, z_b, g_r_b, bound)
 }
 
 test simple_regsiter() {
   // some secret x 
-  expect Some(x): Option<Scalar> = scalar.new(18446744073709551606)
+  let x: State<Scalar> = scalar.from_int(18446744073709551606)
   // the datum register using the g1 generator and the public value for x
   let datum: Register =
     Register {

seedelf-contracts/validators/wallet.ak

@@ -24,7 +24,7 @@ validator contract(_any: Data) {
     self: Transaction,
   ) {
     //
-    // first do a data structure check
+    // do a data structure check
     when maybe_register is {
       Some(register) ->
         if register is Register {