Merge conflicts

.circleci/config.yml

@@ -44,7 +44,7 @@ jobs:
 
   rust-stable:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: 2xlarge
     steps:
       - checkout
@@ -93,7 +93,7 @@ jobs:
 
   snarkvm-algorithms:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout
@@ -108,7 +108,7 @@ jobs:
 
   snarkvm-curves:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout
@@ -123,7 +123,7 @@ jobs:
 
   snarkvm-derives:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout
@@ -138,7 +138,7 @@ jobs:
 
   snarkvm-dpc:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout
@@ -153,7 +153,7 @@ jobs:
 
   snarkvm-fields:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout
@@ -168,7 +168,7 @@ jobs:
 
   snarkvm-gadgets:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout
@@ -183,7 +183,7 @@ jobs:
 
   snarkvm-marlin:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout
@@ -198,7 +198,7 @@ jobs:
 
   snarkvm-parameters:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout
@@ -213,7 +213,7 @@ jobs:
 
   snarkvm-polycommit:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout
@@ -228,7 +228,7 @@ jobs:
 
   snarkvm-posw:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout
@@ -243,7 +243,7 @@ jobs:
 
   snarkvm-profiler:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout
@@ -258,7 +258,7 @@ jobs:
 
   snarkvm-r1cs:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout
@@ -273,7 +273,7 @@ jobs:
 
   snarkvm-utilities:
     docker:
-      - image: cimg/rust:1.51.0
+      - image: cimg/rust:1.53.0
     resource_class: xlarge
     steps:
       - checkout

.integration/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snarkvm-integration"
-version = "0.5.4"
+version = "0.5.5"
 authors = [ "The Aleo Team <hello@aleo.org>" ]
 description = "Integration testing for DPC"
 homepage = "https://aleo.org"
@@ -19,40 +19,40 @@ edition = "2018"
 
 [dependencies.snarkvm-algorithms]
 path = "../algorithms"
-version = "0.5.4"
+version = "0.5.5"
 
 [dependencies.snarkvm-curves]
 path = "../curves"
-version = "0.5.4"
+version = "0.5.5"
 
 [dependencies.snarkvm-dpc]
 path = "../dpc"
-version = "0.5.4"
+version = "0.5.5"
 
 [dependencies.snarkvm-fields]
 path = "../fields"
-version = "0.5.4"
+version = "0.5.5"
 
 [dependencies.snarkvm-gadgets]
 path = "../gadgets"
-version = "0.5.4"
+version = "0.5.5"
 
 [dependencies.snarkvm-parameters]
 path = "../parameters"
-version = "0.5.4"
+version = "0.5.5"
 
 [dependencies.snarkvm-profiler]
 path = "../profiler"
-version = "0.5.4"
+version = "0.5.5"
 default-features = false
 
 [dependencies.snarkvm-r1cs]
 path = "../r1cs"
-version = "0.5.4"
+version = "0.5.5"
 
 [dependencies.snarkvm-utilities]
 path = "../utilities"
-version = "0.5.4"
+version = "0.5.5"
 default-features = false
 
 [dependencies.anyhow]

.resources/release-version

@@ -1 +1 @@
-v0.5.4
+v0.5.5