Merge branch 'iroha2-dev' into feature/DOPS-3309/sonar-dojo

Signed-off-by: BAStos525 <66615487+BAStos525@users.noreply.github.com>
hyperledger-iroha · Oct 16, 2024 · 142933a · 142933a
2 parents d1f9f7a + 021cbf6
commit 142933a
Show file tree

Hide file tree

Showing 489 changed files with 21,227 additions and 19,529 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,8 @@ build/
 */*/out
 
 # Rust
-**/target
+**/target/
 **/Cargo.lock
+**/storage/
+**/*.rs.bk
+**/rusty-tags.vi
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
@@ -1,90 +1,112 @@
-version: "3.8"
-
 services:
-  iroha:
-    image: hyperledger/iroha2:stable-2.0.0-pre-rc.20
+  irohad0:
+    image: hyperledger/iroha:2.0.0-pre-rc.22.2
+    platform: linux/amd64
     environment:
-      TORII_P2P_ADDR: iroha:1337
-      TORII_API_URL: iroha:8080
-      TORII_TELEMETRY_URL: iroha:8180
-      IROHA_PUBLIC_KEY: "ed01207233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"
-      IROHA_PRIVATE_KEY: '{"digest_function": "ed25519", "payload": "9ac47abf59b356e0bd7dcbbbb4dec080e302156a48ca907e47cb6aea1d32719e7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"}'
-      SUMERAGI_TRUSTED_PEERS: '[{"address":"iroha:1337", "public_key": "ed01207233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"}, {"address":"iroha1:1338", "public_key": "ed0120cc25624d62896d3a0bfd8940f928dc2abf27cc57cefeb442aa96d9081aae58a1"}, {"address": "iroha2:1339", "public_key": "ed0120faca9e8aa83225cb4d16d67f27dd4f93fc30ffa11adc1f5c88fd5495ecc91020"}, {"address": "iroha3:1340", "public_key": "ed01208e351a70b6a603ed285d666b8d689b680865913ba03ce29fb7d13a166c4e7f1f"}]'
-      IROHA_GENESIS_ACCOUNT_PUBLIC_KEY: 'ed01203f4e3e98571b55514edc5ccf7e53ca7509d89b2868e62921180a6f57c2f4e255'
-      IROHA_GENESIS_ACCOUNT_PRIVATE_KEY: '{ "digest_function": "ed25519", "payload": "038ae16b219da35aa036335ed0a43c28a2cc737150112c78a7b8034b9d99c9023f4e3e98571b55514edc5ccf7e53ca7509d89b2868e62921180a6f57c2f4e255" }'
-      WSV_WASM_RUNTIME_CONFIG: "{\"FUEL_LIMIT\":900000000000, \"MAX_MEMORY\": 524288000}"
+      CHAIN: 00000000-0000-0000-0000-000000000000
+      PUBLIC_KEY: ed0120A98BAFB0663CE08D75EBD506FEC38A84E576A7C9B0897693ED4B04FD9EF2D18D
+      PRIVATE_KEY: 802620A4DFC16789FBF9A588525E4AC7F791AC51B12AEE8919EACC03EB2FC31D32C692
+      P2P_ADDRESS: 0.0.0.0:1337
+      API_ADDRESS: 0.0.0.0:8080
+      TRUSTED_PEERS: '[{"address":"irohad2:1339","public_key":"ed01204EE2FCD53E1730AF142D1E23951198678295047F9314B4006B0CB61850B1DB10"},{"address":"irohad1:1338","public_key":"ed01209897952D14BDFAEA780087C38FF3EB800CB20B882748FC95A575ADB9CD2CB21D"},{"address":"irohad3:1340","public_key":"ed0120CACF3A84B8DC8710CE9D6B968EE95EC7EE4C93C85858F026F3B4417F569592CE"}]'
+      GENESIS_PUBLIC_KEY: ed01204164BF554923ECE1FD412D241036D863A6AE430476C898248B8237D77534CFC4
+      GENESIS_PRIVATE_KEY: 80262082B3BDE54AEBECA4146257DA0DE8D59D8E46D5FE34887DCD8072866792FCB3AD
+      GENESIS: /tmp/genesis.signed.scale
+      TOPOLOGY: '[{"address":"irohad2:1339","public_key":"ed01204EE2FCD53E1730AF142D1E23951198678295047F9314B4006B0CB61850B1DB10"},{"address":"irohad1:1338","public_key":"ed01209897952D14BDFAEA780087C38FF3EB800CB20B882748FC95A575ADB9CD2CB21D"},{"address":"irohad0:1337","public_key":"ed0120A98BAFB0663CE08D75EBD506FEC38A84E576A7C9B0897693ED4B04FD9EF2D18D"},{"address":"irohad3:1340","public_key":"ed0120CACF3A84B8DC8710CE9D6B968EE95EC7EE4C93C85858F026F3B4417F569592CE"}]'
     ports:
