chore: merge and reusing transparent nodes from non-native

AztecProtocol · Aug 22, 2023 · 96d1ab2 · 96d1ab2
1 parent 23c7642
commit 96d1ab2
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 249 deletions.
diff --git a/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json b/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json
diff --git a/yarn-project/aztec.js/src/abis/schnorr_account_contract.json b/yarn-project/aztec.js/src/abis/schnorr_account_contract.json
diff --git a/yarn-project/noir-contracts/src/contracts/native_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/native_token_contract/Nargo.toml
@@ -6,4 +6,5 @@ type = "contract"
 
 [dependencies]
 aztec = { path = "../../../../noir-libs/noir-aztec" }
-value_note = { path = "../../../../noir-libs/value-note"}
+value_note = { path = "../../../../noir-libs/value-note"}
+non_native = { path = "../non_native_token_contract"}
diff --git a/yarn-project/noir-contracts/src/contracts/native_token_contract/src/hash.nr b/yarn-project/noir-contracts/src/contracts/native_token_contract/src/hash.nr
diff --git a/yarn-project/noir-contracts/src/contracts/native_token_contract/src/main.nr b/yarn-project/noir-contracts/src/contracts/native_token_contract/src/main.nr
@@ -1,6 +1,4 @@
-mod hash;
 mod storage;
-mod transparent_note;
 
 // Testing token that can be bridged in and out.
 // TODOS:
@@ -15,14 +13,15 @@ contract NativeToken {
         value_note::{VALUE_NOTE_LEN, ValueNoteMethods},
     };
 
-    use crate::transparent_note::{
-        TransparentNote,
-        TransparentNoteMethods,
-        TRANSPARENT_NOTE_LEN,
+    use dep::non_native::{
+        hash::{get_mint_content_hash, get_withdraw_content_hash},
+        transparent_note::{
+            TransparentNote,
+            TransparentNoteMethods
+        },
     };
 
     use crate::storage::Storage;
-    use crate::hash::{get_mint_content_hash, get_withdraw_content_hash};
 
     use dep::aztec::context::{
         PrivateContext,
@@ -458,7 +457,7 @@ contract NativeToken {
         let storage = Storage::init();
         let owner_balance = storage.balances.at(owner);
 
-        balance_utils::get_balance(owner_balance.storage_slot)
+        balance_utils::get_balance(owner_balance)
     }
 
     // Computes note hash and nullifier.

diff --git a/yarn-project/noir-contracts/src/contracts/native_token_contract/src/storage.nr b/yarn-project/noir-contracts/src/contracts/native_token_contract/src/storage.nr
@@ -1,17 +1,17 @@
-mod transparent_note;
-
-use crate::transparent_note::{
-    TransparentNote,
-    TransparentNoteMethods,
-    TRANSPARENT_NOTE_LEN,
-};
-
 use dep::value_note::value_note::{
     ValueNote,
     ValueNoteMethods,
     VALUE_NOTE_LEN,
 };
 
+use dep::non_native::{
+    transparent_note::{
+        TransparentNote,
+        TransparentNoteMethods,
+        TRANSPARENT_NOTE_LEN,
+    },
+};
+
 use dep::aztec::{
     state_vars::{
         map::Map,

diff --git a/yarn-project/noir-contracts/src/contracts/native_token_contract/src/transparent_note.nr b/yarn-project/noir-contracts/src/contracts/native_token_contract/src/transparent_note.nr