From 338d0d294ee636e59057d9cc1b0f08faebf20e11 Mon Sep 17 00:00:00 2001
From: timofeevmd <timofeevmd@gmail.com>
Date: Thu, 11 Jul 2024 18:31:48 +0400
Subject: [PATCH] Merge remote-tracking branch 'origin/update/genesis' into
 update/genesis

Signed-off-by: timofeevmd <timofeevmd@gmail.com>
---
 src/test/java/requests/Transactions.java      | 17 ++++++++---------
 src/test/resources/iroha2_config/genesis.json |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/test/java/requests/Transactions.java b/src/test/java/requests/Transactions.java
index c0a1ac9..a463a72 100644
--- a/src/test/java/requests/Transactions.java
+++ b/src/test/java/requests/Transactions.java
@@ -93,7 +93,7 @@ public class Transactions extends Constants {
                                     }
                             ).body(ByteArrayBody(session -> {
                                                 return SignedTransaction.Companion.encode(
-                                                        /*TransactionBuilder.Companion.builder()
+                                                        TransactionBuilder.Companion.builder()
                                                                 .account(ExtensionsKt.asAccountId(session.getString("anotherDevAccountIdSender")))
                                                                 .chainId(Constants.CHAIN_ID)
                                                                 .transferAsset(ExtensionsKt.asAssetId(session.getString("anotherDevAssetIdSender")),
@@ -102,17 +102,16 @@ public class Transactions extends Constants {
                                                                 .buildSigned(CryptoUtils.keyPairFromHex(
                                                                         session.getString("publicKeySender"),
                                                                         session.getString("privateKeySender")
-                                                                ))*/
-                                                        TransactionBuilder.Companion.builder()
-                                                                .account(ExtensionsKt.asAccountId("b75167504b664ff4e5ab4016c3131a5578e71bc3e705cfa7776c04178103a59a@bulb_ffafd84a-6994-40f9-9f0e-a461da5d6482_e50583d2-72f7-44e1-8b80-d269bd0b081b"))
+                                                                ))
+                                                        /*TransactionBuilder.Companion.builder()
+                                                                .account(ExtensionsKt.asAccountId("CE7FA46C9DCE7EA4B125E2E36BDB63EA33073E7590AC92816AE1E861B7048B03@wonderland"))
                                                                 .chainId(Constants.CHAIN_ID)
-                                                                .transferAsset(ExtensionsKt.asAssetId("xor4bad0d98-a969-471b-b733-57113b7c2541_6c3526c2-ea1d-48a1-9a34-27af3eb3dc2b##b75167504b664ff4e5ab4016c3131a5578e71bc3e705cfa7776c04178103a59a@bulb_ffafd84a-6994-40f9-9f0e-a461da5d6482_e50583d2-72f7-44e1-8b80-d269bd0b081b"),
+                                                                .transferAsset(ExtensionsKt.asAssetId("rose#wonderland#CE7FA46C9DCE7EA4B125E2E36BDB63EA33073E7590AC92816AE1E861B7048B03@wonderland"),
                                                                         1,
-                                                                        ExtensionsKt.asAccountId("6462b8b672c478dd3ba0097fcc405bc4396fdc459720cf63299467efb84997ec@bulb_ffafd84a-6994-40f9-9f0e-a461da5d6482_e50583d2-72f7-44e1-8b80-d269bd0b081b"))
+                                                                        ExtensionsKt.asAccountId("04FF5B81046DDCCF19E2E451C45DFB6F53759D4EB30FA2EFA807284D1CC33016@wonderland"))
                                                                 .buildSigned(CryptoUtils.keyPairFromHex(
-                                                                        session.getString("b75167504b664ff4e5ab4016c3131a5578e71bc3e705cfa7776c04178103a59a"),
-                                                                        session.getString("ab78074d854c3cdef2b9aa83a2f6680e987414122d433dd440f4624228e7cc76")
-                                                                ))
+                                                                        "7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0",
+                                                                        "9ac47abf59b356e0bd7dcbbbb4dec080e302156a48ca907e47cb6aea1d32719e"))*/
                                                 );
                                             }
                                     )
diff --git a/src/test/resources/iroha2_config/genesis.json b/src/test/resources/iroha2_config/genesis.json
index 480942b..a406871 100644
--- a/src/test/resources/iroha2_config/genesis.json
+++ b/src/test/resources/iroha2_config/genesis.json
@@ -29,12 +29,12 @@
     },
     {
       "Executor": {
-        "Fuel": 55000000
+        "Fuel": 18446744073709551615
       }
     },
     {
       "Executor": {
-        "Memory": 55000000
+        "Memory": 4294967295
       }
     },
     {