-      - "1337:1337"
-      - "8080:8080"
-      - "8180:8180"
+    - 1337:1337
+    - 8080:8080
     volumes:
-      - "../modules/test-tools/src/main/resources:/config"
-      - "../modules/test-tools/src/main/resources:/app/.cache/wasmtime"
+    - "../modules/test-tools/src/main/resources:/config"
     init: true
-    command: iroha --submit-genesis
-
-  iroha1:
-    image: hyperledger/iroha2:stable-2.0.0-pre-rc.20
+    healthcheck:
+      test: test $(curl -s http://127.0.0.1:8080/status/blocks) -gt 0
+      interval: 2s
+      timeout: 1s
+      retries: 30
+      start_period: 4s
+    command: |-
+      /bin/sh -c "
+          EXECUTOR_RELATIVE_PATH=$(jq -r '.executor' /config/genesis.json) && \\
+          EXECUTOR_ABSOLUTE_PATH=$(realpath \"/config/$$EXECUTOR_RELATIVE_PATH\") && \\
+          jq \\
+              --arg executor \"$$EXECUTOR_ABSOLUTE_PATH\" \\
+              --argjson topology \"$$TOPOLOGY\" \\
+              '.executor = $$executor | .topology = $$topology' /config/genesis.json \\
+              >/tmp/genesis.json && \\
+          kagami genesis sign /tmp/genesis.json \\
+              --public-key $$GENESIS_PUBLIC_KEY \\
+              --private-key $$GENESIS_PRIVATE_KEY \\
+              --out-file $$GENESIS \\
+          && \\
+          irohad
+      "
+  irohad1:
+    image: hyperledger/iroha:2.0.0-pre-rc.22.2
+    platform: linux/amd64
     environment:
-      TORII_P2P_ADDR: iroha1:1338
-      TORII_API_URL: iroha1:8081
-      TORII_TELEMETRY_URL: iroha1:8181
-      IROHA_PUBLIC_KEY: "ed0120cc25624d62896d3a0bfd8940f928dc2abf27cc57cefeb442aa96d9081aae58a1"
-      IROHA_PRIVATE_KEY: '{"digest_function": "ed25519", "payload": "3bac34cda9e3763fa069c1198312d1ec73b53023b8180c822ac355435edc4a24cc25624d62896d3a0bfd8940f928dc2abf27cc57cefeb442aa96d9081aae58a1"}'
-      SUMERAGI_TRUSTED_PEERS: '[{"address":"iroha:1337", "public_key": "ed01207233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"}, {"address":"iroha1:1338", "public_key": "ed0120cc25624d62896d3a0bfd8940f928dc2abf27cc57cefeb442aa96d9081aae58a1"}, {"address": "iroha2:1339", "public_key": "ed0120faca9e8aa83225cb4d16d67f27dd4f93fc30ffa11adc1f5c88fd5495ecc91020"}, {"address": "iroha3:1340", "public_key": "ed01208e351a70b6a603ed285d666b8d689b680865913ba03ce29fb7d13a166c4e7f1f"}]'
-      IROHA_GENESIS_ACCOUNT_PUBLIC_KEY: 'ed01203f4e3e98571b55514edc5ccf7e53ca7509d89b2868e62921180a6f57c2f4e255'
-      IROHA_GENESIS_ACCOUNT_PRIVATE_KEY: '{ "digest_function": "ed25519", "payload": "038ae16b219da35aa036335ed0a43c28a2cc737150112c78a7b8034b9d99c9023f4e3e98571b55514edc5ccf7e53ca7509d89b2868e62921180a6f57c2f4e255" }'
-      WSV_WASM_RUNTIME_CONFIG: "{\"FUEL_LIMIT\":900000000000, \"MAX_MEMORY\": 524288000}"
+      CHAIN: 00000000-0000-0000-0000-000000000000
+      PUBLIC_KEY: ed01209897952D14BDFAEA780087C38FF3EB800CB20B882748FC95A575ADB9CD2CB21D
+      PRIVATE_KEY: 8026203ECA64ADC23DC106C9D703233375EA6AC345AD7299FF3AD45F355DE6CD1B5510
+      P2P_ADDRESS: 0.0.0.0:1338
+      API_ADDRESS: 0.0.0.0:8081
+      GENESIS_PUBLIC_KEY: ed01204164BF554923ECE1FD412D241036D863A6AE430476C898248B8237D77534CFC4
+      TRUSTED_PEERS: '[{"address":"irohad2:1339","public_key":"ed01204EE2FCD53E1730AF142D1E23951198678295047F9314B4006B0CB61850B1DB10"},{"address":"irohad0:1337","public_key":"ed0120A98BAFB0663CE08D75EBD506FEC38A84E576A7C9B0897693ED4B04FD9EF2D18D"},{"address":"irohad3:1340","public_key":"ed0120CACF3A84B8DC8710CE9D6B968EE95EC7EE4C93C85858F026F3B4417F569592CE"}]'
     ports:
-      - "1338:1338"
-      - "8081:8081"
-      - "8181:8181"
+    - 1338:1338
+    - 8081:8081
     volumes:
-      - "../modules/test-tools/src/main/resources:/config"
-      - "../modules/test-tools/src/main/resources:/app/.cache/wasmtime"
+    - "../modules/test-tools/src/main/resources:/config"
     init: true
-    command: iroha
-
-  iroha2:
-    image: hyperledger/iroha2:stable-2.0.0-pre-rc.20
+    healthcheck:
+      test: test $(curl -s http://127.0.0.1:8081/status/blocks) -gt 0
+      interval: 2s
+      timeout: 1s
+      retries: 30
+      start_period: 4s
+  irohad2:
+    image: hyperledger/iroha:2.0.0-pre-rc.22.2
+    platform: linux/amd64
     environment:
-      TORII_P2P_ADDR: iroha2:1339
-      TORII_API_URL: iroha2:8082
-      TORII_TELEMETRY_URL: iroha2:8182
-      IROHA_PUBLIC_KEY: "ed0120faca9e8aa83225cb4d16d67f27dd4f93fc30ffa11adc1f5c88fd5495ecc91020"
-      IROHA_PRIVATE_KEY: '{"digest_function": "ed25519", "payload": "1261a436d36779223d7d6cf20e8b644510e488e6a50bafd77a7485264d27197dfaca9e8aa83225cb4d16d67f27dd4f93fc30ffa11adc1f5c88fd5495ecc91020"}'
-      SUMERAGI_TRUSTED_PEERS: '[{"address":"iroha:1337", "public_key": "ed01207233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"}, {"address":"iroha1:1338", "public_key": "ed0120cc25624d62896d3a0bfd8940f928dc2abf27cc57cefeb442aa96d9081aae58a1"}, {"address": "iroha2:1339", "public_key": "ed0120faca9e8aa83225cb4d16d67f27dd4f93fc30ffa11adc1f5c88fd5495ecc91020"}, {"address": "iroha3:1340", "public_key": "ed01208e351a70b6a603ed285d666b8d689b680865913ba03ce29fb7d13a166c4e7f1f"}]'
-      IROHA_GENESIS_ACCOUNT_PUBLIC_KEY: 'ed01203f4e3e98571b55514edc5ccf7e53ca7509d89b2868e62921180a6f57c2f4e255'
-      IROHA_GENESIS_ACCOUNT_PRIVATE_KEY: '{ "digest_function": "ed25519", "payload": "038ae16b219da35aa036335ed0a43c28a2cc737150112c78a7b8034b9d99c9023f4e3e98571b55514edc5ccf7e53ca7509d89b2868e62921180a6f57c2f4e255" }'
-      WSV_WASM_RUNTIME_CONFIG: "{\"FUEL_LIMIT\":900000000000, \"MAX_MEMORY\": 524288000}"
+      CHAIN: 00000000-0000-0000-0000-000000000000
+      PUBLIC_KEY: ed01204EE2FCD53E1730AF142D1E23951198678295047F9314B4006B0CB61850B1DB10
+      PRIVATE_KEY: 8026207B1C78F733EDAFD6AF9BAC3A0D6C5A494557DD031609A4FDD9796EEF471D928C
+      P2P_ADDRESS: 0.0.0.0:1339
+      API_ADDRESS: 0.0.0.0:8082
+      GENESIS_PUBLIC_KEY: ed01204164BF554923ECE1FD412D241036D863A6AE430476C898248B8237D77534CFC4
+      TRUSTED_PEERS: '[{"address":"irohad1:1338","public_key":"ed01209897952D14BDFAEA780087C38FF3EB800CB20B882748FC95A575ADB9CD2CB21D"},{"address":"irohad0:1337","public_key":"ed0120A98BAFB0663CE08D75EBD506FEC38A84E576A7C9B0897693ED4B04FD9EF2D18D"},{"address":"irohad3:1340","public_key":"ed0120CACF3A84B8DC8710CE9D6B968EE95EC7EE4C93C85858F026F3B4417F569592CE"}]'
     ports:
-      - "1339:1339"
-      - "8082:8082"
-      - "8182:8182"
+    - 1339:1339
+    - 8082:8082
     volumes:
-      - "../modules/test-tools/src/main/resources:/config"
-      - "../modules/test-tools/src/main/resources:/app/.cache/wasmtime"
+    - "../modules/test-tools/src/main/resources:/config"
     init: true
-    command: iroha
-
-  iroha3:
-    image: hyperledger/iroha2:stable-2.0.0-pre-rc.20
+    healthcheck:
+      test: test $(curl -s http://127.0.0.1:8082/status/blocks) -gt 0
+      interval: 2s
+      timeout: 1s
+      retries: 30
+      start_period: 4s
+  irohad3:
+    image: hyperledger/iroha:2.0.0-pre-rc.22.2
+    platform: linux/amd64
     environment:
-      TORII_P2P_ADDR: iroha3:1340
-      TORII_API_URL: iroha3:8083
-      TORII_TELEMETRY_URL: iroha3:8183
-      IROHA_PUBLIC_KEY: "ed01208e351a70b6a603ed285d666b8d689b680865913ba03ce29fb7d13a166c4e7f1f"
-      IROHA_PRIVATE_KEY: '{"digest_function": "ed25519", "payload": "a70dab95c7482eb9f159111b65947e482108cfe67df877bd8d3b9441a781c7c98e351a70b6a603ed285d666b8d689b680865913ba03ce29fb7d13a166c4e7f1f"}'
-      SUMERAGI_TRUSTED_PEERS: '[{"address":"iroha:1337", "public_key": "ed01207233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"}, {"address":"iroha1:1338", "public_key": "ed0120cc25624d62896d3a0bfd8940f928dc2abf27cc57cefeb442aa96d9081aae58a1"}, {"address": "iroha2:1339", "public_key": "ed0120faca9e8aa83225cb4d16d67f27dd4f93fc30ffa11adc1f5c88fd5495ecc91020"}, {"address": "iroha3:1340", "public_key": "ed01208e351a70b6a603ed285d666b8d689b680865913ba03ce29fb7d13a166c4e7f1f"}]'
-      IROHA_GENESIS_ACCOUNT_PUBLIC_KEY: 'ed01203f4e3e98571b55514edc5ccf7e53ca7509d89b2868e62921180a6f57c2f4e255'
-      IROHA_GENESIS_ACCOUNT_PRIVATE_KEY: '{ "digest_function": "ed25519", "payload": "038ae16b219da35aa036335ed0a43c28a2cc737150112c78a7b8034b9d99c9023f4e3e98571b55514edc5ccf7e53ca7509d89b2868e62921180a6f57c2f4e255" }'
-      WSV_WASM_RUNTIME_CONFIG: "{\"FUEL_LIMIT\":900000000000, \"MAX_MEMORY\": 524288000}"
+      CHAIN: 00000000-0000-0000-0000-000000000000
+      PUBLIC_KEY: ed0120CACF3A84B8DC8710CE9D6B968EE95EC7EE4C93C85858F026F3B4417F569592CE
+      PRIVATE_KEY: 8026206C7FF4CA09D395C7B7332C654099406E929C6238942E3CE85155CC1A5E2CF519
+      P2P_ADDRESS: 0.0.0.0:1340
+      API_ADDRESS: 0.0.0.0:8083
+      GENESIS_PUBLIC_KEY: ed01204164BF554923ECE1FD412D241036D863A6AE430476C898248B8237D77534CFC4
+      TRUSTED_PEERS: '[{"address":"irohad2:1339","public_key":"ed01204EE2FCD53E1730AF142D1E23951198678295047F9314B4006B0CB61850B1DB10"},{"address":"irohad1:1338","public_key":"ed01209897952D14BDFAEA780087C38FF3EB800CB20B882748FC95A575ADB9CD2CB21D"},{"address":"irohad0:1337","public_key":"ed0120A98BAFB0663CE08D75EBD506FEC38A84E576A7C9B0897693ED4B04FD9EF2D18D"}]'
     ports:
-      - "1340:1340"
-      - "8083:8083"
-      - "8183:8183"
+    - 1340:1340
+    - 8083:8083
     volumes:
-      - "../modules/test-tools/src/main/resources:/config"
-      - "../modules/test-tools/src/main/resources:/app/.cache/wasmtime"
+    - "../modules/test-tools/src/main/resources:/config"
     init: true
-    command: iroha
+    healthcheck:
+      test: test $(curl -s http://127.0.0.1:8083/status/blocks) -gt 0
+      interval: 2s
+      timeout: 1s
+      retries: 30
+      start_period: 4s
diff --git a/examples/tutorial/src/main/kotlin/jp/co/soramitsu/iroha2/Main.kt b/examples/tutorial/src/main/kotlin/jp/co/soramitsu/iroha2/Main.kt
@@ -1,63 +1,69 @@
 package jp.co.soramitsu.iroha2
 
 import jp.co.soramitsu.iroha2.generated.AccountId
+import jp.co.soramitsu.iroha2.generated.AssetId
+import jp.co.soramitsu.iroha2.generated.AssetType
 import jp.co.soramitsu.iroha2.generated.AssetValue
-import jp.co.soramitsu.iroha2.generated.AssetValueType
 import kotlinx.coroutines.runBlocking
 import java.net.URL
+import java.util.UUID
 
 fun main(args: Array<String>): Unit = runBlocking {
-    val peerUrl = "http://127.0.0.1:8080"
-    val telemetryUrl = "http://127.0.0.1:8180"
-    val admin = AccountId("wonderland".asDomainId(), "bob".asName())
+    val chainId = UUID.fromString("00000000-0000-0000-0000-000000000000")
+    val apiUrl = "http://127.0.0.1:8080"
+    val peerUrl = "http://127.0.0.1:1337"
+    val admin = AccountId(
+        "wonderland".asDomainId(),
+        publicKeyFromHex("CE7FA46C9DCE7EA4B125E2E36BDB63EA33073E7590AC92816AE1E861B7048B03").toIrohaPublicKey(),
+    )
     val adminKeyPair = keyPairFromHex(
-        "7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0",
-        "9ac47abf59b356e0bd7dcbbbb4dec080e302156a48ca907e47cb6aea1d32719e",
+        "CE7FA46C9DCE7EA4B125E2E36BDB63EA33073E7590AC92816AE1E861B7048B03",
+        "CCF31D85E3B32A4BEA59987CE0C78E3B8E2DB93881468AB2435FE45D5C9DCD53",
     )
-
-    val client = AdminIroha2Client(URL(peerUrl), URL(peerUrl), URL(telemetryUrl), log = true)
+    val client = AdminIroha2Client(URL(apiUrl), URL(peerUrl), log = true)
     val query = Query(client, admin, adminKeyPair)
     query.findAllDomains()
         .also { println("ALL DOMAINS: ${it.map { d -> d.id.asString() }}") }
+    query.findAllAccounts()
+        .also { println("ALL ACCOUNTS: ${it.map { d -> d.id.asString() }}") }
+    query.findAllAssets()
+        .also { println("ALL ASSETS: ${it.map { d -> d.id.asString() }}") }
 
-    val sendTransaction = SendTransaction(client, admin, adminKeyPair)
+    val sendTransaction = SendTransaction(client, admin, adminKeyPair, chainId)
 
     val domain = "looking_glass_${System.currentTimeMillis()}"
     sendTransaction.registerDomain(domain).also { println("DOMAIN $domain CREATED") }
 
-    val madHatter = "madHatter_${System.currentTimeMillis()}$ACCOUNT_ID_DELIMITER$domain"
     val madHatterKeyPair = generateKeyPair()
-    sendTransaction.registerAccount(madHatter, listOf(madHatterKeyPair.public.toIrohaPublicKey()))
+    val madHatter = AccountId(domain.asDomainId(), madHatterKeyPair.public.toIrohaPublicKey())
+    sendTransaction.registerAccount(madHatter.asString())
         .also { println("ACCOUNT $madHatter CREATED") }
 
-    query.findAllAccounts()
-        .also { println("ALL ACCOUNTS: ${it.map { a -> a.id.asString() }}") }
-
     val assetDefinition = "asset_time_${System.currentTimeMillis()}$ASSET_ID_DELIMITER$domain"
-    sendTransaction.registerAssetDefinition(assetDefinition, AssetValueType.Quantity())
+    sendTransaction.registerAssetDefinition(assetDefinition, AssetType.numeric())
         .also { println("ASSET DEFINITION $assetDefinition CREATED") }
 
-    val madHatterAsset = "$assetDefinition$ASSET_ID_DELIMITER$madHatter"
-    sendTransaction.registerAsset(madHatterAsset, AssetValue.Quantity(100))
+    val madHatterAsset = AssetId(madHatter, assetDefinition.asAssetDefinitionId())
+    sendTransaction.registerAsset(madHatterAsset, AssetValue.Numeric(100.asNumeric()))
         .also { println("ASSET $madHatterAsset CREATED") }
 
-    val whiteRabbit = "whiteRabbit_${System.currentTimeMillis()}$ACCOUNT_ID_DELIMITER$domain"
     val whiteRabbitKeyPair = generateKeyPair()
-    sendTransaction.registerAccount(whiteRabbit, listOf(whiteRabbitKeyPair.public.toIrohaPublicKey()))
+    val whiteRabbit = AccountId(domain.asDomainId(), whiteRabbitKeyPair.public.toIrohaPublicKey())
+    sendTransaction.registerAccount(whiteRabbit.asString())
         .also { println("ACCOUNT $whiteRabbit CREATED") }
 
-    val whiteRabbitAsset = "$assetDefinition$ASSET_ID_DELIMITER$whiteRabbit"
-    sendTransaction.registerAsset(whiteRabbitAsset, AssetValue.Quantity(0))
+    val whiteRabbitAsset = AssetId(whiteRabbit, assetDefinition.asAssetDefinitionId())
+    sendTransaction.registerAsset(whiteRabbitAsset, AssetValue.Numeric(0.asNumeric()))
         .also { println("ASSET $whiteRabbitAsset CREATED") }
 
-    sendTransaction.transferAsset(madHatterAsset, 10, whiteRabbit, madHatter.asAccountId(), madHatterKeyPair)
+    sendTransaction.transferAsset(madHatterAsset, 10, whiteRabbit.asString(), madHatter, madHatterKeyPair)
         .also { println("$madHatter TRANSFERRED FROM $madHatterAsset TO $whiteRabbitAsset: 10") }
-    query.getAccountAmount(madHatter, madHatterAsset).also { println("$madHatterAsset BALANCE: $it") }
-    query.getAccountAmount(whiteRabbit, whiteRabbitAsset).also { println("$whiteRabbitAsset BALANCE: $it") }
+    query.getAccountAmount(madHatter, madHatterAsset.definition).also { println("$madHatterAsset BALANCE: $it") }
+    query.getAccountAmount(whiteRabbit, whiteRabbitAsset.definition).also { println("$whiteRabbitAsset BALANCE: $it") }
 
-    sendTransaction.burnAssets(madHatterAsset, 10, madHatter.asAccountId(), madHatterKeyPair)
+    sendTransaction.burnAssets(madHatterAsset, 10, madHatter, madHatterKeyPair)
         .also { println("$madHatterAsset WAS BURN") }
 
-    query.getAccountAmount(madHatter, madHatterAsset)
+    query.getAccountAmount(madHatter, madHatterAsset.definition)
         .also { println("$madHatterAsset BALANCE: $it AFTER ASSETS BURNING") }
 }