refactor: use latest noir gadgets

Author: olehmisar

README.md

@@ -9,7 +9,7 @@ Put this into your Nargo.toml.
 If you are using Noir:
 
 ```toml
-nodash = { git = "https://github.com/olehmisar/nodash/", tag = "noir-v0.33.0" }
+nodash = { git = "https://github.com/olehmisar/nodash/", tag = "noir-v0.34.1" }
 ```
 
 If you are using Aztec:
@@ -48,8 +48,6 @@ assert(clamp(2 as u64, 1 as u64, 3 as u64) == 2 as u64);
 
 Equivalent to `abi.encodeWithSelector` in Solidity.
 
-_Note: due to Noir limitations, you have to pass the result array as the last argument. The length of the array should be `4 + N * 32` where `N` is the number of arguments. In the example below, `4 + 2 * 32 == 68`_
-
 ```rs
 use nodash::solidity::encode_with_selector;
 
@@ -58,7 +56,7 @@ let args: [Field; 2] = [
   0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045, // address
   123 // uint256
 ];
-let encoded = encode_with_selector(selector, args, [0; 68]);
+let encoded = encode_with_selector(selector, args);
 // typeof encoded: [u8; 68]
 ```
 

src/lib.nr

@@ -5,9 +5,8 @@ mod string;
 pub use string::to_hex_string_bytes;
 pub use math::{clamp, sqrt::sqrt};
 
-pub fn array_concat<T, let L1: u32, let L2: u32, let L: u32>(a: [T; L1], b: [T; L2]) -> [T; L] {
-    assert(L1 + L2 == L, "array_concat: array lengths do not match");
-    let mut result = [a[0]; L];
+pub fn array_concat<T, let L1: u32, let L2: u32>(a: [T; L1], b: [T; L2]) -> [T; L1 + L2] {
+    let mut result = [a[0]; L1 + L2];
     for i in 0..L1 {
         result[i] = a[i];
     }
@@ -16,3 +15,15 @@ pub fn array_concat<T, let L1: u32, let L2: u32, let L: u32>(a: [T; L1], b: [T;
     }
     result
 }
+
+mod array_concat_tests {
+    use crate::array_concat;
+
+    #[test]
+    fn test_simple() {
+        let a: [u8; 3] = [1, 2, 3];
+        let b: [u8; 2] = [4, 5];
+        let c: [u8; 5] = array_concat(a, b);
+        assert(c == [1, 2, 3, 4, 5]);
+    }
+}

src/math/sqrt.nr

@@ -2,11 +2,15 @@ use std::{ops::{Mul, Div, Add}, cmp::Ord};
 
 // TODO: check if this is correct
 pub fn sqrt<T>(value: T) -> T where T: Numeric + Mul + Ord + Add + Div {
-    let r = sqrt_unconstrained(value);
-    assert(value >= r * r);
-    let ONE: T = Numeric::one();
-    let r_plus_1 = r + ONE;
-    assert(value < r_plus_1 * r_plus_1);
+    let r = unsafe {
+        // Safety: unsafe sqrt is checked to be between bounds
+        let r = sqrt_unconstrained(value);
+        assert(value >= r * r);
+        let ONE: T = Numeric::one();
+        let r_plus_1 = r + ONE;
+        assert(value < r_plus_1 * r_plus_1);
+        r
+    };
     r
 }
 

src/solidity.nr

@@ -1,10 +1,7 @@
-use std;
-
 global SELECTOR_LENGTH = 4;
 
-pub fn encode_with_selector<let N: u32, let M: u32>(selector: u32, args: [Field; N], mut result: [u8; M]) -> [u8; M] {
-    // TODO: remove this assert
-    assert(M == SELECTOR_LENGTH + N * 32, "Invalid result length");
+pub fn encode_with_selector<let N: u32>(selector: u32, args: [Field; N]) -> [u8; SELECTOR_LENGTH + N * 32] {
+    let mut result = [0; SELECTOR_LENGTH + N * 32];
 
     let selector_bytes: [u8; 4] = (selector as Field).to_be_bytes();
     for i in 0..SELECTOR_LENGTH {
@@ -31,7 +28,7 @@ mod tests {
             0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045,// address
             123// uint256
         ];
-        let encoded = encode_with_selector(selector, args, [0; 68]);
+        let encoded = encode_with_selector(selector, args);
         let expected: [u8; 68] = [
             169, 5, 156, 187, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 216, 218, 107, 242, 105, 100, 175, 157, 126, 237, 158, 3, 229, 52, 21, 211, 122, 169, 96, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123
         ];
@@ -49,17 +46,11 @@ mod tests {
             0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e,
             333,
             64
-        ],
-            [0; 164]
+        ]
         );
         let expected = [
             134, 208, 157, 174, 26, 112, 151, 160, 240, 148, 87, 176, 176, 73, 102, 132, 178, 237, 103, 35, 162, 98, 218, 58, 27, 6, 27, 89, 142, 233, 44, 227, 55, 108, 179, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 97, 1, 120, 218, 33, 31, 239, 125, 65, 123, 192, 230, 254, 211, 159, 5, 96, 154, 215, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 183, 248, 188, 99, 187, 202, 209, 129, 85, 32, 19, 8, 200, 243, 84, 11, 7, 248, 79, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64
         ];
         assert(result == expected);
     }
-
-    #[test(should_fail_with = "Invalid result length")]
-    fn test_fails_if_result_length_is_wrong() {
-        let _ = encode_with_selector(0xbd87d14b, [1, 2], [0; 67]);
-    }
 }