From eedc4dbe61d887b6509acfa4f50612a0edc2e168 Mon Sep 17 00:00:00 2001
From: schaeff <thibaut@schaeff.fr>
Date: Sun, 25 Jul 2021 15:46:30 +0200
Subject: [PATCH 1/2] use vec instead of map

---
 zokrates_abi/src/lib.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/zokrates_abi/src/lib.rs b/zokrates_abi/src/lib.rs
index f828825e..4102a428 100644
--- a/zokrates_abi/src/lib.rs
+++ b/zokrates_abi/src/lib.rs
@@ -14,14 +14,11 @@ impl<T: From<usize>> Encode<T> for Inputs<T> {
     }
 }
 
-use std::collections::BTreeMap;
 use std::fmt;
 use zokrates_core::typed_absy::types::{ConcreteType, UBitwidth};
 
 use zokrates_field::Field;
 
-type Map<K, V> = BTreeMap<K, V>;
-
 #[derive(Debug, PartialEq)]
 pub enum Error {
     Json(String),
@@ -48,7 +45,7 @@ pub enum Value<T> {
     Field(T),
     Boolean(bool),
     Array(Vec<Value<T>>),
-    Struct(Map<String, Value<T>>),
+    Struct(Vec<(String, Value<T>)>),
 }
 
 #[derive(PartialEq, Debug)]

From 84f717cd32f03b9328bdc34fef768a87b7dda964 Mon Sep 17 00:00:00 2001
From: schaeff <thibaut@schaeff.fr>
Date: Sun, 25 Jul 2021 15:51:45 +0200
Subject: [PATCH 2/2] add changelog

---
 changelogs/unreleased/947-schaeff | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelogs/unreleased/947-schaeff

diff --git a/changelogs/unreleased/947-schaeff b/changelogs/unreleased/947-schaeff
new file mode 100644
index 00000000..07e3af35
--- /dev/null
+++ b/changelogs/unreleased/947-schaeff
@@ -0,0 +1 @@
+Fix abi encoder bug for struct values where the members are encoded in the wrong order
\ No newline at end of file