From a7061b57d4a66042c8ed35ae8005c517f35f2446 Mon Sep 17 00:00:00 2001 From: straumat Date: Mon, 11 Dec 2023 21:10:08 +0100 Subject: [PATCH 01/57] Update for next development version --- backend/explorer-core/autoconfigure/pom.xml | 2 +- backend/explorer-core/starter/pom.xml | 2 +- backend/servers/explorer-api/pom.xml | 2 +- backend/servers/explorer-batch/pom.xml | 2 +- backend/servers/explorer-web/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/explorer-core/autoconfigure/pom.xml b/backend/explorer-core/autoconfigure/pom.xml index cb944ff44..431ec119c 100644 --- a/backend/explorer-core/autoconfigure/pom.xml +++ b/backend/explorer-core/autoconfigure/pom.xml @@ -274,7 +274,7 @@ org.royllo.explorer explorer - 0.0.22 + 0.0.23-SNAPSHOT ../../../pom.xml diff --git a/backend/explorer-core/starter/pom.xml b/backend/explorer-core/starter/pom.xml index 3aea18010..222dde4ec 100644 --- a/backend/explorer-core/starter/pom.xml +++ b/backend/explorer-core/starter/pom.xml @@ -114,7 +114,7 @@ org.royllo.explorer explorer - 0.0.22 + 0.0.23-SNAPSHOT ../../../pom.xml diff --git a/backend/servers/explorer-api/pom.xml b/backend/servers/explorer-api/pom.xml index 323b7473b..8638fd916 100644 --- a/backend/servers/explorer-api/pom.xml +++ b/backend/servers/explorer-api/pom.xml @@ -311,7 +311,7 @@ org.royllo.explorer explorer - 0.0.22 + 0.0.23-SNAPSHOT ../../../pom.xml diff --git a/backend/servers/explorer-batch/pom.xml b/backend/servers/explorer-batch/pom.xml index a21de9465..909340358 100644 --- a/backend/servers/explorer-batch/pom.xml +++ b/backend/servers/explorer-batch/pom.xml @@ -227,7 +227,7 @@ org.royllo.explorer explorer - 0.0.22 + 0.0.23-SNAPSHOT ../../../pom.xml diff --git a/backend/servers/explorer-web/pom.xml b/backend/servers/explorer-web/pom.xml index 7286e62b6..5e3ee8800 100644 --- a/backend/servers/explorer-web/pom.xml +++ b/backend/servers/explorer-web/pom.xml @@ -291,7 +291,7 @@ org.royllo.explorer explorer - 0.0.22 + 0.0.23-SNAPSHOT ../../../pom.xml diff --git a/pom.xml b/pom.xml index b575ccf0a..cf5cbb4e5 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.royllo.explorer explorer - 0.0.22 + 0.0.23-SNAPSHOT Royllo - A Taproot asset explorer Royllo explorer allows you to search for Taproot assets created on the Bitcoin blockchain pom From 3a9e48f30b2052978dd4d05fe0e3c05c032c8ba9 Mon Sep 17 00:00:00 2001 From: straumat Date: Mon, 11 Dec 2023 23:11:55 +0100 Subject: [PATCH 02/57] getAssetByAssetId() optimisation --- .../asset/AssetServiceImplementation.java | 26 ++++---- .../test/core/service/AssetServiceTest.java | 16 ++--- .../core/service/AssetStateServiceTest.java | 22 +++---- .../asset/AssetControllerTest.java | 20 +++---- .../search/SearchControllerTest.java | 60 +++++++++---------- 5 files changed, 75 insertions(+), 69 deletions(-) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java index a9b388cf9..ebb237cfe 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java @@ -20,6 +20,7 @@ import static java.util.stream.Collectors.joining; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER; +import static org.royllo.explorer.core.util.constants.TaprootAssetsConstants.ASSET_ID_SIZE; /** * {@link AssetService} implementation. @@ -159,23 +160,28 @@ public Optional getAssetByAssetId(final String assetId) { return Optional.empty(); } - Optional asset = assetRepository.findByAssetId(assetId.trim()); - if (asset.isEmpty()) { - logger.info("Asset with assetId {} not found, searching on assetIdAlias", assetId); - - // As asset id is not found, we search on asset id alias. - asset = assetRepository.findByAssetIdAlias(assetId.trim()); + if (assetId.length() == ASSET_ID_SIZE) { + // We received an asset id (we know it because of the size). + Optional asset = assetRepository.findByAssetId(assetId.trim()); if (asset.isPresent()) { - logger.info("Asset with assetIdAlias {} found: {}", assetId, asset.get()); + logger.info("Asset with assetId {} found: {}", assetId, asset.get()); return asset.map(ASSET_MAPPER::mapToAssetDTO); } else { - logger.info("Asset with assetId or assetIdAlias {} not found", assetId); + logger.info("Asset with assetId {} not found", assetId); return Optional.empty(); } } else { - logger.info("Asset with assetId {} found: {}", assetId, asset.get()); - return asset.map(ASSET_MAPPER::mapToAssetDTO); + // it's not an asset id (the size is not the good one), so we search on asset id alias. + Optional asset = assetRepository.findByAssetIdAlias(assetId.trim()); + if (asset.isPresent()) { + logger.info("Asset with assetIdAlias {} found: {}", assetId, asset.get()); + return asset.map(ASSET_MAPPER::mapToAssetDTO); + } else { + logger.info("Asset with assetIdAlias {} not found", assetId); + return Optional.empty(); + } } + } @Override diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java index 53ca6d5d4..0585ebc38 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java @@ -271,25 +271,25 @@ public void addAssetWithAssetGroup() { // 4 assets : 1 with no asset group, 2 with the same asset group and 1 with another asset group. AssetDTO asset1 = AssetDTO.builder() - .assetId("asset1") + .assetId("asset10000000000000000000000000000000000000000000000000000000000") .genesisPoint(bto.get()) .build(); AssetDTO asset2 = AssetDTO.builder() - .assetId("asset2") + .assetId("asset20000000000000000000000000000000000000000000000000000000000") .genesisPoint(bto.get()) .assetGroup(AssetGroupDTO.builder() .assetGroupId("assetGroupId1") .tweakedGroupKey("assetGroup1").build()) .build(); AssetDTO asset3 = AssetDTO.builder() - .assetId("asset3") + .assetId("asset30000000000000000000000000000000000000000000000000000000000") .genesisPoint(bto.get()) .assetGroup(AssetGroupDTO.builder() .assetGroupId("assetGroupId1") .tweakedGroupKey("assetGroup1").build()) .build(); AssetDTO asset4 = AssetDTO.builder() - .assetId("asset4") + .assetId("asset40000000000000000000000000000000000000000000000000000000000") .genesisPoint(bto.get()) .assetGroup(AssetGroupDTO.builder() .assetGroupId("assetGroupId2") @@ -303,10 +303,10 @@ public void addAssetWithAssetGroup() { assetService.addAsset(asset4); // Asset retrieval. - AssetDTO asset1Created = assetService.getAssetByAssetId("asset1").orElse(null); - AssetDTO asset2Created = assetService.getAssetByAssetId("asset2").orElse(null); - AssetDTO asset3Created = assetService.getAssetByAssetId("asset3").orElse(null); - AssetDTO asset4Created = assetService.getAssetByAssetId("asset4").orElse(null); + AssetDTO asset1Created = assetService.getAssetByAssetId("asset10000000000000000000000000000000000000000000000000000000000").orElse(null); + AssetDTO asset2Created = assetService.getAssetByAssetId("asset20000000000000000000000000000000000000000000000000000000000").orElse(null); + AssetDTO asset3Created = assetService.getAssetByAssetId("asset30000000000000000000000000000000000000000000000000000000000").orElse(null); + AssetDTO asset4Created = assetService.getAssetByAssetId("asset40000000000000000000000000000000000000000000000000000000000").orElse(null); // Verification. assertNotNull(asset1Created); diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetStateServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetStateServiceTest.java index 549340582..bde83791d 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetStateServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetStateServiceTest.java @@ -94,7 +94,7 @@ public void addAssetState() { final AssetStateDTO firstAssetStateCreated = assetStateService.addAssetState(AssetStateDTO.builder() .creator(ANONYMOUS_USER_DTO) .asset(AssetDTO.builder() - .assetId("TEST_COIN_ASSET_ID") + .assetId("TEST_COIN_ASSET_ID_000000000000000000000000000000000000000000000") .genesisPoint(bto.get()) .build()) .anchorBlockHash("TEST_ANCHOR_BLOCK_HASH") @@ -115,15 +115,15 @@ public void addAssetState() { // We check what was created. assertNotNull(firstAssetStateCreated.getId()); // Asset state id is calculated from the asset state data. - // TEST_COIN_ASSET_ID_ca8d2eb13b25fd0b363d92de2655988b49bc5b519f282d41e10ce117beb97558:0_TEST_SCRIPT_KEY - assertEquals("c8c6b3b8808a00749763400cf599442ac0a5687a8fd6715084768e3550bf9162", firstAssetStateCreated.getAssetStateId()); + // TEST_COIN_ASSET_ID_000000000000000000000000000000000000000000000_ca8d2eb13b25fd0b363d92de2655988b49bc5b519f282d41e10ce117beb97558:0_TEST_SCRIPT_KEY + assertEquals("cbac989304d353d8c8bbe7b19b1e1e352f317a7545e342584a30aa8875510e2f", firstAssetStateCreated.getAssetStateId()); // User. assertNotNull(firstAssetStateCreated.getCreator()); assertEquals(ANONYMOUS_USER_ID, firstAssetStateCreated.getCreator().getUserId()); // Asset. assertNotNull(firstAssetStateCreated.getAsset()); assertNotNull(firstAssetStateCreated.getAsset().getId()); - assertEquals("TEST_COIN_ASSET_ID", firstAssetStateCreated.getAsset().getAssetId()); + assertEquals("TEST_COIN_ASSET_ID_000000000000000000000000000000000000000000000", firstAssetStateCreated.getAsset().getAssetId()); // Asset group. assertNull(firstAssetStateCreated.getAsset().getAssetGroup()); // Asset state data. @@ -138,7 +138,7 @@ public void addAssetState() { assertEquals("TEST_SCRIPT_KEY", firstAssetStateCreated.getScriptKey()); // Test if the asset exists in database. - final Optional assetCreated = assetService.getAssetByAssetId("TEST_COIN_ASSET_ID"); + final Optional assetCreated = assetService.getAssetByAssetId("TEST_COIN_ASSET_ID_000000000000000000000000000000000000000000000"); assertTrue(assetCreated.isPresent()); assertNotNull(assetCreated.get().getId()); @@ -147,7 +147,7 @@ public void addAssetState() { e = assertThrows(AssertionError.class, () -> assetStateService.addAssetState(AssetStateDTO.builder() .creator(ANONYMOUS_USER_DTO) .asset(AssetDTO.builder() - .assetId("TEST_COIN_ASSET_ID") + .assetId("TEST_COIN_ASSET_ID_000000000000000000000000000000000000000000000") .genesisPoint(bto.get()) .build()) .anchorBlockHash("TEST_ANCHOR_BLOCK_HASH") @@ -171,7 +171,7 @@ public void addAssetState() { assetStateService.addAssetState(AssetStateDTO.builder() .creator(ANONYMOUS_USER_DTO) .asset(AssetDTO.builder() - .assetId("TEST_COIN_ASSET_ID") + .assetId("TEST_COIN_ASSET_ID_000000000000000000000000000000000000000000000") .genesisPoint(bto.get()) .build()) .anchorBlockHash("TEST_ANCHOR_BLOCK_HASH_2") @@ -190,19 +190,19 @@ public void addAssetState() { assertEquals(assetStateCount + 2, assetStateRepository.findAll().size()); // We check what was created (this time we used the getByAssetId() method). - final Optional secondAssetStateCreated = assetStateService.getAssetStateByAssetStateId("31c9f36b393bbeb968b973fe16fade5ab6e65e0dfd7fee10f4254627f0f70c53"); + final Optional secondAssetStateCreated = assetStateService.getAssetStateByAssetStateId("941d2c356c616893f716376f79b820092e03f697c4b4eebf62f3ceb5cd01b72c"); assertTrue(secondAssetStateCreated.isPresent()); assertNotNull(secondAssetStateCreated.get().getId()); // Asset state id is calculated from the asset state data. - // TEST_COIN_ASSET_ID_ca8d2eb13b25fd0b363d92de2655988b49bc5b519f282d41e10ce117beb97558:0_TEST_SCRIPT_KEY_2 - assertEquals("31c9f36b393bbeb968b973fe16fade5ab6e65e0dfd7fee10f4254627f0f70c53", secondAssetStateCreated.get().getAssetStateId()); + // TEST_COIN_ASSET_ID_000000000000000000000000000000000000000000000_ca8d2eb13b25fd0b363d92de2655988b49bc5b519f282d41e10ce117beb97558:0_TEST_SCRIPT_KEY_2 + assertEquals("941d2c356c616893f716376f79b820092e03f697c4b4eebf62f3ceb5cd01b72c", secondAssetStateCreated.get().getAssetStateId()); // User. assertNotNull(secondAssetStateCreated.get().getCreator()); assertEquals(ANONYMOUS_USER_ID, secondAssetStateCreated.get().getCreator().getUserId()); // Asset. assertNotNull(secondAssetStateCreated.get().getAsset()); assertNotNull(secondAssetStateCreated.get().getAsset().getId()); - assertEquals("TEST_COIN_ASSET_ID", secondAssetStateCreated.get().getAsset().getAssetId()); + assertEquals("TEST_COIN_ASSET_ID_000000000000000000000000000000000000000000000", secondAssetStateCreated.get().getAsset().getAssetId()); // Asset group. assertNull(secondAssetStateCreated.get().getAsset().getAssetGroup()); // Asset state data. diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/AssetControllerTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/AssetControllerTest.java index c1ed24f6c..44b1a37eb 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/AssetControllerTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/AssetControllerTest.java @@ -135,7 +135,7 @@ void assetGroupPageWithPagination(final HttpHeaders headers) throws Exception { createFakeAssets(); // Page 1. - mockMvc.perform(get("/asset/FAKE_ASSET_ID_01/group").headers(headers)) + mockMvc.perform(get("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000001/group").headers(headers)) .andExpect(status().isOk()) .andExpect(view().name(containsString(ASSET_GROUP_PAGE))) // Checking group tab data. @@ -151,7 +151,7 @@ void assetGroupPageWithPagination(final HttpHeaders headers) throws Exception { .andExpect(content().string(not(containsString(getMessage(messages, "asset.view.error.assetNotFound"))))); // Page 10. - mockMvc.perform(get("/asset/FAKE_ASSET_ID_01/group?page=10").headers(headers)) + mockMvc.perform(get("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000001/group?page=10").headers(headers)) .andExpect(status().isOk()) .andExpect(view().name(containsString(ASSET_GROUP_PAGE))) // Checking group tab data. @@ -175,7 +175,7 @@ void assetStatesPageWithPagination(final HttpHeaders headers) throws Exception { createFakeAssets(); // Page 1. - mockMvc.perform(get("/asset/FAKE_ASSET_ID_01/states").headers(headers)) + mockMvc.perform(get("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000001/states").headers(headers)) .andExpect(status().isOk()) .andExpect(view().name(containsString(ASSET_STATES_PAGE))) // Checking pagination. @@ -188,7 +188,7 @@ void assetStatesPageWithPagination(final HttpHeaders headers) throws Exception { .andExpect(content().string(not(containsString(getMessage(messages, "asset.view.error.assetNotFound"))))); // Page 5. - mockMvc.perform(get("/asset/FAKE_ASSET_ID_01/states?page=5").headers(headers)) + mockMvc.perform(get("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000001/states?page=5").headers(headers)) .andExpect(status().isOk()) .andExpect(view().name(containsString(ASSET_STATES_PAGE))) // Checking pagination. @@ -209,7 +209,7 @@ void assetProofsPageWithPagination(final HttpHeaders headers) throws Exception { createFakeAssets(); // Page 1. - mockMvc.perform(get("/asset/FAKE_ASSET_ID_01/proofs").headers(headers)) + mockMvc.perform(get("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000001/proofs").headers(headers)) .andExpect(status().isOk()) .andExpect(view().name(containsString(ASSET_PROOFS_PAGE))) // Checking pagination. @@ -222,7 +222,7 @@ void assetProofsPageWithPagination(final HttpHeaders headers) throws Exception { .andExpect(content().string(not(containsString(getMessage(messages, "asset.view.error.assetNotFound"))))); // Page 5. - mockMvc.perform(get("/asset/FAKE_ASSET_ID_01/proofs?page=3").headers(headers)) + mockMvc.perform(get("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000001/proofs?page=3").headers(headers)) .andExpect(status().isOk()) .andExpect(view().name(containsString(ASSET_PROOFS_PAGE))) // Checking pagination. @@ -256,16 +256,16 @@ private void createFakeAssets() { // Create fake assets. for (int i = 1; i <= 99; i++) { - final Optional assetFound = assetService.getAssetByAssetId("FAKE_ASSET_ID_" + String.format("%02d", i)); + final Optional assetFound = assetService.getAssetByAssetId("FAKE_ASSET_ID_000000000000000000000000000000000000000000000000" + String.format("%02d", i)); if (assetFound.isEmpty()) { assetService.addAsset( AssetDTO.builder() .creator(ANONYMOUS_USER_DTO) .assetGroup(assetGroupDTO) - .assetId("FAKE_ASSET_ID_" + String.format("%02d", i)) + .assetId("FAKE_ASSET_ID_000000000000000000000000000000000000000000000000" + String.format("%02d", i)) .genesisPoint(bto.get()) .metaDataHash("metadata") - .name("FAKE_ASSET_NAME_" + String.format("%02d", i)) + .name("FAKE_ASSET_NAME_000000000000000000000000000000000000000000000000" + String.format("%02d", i)) .outputIndex(0) .version(0) .type(NORMAL) @@ -276,7 +276,7 @@ private void createFakeAssets() { } // Create fake asset states. - final Optional assetForAssetTest = assetService.getAssetByAssetId("FAKE_ASSET_ID_01"); + final Optional assetForAssetTest = assetService.getAssetByAssetId("FAKE_ASSET_ID_00000000000000000000000000000000000000000000000001"); if (assetForAssetTest.isPresent()) { for (int i = 1; i <= 50; i++) { final AssetStateDTO assetToCreate = AssetStateDTO.builder() diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/SearchControllerTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/SearchControllerTest.java index 57d9fe5d8..a4f01dfcc 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/SearchControllerTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/SearchControllerTest.java @@ -119,17 +119,17 @@ void searchPageWithResultsOnSeveralPages(final HttpHeaders headers) throws Excep .andExpect(status().isOk()) .andExpect(view().name(containsString(SEARCH_PAGE))) // Checking results. - .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_01"))) - .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_02"))) - .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_03"))) - .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_04"))) - .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_05"))) - .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_06"))) - .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_07"))) - .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_08"))) - .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_09"))) - .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_10"))) - .andExpect(content().string(not(containsString("/asset/FAKE_ASSET_ID_11")))) + .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000001"))) + .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000002"))) + .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000003"))) + .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000004"))) + .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000005"))) + .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000006"))) + .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000007"))) + .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000008"))) + .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000009"))) + .andExpect(content().string(containsString("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000010"))) + .andExpect(content().string(not(containsString("/asset/FAKE_ASSET_ID_00000000000000000000000000000000000000000000000011")))) // Checking pages. .andExpect(content().string(not(containsString("previousPage")))) .andExpect(content().string(containsString(">1/101/102/1010/10 assetFound = assetService.getAssetByAssetId("FAKE_ASSET_ID_" + String.format("%02d", i)); + final Optional assetFound = assetService.getAssetByAssetId("FAKE_ASSET_ID_000000000000000000000000000000000000000000000000" + String.format("%02d", i)); if (assetFound.isEmpty()) { assetService.addAsset( AssetDTO.builder() .creator(ANONYMOUS_USER_DTO) .assetGroup(assetGroupDTO) - .assetId("FAKE_ASSET_ID_" + String.format("%02d", i)) + .assetId("FAKE_ASSET_ID_000000000000000000000000000000000000000000000000" + String.format("%02d", i)) .genesisPoint(bto.get()) .metaDataHash("metadata") - .name("FAKE_ASSET_NAME_" + String.format("%02d", i)) + .name("FAKE_ASSET_NAME_000000000000000000000000000000000000000000000000" + String.format("%02d", i)) .outputIndex(0) .version(0) .type(NORMAL) From dce99119849b05b5a6990040af1901ac88e54b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Traumat?= Date: Tue, 12 Dec 2023 09:54:31 +0100 Subject: [PATCH 03/57] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9cf149d12..6a664f66f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Key features for users include: - Search for Taproot assets and proofs using our user-friendly web interface. - Add your proofs to our database to let the world discover and learn about your assets. -- Add universe servers to let us discover new data automatically (Work in progress). +- Add your universe server to let us discover new assets automatically. - Build new applications, services, and tools effortlessly using our GraphQL API A live version is available here: [https://explorer.royllo.org/](https://explorer.royllo.org/) @@ -43,4 +43,4 @@ Just run : `docker-compose up` ## Contact -Feel free to contact me: [straumat](https://github.com/straumat) \ No newline at end of file +Feel free to contact me: [straumat](https://github.com/straumat) From 8e383f5ee91708fe485e0c450c7d0621bc48d8c1 Mon Sep 17 00:00:00 2001 From: straumat Date: Fri, 15 Dec 2023 15:39:44 +0100 Subject: [PATCH 04/57] Adding missing fields --- .../core/domain/asset/AssetState.java | 8 +++ .../core/dto/asset/AssetStateDTO.java | 6 ++ .../provider/tapd/DecodedProofResponse.java | 53 +++++++++++++++++- .../tapd/TapdServiceImplementation.java | 2 +- .../core/util/mapper/AssetStateMapper.java | 2 + .../core/util/mapper/RequestMapper.java | 2 +- .../changelog/1.0.0/data/data-asset_state.xml | 2 + .../1.0.0/table/table-asset_state.xml | 4 ++ .../core/test/util/TestWithMockServers.java | 8 +++ .../db/test/test-data-asset_state.xml | 20 +++++++ .../resources/db/dev/dev-data-asset_state.xml | 16 ++++++ .../db/test/api-test-data-asset_state.xml | 20 +++++++ .../resources/db/dev/dev-data-asset_state.xml | 20 +++++++ .../db/test/web-test-data-asset_state.xml | 20 +++++++ util/test/common-test/justfile | 2 +- .../tapd/asset/DecodedProofValueResponse.java | 28 ++++++++- ...e967fe8c474b2d2242d5a349da3d-response.json | 1 + ...6d83bd217523888feee6a8553ec8-response.json | 1 + ...ef153800086cf879baae89d9df76-response.json | 1 + ...84fafc814cab7b22a97bacfa6825-response.json | 1 + ...d7976f7aa33efb615b408737b0ad-response.json | 1 + ...1a6fc6a7450664e15559ad770b90-response.json | 1 + ...1573afe6fbf20c35935ce4bb0413-response.json | 1 + ...ab7b6988b3cd73aac95b9e077b1f-response.json | 1 + ...573124dbc82526d02bbad5b3d9c7-response.json | 1 + ...5b519f282d41e10ce117beb97558-response.json | 1 + ...1194af236d789a79683c9ec76526-response.json | 1 + ...3c96f3fb85bfd756ba66626b9fcb-response.json | 1 + ...33f0fc4a7c85f2191aa8d49ce0d3-response.json | 1 + .../main/resources/tapd/admin-local.macaroon | Bin 209 -> 209 bytes ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 13 ++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 13 ++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 15 ++++- ...roof-proofFile2-proofAtDepth0-request.json | 2 +- ...oof-proofFile2-proofAtDepth0-response.json | 15 ++++- ...roof-proofFile3-proofAtDepth0-request.json | 2 +- ...oof-proofFile3-proofAtDepth0-response.json | 15 ++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 13 ++++- ...roof-proofFile2-proofAtDepth0-request.json | 2 +- ...oof-proofFile2-proofAtDepth0-response.json | 52 ++++++++++++++++- ...roof-proofFile2-proofAtDepth1-request.json | 2 +- ...oof-proofFile2-proofAtDepth1-response.json | 13 ++++- ...roof-proofFile3-proofAtDepth0-request.json | 2 +- ...oof-proofFile3-proofAtDepth0-response.json | 52 ++++++++++++++++- ...roof-proofFile3-proofAtDepth1-request.json | 2 +- ...oof-proofFile3-proofAtDepth1-response.json | 15 ++++- ...roof-proofFile3-proofAtDepth2-request.json | 2 +- ...oof-proofFile3-proofAtDepth2-response.json | 13 ++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 13 ++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 15 ++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 15 ++++- 59 files changed, 494 insertions(+), 34 deletions(-) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/AssetState.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/AssetState.java index eb9cadfb9..f9cf636a5 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/AssetState.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/AssetState.java @@ -106,6 +106,10 @@ public class AssetState extends BaseDomain { @Column(name = "SCRIPT_KEY") private String scriptKey; + /** Indicates whether the asset has been spent. */ + @Column(name = "SPENT") + private boolean spent; + /** If the asset has been leased, this is the owner (application ID) of the lease. */ @Column(name = "LEASE_OWNER") private String leaseOwner; @@ -114,6 +118,10 @@ public class AssetState extends BaseDomain { @Column(name = "LEASE_EXPIRY") private long leaseExpiry; + /** Indicates whether this transfer was an asset burn. If true, the number of assets in this output are destroyed and can no longer be spent. */ + @Column(name = "BURN") + private boolean burn; + /** The merkle proof for AnchorTx used to prove its inclusion within BlockHeader. */ @Column(name = "TX_MERKLE_PROOF") private String txMerkleProof; diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetStateDTO.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetStateDTO.java index 06bbbf091..0dd9e6409 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetStateDTO.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetStateDTO.java @@ -79,12 +79,18 @@ public class AssetStateDTO { @NotNull(message = "Script key is required") String scriptKey; + /** Indicates whether the asset has been spent. */ + boolean spent; + /** If the asset has been leased, this is the owner (application ID) of the lease. */ String leaseOwner; /** If the asset has been leased, this is the expiry of the lease as a Unix timestamp in seconds. */ Long leaseExpiry; + /** Indicates whether this transfer was an asset burn. If true, the number of assets in this output are destroyed and can no longer be spent. */ + boolean burn; + /** The merkle proof for AnchorTx used to prove its inclusion within BlockHeader. */ String txMerkleProof; diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java index b44151615..cf59e1b32 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java @@ -7,7 +7,11 @@ import lombok.Setter; import lombok.ToString; +import javax.xml.bind.DatatypeConverter; import java.math.BigInteger; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.util.List; /** @@ -125,7 +129,7 @@ public static class Asset { /** Previous witnesses. */ @JsonProperty("prev_witnesses") - List prevWitnesses; + List prevWitnesses; /** Indicates whether the asset has been spent. */ @JsonProperty("is_spent") @@ -160,6 +164,53 @@ public final Long getLeaseExpiryTimestamp() { } } + /** + * Returns the calculated state id. + * + * @return asset state id (calculated) + */ + public String getAssetStateId() { + // If we are in an asset state creation, asset state id is null, so we calculate it. + // We calculate the asset state id here. + String uniqueValue = assetGenesis.getAssetId() + + "_" + chainAnchor.getAnchorOutpoint() + + "_" + scriptKey; + + try { + MessageDigest md = MessageDigest.getInstance("SHA-256"); + byte[] digest = md.digest(uniqueValue.getBytes(StandardCharsets.UTF_8)); + return DatatypeConverter.printHexBinary(digest).toLowerCase(); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("SHA-256 is not available: " + e.getMessage()); + } + } + + @Getter + @Setter + @NoArgsConstructor + @ToString + @JsonIgnoreProperties(ignoreUnknown = true) + public static class PrevWitness { + + /** Split commitment. */ + @JsonProperty("split_commitment") + private SplitCommitment splitCommitment; + + } + + @Getter + @Setter + @NoArgsConstructor + @ToString + @JsonIgnoreProperties(ignoreUnknown = true) + public static class SplitCommitment { + + /** Script key. */ + @JsonProperty("script_key") + private String scriptKey; + + } + @Getter @Setter @NoArgsConstructor diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/TapdServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/TapdServiceImplementation.java index 2a0738784..72fb7877f 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/TapdServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/TapdServiceImplementation.java @@ -104,7 +104,7 @@ public final Mono decode(final String proof, final long pr .body(BodyInserters.fromValue(DecodedProofRequest.builder() .rawProof(proof) .proofAtDepth(proofAtDepth) - .withPrevWitnesses(false) + .withPrevWitnesses(true) .withMetaReveal(false) .build() )) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetStateMapper.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetStateMapper.java index bc3e35df6..1fe16c244 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetStateMapper.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetStateMapper.java @@ -45,8 +45,10 @@ public interface AssetStateMapper { @Mapping(source = "asset.scriptVersion", target = "scriptVersion") @Mapping(source = "asset.scriptKey", target = "scriptKey") + @Mapping(source = "asset.isSpent", target = "spent") @Mapping(source = "asset.leaseOwner", target = "leaseOwner") @Mapping(source = "asset.leaseExpiryTimestamp", target = "leaseExpiry") + @Mapping(source = "asset.isBurn", target = "burn") @Mapping(source = "txMerkleProof", target = "txMerkleProof") @Mapping(source = "inclusionProof", target = "inclusionProof") diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/RequestMapper.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/RequestMapper.java index 46c3a327c..77bf76991 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/RequestMapper.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/RequestMapper.java @@ -18,7 +18,7 @@ */ @SuppressWarnings("unused") @Mapper(nullValuePropertyMappingStrategy = IGNORE, - uses = {UserMapper.class, BitcoinMapper.class, AssetMapper.class, UserMapper.class}) + uses = {UserMapper.class, BitcoinMapper.class, AssetMapper.class, UserMapper.class, UniverseServerMapper.class}) public interface RequestMapper { // ================================================================================================================= diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-asset_state.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-asset_state.xml index 5f930385b..775d502cc 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-asset_state.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-asset_state.xml @@ -33,8 +33,10 @@ + + diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset_state.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset_state.xml index 18abded73..26d638ffa 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset_state.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset_state.xml @@ -55,10 +55,14 @@ remarks="The version of the script, only version 0 is defined at present"/> + + + + @@ -47,8 +49,10 @@ + + @@ -68,8 +72,10 @@ + + @@ -89,8 +95,10 @@ + + @@ -114,8 +122,10 @@ + + @@ -135,8 +145,10 @@ + + @@ -156,8 +168,10 @@ + + @@ -177,8 +191,10 @@ + + @@ -202,8 +218,10 @@ + + @@ -223,8 +241,10 @@ + + diff --git a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-asset_state.xml b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-asset_state.xml index a550f8f30..d0faaee34 100644 --- a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-asset_state.xml +++ b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-asset_state.xml @@ -22,8 +22,10 @@ + + @@ -47,8 +49,10 @@ + + @@ -68,8 +72,10 @@ + + @@ -89,8 +95,10 @@ + + @@ -131,8 +139,10 @@ + + @@ -152,8 +162,10 @@ + + @@ -173,8 +185,10 @@ + + @@ -215,8 +229,10 @@ + + diff --git a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-asset_state.xml b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-asset_state.xml index b53d14289..a289af69d 100644 --- a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-asset_state.xml +++ b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-asset_state.xml @@ -22,8 +22,10 @@ + + @@ -47,8 +49,10 @@ + + @@ -68,8 +72,10 @@ + + @@ -89,8 +95,10 @@ + + @@ -114,8 +122,10 @@ + + @@ -135,8 +145,10 @@ + + @@ -156,8 +168,10 @@ + + @@ -177,8 +191,10 @@ + + @@ -202,8 +218,10 @@ + + @@ -223,8 +241,10 @@ + + diff --git a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset_state.xml b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset_state.xml index b53d14289..a289af69d 100644 --- a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset_state.xml +++ b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset_state.xml @@ -22,8 +22,10 @@ + + @@ -47,8 +49,10 @@ + + @@ -68,8 +72,10 @@ + + @@ -89,8 +95,10 @@ + + @@ -114,8 +122,10 @@ + + @@ -135,8 +145,10 @@ + + @@ -156,8 +168,10 @@ + + @@ -177,8 +191,10 @@ + + @@ -202,8 +218,10 @@ + + @@ -223,8 +241,10 @@ + + diff --git a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-asset_state.xml b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-asset_state.xml index b53d14289..a289af69d 100644 --- a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-asset_state.xml +++ b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-asset_state.xml @@ -22,8 +22,10 @@ + + @@ -47,8 +49,10 @@ + + @@ -68,8 +72,10 @@ + + @@ -89,8 +95,10 @@ + + @@ -114,8 +122,10 @@ + + @@ -135,8 +145,10 @@ + + @@ -156,8 +168,10 @@ + + @@ -177,8 +191,10 @@ + + @@ -202,8 +218,10 @@ + + @@ -223,8 +241,10 @@ + + diff --git a/util/test/common-test/justfile b/util/test/common-test/justfile index 90ba83db9..8f83846f9 100644 --- a/util/test/common-test/justfile +++ b/util/test/common-test/justfile @@ -12,7 +12,7 @@ run_tapd: retrieve_local_macaroon: rm -f ./src/main/resources/tapd/admin-local.macaroon - sudo cp /var/lib/docker/volumes/tapd/_data/data/testnet/admin.macaroon ./src/main/resources/tapd/admin-local.macaroon + sudo cp /var/snap/docker/common/var-lib-docker/volumes/tapd/_data/data/testnet/admin.macaroon ./src/main/resources/tapd/admin-local.macaroon sudo chown $USER ./src/main/resources/tapd/admin-local.macaroon curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ -X POST --insecure https://localhost:8089/v1/taproot-assets/getinfo | jq diff --git a/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java b/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java index ebc9265e9..cd2177c09 100644 --- a/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java +++ b/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java @@ -129,7 +129,7 @@ public static class Asset { /** Previous witnesses. */ @JsonProperty("prev_witnesses") - List prevWitnesses; + List prevWitnesses; /** Indicates whether the asset has been spent. */ @JsonProperty("is_spent") @@ -185,6 +185,32 @@ public String getAssetStateId() { } } + @Getter + @Setter + @NoArgsConstructor + @ToString + @JsonIgnoreProperties(ignoreUnknown = true) + public static class PrevWitness { + + /** Split commitment. */ + @JsonProperty("split_commitment") + private SplitCommitment splitCommitment; + + } + + @Getter + @Setter + @NoArgsConstructor + @ToString + @JsonIgnoreProperties(ignoreUnknown = true) + public static class SplitCommitment { + + /** Script key. */ + @JsonProperty("script_key") + private String scriptKey; + + } + @Getter @Setter @NoArgsConstructor diff --git a/util/test/common-test/src/main/resources/mempool/0516611bebe6a92675ee7360ad64edf0b3b2e967fe8c474b2d2242d5a349da3d-response.json b/util/test/common-test/src/main/resources/mempool/0516611bebe6a92675ee7360ad64edf0b3b2e967fe8c474b2d2242d5a349da3d-response.json index 64bae3684..11fc16ce6 100644 --- a/util/test/common-test/src/main/resources/mempool/0516611bebe6a92675ee7360ad64edf0b3b2e967fe8c474b2d2242d5a349da3d-response.json +++ b/util/test/common-test/src/main/resources/mempool/0516611bebe6a92675ee7360ad64edf0b3b2e967fe8c474b2d2242d5a349da3d-response.json @@ -40,6 +40,7 @@ ], "size": 205, "weight": 616, + "sigops": 0, "fee": 3565, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/mempool/2727229cc771efa552f9232a04b0cd8d16df6d83bd217523888feee6a8553ec8-response.json b/util/test/common-test/src/main/resources/mempool/2727229cc771efa552f9232a04b0cd8d16df6d83bd217523888feee6a8553ec8-response.json index 5a030d204..dc4a42edf 100644 --- a/util/test/common-test/src/main/resources/mempool/2727229cc771efa552f9232a04b0cd8d16df6d83bd217523888feee6a8553ec8-response.json +++ b/util/test/common-test/src/main/resources/mempool/2727229cc771efa552f9232a04b0cd8d16df6d83bd217523888feee6a8553ec8-response.json @@ -65,6 +65,7 @@ ], "size": 355, "weight": 1018, + "sigops": 0, "fee": 1574, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/mempool/2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76-response.json b/util/test/common-test/src/main/resources/mempool/2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76-response.json index 4bb5db3ae..3993f9ed6 100644 --- a/util/test/common-test/src/main/resources/mempool/2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76-response.json +++ b/util/test/common-test/src/main/resources/mempool/2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76-response.json @@ -41,6 +41,7 @@ ], "size": 222, "weight": 561, + "sigops": 1, "fee": 14100, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/mempool/2debb29de64ed7aafaf79c034f1ba22c41f484fafc814cab7b22a97bacfa6825-response.json b/util/test/common-test/src/main/resources/mempool/2debb29de64ed7aafaf79c034f1ba22c41f484fafc814cab7b22a97bacfa6825-response.json index 0ab31da8c..a1a6d01cb 100644 --- a/util/test/common-test/src/main/resources/mempool/2debb29de64ed7aafaf79c034f1ba22c41f484fafc814cab7b22a97bacfa6825-response.json +++ b/util/test/common-test/src/main/resources/mempool/2debb29de64ed7aafaf79c034f1ba22c41f484fafc814cab7b22a97bacfa6825-response.json @@ -40,6 +40,7 @@ ], "size": 205, "weight": 616, + "sigops": 0, "fee": 930, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/mempool/632d0c3935fff230aa3718e268dce5517786d7976f7aa33efb615b408737b0ad-response.json b/util/test/common-test/src/main/resources/mempool/632d0c3935fff230aa3718e268dce5517786d7976f7aa33efb615b408737b0ad-response.json index 97b21371f..06358bd2f 100644 --- a/util/test/common-test/src/main/resources/mempool/632d0c3935fff230aa3718e268dce5517786d7976f7aa33efb615b408737b0ad-response.json +++ b/util/test/common-test/src/main/resources/mempool/632d0c3935fff230aa3718e268dce5517786d7976f7aa33efb615b408737b0ad-response.json @@ -41,6 +41,7 @@ ], "size": 246, "weight": 657, + "sigops": 1, "fee": 1155, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/mempool/6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90-response.json b/util/test/common-test/src/main/resources/mempool/6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90-response.json index 4517d2bce..7df09bd2c 100644 --- a/util/test/common-test/src/main/resources/mempool/6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90-response.json +++ b/util/test/common-test/src/main/resources/mempool/6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90-response.json @@ -40,6 +40,7 @@ ], "size": 205, "weight": 616, + "sigops": 0, "fee": 2325, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/mempool/77b550de10ad347daf314f4982a979db6d101573afe6fbf20c35935ce4bb0413-response.json b/util/test/common-test/src/main/resources/mempool/77b550de10ad347daf314f4982a979db6d101573afe6fbf20c35935ce4bb0413-response.json index 6c3824538..6a5f9d274 100644 --- a/util/test/common-test/src/main/resources/mempool/77b550de10ad347daf314f4982a979db6d101573afe6fbf20c35935ce4bb0413-response.json +++ b/util/test/common-test/src/main/resources/mempool/77b550de10ad347daf314f4982a979db6d101573afe6fbf20c35935ce4bb0413-response.json @@ -40,6 +40,7 @@ ], "size": 205, "weight": 616, + "sigops": 0, "fee": 930, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/mempool/89cd5498584f217ca77d50e740e56490a710ab7b6988b3cd73aac95b9e077b1f-response.json b/util/test/common-test/src/main/resources/mempool/89cd5498584f217ca77d50e740e56490a710ab7b6988b3cd73aac95b9e077b1f-response.json index 996071c95..8e79e7a4e 100644 --- a/util/test/common-test/src/main/resources/mempool/89cd5498584f217ca77d50e740e56490a710ab7b6988b3cd73aac95b9e077b1f-response.json +++ b/util/test/common-test/src/main/resources/mempool/89cd5498584f217ca77d50e740e56490a710ab7b6988b3cd73aac95b9e077b1f-response.json @@ -40,6 +40,7 @@ ], "size": 205, "weight": 616, + "sigops": 0, "fee": 775, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/mempool/c28a42586b36ac499c6d36da792d98176572573124dbc82526d02bbad5b3d9c7-response.json b/util/test/common-test/src/main/resources/mempool/c28a42586b36ac499c6d36da792d98176572573124dbc82526d02bbad5b3d9c7-response.json index 8380c991b..66e8313f7 100644 --- a/util/test/common-test/src/main/resources/mempool/c28a42586b36ac499c6d36da792d98176572573124dbc82526d02bbad5b3d9c7-response.json +++ b/util/test/common-test/src/main/resources/mempool/c28a42586b36ac499c6d36da792d98176572573124dbc82526d02bbad5b3d9c7-response.json @@ -41,6 +41,7 @@ ], "size": 246, "weight": 657, + "sigops": 1, "fee": 2475, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/mempool/ca8d2eb13b25fd0b363d92de2655988b49bc5b519f282d41e10ce117beb97558-response.json b/util/test/common-test/src/main/resources/mempool/ca8d2eb13b25fd0b363d92de2655988b49bc5b519f282d41e10ce117beb97558-response.json index b2455ce5b..8a93d7e6e 100644 --- a/util/test/common-test/src/main/resources/mempool/ca8d2eb13b25fd0b363d92de2655988b49bc5b519f282d41e10ce117beb97558-response.json +++ b/util/test/common-test/src/main/resources/mempool/ca8d2eb13b25fd0b363d92de2655988b49bc5b519f282d41e10ce117beb97558-response.json @@ -41,6 +41,7 @@ ], "size": 247, "weight": 658, + "sigops": 1, "fee": 12375, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/mempool/ca93a44b534f410914c18ed4563c97b0a6c31194af236d789a79683c9ec76526-response.json b/util/test/common-test/src/main/resources/mempool/ca93a44b534f410914c18ed4563c97b0a6c31194af236d789a79683c9ec76526-response.json index dcf8f473f..9152458ab 100644 --- a/util/test/common-test/src/main/resources/mempool/ca93a44b534f410914c18ed4563c97b0a6c31194af236d789a79683c9ec76526-response.json +++ b/util/test/common-test/src/main/resources/mempool/ca93a44b534f410914c18ed4563c97b0a6c31194af236d789a79683c9ec76526-response.json @@ -40,6 +40,7 @@ ], "size": 205, "weight": 616, + "sigops": 0, "fee": 1240, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/mempool/d22de9a2de657c262a2c20c14500b8adca593c96f3fb85bfd756ba66626b9fcb-response.json b/util/test/common-test/src/main/resources/mempool/d22de9a2de657c262a2c20c14500b8adca593c96f3fb85bfd756ba66626b9fcb-response.json index fc7074946..425e95c06 100644 --- a/util/test/common-test/src/main/resources/mempool/d22de9a2de657c262a2c20c14500b8adca593c96f3fb85bfd756ba66626b9fcb-response.json +++ b/util/test/common-test/src/main/resources/mempool/d22de9a2de657c262a2c20c14500b8adca593c96f3fb85bfd756ba66626b9fcb-response.json @@ -203,6 +203,7 @@ ], "size": 990, "weight": 3633, + "sigops": 9, "fee": 200744, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/mempool/f2acf1235882a7683bad5baeb1b84c2f1dbf33f0fc4a7c85f2191aa8d49ce0d3-response.json b/util/test/common-test/src/main/resources/mempool/f2acf1235882a7683bad5baeb1b84c2f1dbf33f0fc4a7c85f2191aa8d49ce0d3-response.json index a3bec7cbb..7643f2b14 100644 --- a/util/test/common-test/src/main/resources/mempool/f2acf1235882a7683bad5baeb1b84c2f1dbf33f0fc4a7c85f2191aa8d49ce0d3-response.json +++ b/util/test/common-test/src/main/resources/mempool/f2acf1235882a7683bad5baeb1b84c2f1dbf33f0fc4a7c85f2191aa8d49ce0d3-response.json @@ -65,6 +65,7 @@ ], "size": 355, "weight": 1018, + "sigops": 0, "fee": 2034, "status": { "confirmed": true, diff --git a/util/test/common-test/src/main/resources/tapd/admin-local.macaroon b/util/test/common-test/src/main/resources/tapd/admin-local.macaroon index 72042ee8a1073e7a29ffa71b06b80f25c717b363..fc35d5b8a04103e90f586b8fb0ada9e8210953ab 100644 GIT binary patch delta 70 zcmV-M0J;Cs0nq^+0s#bcVQ^#uqX7d75Rdy8gT%R$ Date: Fri, 15 Dec 2023 15:09:21 +0000 Subject: [PATCH 05/57] Bump JetBrains/qodana-action from 2023.2.9 to 2023.3.0 Bumps [JetBrains/qodana-action](https://github.com/jetbrains/qodana-action) from 2023.2.9 to 2023.3.0. - [Release notes](https://github.com/jetbrains/qodana-action/releases) - [Commits](https://github.com/jetbrains/qodana-action/compare/v2023.2.9...v2023.3.0) --- updated-dependencies: - dependency-name: JetBrains/qodana-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/on-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml index d3611b3ee..eb4022cd6 100644 --- a/.github/workflows/on-push.yml +++ b/.github/workflows/on-push.yml @@ -157,7 +157,7 @@ jobs: # ================================================================================================================ # Using Qodana. - name: Qodana Scan - uses: JetBrains/qodana-action@v2023.2.9 + uses: JetBrains/qodana-action@v2023.3.0 env: QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} From b2e710751151af0228a45fc049daaf25e5716895 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:09:23 +0000 Subject: [PATCH 06/57] Bump com.netflix.graphql.dgs.codegen:graphql-dgs-codegen-core Bumps [com.netflix.graphql.dgs.codegen:graphql-dgs-codegen-core](https://github.com/Netflix/dgs-codegen) from 6.1.0 to 6.1.1. - [Release notes](https://github.com/Netflix/dgs-codegen/releases) - [Commits](https://github.com/Netflix/dgs-codegen/compare/v6.1.0...v6.1.1) --- updated-dependencies: - dependency-name: com.netflix.graphql.dgs.codegen:graphql-dgs-codegen-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf5cbb4e5..93a40be39 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 1.1.13 8.2.0 - 6.1.0 + 6.1.1 5.1.17 4.25.0 From 745516eab4c35f815c16d10bdf25fc9ab725576d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:09:28 +0000 Subject: [PATCH 07/57] Bump io.projectreactor:reactor-core from 3.6.0 to 3.6.1 Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.6.0 to 3.6.1. - [Release notes](https://github.com/reactor/reactor-core/releases) - [Commits](https://github.com/reactor/reactor-core/compare/v3.6.0...v3.6.1) --- updated-dependencies: - dependency-name: io.projectreactor:reactor-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf5cbb4e5..e104ddac8 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 3.1.5 - 3.6.0 + 3.6.1 1.1.13 8.2.0 From 57b587e85d298621d6a433c09c66a879dd3d025a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:50:09 +0000 Subject: [PATCH 08/57] Bump io.projectreactor.netty:reactor-netty from 1.1.13 to 1.1.14 Bumps [io.projectreactor.netty:reactor-netty](https://github.com/reactor/reactor-netty) from 1.1.13 to 1.1.14. - [Release notes](https://github.com/reactor/reactor-netty/releases) - [Commits](https://github.com/reactor/reactor-netty/compare/v1.1.13...v1.1.14) --- updated-dependencies: - dependency-name: io.projectreactor.netty:reactor-netty dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a84aaafa7..f2ef76ef8 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 3.1.5 3.6.1 - 1.1.13 + 1.1.14 8.2.0 6.1.1 From d72b2000ed9e9c790435f111f1e43609482f1c2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:55:01 +0000 Subject: [PATCH 09/57] Bump github/codeql-action from 2 to 3 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/on-push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml index eb4022cd6..86f30aab8 100644 --- a/.github/workflows/on-push.yml +++ b/.github/workflows/on-push.yml @@ -143,7 +143,7 @@ jobs: # ================================================================================================================ # Using CodeQL. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: java @@ -152,7 +152,7 @@ jobs: mvn package -DskipTests - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 # ================================================================================================================ # Using Qodana. From 2dc118411ccd585d97dd4ae055c3524aad571153 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:55:02 +0000 Subject: [PATCH 10/57] Bump io.github.wimdeblauwe:htmx-spring-boot-thymeleaf Bumps [io.github.wimdeblauwe:htmx-spring-boot-thymeleaf](https://github.com/wimdeblauwe/htmx-spring-boot-thymeleaf) from 3.1.1 to 3.2.0. - [Release notes](https://github.com/wimdeblauwe/htmx-spring-boot-thymeleaf/releases) - [Commits](https://github.com/wimdeblauwe/htmx-spring-boot-thymeleaf/compare/3.1.1...3.2.0) --- updated-dependencies: - dependency-name: io.github.wimdeblauwe:htmx-spring-boot-thymeleaf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a84aaafa7..a3fe7c85c 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ 3.1.8 3.3.0 - 3.1.1 + 3.2.0 0.50 1.9.9 3.13.3 From f5918482f441cf3e9739dbfed1edab52af692ccc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:55:38 +0000 Subject: [PATCH 11/57] Bump daisyui from 4.4.19 to 4.4.20 in /backend/servers/explorer-web Bumps [daisyui](https://github.com/saadeghi/daisyui) from 4.4.19 to 4.4.20. - [Release notes](https://github.com/saadeghi/daisyui/releases) - [Changelog](https://github.com/saadeghi/daisyui/blob/master/CHANGELOG.md) - [Commits](https://github.com/saadeghi/daisyui/compare/v4.4.19...v4.4.20) --- updated-dependencies: - dependency-name: daisyui dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../servers/explorer-web/package-lock.json | 14 +- backend/servers/explorer-web/package.json | 2 +- backend/servers/explorer-web/yarn.lock | 198 ++++++++---------- 3 files changed, 100 insertions(+), 114 deletions(-) diff --git a/backend/servers/explorer-web/package-lock.json b/backend/servers/explorer-web/package-lock.json index 696473310..9825b894e 100644 --- a/backend/servers/explorer-web/package-lock.json +++ b/backend/servers/explorer-web/package-lock.json @@ -13,7 +13,7 @@ "autoprefixer": "^10.4.16", "browser-sync": "^2.29.3", "cssnano": "^6.0.1", - "daisyui": "^4.4.19", + "daisyui": "^4.4.20", "mkdirp": "^3.0.1", "ncp": "^2.0.0", "npm-run-all": "^4.1.5", @@ -1060,9 +1060,9 @@ } }, "node_modules/daisyui": { - "version": "4.4.19", - "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.4.19.tgz", - "integrity": "sha512-IjOLWwnndD4N7Ut5CDxbUsaVtbqXPeVHM92IcgxGFxpuOd3CCKW/PAXZH6JoBTHFRaN57vB9XqEhdWm5yC+bPA==", + "version": "4.4.20", + "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.4.20.tgz", + "integrity": "sha512-AR2fuFVVLHVTdbkV+XWAqjtymEoxXksrsEMkdzPQo2wANtWjSXuODUzePNade64gJ0Y2CdQtiQkaZI7fWcp13g==", "dev": true, "dependencies": { "css-selector-tokenizer": "^0.8", @@ -5649,9 +5649,9 @@ "dev": true }, "daisyui": { - "version": "4.4.19", - "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.4.19.tgz", - "integrity": "sha512-IjOLWwnndD4N7Ut5CDxbUsaVtbqXPeVHM92IcgxGFxpuOd3CCKW/PAXZH6JoBTHFRaN57vB9XqEhdWm5yC+bPA==", + "version": "4.4.20", + "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.4.20.tgz", + "integrity": "sha512-AR2fuFVVLHVTdbkV+XWAqjtymEoxXksrsEMkdzPQo2wANtWjSXuODUzePNade64gJ0Y2CdQtiQkaZI7fWcp13g==", "dev": true, "requires": { "css-selector-tokenizer": "^0.8", diff --git a/backend/servers/explorer-web/package.json b/backend/servers/explorer-web/package.json index 5796a6976..ffe33d448 100644 --- a/backend/servers/explorer-web/package.json +++ b/backend/servers/explorer-web/package.json @@ -20,7 +20,7 @@ "autoprefixer": "^10.4.16", "browser-sync": "^2.29.3", "cssnano": "^6.0.1", - "daisyui": "^4.4.19", + "daisyui": "^4.4.20", "mkdirp": "^3.0.1", "ncp": "^2.0.0", "npm-run-all": "^4.1.5", diff --git a/backend/servers/explorer-web/yarn.lock b/backend/servers/explorer-web/yarn.lock index f01172321..460945c31 100644 --- a/backend/servers/explorer-web/yarn.lock +++ b/backend/servers/explorer-web/yarn.lock @@ -36,7 +36,7 @@ resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@1.4.14": +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.14" resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== @@ -57,7 +57,7 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== @@ -139,14 +139,7 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -ansi-styles@^4.0.0: - version "4.3.0" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -ansi-styles@^4.1.0: +ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== @@ -217,7 +210,7 @@ balanced-match@^1.0.0: resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64id@~2.0.0, base64id@2.0.0: +base64id@2.0.0, base64id@~2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz" integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== @@ -309,7 +302,7 @@ browser-sync@^2.29.3: ua-parser-js "^1.0.33" yargs "^17.3.1" -browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.4, "browserslist@>= 4.21.0": +browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.4: version "4.21.10" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz" integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ== @@ -357,6 +350,14 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001538: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001539.tgz" integrity sha512-hfS5tE8bnNiNvEOEkm8HElUHroYwlqMMENEzELymy77+tJ6m+gA2krtHl5hxJaj71OlpC2cHZbdSMX1/YEqEkA== +chalk@4.1.2: + version "4.1.2" + resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chalk@^2.4.1: version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" @@ -366,14 +367,6 @@ chalk@^2.4.1: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@4.1.2: - version "4.1.2" - resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chokidar@^3.3.0, chokidar@^3.3.1, chokidar@^3.5.1, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" @@ -421,16 +414,16 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - color-name@1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + colord@^2.9.1: version "2.9.3" resolved "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz" @@ -614,31 +607,17 @@ culori@^3: resolved "https://registry.npmjs.org/culori/-/culori-3.2.0.tgz" integrity sha512-HIEbTSP7vs1mPq/2P9In6QyFE0Tkpevh0k9a+FkjhD+cwsYm9WRSbn4uMdW9O0yXlNYC3ppxL3gWWPOcvEl57w== -daisyui@^4.4.19: - version "4.4.19" - resolved "https://registry.npmjs.org/daisyui/-/daisyui-4.4.19.tgz" - integrity sha512-IjOLWwnndD4N7Ut5CDxbUsaVtbqXPeVHM92IcgxGFxpuOd3CCKW/PAXZH6JoBTHFRaN57vB9XqEhdWm5yC+bPA== +daisyui@^4.4.20: + version "4.4.20" + resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.4.20.tgz#3f010eb3d1fc7b4b5824524d27a07adea6e4578d" + integrity sha512-AR2fuFVVLHVTdbkV+XWAqjtymEoxXksrsEMkdzPQo2wANtWjSXuODUzePNade64gJ0Y2CdQtiQkaZI7fWcp13g== dependencies: css-selector-tokenizer "^0.8" culori "^3" picocolors "^1" postcss-js "^4" -debug@^2.2.0: - version "2.6.9" - resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@~4.3.1, debug@~4.3.2: - version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@2.6.9: +debug@2.6.9, debug@^2.2.0: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -652,6 +631,13 @@ debug@4.3.2: dependencies: ms "2.1.2" +debug@~4.3.1, debug@~4.3.2: + version "4.3.4" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz" @@ -660,16 +646,16 @@ define-properties@^1.1.3, define-properties@^1.1.4: has-property-descriptors "^1.0.0" object-keys "^1.1.1" -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" - integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== - depd@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== + dependency-graph@^0.11.0: version "0.11.0" resolved "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz" @@ -875,7 +861,7 @@ escape-string-regexp@^1.0.5: resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== -etag@^1.8.1, etag@~1.8.1, etag@1.8.1: +etag@1.8.1, etag@^1.8.1, etag@~1.8.1: version "1.8.1" resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== @@ -945,20 +931,11 @@ fraction.js@^4.3.6: resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz" integrity sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg== -fresh@^0.5.2, fresh@0.5.2: +fresh@0.5.2, fresh@^0.5.2: version "0.5.2" resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== -fs-extra@^11.0.0: - version "11.1.0" - resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz" - integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-extra@3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz" @@ -968,11 +945,25 @@ fs-extra@3.0.1: jsonfile "^3.0.0" universalify "^0.1.0" +fs-extra@^11.0.0: + version "11.1.0" + resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz" + integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== +fsevents@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" @@ -1128,16 +1119,6 @@ hosted-git-info@^2.1.4: resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz" - integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - http-errors@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz" @@ -1149,6 +1130,16 @@ http-errors@2.0.0: statuses "2.0.1" toidentifier "1.0.1" +http-errors@~1.6.2: + version "1.6.3" + resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz" + integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + http-proxy@^1.18.1: version "1.18.1" resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz" @@ -1355,7 +1346,7 @@ isexe@^2.0.0: resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -jiti@^1.19.1, jiti@>=1.21.0: +jiti@^1.19.1: version "1.21.0" resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz" integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== @@ -2007,14 +1998,6 @@ postcss-reporter@^7.0.0: picocolors "^1.0.0" thenby "^1.3.4" -postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5: - version "6.0.11" - resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz" - integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - postcss-selector-parser@6.0.10: version "6.0.10" resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz" @@ -2023,6 +2006,14 @@ postcss-selector-parser@6.0.10: cssesc "^3.0.0" util-deprecate "^1.0.2" +postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5: + version "6.0.11" + resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz" + integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + postcss-svgo@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.0.tgz" @@ -2043,7 +2034,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0: resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.0.0, postcss@^8.0.9, postcss@^8.1.0, postcss@^8.2.14, postcss@^8.2.15, postcss@^8.2.2, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.32, postcss@>=8.0.9: +postcss@^8.4.23, postcss@^8.4.32: version "8.4.32" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz" integrity sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw== @@ -2167,12 +2158,7 @@ safe-regex-test@^1.0.0: resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -semver@^5.5.0: - version "5.7.1" - resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -"semver@2 || 3 || 4 || 5": +"semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -2345,6 +2331,11 @@ spdx-license-ids@^3.0.0: resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz" integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + "statuses@>= 1.4.0 < 2", statuses@~1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz" @@ -2355,11 +2346,6 @@ statuses@~1.3.1: resolved "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz" integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg== -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== - stream-throttle@^0.1.3: version "0.1.3" resolved "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz" @@ -2468,7 +2454,7 @@ svgo@^3.0.2: csso "^5.0.5" picocolors "^1.0.0" -tailwindcss@^3.3.6, "tailwindcss@>=3.0.0 || >= 3.0.0-alpha.1", "tailwindcss@>=3.0.0 || insiders": +tailwindcss@^3.3.6: version "3.3.6" resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.6.tgz" integrity sha512-AKjF7qbbLvLaPieoKeTjG1+FyNZT6KaJMJPFeQyLfIp7l82ggH1fbHJSsYIvnbTFQOlkh+gBYpyby5GT1LIdLw== @@ -2576,7 +2562,7 @@ universalify@^2.0.0: resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -unpipe@~1.0.0, unpipe@1.0.0: +unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== @@ -2693,19 +2679,6 @@ yargs-parser@^21.1.1: resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^17.0.0, yargs@^17.3.1: - version "17.6.2" - resolved "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz" - integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - yargs@17.1.1: version "17.1.1" resolved "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz" @@ -2718,3 +2691,16 @@ yargs@17.1.1: string-width "^4.2.0" y18n "^5.0.5" yargs-parser "^20.2.2" + +yargs@^17.0.0, yargs@^17.3.1: + version "17.6.2" + resolved "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz" + integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" From 410f89225ed46ac02a59b135d6b8b68bf016b101 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 09:12:51 +0000 Subject: [PATCH 12/57] Bump cssnano from 6.0.1 to 6.0.2 in /backend/servers/explorer-web Bumps [cssnano](https://github.com/cssnano/cssnano) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/cssnano/cssnano/releases) - [Commits](https://github.com/cssnano/cssnano/compare/cssnano@6.0.1...cssnano@6.0.2) --- updated-dependencies: - dependency-name: cssnano dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../servers/explorer-web/package-lock.json | 639 +++++++++--------- backend/servers/explorer-web/package.json | 2 +- backend/servers/explorer-web/yarn.lock | 349 +++++----- 3 files changed, 505 insertions(+), 485 deletions(-) diff --git a/backend/servers/explorer-web/package-lock.json b/backend/servers/explorer-web/package-lock.json index 9825b894e..1617a254a 100644 --- a/backend/servers/explorer-web/package-lock.json +++ b/backend/servers/explorer-web/package-lock.json @@ -12,7 +12,7 @@ "@tailwindcss/typography": "^0.5.10", "autoprefixer": "^10.4.16", "browser-sync": "^2.29.3", - "cssnano": "^6.0.1", + "cssnano": "^6.0.2", "daisyui": "^4.4.20", "mkdirp": "^3.0.1", "ncp": "^2.0.0", @@ -869,12 +869,12 @@ } }, "node_modules/css-declaration-sorter": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz", - "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.1.1.tgz", + "integrity": "sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ==", "dev": true, "engines": { - "node": "^10 || ^12 || >=14" + "node": "^14 || ^16 || >=18" }, "peerDependencies": { "postcss": "^8.0.9" @@ -943,13 +943,13 @@ } }, "node_modules/cssnano": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.1.tgz", - "integrity": "sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.2.tgz", + "integrity": "sha512-Tu9wv8UdN6CoiQnIVkCNvi+0rw/BwFWOJBlg2bVfEyKaadSuE3Gq/DD8tniVvggTJGwK88UjqZp7zL5sv6t1aA==", "dev": true, "dependencies": { - "cssnano-preset-default": "^6.0.1", - "lilconfig": "^2.1.0" + "cssnano-preset-default": "^6.0.2", + "lilconfig": "^3.0.0" }, "engines": { "node": "^14 || ^16 || >=18.0" @@ -959,62 +959,71 @@ "url": "https://opencollective.com/cssnano" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/cssnano-preset-default": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz", - "integrity": "sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==", - "dev": true, - "dependencies": { - "css-declaration-sorter": "^6.3.1", - "cssnano-utils": "^4.0.0", - "postcss-calc": "^9.0.0", - "postcss-colormin": "^6.0.0", - "postcss-convert-values": "^6.0.0", - "postcss-discard-comments": "^6.0.0", - "postcss-discard-duplicates": "^6.0.0", - "postcss-discard-empty": "^6.0.0", - "postcss-discard-overridden": "^6.0.0", - "postcss-merge-longhand": "^6.0.0", - "postcss-merge-rules": "^6.0.1", - "postcss-minify-font-values": "^6.0.0", - "postcss-minify-gradients": "^6.0.0", - "postcss-minify-params": "^6.0.0", - "postcss-minify-selectors": "^6.0.0", - "postcss-normalize-charset": "^6.0.0", - "postcss-normalize-display-values": "^6.0.0", - "postcss-normalize-positions": "^6.0.0", - "postcss-normalize-repeat-style": "^6.0.0", - "postcss-normalize-string": "^6.0.0", - "postcss-normalize-timing-functions": "^6.0.0", - "postcss-normalize-unicode": "^6.0.0", - "postcss-normalize-url": "^6.0.0", - "postcss-normalize-whitespace": "^6.0.0", - "postcss-ordered-values": "^6.0.0", - "postcss-reduce-initial": "^6.0.0", - "postcss-reduce-transforms": "^6.0.0", - "postcss-svgo": "^6.0.0", - "postcss-unique-selectors": "^6.0.0" + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.2.tgz", + "integrity": "sha512-VnZybFeZ63AiVqIUNlxqMxpj9VU8B5j0oKgP7WyVt/7mkyf97KsYkNzsPTV/RVmy54Pg7cBhOK4WATbdCB44gw==", + "dev": true, + "dependencies": { + "css-declaration-sorter": "^7.0.0", + "cssnano-utils": "^4.0.1", + "postcss-calc": "^9.0.1", + "postcss-colormin": "^6.0.1", + "postcss-convert-values": "^6.0.1", + "postcss-discard-comments": "^6.0.1", + "postcss-discard-duplicates": "^6.0.1", + "postcss-discard-empty": "^6.0.1", + "postcss-discard-overridden": "^6.0.1", + "postcss-merge-longhand": "^6.0.1", + "postcss-merge-rules": "^6.0.2", + "postcss-minify-font-values": "^6.0.1", + "postcss-minify-gradients": "^6.0.1", + "postcss-minify-params": "^6.0.1", + "postcss-minify-selectors": "^6.0.1", + "postcss-normalize-charset": "^6.0.1", + "postcss-normalize-display-values": "^6.0.1", + "postcss-normalize-positions": "^6.0.1", + "postcss-normalize-repeat-style": "^6.0.1", + "postcss-normalize-string": "^6.0.1", + "postcss-normalize-timing-functions": "^6.0.1", + "postcss-normalize-unicode": "^6.0.1", + "postcss-normalize-url": "^6.0.1", + "postcss-normalize-whitespace": "^6.0.1", + "postcss-ordered-values": "^6.0.1", + "postcss-reduce-initial": "^6.0.1", + "postcss-reduce-transforms": "^6.0.1", + "postcss-svgo": "^6.0.1", + "postcss-unique-selectors": "^6.0.1" }, "engines": { "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/cssnano-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.0.tgz", - "integrity": "sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.1.tgz", + "integrity": "sha512-6qQuYDqsGoiXssZ3zct6dcMxiqfT6epy7x4R0TQJadd4LWO3sPR6JH6ZByOvVLoZ6EdwPGgd7+DR1EmX3tiXQQ==", "dev": true, "engines": { "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" + } + }, + "node_modules/cssnano/node_modules/lilconfig": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", + "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", + "dev": true, + "engines": { + "node": ">=14" } }, "node_modules/csso": { @@ -2995,9 +3004,9 @@ } }, "node_modules/postcss-calc": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.0.tgz", - "integrity": "sha512-B9BNW/SVh4SMJfoCQ6D9h1Wo7Yjqks7UdbiARJ16J5TIsQn5NEqwMF5joSgOYb26oJPUR5Uv3fCQ/4PvmZWeJQ==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz", + "integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==", "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.11", @@ -3119,9 +3128,9 @@ } }, "node_modules/postcss-colormin": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.0.tgz", - "integrity": "sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.1.tgz", + "integrity": "sha512-Tb9aR2wCJCzKuNjIeMzVNd0nXjQy25HDgFmmaRsHnP0eP/k8uQWE4S8voX5S2coO5CeKrp+USFs1Ayv9Tpxx6w==", "dev": true, "dependencies": { "browserslist": "^4.21.4", @@ -3133,13 +3142,13 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-convert-values": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz", - "integrity": "sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.1.tgz", + "integrity": "sha512-zTd4Vh0HxGkhg5aHtfCogcRHzGkvblfdWlQ53lIh1cJhYcGyIxh2hgtKoVh40AMktRERet+JKdB04nNG19kjmA==", "dev": true, "dependencies": { "browserslist": "^4.21.4", @@ -3149,55 +3158,55 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-discard-comments": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz", - "integrity": "sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.1.tgz", + "integrity": "sha512-f1KYNPtqYLUeZGCHQPKzzFtsHaRuECe6jLakf/RjSRqvF5XHLZnM2+fXLhb8Qh/HBFHs3M4cSLb1k3B899RYIg==", "dev": true, "engines": { "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-discard-duplicates": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz", - "integrity": "sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.1.tgz", + "integrity": "sha512-1hvUs76HLYR8zkScbwyJ8oJEugfPV+WchpnA+26fpJ7Smzs51CzGBHC32RS03psuX/2l0l0UKh2StzNxOrKCYg==", "dev": true, "engines": { "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-discard-empty": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz", - "integrity": "sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.1.tgz", + "integrity": "sha512-yitcmKwmVWtNsrrRqGJ7/C0YRy53i0mjexBDQ9zYxDwTWVBgbU4+C9jIZLmQlTDT9zhml+u0OMFJh8+31krmOg==", "dev": true, "engines": { "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-discard-overridden": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz", - "integrity": "sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.1.tgz", + "integrity": "sha512-qs0ehZMMZpSESbRkw1+inkf51kak6OOzNRaoLd/U7Fatp0aN2HQ1rxGOrJvYcRAN9VpX8kUF13R2ofn8OlvFVA==", "dev": true, "engines": { "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-import": { @@ -3263,43 +3272,43 @@ } }, "node_modules/postcss-merge-longhand": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz", - "integrity": "sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.1.tgz", + "integrity": "sha512-vmr/HZQzaPXc45FRvSctqFTF05UaDnTn5ABX+UtQPJznDWT/QaFbVc/pJ5C2YPxx2J2XcfmWowlKwtCDwiQ5hA==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0", - "stylehacks": "^6.0.0" + "stylehacks": "^6.0.1" }, "engines": { "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-merge-rules": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz", - "integrity": "sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.2.tgz", + "integrity": "sha512-6lm8bl0UfriSfxI+F/cezrebqqP8w702UC6SjZlUlBYwuRVNbmgcJuQU7yePIvD4MNT53r/acQCUAyulrpgmeQ==", "dev": true, "dependencies": { "browserslist": "^4.21.4", "caniuse-api": "^3.0.0", - "cssnano-utils": "^4.0.0", + "cssnano-utils": "^4.0.1", "postcss-selector-parser": "^6.0.5" }, "engines": { "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-minify-font-values": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz", - "integrity": "sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.1.tgz", + "integrity": "sha512-tIwmF1zUPoN6xOtA/2FgVk1ZKrLcCvE0dpZLtzyyte0j9zUeB8RTbCqrHZGjJlxOvNWKMYtunLrrl7HPOiR46w==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3308,47 +3317,47 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-minify-gradients": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz", - "integrity": "sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.1.tgz", + "integrity": "sha512-M1RJWVjd6IOLPl1hYiOd5HQHgpp6cvJVLrieQYS9y07Yo8itAr6jaekzJphaJFR0tcg4kRewCk3kna9uHBxn/w==", "dev": true, "dependencies": { "colord": "^2.9.1", - "cssnano-utils": "^4.0.0", + "cssnano-utils": "^4.0.1", "postcss-value-parser": "^4.2.0" }, "engines": { "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-minify-params": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz", - "integrity": "sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.1.tgz", + "integrity": "sha512-eFvGWArqh4khPIgPDu6SZNcaLctx97nO7c59OXnRtGntAp5/VS4gjMhhW9qUFsK6mQ27pEZGt2kR+mPizI+Z9g==", "dev": true, "dependencies": { "browserslist": "^4.21.4", - "cssnano-utils": "^4.0.0", + "cssnano-utils": "^4.0.1", "postcss-value-parser": "^4.2.0" }, "engines": { "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-minify-selectors": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz", - "integrity": "sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.1.tgz", + "integrity": "sha512-mfReq5wrS6vkunxvJp6GDuOk+Ak6JV7134gp8L+ANRnV9VwqzTvBtX6lpohooVU750AR0D3pVx2Zn6uCCwOAfQ==", "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.5" @@ -3357,7 +3366,7 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-nested": { @@ -3379,21 +3388,21 @@ } }, "node_modules/postcss-normalize-charset": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz", - "integrity": "sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.1.tgz", + "integrity": "sha512-aW5LbMNRZ+oDV57PF9K+WI1Z8MPnF+A8qbajg/T8PP126YrGX1f9IQx21GI2OlGz7XFJi/fNi0GTbY948XJtXg==", "dev": true, "engines": { "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-normalize-display-values": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz", - "integrity": "sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.1.tgz", + "integrity": "sha512-mc3vxp2bEuCb4LgCcmG1y6lKJu1Co8T+rKHrcbShJwUmKJiEl761qb/QQCfFwlrvSeET3jksolCR/RZuMURudw==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3402,13 +3411,13 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-normalize-positions": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz", - "integrity": "sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.1.tgz", + "integrity": "sha512-HRsq8u/0unKNvm0cvwxcOUEcakFXqZ41fv3FOdPn916XFUrympjr+03oaLkuZENz3HE9RrQE9yU0Xv43ThWjQg==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3417,13 +3426,13 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-normalize-repeat-style": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz", - "integrity": "sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.1.tgz", + "integrity": "sha512-Gbb2nmCy6tTiA7Sh2MBs3fj9W8swonk6lw+dFFeQT68B0Pzwp1kvisJQkdV6rbbMSd9brMlS8I8ts52tAGWmGQ==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3432,13 +3441,13 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-normalize-string": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz", - "integrity": "sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.1.tgz", + "integrity": "sha512-5Fhx/+xzALJD9EI26Aq23hXwmv97Zfy2VFrt5PLT8lAhnBIZvmaT5pQk+NuJ/GWj/QWaKSKbnoKDGLbV6qnhXg==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3447,13 +3456,13 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-normalize-timing-functions": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz", - "integrity": "sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.1.tgz", + "integrity": "sha512-4zcczzHqmCU7L5dqTB9rzeqPWRMc0K2HoR+Bfl+FSMbqGBUcP5LRfgcH4BdRtLuzVQK1/FHdFoGT3F7rkEnY+g==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3462,13 +3471,13 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-normalize-unicode": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz", - "integrity": "sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.1.tgz", + "integrity": "sha512-ok9DsI94nEF79MkvmLfHfn8ddnKXA7w+8YuUoz5m7b6TOdoaRCpvu/QMHXQs9+DwUbvp+ytzz04J55CPy77PuQ==", "dev": true, "dependencies": { "browserslist": "^4.21.4", @@ -3478,13 +3487,13 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-normalize-url": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz", - "integrity": "sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.1.tgz", + "integrity": "sha512-jEXL15tXSvbjm0yzUV7FBiEXwhIa9H88JOXDGQzmcWoB4mSjZIsmtto066s2iW9FYuIrIF4k04HA2BKAOpbsaQ==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3493,13 +3502,13 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-normalize-whitespace": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz", - "integrity": "sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.1.tgz", + "integrity": "sha512-76i3NpWf6bB8UHlVuLRxG4zW2YykF9CTEcq/9LGAiz2qBuX5cBStadkk0jSkg9a9TCIXbMQz7yzrygKoCW9JuA==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3508,29 +3517,29 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-ordered-values": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz", - "integrity": "sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.1.tgz", + "integrity": "sha512-XXbb1O/MW9HdEhnBxitZpPFbIvDgbo9NK4c/5bOfiKpnIGZDoL2xd7/e6jW5DYLsWxBbs+1nZEnVgnjnlFViaA==", "dev": true, "dependencies": { - "cssnano-utils": "^4.0.0", + "cssnano-utils": "^4.0.1", "postcss-value-parser": "^4.2.0" }, "engines": { "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-reduce-initial": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz", - "integrity": "sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.1.tgz", + "integrity": "sha512-cgzsI2ThG1PMSdSyM9A+bVxiiVgPIVz9f5c6H+TqEv0CA89iCOO81mwLWRWLgOKFtQkKob9nNpnkxG/1RlgFcA==", "dev": true, "dependencies": { "browserslist": "^4.21.4", @@ -3540,13 +3549,13 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-reduce-transforms": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz", - "integrity": "sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.1.tgz", + "integrity": "sha512-fUbV81OkUe75JM+VYO1gr/IoA2b/dRiH6HvMwhrIBSUrxq3jNZQZitSnugcTLDi1KkQh1eR/zi+iyxviUNBkcQ==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" @@ -3555,7 +3564,7 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-reporter": { @@ -3591,25 +3600,25 @@ } }, "node_modules/postcss-svgo": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.0.tgz", - "integrity": "sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.1.tgz", + "integrity": "sha512-eWV4Rrqa06LzTgqirOv5Ln6WTGyU7Pbeqj9WEyKo9tpnWixNATVJMeaEcOHOW1ZYyjcG8wSJwX/28DvU3oy3HA==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0", - "svgo": "^3.0.2" + "svgo": "^3.0.5" }, "engines": { "node": "^14 || ^16 || >= 18" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-unique-selectors": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz", - "integrity": "sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.1.tgz", + "integrity": "sha512-/KCCEpNNR7oXVJ38/Id7GC9Nt0zxO1T3zVbhVaq6F6LSG+3gU3B7+QuTHfD0v8NPEHlzewAout29S0InmB78EQ==", "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.5" @@ -3618,7 +3627,7 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/postcss-value-parser": { @@ -4324,9 +4333,9 @@ } }, "node_modules/stylehacks": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.0.tgz", - "integrity": "sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.1.tgz", + "integrity": "sha512-jTqG2aIoX2fYg0YsGvqE4ooE/e75WmaEjnNiP6Ag7irLtHxML8NJRxRxS0HyDpde8DRGuEXTFVHVfR5Tmbxqzg==", "dev": true, "dependencies": { "browserslist": "^4.21.4", @@ -4336,7 +4345,7 @@ "node": "^14 || ^16 || >=18.0" }, "peerDependencies": { - "postcss": "^8.2.15" + "postcss": "^8.4.31" } }, "node_modules/sucrase": { @@ -4416,16 +4425,17 @@ } }, "node_modules/svgo": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz", - "integrity": "sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.1.0.tgz", + "integrity": "sha512-R5SnNA89w1dYgNv570591F66v34b3eQShpIBcQtZtM5trJwm1VvxbIoMpRYY3ybTAutcKTLEmTsdnaknOHbiQA==", "dev": true, "dependencies": { "@trysound/sax": "0.2.0", "commander": "^7.2.0", "css-select": "^5.1.0", "css-tree": "^2.2.1", - "csso": "^5.0.5", + "css-what": "^6.1.0", + "csso": "5.0.5", "picocolors": "^1.0.0" }, "bin": { @@ -5511,9 +5521,9 @@ } }, "css-declaration-sorter": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz", - "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.1.1.tgz", + "integrity": "sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ==", "dev": true, "requires": {} }, @@ -5562,56 +5572,64 @@ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" }, "cssnano": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.1.tgz", - "integrity": "sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.2.tgz", + "integrity": "sha512-Tu9wv8UdN6CoiQnIVkCNvi+0rw/BwFWOJBlg2bVfEyKaadSuE3Gq/DD8tniVvggTJGwK88UjqZp7zL5sv6t1aA==", "dev": true, "requires": { - "cssnano-preset-default": "^6.0.1", - "lilconfig": "^2.1.0" + "cssnano-preset-default": "^6.0.2", + "lilconfig": "^3.0.0" + }, + "dependencies": { + "lilconfig": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", + "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", + "dev": true + } } }, "cssnano-preset-default": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz", - "integrity": "sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==", - "dev": true, - "requires": { - "css-declaration-sorter": "^6.3.1", - "cssnano-utils": "^4.0.0", - "postcss-calc": "^9.0.0", - "postcss-colormin": "^6.0.0", - "postcss-convert-values": "^6.0.0", - "postcss-discard-comments": "^6.0.0", - "postcss-discard-duplicates": "^6.0.0", - "postcss-discard-empty": "^6.0.0", - "postcss-discard-overridden": "^6.0.0", - "postcss-merge-longhand": "^6.0.0", - "postcss-merge-rules": "^6.0.1", - "postcss-minify-font-values": "^6.0.0", - "postcss-minify-gradients": "^6.0.0", - "postcss-minify-params": "^6.0.0", - "postcss-minify-selectors": "^6.0.0", - "postcss-normalize-charset": "^6.0.0", - "postcss-normalize-display-values": "^6.0.0", - "postcss-normalize-positions": "^6.0.0", - "postcss-normalize-repeat-style": "^6.0.0", - "postcss-normalize-string": "^6.0.0", - "postcss-normalize-timing-functions": "^6.0.0", - "postcss-normalize-unicode": "^6.0.0", - "postcss-normalize-url": "^6.0.0", - "postcss-normalize-whitespace": "^6.0.0", - "postcss-ordered-values": "^6.0.0", - "postcss-reduce-initial": "^6.0.0", - "postcss-reduce-transforms": "^6.0.0", - "postcss-svgo": "^6.0.0", - "postcss-unique-selectors": "^6.0.0" + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.2.tgz", + "integrity": "sha512-VnZybFeZ63AiVqIUNlxqMxpj9VU8B5j0oKgP7WyVt/7mkyf97KsYkNzsPTV/RVmy54Pg7cBhOK4WATbdCB44gw==", + "dev": true, + "requires": { + "css-declaration-sorter": "^7.0.0", + "cssnano-utils": "^4.0.1", + "postcss-calc": "^9.0.1", + "postcss-colormin": "^6.0.1", + "postcss-convert-values": "^6.0.1", + "postcss-discard-comments": "^6.0.1", + "postcss-discard-duplicates": "^6.0.1", + "postcss-discard-empty": "^6.0.1", + "postcss-discard-overridden": "^6.0.1", + "postcss-merge-longhand": "^6.0.1", + "postcss-merge-rules": "^6.0.2", + "postcss-minify-font-values": "^6.0.1", + "postcss-minify-gradients": "^6.0.1", + "postcss-minify-params": "^6.0.1", + "postcss-minify-selectors": "^6.0.1", + "postcss-normalize-charset": "^6.0.1", + "postcss-normalize-display-values": "^6.0.1", + "postcss-normalize-positions": "^6.0.1", + "postcss-normalize-repeat-style": "^6.0.1", + "postcss-normalize-string": "^6.0.1", + "postcss-normalize-timing-functions": "^6.0.1", + "postcss-normalize-unicode": "^6.0.1", + "postcss-normalize-url": "^6.0.1", + "postcss-normalize-whitespace": "^6.0.1", + "postcss-ordered-values": "^6.0.1", + "postcss-reduce-initial": "^6.0.1", + "postcss-reduce-transforms": "^6.0.1", + "postcss-svgo": "^6.0.1", + "postcss-unique-selectors": "^6.0.1" } }, "cssnano-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.0.tgz", - "integrity": "sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.1.tgz", + "integrity": "sha512-6qQuYDqsGoiXssZ3zct6dcMxiqfT6epy7x4R0TQJadd4LWO3sPR6JH6ZByOvVLoZ6EdwPGgd7+DR1EmX3tiXQQ==", "dev": true, "requires": {} }, @@ -7056,9 +7074,9 @@ } }, "postcss-calc": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.0.tgz", - "integrity": "sha512-B9BNW/SVh4SMJfoCQ6D9h1Wo7Yjqks7UdbiARJ16J5TIsQn5NEqwMF5joSgOYb26oJPUR5Uv3fCQ/4PvmZWeJQ==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz", + "integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==", "dev": true, "requires": { "postcss-selector-parser": "^6.0.11", @@ -7131,9 +7149,9 @@ } }, "postcss-colormin": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.0.tgz", - "integrity": "sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.1.tgz", + "integrity": "sha512-Tb9aR2wCJCzKuNjIeMzVNd0nXjQy25HDgFmmaRsHnP0eP/k8uQWE4S8voX5S2coO5CeKrp+USFs1Ayv9Tpxx6w==", "dev": true, "requires": { "browserslist": "^4.21.4", @@ -7143,9 +7161,9 @@ } }, "postcss-convert-values": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz", - "integrity": "sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.1.tgz", + "integrity": "sha512-zTd4Vh0HxGkhg5aHtfCogcRHzGkvblfdWlQ53lIh1cJhYcGyIxh2hgtKoVh40AMktRERet+JKdB04nNG19kjmA==", "dev": true, "requires": { "browserslist": "^4.21.4", @@ -7153,30 +7171,30 @@ } }, "postcss-discard-comments": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz", - "integrity": "sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.1.tgz", + "integrity": "sha512-f1KYNPtqYLUeZGCHQPKzzFtsHaRuECe6jLakf/RjSRqvF5XHLZnM2+fXLhb8Qh/HBFHs3M4cSLb1k3B899RYIg==", "dev": true, "requires": {} }, "postcss-discard-duplicates": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz", - "integrity": "sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.1.tgz", + "integrity": "sha512-1hvUs76HLYR8zkScbwyJ8oJEugfPV+WchpnA+26fpJ7Smzs51CzGBHC32RS03psuX/2l0l0UKh2StzNxOrKCYg==", "dev": true, "requires": {} }, "postcss-discard-empty": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz", - "integrity": "sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.1.tgz", + "integrity": "sha512-yitcmKwmVWtNsrrRqGJ7/C0YRy53i0mjexBDQ9zYxDwTWVBgbU4+C9jIZLmQlTDT9zhml+u0OMFJh8+31krmOg==", "dev": true, "requires": {} }, "postcss-discard-overridden": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz", - "integrity": "sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.1.tgz", + "integrity": "sha512-qs0ehZMMZpSESbRkw1+inkf51kak6OOzNRaoLd/U7Fatp0aN2HQ1rxGOrJvYcRAN9VpX8kUF13R2ofn8OlvFVA==", "dev": true, "requires": {} }, @@ -7208,62 +7226,62 @@ } }, "postcss-merge-longhand": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz", - "integrity": "sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.1.tgz", + "integrity": "sha512-vmr/HZQzaPXc45FRvSctqFTF05UaDnTn5ABX+UtQPJznDWT/QaFbVc/pJ5C2YPxx2J2XcfmWowlKwtCDwiQ5hA==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0", - "stylehacks": "^6.0.0" + "stylehacks": "^6.0.1" } }, "postcss-merge-rules": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz", - "integrity": "sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.2.tgz", + "integrity": "sha512-6lm8bl0UfriSfxI+F/cezrebqqP8w702UC6SjZlUlBYwuRVNbmgcJuQU7yePIvD4MNT53r/acQCUAyulrpgmeQ==", "dev": true, "requires": { "browserslist": "^4.21.4", "caniuse-api": "^3.0.0", - "cssnano-utils": "^4.0.0", + "cssnano-utils": "^4.0.1", "postcss-selector-parser": "^6.0.5" } }, "postcss-minify-font-values": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz", - "integrity": "sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.1.tgz", + "integrity": "sha512-tIwmF1zUPoN6xOtA/2FgVk1ZKrLcCvE0dpZLtzyyte0j9zUeB8RTbCqrHZGjJlxOvNWKMYtunLrrl7HPOiR46w==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-minify-gradients": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz", - "integrity": "sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.1.tgz", + "integrity": "sha512-M1RJWVjd6IOLPl1hYiOd5HQHgpp6cvJVLrieQYS9y07Yo8itAr6jaekzJphaJFR0tcg4kRewCk3kna9uHBxn/w==", "dev": true, "requires": { "colord": "^2.9.1", - "cssnano-utils": "^4.0.0", + "cssnano-utils": "^4.0.1", "postcss-value-parser": "^4.2.0" } }, "postcss-minify-params": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz", - "integrity": "sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.1.tgz", + "integrity": "sha512-eFvGWArqh4khPIgPDu6SZNcaLctx97nO7c59OXnRtGntAp5/VS4gjMhhW9qUFsK6mQ27pEZGt2kR+mPizI+Z9g==", "dev": true, "requires": { "browserslist": "^4.21.4", - "cssnano-utils": "^4.0.0", + "cssnano-utils": "^4.0.1", "postcss-value-parser": "^4.2.0" } }, "postcss-minify-selectors": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz", - "integrity": "sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.1.tgz", + "integrity": "sha512-mfReq5wrS6vkunxvJp6GDuOk+Ak6JV7134gp8L+ANRnV9VwqzTvBtX6lpohooVU750AR0D3pVx2Zn6uCCwOAfQ==", "dev": true, "requires": { "postcss-selector-parser": "^6.0.5" @@ -7278,61 +7296,61 @@ } }, "postcss-normalize-charset": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz", - "integrity": "sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.1.tgz", + "integrity": "sha512-aW5LbMNRZ+oDV57PF9K+WI1Z8MPnF+A8qbajg/T8PP126YrGX1f9IQx21GI2OlGz7XFJi/fNi0GTbY948XJtXg==", "dev": true, "requires": {} }, "postcss-normalize-display-values": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz", - "integrity": "sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.1.tgz", + "integrity": "sha512-mc3vxp2bEuCb4LgCcmG1y6lKJu1Co8T+rKHrcbShJwUmKJiEl761qb/QQCfFwlrvSeET3jksolCR/RZuMURudw==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-normalize-positions": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz", - "integrity": "sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.1.tgz", + "integrity": "sha512-HRsq8u/0unKNvm0cvwxcOUEcakFXqZ41fv3FOdPn916XFUrympjr+03oaLkuZENz3HE9RrQE9yU0Xv43ThWjQg==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-normalize-repeat-style": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz", - "integrity": "sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.1.tgz", + "integrity": "sha512-Gbb2nmCy6tTiA7Sh2MBs3fj9W8swonk6lw+dFFeQT68B0Pzwp1kvisJQkdV6rbbMSd9brMlS8I8ts52tAGWmGQ==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-normalize-string": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz", - "integrity": "sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.1.tgz", + "integrity": "sha512-5Fhx/+xzALJD9EI26Aq23hXwmv97Zfy2VFrt5PLT8lAhnBIZvmaT5pQk+NuJ/GWj/QWaKSKbnoKDGLbV6qnhXg==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-normalize-timing-functions": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz", - "integrity": "sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.1.tgz", + "integrity": "sha512-4zcczzHqmCU7L5dqTB9rzeqPWRMc0K2HoR+Bfl+FSMbqGBUcP5LRfgcH4BdRtLuzVQK1/FHdFoGT3F7rkEnY+g==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-normalize-unicode": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz", - "integrity": "sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.1.tgz", + "integrity": "sha512-ok9DsI94nEF79MkvmLfHfn8ddnKXA7w+8YuUoz5m7b6TOdoaRCpvu/QMHXQs9+DwUbvp+ytzz04J55CPy77PuQ==", "dev": true, "requires": { "browserslist": "^4.21.4", @@ -7340,37 +7358,37 @@ } }, "postcss-normalize-url": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz", - "integrity": "sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.1.tgz", + "integrity": "sha512-jEXL15tXSvbjm0yzUV7FBiEXwhIa9H88JOXDGQzmcWoB4mSjZIsmtto066s2iW9FYuIrIF4k04HA2BKAOpbsaQ==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-normalize-whitespace": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz", - "integrity": "sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.1.tgz", + "integrity": "sha512-76i3NpWf6bB8UHlVuLRxG4zW2YykF9CTEcq/9LGAiz2qBuX5cBStadkk0jSkg9a9TCIXbMQz7yzrygKoCW9JuA==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-ordered-values": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz", - "integrity": "sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.1.tgz", + "integrity": "sha512-XXbb1O/MW9HdEhnBxitZpPFbIvDgbo9NK4c/5bOfiKpnIGZDoL2xd7/e6jW5DYLsWxBbs+1nZEnVgnjnlFViaA==", "dev": true, "requires": { - "cssnano-utils": "^4.0.0", + "cssnano-utils": "^4.0.1", "postcss-value-parser": "^4.2.0" } }, "postcss-reduce-initial": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz", - "integrity": "sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.1.tgz", + "integrity": "sha512-cgzsI2ThG1PMSdSyM9A+bVxiiVgPIVz9f5c6H+TqEv0CA89iCOO81mwLWRWLgOKFtQkKob9nNpnkxG/1RlgFcA==", "dev": true, "requires": { "browserslist": "^4.21.4", @@ -7378,9 +7396,9 @@ } }, "postcss-reduce-transforms": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz", - "integrity": "sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.1.tgz", + "integrity": "sha512-fUbV81OkUe75JM+VYO1gr/IoA2b/dRiH6HvMwhrIBSUrxq3jNZQZitSnugcTLDi1KkQh1eR/zi+iyxviUNBkcQ==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" @@ -7406,19 +7424,19 @@ } }, "postcss-svgo": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.0.tgz", - "integrity": "sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.1.tgz", + "integrity": "sha512-eWV4Rrqa06LzTgqirOv5Ln6WTGyU7Pbeqj9WEyKo9tpnWixNATVJMeaEcOHOW1ZYyjcG8wSJwX/28DvU3oy3HA==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0", - "svgo": "^3.0.2" + "svgo": "^3.0.5" } }, "postcss-unique-selectors": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz", - "integrity": "sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.1.tgz", + "integrity": "sha512-/KCCEpNNR7oXVJ38/Id7GC9Nt0zxO1T3zVbhVaq6F6LSG+3gU3B7+QuTHfD0v8NPEHlzewAout29S0InmB78EQ==", "dev": true, "requires": { "postcss-selector-parser": "^6.0.5" @@ -7975,9 +7993,9 @@ "dev": true }, "stylehacks": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.0.tgz", - "integrity": "sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.1.tgz", + "integrity": "sha512-jTqG2aIoX2fYg0YsGvqE4ooE/e75WmaEjnNiP6Ag7irLtHxML8NJRxRxS0HyDpde8DRGuEXTFVHVfR5Tmbxqzg==", "dev": true, "requires": { "browserslist": "^4.21.4", @@ -8038,16 +8056,17 @@ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" }, "svgo": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz", - "integrity": "sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.1.0.tgz", + "integrity": "sha512-R5SnNA89w1dYgNv570591F66v34b3eQShpIBcQtZtM5trJwm1VvxbIoMpRYY3ybTAutcKTLEmTsdnaknOHbiQA==", "dev": true, "requires": { "@trysound/sax": "0.2.0", "commander": "^7.2.0", "css-select": "^5.1.0", "css-tree": "^2.2.1", - "csso": "^5.0.5", + "css-what": "^6.1.0", + "csso": "5.0.5", "picocolors": "^1.0.0" }, "dependencies": { diff --git a/backend/servers/explorer-web/package.json b/backend/servers/explorer-web/package.json index ffe33d448..bb5f35c7c 100644 --- a/backend/servers/explorer-web/package.json +++ b/backend/servers/explorer-web/package.json @@ -19,7 +19,7 @@ "@tailwindcss/typography": "^0.5.10", "autoprefixer": "^10.4.16", "browser-sync": "^2.29.3", - "cssnano": "^6.0.1", + "cssnano": "^6.0.2", "daisyui": "^4.4.20", "mkdirp": "^3.0.1", "ncp": "^2.0.0", diff --git a/backend/servers/explorer-web/yarn.lock b/backend/servers/explorer-web/yarn.lock index 460945c31..efddc406e 100644 --- a/backend/servers/explorer-web/yarn.lock +++ b/backend/servers/explorer-web/yarn.lock @@ -497,10 +497,10 @@ cross-spawn@^7.0.1: shebang-command "^2.0.0" which "^2.0.1" -css-declaration-sorter@^6.3.1: - version "6.4.0" - resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz" - integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew== +css-declaration-sorter@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.1.1.tgz#9796bcc257b4647c39993bda8d431ce32b666f80" + integrity sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ== css-select@^5.1.0: version "5.1.0" @@ -547,57 +547,57 @@ cssesc@^3.0.0: resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz" - integrity sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ== - dependencies: - css-declaration-sorter "^6.3.1" - cssnano-utils "^4.0.0" - postcss-calc "^9.0.0" - postcss-colormin "^6.0.0" - postcss-convert-values "^6.0.0" - postcss-discard-comments "^6.0.0" - postcss-discard-duplicates "^6.0.0" - postcss-discard-empty "^6.0.0" - postcss-discard-overridden "^6.0.0" - postcss-merge-longhand "^6.0.0" - postcss-merge-rules "^6.0.1" - postcss-minify-font-values "^6.0.0" - postcss-minify-gradients "^6.0.0" - postcss-minify-params "^6.0.0" - postcss-minify-selectors "^6.0.0" - postcss-normalize-charset "^6.0.0" - postcss-normalize-display-values "^6.0.0" - postcss-normalize-positions "^6.0.0" - postcss-normalize-repeat-style "^6.0.0" - postcss-normalize-string "^6.0.0" - postcss-normalize-timing-functions "^6.0.0" - postcss-normalize-unicode "^6.0.0" - postcss-normalize-url "^6.0.0" - postcss-normalize-whitespace "^6.0.0" - postcss-ordered-values "^6.0.0" - postcss-reduce-initial "^6.0.0" - postcss-reduce-transforms "^6.0.0" - postcss-svgo "^6.0.0" - postcss-unique-selectors "^6.0.0" - -cssnano-utils@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.0.tgz" - integrity sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw== +cssnano-preset-default@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-6.0.2.tgz#0cc13e2da462b0d1632b1ebea4af78e7484592e8" + integrity sha512-VnZybFeZ63AiVqIUNlxqMxpj9VU8B5j0oKgP7WyVt/7mkyf97KsYkNzsPTV/RVmy54Pg7cBhOK4WATbdCB44gw== + dependencies: + css-declaration-sorter "^7.0.0" + cssnano-utils "^4.0.1" + postcss-calc "^9.0.1" + postcss-colormin "^6.0.1" + postcss-convert-values "^6.0.1" + postcss-discard-comments "^6.0.1" + postcss-discard-duplicates "^6.0.1" + postcss-discard-empty "^6.0.1" + postcss-discard-overridden "^6.0.1" + postcss-merge-longhand "^6.0.1" + postcss-merge-rules "^6.0.2" + postcss-minify-font-values "^6.0.1" + postcss-minify-gradients "^6.0.1" + postcss-minify-params "^6.0.1" + postcss-minify-selectors "^6.0.1" + postcss-normalize-charset "^6.0.1" + postcss-normalize-display-values "^6.0.1" + postcss-normalize-positions "^6.0.1" + postcss-normalize-repeat-style "^6.0.1" + postcss-normalize-string "^6.0.1" + postcss-normalize-timing-functions "^6.0.1" + postcss-normalize-unicode "^6.0.1" + postcss-normalize-url "^6.0.1" + postcss-normalize-whitespace "^6.0.1" + postcss-ordered-values "^6.0.1" + postcss-reduce-initial "^6.0.1" + postcss-reduce-transforms "^6.0.1" + postcss-svgo "^6.0.1" + postcss-unique-selectors "^6.0.1" + +cssnano-utils@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-4.0.1.tgz#fd18b42f95938bf55ab47967705355d6047bf1da" + integrity sha512-6qQuYDqsGoiXssZ3zct6dcMxiqfT6epy7x4R0TQJadd4LWO3sPR6JH6ZByOvVLoZ6EdwPGgd7+DR1EmX3tiXQQ== -cssnano@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/cssnano/-/cssnano-6.0.1.tgz" - integrity sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg== +cssnano@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-6.0.2.tgz#7b49d60ce51e1dea3d569795f751ee49e97124c9" + integrity sha512-Tu9wv8UdN6CoiQnIVkCNvi+0rw/BwFWOJBlg2bVfEyKaadSuE3Gq/DD8tniVvggTJGwK88UjqZp7zL5sv6t1aA== dependencies: - cssnano-preset-default "^6.0.1" - lilconfig "^2.1.0" + cssnano-preset-default "^6.0.2" + lilconfig "^3.0.0" -csso@^5.0.5: +csso@5.0.5: version "5.0.5" - resolved "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz" + resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6" integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ== dependencies: css-tree "~2.2.0" @@ -1752,10 +1752,10 @@ portscanner@2.2.0: async "^2.6.0" is-number-like "^1.0.3" -postcss-calc@^9.0.0: - version "9.0.0" - resolved "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.0.tgz" - integrity sha512-B9BNW/SVh4SMJfoCQ6D9h1Wo7Yjqks7UdbiARJ16J5TIsQn5NEqwMF5joSgOYb26oJPUR5Uv3fCQ/4PvmZWeJQ== +postcss-calc@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-9.0.1.tgz#a744fd592438a93d6de0f1434c572670361eb6c6" + integrity sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ== dependencies: postcss-selector-parser "^6.0.11" postcss-value-parser "^4.2.0" @@ -1778,43 +1778,43 @@ postcss-cli@^11.0.0: slash "^5.0.0" yargs "^17.0.0" -postcss-colormin@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.0.tgz" - integrity sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw== +postcss-colormin@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-6.0.1.tgz#3aa61d38a88dbdeeb7252fae67809a7ac547a129" + integrity sha512-Tb9aR2wCJCzKuNjIeMzVNd0nXjQy25HDgFmmaRsHnP0eP/k8uQWE4S8voX5S2coO5CeKrp+USFs1Ayv9Tpxx6w== dependencies: browserslist "^4.21.4" caniuse-api "^3.0.0" colord "^2.9.1" postcss-value-parser "^4.2.0" -postcss-convert-values@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz" - integrity sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw== +postcss-convert-values@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-6.0.1.tgz#a1451cb7e53b67b3db95c37276c5decb997409f2" + integrity sha512-zTd4Vh0HxGkhg5aHtfCogcRHzGkvblfdWlQ53lIh1cJhYcGyIxh2hgtKoVh40AMktRERet+JKdB04nNG19kjmA== dependencies: browserslist "^4.21.4" postcss-value-parser "^4.2.0" -postcss-discard-comments@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz" - integrity sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw== +postcss-discard-comments@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-6.0.1.tgz#46176212bd9c3e5f48aa4b8b4868786726c41d36" + integrity sha512-f1KYNPtqYLUeZGCHQPKzzFtsHaRuECe6jLakf/RjSRqvF5XHLZnM2+fXLhb8Qh/HBFHs3M4cSLb1k3B899RYIg== -postcss-discard-duplicates@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz" - integrity sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA== +postcss-discard-duplicates@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.1.tgz#112b1a95948e69b3484fdd43584dda6930977939" + integrity sha512-1hvUs76HLYR8zkScbwyJ8oJEugfPV+WchpnA+26fpJ7Smzs51CzGBHC32RS03psuX/2l0l0UKh2StzNxOrKCYg== -postcss-discard-empty@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz" - integrity sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ== +postcss-discard-empty@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-6.0.1.tgz#b34cb45ec891246da4506b53e352390fdef126c4" + integrity sha512-yitcmKwmVWtNsrrRqGJ7/C0YRy53i0mjexBDQ9zYxDwTWVBgbU4+C9jIZLmQlTDT9zhml+u0OMFJh8+31krmOg== -postcss-discard-overridden@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz" - integrity sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw== +postcss-discard-overridden@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.1.tgz#c63c559237758d74bc505452393a64dda9b19ef4" + integrity sha512-qs0ehZMMZpSESbRkw1+inkf51kak6OOzNRaoLd/U7Fatp0aN2HQ1rxGOrJvYcRAN9VpX8kUF13R2ofn8OlvFVA== postcss-import@^15.1.0: version "15.1.0" @@ -1848,53 +1848,53 @@ postcss-load-config@^5.0.0: lilconfig "^3.0.0" yaml "^2.3.4" -postcss-merge-longhand@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz" - integrity sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg== +postcss-merge-longhand@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.1.tgz#5a1145868c615e643ca0996d9e9c3f09ad8de854" + integrity sha512-vmr/HZQzaPXc45FRvSctqFTF05UaDnTn5ABX+UtQPJznDWT/QaFbVc/pJ5C2YPxx2J2XcfmWowlKwtCDwiQ5hA== dependencies: postcss-value-parser "^4.2.0" - stylehacks "^6.0.0" + stylehacks "^6.0.1" -postcss-merge-rules@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz" - integrity sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw== +postcss-merge-rules@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-6.0.2.tgz#b0f0063a05d671b7093a86f0faa6d2c6695dc036" + integrity sha512-6lm8bl0UfriSfxI+F/cezrebqqP8w702UC6SjZlUlBYwuRVNbmgcJuQU7yePIvD4MNT53r/acQCUAyulrpgmeQ== dependencies: browserslist "^4.21.4" caniuse-api "^3.0.0" - cssnano-utils "^4.0.0" + cssnano-utils "^4.0.1" postcss-selector-parser "^6.0.5" -postcss-minify-font-values@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz" - integrity sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA== +postcss-minify-font-values@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.1.tgz#788eb930168be90225f3937f0b70aa19d8b532b2" + integrity sha512-tIwmF1zUPoN6xOtA/2FgVk1ZKrLcCvE0dpZLtzyyte0j9zUeB8RTbCqrHZGjJlxOvNWKMYtunLrrl7HPOiR46w== dependencies: postcss-value-parser "^4.2.0" -postcss-minify-gradients@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz" - integrity sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA== +postcss-minify-gradients@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.1.tgz#4faf1880b483dc37016658aa186b42194ff9b5bc" + integrity sha512-M1RJWVjd6IOLPl1hYiOd5HQHgpp6cvJVLrieQYS9y07Yo8itAr6jaekzJphaJFR0tcg4kRewCk3kna9uHBxn/w== dependencies: colord "^2.9.1" - cssnano-utils "^4.0.0" + cssnano-utils "^4.0.1" postcss-value-parser "^4.2.0" -postcss-minify-params@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz" - integrity sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ== +postcss-minify-params@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-6.0.1.tgz#79b83947bae2aa991df12646c7f463276abb0aef" + integrity sha512-eFvGWArqh4khPIgPDu6SZNcaLctx97nO7c59OXnRtGntAp5/VS4gjMhhW9qUFsK6mQ27pEZGt2kR+mPizI+Z9g== dependencies: browserslist "^4.21.4" - cssnano-utils "^4.0.0" + cssnano-utils "^4.0.1" postcss-value-parser "^4.2.0" -postcss-minify-selectors@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz" - integrity sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g== +postcss-minify-selectors@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-6.0.1.tgz#7b2f05651a2f734da1fa50dea62cfc47e67d68f9" + integrity sha512-mfReq5wrS6vkunxvJp6GDuOk+Ak6JV7134gp8L+ANRnV9VwqzTvBtX6lpohooVU750AR0D3pVx2Zn6uCCwOAfQ== dependencies: postcss-selector-parser "^6.0.5" @@ -1905,88 +1905,88 @@ postcss-nested@^6.0.1: dependencies: postcss-selector-parser "^6.0.11" -postcss-normalize-charset@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz" - integrity sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ== +postcss-normalize-charset@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-6.0.1.tgz#5f70e1eb8bbdbcfcbed060ef70f179e8fef57d0c" + integrity sha512-aW5LbMNRZ+oDV57PF9K+WI1Z8MPnF+A8qbajg/T8PP126YrGX1f9IQx21GI2OlGz7XFJi/fNi0GTbY948XJtXg== -postcss-normalize-display-values@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz" - integrity sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw== +postcss-normalize-display-values@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.1.tgz#ff9aa30bbf1283294bfd9cc8b6fb81ff060a7f2d" + integrity sha512-mc3vxp2bEuCb4LgCcmG1y6lKJu1Co8T+rKHrcbShJwUmKJiEl761qb/QQCfFwlrvSeET3jksolCR/RZuMURudw== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-positions@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz" - integrity sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg== +postcss-normalize-positions@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-6.0.1.tgz#41ffdc72994f024c6cd6e91dbfb40ab9abe6fe90" + integrity sha512-HRsq8u/0unKNvm0cvwxcOUEcakFXqZ41fv3FOdPn916XFUrympjr+03oaLkuZENz3HE9RrQE9yU0Xv43ThWjQg== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-repeat-style@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz" - integrity sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A== +postcss-normalize-repeat-style@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.1.tgz#55dc54b6f80305b280a379899a6626e0a07b04a8" + integrity sha512-Gbb2nmCy6tTiA7Sh2MBs3fj9W8swonk6lw+dFFeQT68B0Pzwp1kvisJQkdV6rbbMSd9brMlS8I8ts52tAGWmGQ== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-string@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz" - integrity sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w== +postcss-normalize-string@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-6.0.1.tgz#7605e0fb4ec7bf2709709991d13a949e4419db1d" + integrity sha512-5Fhx/+xzALJD9EI26Aq23hXwmv97Zfy2VFrt5PLT8lAhnBIZvmaT5pQk+NuJ/GWj/QWaKSKbnoKDGLbV6qnhXg== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-timing-functions@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz" - integrity sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg== +postcss-normalize-timing-functions@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.1.tgz#ef937b7ca2fd62ed0b46645ea5728b842a3600db" + integrity sha512-4zcczzHqmCU7L5dqTB9rzeqPWRMc0K2HoR+Bfl+FSMbqGBUcP5LRfgcH4BdRtLuzVQK1/FHdFoGT3F7rkEnY+g== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-unicode@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz" - integrity sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg== +postcss-normalize-unicode@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.1.tgz#a652faa02fc8ce5d1429ac0782575d8d66a60d9b" + integrity sha512-ok9DsI94nEF79MkvmLfHfn8ddnKXA7w+8YuUoz5m7b6TOdoaRCpvu/QMHXQs9+DwUbvp+ytzz04J55CPy77PuQ== dependencies: browserslist "^4.21.4" postcss-value-parser "^4.2.0" -postcss-normalize-url@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz" - integrity sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw== +postcss-normalize-url@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-6.0.1.tgz#eae58cb4f5f9a4fa5bbbf6d4222dff534ad46186" + integrity sha512-jEXL15tXSvbjm0yzUV7FBiEXwhIa9H88JOXDGQzmcWoB4mSjZIsmtto066s2iW9FYuIrIF4k04HA2BKAOpbsaQ== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-whitespace@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz" - integrity sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw== +postcss-normalize-whitespace@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.1.tgz#b5933750b938814c028d3d2b2e5c0199e0037b53" + integrity sha512-76i3NpWf6bB8UHlVuLRxG4zW2YykF9CTEcq/9LGAiz2qBuX5cBStadkk0jSkg9a9TCIXbMQz7yzrygKoCW9JuA== dependencies: postcss-value-parser "^4.2.0" -postcss-ordered-values@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz" - integrity sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg== +postcss-ordered-values@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-6.0.1.tgz#553e735d009065b362da93340e57f43d5f2d0fbc" + integrity sha512-XXbb1O/MW9HdEhnBxitZpPFbIvDgbo9NK4c/5bOfiKpnIGZDoL2xd7/e6jW5DYLsWxBbs+1nZEnVgnjnlFViaA== dependencies: - cssnano-utils "^4.0.0" + cssnano-utils "^4.0.1" postcss-value-parser "^4.2.0" -postcss-reduce-initial@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz" - integrity sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA== +postcss-reduce-initial@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-6.0.1.tgz#37621ba31a18fd75eb9c76e818cca2a2adb13238" + integrity sha512-cgzsI2ThG1PMSdSyM9A+bVxiiVgPIVz9f5c6H+TqEv0CA89iCOO81mwLWRWLgOKFtQkKob9nNpnkxG/1RlgFcA== dependencies: browserslist "^4.21.4" caniuse-api "^3.0.0" -postcss-reduce-transforms@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz" - integrity sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w== +postcss-reduce-transforms@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.1.tgz#7bf59d7c6e7066e3b18ef17237d2344bd3da6d75" + integrity sha512-fUbV81OkUe75JM+VYO1gr/IoA2b/dRiH6HvMwhrIBSUrxq3jNZQZitSnugcTLDi1KkQh1eR/zi+iyxviUNBkcQ== dependencies: postcss-value-parser "^4.2.0" @@ -2014,18 +2014,18 @@ postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.4, postcss-selecto cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-svgo@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.0.tgz" - integrity sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw== +postcss-svgo@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-6.0.1.tgz#6bf63713ef5cb40f1bedd2c2cfca2486b41d5184" + integrity sha512-eWV4Rrqa06LzTgqirOv5Ln6WTGyU7Pbeqj9WEyKo9tpnWixNATVJMeaEcOHOW1ZYyjcG8wSJwX/28DvU3oy3HA== dependencies: postcss-value-parser "^4.2.0" - svgo "^3.0.2" + svgo "^3.0.5" -postcss-unique-selectors@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz" - integrity sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw== +postcss-unique-selectors@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-6.0.1.tgz#e6d071c2ea64ce265eb55ea9c170ff951183c712" + integrity sha512-/KCCEpNNR7oXVJ38/Id7GC9Nt0zxO1T3zVbhVaq6F6LSG+3gU3B7+QuTHfD0v8NPEHlzewAout29S0InmB78EQ== dependencies: postcss-selector-parser "^6.0.5" @@ -2402,10 +2402,10 @@ strip-bom@^3.0.0: resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz" integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== -stylehacks@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.0.tgz" - integrity sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw== +stylehacks@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-6.0.1.tgz#c103f0149e268a290a0dda3fce8fd4c5459a13c3" + integrity sha512-jTqG2aIoX2fYg0YsGvqE4ooE/e75WmaEjnNiP6Ag7irLtHxML8NJRxRxS0HyDpde8DRGuEXTFVHVfR5Tmbxqzg== dependencies: browserslist "^4.21.4" postcss-selector-parser "^6.0.4" @@ -2442,16 +2442,17 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -svgo@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz" - integrity sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ== +svgo@^3.0.5: + version "3.1.0" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.1.0.tgz#7e63855c8da73297d5d5765e968f9679a0f8d24a" + integrity sha512-R5SnNA89w1dYgNv570591F66v34b3eQShpIBcQtZtM5trJwm1VvxbIoMpRYY3ybTAutcKTLEmTsdnaknOHbiQA== dependencies: "@trysound/sax" "0.2.0" commander "^7.2.0" css-select "^5.1.0" css-tree "^2.2.1" - csso "^5.0.5" + css-what "^6.1.0" + csso "5.0.5" picocolors "^1.0.0" tailwindcss@^3.3.6: From 85042a7651422dcda175d07bc5bf081335a7c790 Mon Sep 17 00:00:00 2001 From: straumat Date: Sun, 17 Dec 2023 12:57:03 +0100 Subject: [PATCH 13/57] Container image build with Jlink --- backend/servers/explorer-api/pom.xml | 3 +++ backend/servers/explorer-batch/pom.xml | 3 +++ backend/servers/explorer-web/pom.xml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/backend/servers/explorer-api/pom.xml b/backend/servers/explorer-api/pom.xml index 8638fd916..e10873d21 100644 --- a/backend/servers/explorer-api/pom.xml +++ b/backend/servers/explorer-api/pom.xml @@ -138,6 +138,9 @@ royllo/explorer-api:latest + + true + org.royllo.explorer.api.Application diff --git a/backend/servers/explorer-batch/pom.xml b/backend/servers/explorer-batch/pom.xml index 909340358..8adaf2d77 100644 --- a/backend/servers/explorer-batch/pom.xml +++ b/backend/servers/explorer-batch/pom.xml @@ -110,6 +110,9 @@ royllo/explorer-batch:latest + + true + org.royllo.explorer.batch.Application diff --git a/backend/servers/explorer-web/pom.xml b/backend/servers/explorer-web/pom.xml index 5e3ee8800..da5a6d280 100644 --- a/backend/servers/explorer-web/pom.xml +++ b/backend/servers/explorer-web/pom.xml @@ -130,6 +130,9 @@ royllo/explorer-web:latest + + true + org.royllo.explorer.web.Application From 54956650b9eb7a4af050ab27063a280e21b91c4f Mon Sep 17 00:00:00 2001 From: straumat Date: Sun, 17 Dec 2023 16:53:46 +0100 Subject: [PATCH 14/57] getGlobalStatistics method with cache --- backend/explorer-core/autoconfigure/pom.xml | 9 +++ .../configuration/CachingConfiguration.java | 13 ++++ .../dto/statistics/GlobalStatisticsDTO.java | 25 +++++++ .../core/dto/statistics/package-info.java | 4 ++ .../service/statistics/StatisticService.java | 17 +++++ .../StatisticServiceImplementation.java | 47 +++++++++++++ .../core/service/statistics/package-info.java | 4 ++ .../src/main/resources/application.properties | 4 ++ .../core/service/StatisticServiceTest.java | 68 +++++++++++++++++++ .../src/test/resources/application.properties | 4 ++ backend/servers/explorer-api/pom.xml | 7 +- .../src/main/resources/application.properties | 4 ++ backend/servers/explorer-batch/pom.xml | 2 + .../src/main/resources/application.properties | 4 ++ backend/servers/explorer-web/pom.xml | 7 +- .../src/main/resources/application.properties | 4 ++ .../src/test/resources/application.properties | 4 ++ 17 files changed, 217 insertions(+), 10 deletions(-) create mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/configuration/CachingConfiguration.java create mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/statistics/GlobalStatisticsDTO.java create mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/statistics/package-info.java create mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/statistics/StatisticService.java create mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/statistics/StatisticServiceImplementation.java create mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/statistics/package-info.java create mode 100644 backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/StatisticServiceTest.java diff --git a/backend/explorer-core/autoconfigure/pom.xml b/backend/explorer-core/autoconfigure/pom.xml index 431ec119c..51c80fc6a 100644 --- a/backend/explorer-core/autoconfigure/pom.xml +++ b/backend/explorer-core/autoconfigure/pom.xml @@ -24,6 +24,15 @@ org.springframework.boot spring-boot-starter-webflux + + org.springframework.boot + spring-boot-starter-cache + + + com.github.ben-manes.caffeine + caffeine + ${caffeine.version} + diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/configuration/CachingConfiguration.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/configuration/CachingConfiguration.java new file mode 100644 index 000000000..a9566d7a2 --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/configuration/CachingConfiguration.java @@ -0,0 +1,13 @@ +package org.royllo.explorer.core.configuration; + +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Configuration; + +/** + * Caching configuration. + */ +@Configuration +@EnableCaching +public class CachingConfiguration { + +} diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/statistics/GlobalStatisticsDTO.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/statistics/GlobalStatisticsDTO.java new file mode 100644 index 000000000..b447c478a --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/statistics/GlobalStatisticsDTO.java @@ -0,0 +1,25 @@ +package org.royllo.explorer.core.dto.statistics; + +import lombok.Getter; +import lombok.ToString; +import lombok.experimental.SuperBuilder; + +/** + * Global statistics DTO. + */ +@Getter +@SuperBuilder +@ToString(callSuper = true) +@SuppressWarnings("checkstyle:VisibilityModifier") +public class GlobalStatisticsDTO { + + /** Total number of universes. */ + long universeCount; + + /** Total number of assets. */ + long assetCount; + + /** Total number of asset states. */ + long assetStateCount; + +} diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/statistics/package-info.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/statistics/package-info.java new file mode 100644 index 000000000..244ea64c4 --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/statistics/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains the DTOs for the statistics. + */ +package org.royllo.explorer.core.dto.statistics; \ No newline at end of file diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/statistics/StatisticService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/statistics/StatisticService.java new file mode 100644 index 000000000..4c02024e7 --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/statistics/StatisticService.java @@ -0,0 +1,17 @@ +package org.royllo.explorer.core.service.statistics; + +import org.royllo.explorer.core.dto.statistics.GlobalStatisticsDTO; + +/** + * Statistic service. + */ +public interface StatisticService { + + /** + * Returns the global statistics. + * + * @return the global statistics + */ + GlobalStatisticsDTO getGlobalStatistics(); + +} diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/statistics/StatisticServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/statistics/StatisticServiceImplementation.java new file mode 100644 index 000000000..724ec830b --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/statistics/StatisticServiceImplementation.java @@ -0,0 +1,47 @@ +package org.royllo.explorer.core.service.statistics; + +import lombok.RequiredArgsConstructor; +import org.royllo.explorer.core.dto.statistics.GlobalStatisticsDTO; +import org.royllo.explorer.core.repository.asset.AssetRepository; +import org.royllo.explorer.core.repository.asset.AssetStateRepository; +import org.royllo.explorer.core.repository.universe.UniverseServerRepository; +import org.royllo.explorer.core.util.base.BaseService; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; + +/** + * {@link StatisticService} implementation. + */ +@Service +@RequiredArgsConstructor +@SuppressWarnings({"checkstyle:DesignForExtension", "unused"}) +public class StatisticServiceImplementation extends BaseService implements StatisticService { + + /** Universe server repository. */ + private final UniverseServerRepository universeServerRepository; + + /** Asset repository. */ + private final AssetRepository assetRepository; + + /** Asset state repository. */ + private final AssetStateRepository assetStateRepository; + + @Override + @Cacheable("globalStatistics") + public GlobalStatisticsDTO getGlobalStatistics() { + return GlobalStatisticsDTO.builder() + .universeCount(universeServerRepository.count()) + .assetCount(assetRepository.count()) + .assetStateCount(assetStateRepository.count()) + .build(); + } + + @Scheduled(fixedDelayString = "PT1H") + @CacheEvict(value = "globalStatistics", allEntries = true) + public void evictStatisticsCache() { + logger.info("Clearing global statistics cache."); + } + +} diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/statistics/package-info.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/statistics/package-info.java new file mode 100644 index 000000000..ad6ce0f89 --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/statistics/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains the service classes for the statistics module. + */ +package org.royllo.explorer.core.service.statistics; \ No newline at end of file diff --git a/backend/explorer-core/autoconfigure/src/main/resources/application.properties b/backend/explorer-core/autoconfigure/src/main/resources/application.properties index 840ca75cc..9089578f7 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/application.properties +++ b/backend/explorer-core/autoconfigure/src/main/resources/application.properties @@ -15,6 +15,10 @@ spring.datasource.username=sa spring.datasource.password= # # ====================================================================================================================== +# Cache configuration. +spring.cache.type=caffeine +# +# ====================================================================================================================== # Mempool configuration (testnet). mempool.api.base-url=https://mempool.space/testnet/api # diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/StatisticServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/StatisticServiceTest.java new file mode 100644 index 000000000..9ceaa11a5 --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/StatisticServiceTest.java @@ -0,0 +1,68 @@ +package org.royllo.explorer.core.test.core.service; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.royllo.explorer.core.dto.statistics.GlobalStatisticsDTO; +import org.royllo.explorer.core.repository.asset.AssetRepository; +import org.royllo.explorer.core.repository.asset.AssetStateRepository; +import org.royllo.explorer.core.repository.universe.UniverseServerRepository; +import org.royllo.explorer.core.service.statistics.StatisticServiceImplementation; +import org.royllo.explorer.core.service.universe.UniverseServerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@SpringBootTest +@DisplayName("StatisticService tests") +public class StatisticServiceTest { + + @Autowired + UniverseServerRepository universeServerRepository; + + @Autowired + AssetRepository assetRepository; + + @Autowired + AssetStateRepository assetStateRepository; + + @Autowired + UniverseServerService universeServerService; + + @Autowired + StatisticServiceImplementation statisticService; + + @Test + @DisplayName("getGlobalStatistics()") + public void getGlobalStatistics() { + // Initial values of statistics. + long initialUniverseCount = universeServerRepository.count(); + long initialAssetCount = assetRepository.count(); + long initialAssetStateCount = assetStateRepository.count(); + + // We get the statistics from the database. + GlobalStatisticsDTO globalStatistics = statisticService.getGlobalStatistics(); + assertEquals(initialUniverseCount, globalStatistics.getUniverseCount()); + assertEquals(initialAssetCount, globalStatistics.getAssetCount()); + assertEquals(initialAssetStateCount, globalStatistics.getAssetStateCount()); + + // We add a new universe server. + universeServerService.addUniverseServer("1.1.1.1"); + + // We added a universe server => the statistics should not be updated as we have cache. + globalStatistics = statisticService.getGlobalStatistics(); + assertEquals(initialUniverseCount, globalStatistics.getUniverseCount()); + assertEquals(initialAssetCount, globalStatistics.getAssetCount()); + assertEquals(initialAssetStateCount, globalStatistics.getAssetStateCount()); + + // We clear the cache. + statisticService.evictStatisticsCache(); + + // We should now see the universe server we added. + globalStatistics = statisticService.getGlobalStatistics(); + assertEquals(initialUniverseCount + 1, globalStatistics.getUniverseCount()); + assertEquals(initialAssetCount, globalStatistics.getAssetCount()); + assertEquals(initialAssetStateCount, globalStatistics.getAssetStateCount()); + } + +} diff --git a/backend/explorer-core/autoconfigure/src/test/resources/application.properties b/backend/explorer-core/autoconfigure/src/test/resources/application.properties index 0f823b920..d9a9a82b9 100644 --- a/backend/explorer-core/autoconfigure/src/test/resources/application.properties +++ b/backend/explorer-core/autoconfigure/src/test/resources/application.properties @@ -10,6 +10,10 @@ spring.datasource.username=sa spring.datasource.password= # # ====================================================================================================================== +# Cache configuration. +spring.cache.type=caffeine +# +# ====================================================================================================================== # Mempool configuration - Using our mock server. mempool.api.base-url=http://localhost:9091/testnet/api # diff --git a/backend/servers/explorer-api/pom.xml b/backend/servers/explorer-api/pom.xml index e10873d21..72ce793b8 100644 --- a/backend/servers/explorer-api/pom.xml +++ b/backend/servers/explorer-api/pom.xml @@ -44,11 +44,6 @@ bucket4j-core ${bucket4j-core.version} - - com.github.ben-manes.caffeine - caffeine - ${caffeine.version} - @@ -138,9 +133,11 @@ royllo/explorer-api:latest + org.royllo.explorer.api.Application diff --git a/backend/servers/explorer-api/src/main/resources/application.properties b/backend/servers/explorer-api/src/main/resources/application.properties index 0d482bd95..5b52e49c1 100644 --- a/backend/servers/explorer-api/src/main/resources/application.properties +++ b/backend/servers/explorer-api/src/main/resources/application.properties @@ -10,6 +10,10 @@ spring.datasource.username=sa spring.datasource.password= # # ====================================================================================================================== +# Cache configuration. +spring.cache.type=caffeine +# +# ====================================================================================================================== # Mempool configuration (testnet). mempool.api.base-url=https://mempool.space/testnet/api # diff --git a/backend/servers/explorer-batch/pom.xml b/backend/servers/explorer-batch/pom.xml index 8adaf2d77..61b320d18 100644 --- a/backend/servers/explorer-batch/pom.xml +++ b/backend/servers/explorer-batch/pom.xml @@ -110,9 +110,11 @@ royllo/explorer-batch:latest + org.royllo.explorer.batch.Application diff --git a/backend/servers/explorer-batch/src/main/resources/application.properties b/backend/servers/explorer-batch/src/main/resources/application.properties index 1d85518b0..ac5a3dd7d 100644 --- a/backend/servers/explorer-batch/src/main/resources/application.properties +++ b/backend/servers/explorer-batch/src/main/resources/application.properties @@ -10,6 +10,10 @@ spring.datasource.username=sa spring.datasource.password= # # ====================================================================================================================== +# Cache configuration. +spring.cache.type=caffeine +# +# ====================================================================================================================== # Mempool configuration (testnet). mempool.api.base-url=https://mempool.space/testnet/api # diff --git a/backend/servers/explorer-web/pom.xml b/backend/servers/explorer-web/pom.xml index da5a6d280..4b43d544a 100644 --- a/backend/servers/explorer-web/pom.xml +++ b/backend/servers/explorer-web/pom.xml @@ -53,11 +53,6 @@ bucket4j-core ${bucket4j-core.version} - - com.github.ben-manes.caffeine - caffeine - ${caffeine.version} - @@ -130,9 +125,11 @@ royllo/explorer-web:latest + org.royllo.explorer.web.Application diff --git a/backend/servers/explorer-web/src/main/resources/application.properties b/backend/servers/explorer-web/src/main/resources/application.properties index e89ef3e75..56a62b70e 100644 --- a/backend/servers/explorer-web/src/main/resources/application.properties +++ b/backend/servers/explorer-web/src/main/resources/application.properties @@ -15,6 +15,10 @@ spring.datasource.username=sa spring.datasource.password= # # ====================================================================================================================== +# Cache configuration. +spring.cache.type=caffeine +# +# ====================================================================================================================== # Mempool configuration (testnet). mempool.api.base-url=https://mempool.space/testnet/api # diff --git a/backend/servers/explorer-web/src/test/resources/application.properties b/backend/servers/explorer-web/src/test/resources/application.properties index 213f97045..d9ef1ce86 100644 --- a/backend/servers/explorer-web/src/test/resources/application.properties +++ b/backend/servers/explorer-web/src/test/resources/application.properties @@ -15,6 +15,10 @@ spring.datasource.username=sa spring.datasource.password= # # ====================================================================================================================== +# Cache configuration. +spring.cache.type=caffeine +# +# ====================================================================================================================== # Mempool configuration (testnet). mempool.api.base-url=https://mempool.space/testnet/api # From 7080ce1d35b8a7fddbc1033c38ef207970d43a0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Dec 2023 19:04:39 +0000 Subject: [PATCH 15/57] Bump com.squareup.okhttp3:okhttp from 5.0.0-alpha.11 to 5.0.0-alpha.12 Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 5.0.0-alpha.11 to 5.0.0-alpha.12. - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okhttp/compare/jesse-5.0.0-alpha.11...parent-5.0.0-alpha.12) --- updated-dependencies: - dependency-name: com.squareup.okhttp3:okhttp dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- util/test/common-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/test/common-test/pom.xml b/util/test/common-test/pom.xml index 847603585..48b44c9f3 100644 --- a/util/test/common-test/pom.xml +++ b/util/test/common-test/pom.xml @@ -72,7 +72,7 @@ com.squareup.okhttp3 okhttp - 5.0.0-alpha.11 + 5.0.0-alpha.12 From b9678c51f7f9b36f6bc782517eb309cd38a7602b Mon Sep 17 00:00:00 2001 From: straumat Date: Sun, 17 Dec 2023 21:45:55 +0100 Subject: [PATCH 16/57] Global statistics added to homepage --- .../web/configuration/WebConfiguration.java | 3 ++- .../web/controller/HomeController.java | 10 +++++++ .../util/constants/HomePagesConstants.java | 2 ++ .../src/main/resources/i18n/html.properties | 2 +- .../main/resources/i18n/statistic.properties | 7 +++++ .../src/main/resources/templates/home.html | 5 ++++ .../components/global_statistics.html | 18 +++++++++++++ .../fragments/layouts/default/header.html | 2 +- .../search/HomeControllerTest.java | 26 +++++++++++++++++++ 9 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 backend/servers/explorer-web/src/main/resources/i18n/statistic.properties create mode 100644 backend/servers/explorer-web/src/main/resources/templates/util/fragments/components/global_statistics.html diff --git a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/configuration/WebConfiguration.java b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/configuration/WebConfiguration.java index 5b11cc437..430a67c9b 100644 --- a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/configuration/WebConfiguration.java +++ b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/configuration/WebConfiguration.java @@ -61,7 +61,8 @@ public MessageSource messageSource() { "classpath:/i18n/asset", "classpath:/i18n/html", "classpath:/i18n/request", - "classpath:/i18n/search" + "classpath:/i18n/search", + "classpath:/i18n/statistic" ); messageSource.setDefaultEncoding("UTF-8"); return messageSource; diff --git a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/controller/HomeController.java b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/controller/HomeController.java index fd1259e2c..810452645 100644 --- a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/controller/HomeController.java +++ b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/controller/HomeController.java @@ -1,12 +1,15 @@ package org.royllo.explorer.web.controller; import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import org.royllo.explorer.core.service.statistics.StatisticService; import org.royllo.explorer.web.util.base.BaseController; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import static org.royllo.explorer.web.util.constants.HomePagesConstants.GLOBAL_STATISTICS_ATTRIBUTE; import static org.royllo.explorer.web.util.constants.HomePagesConstants.HOME_PAGE; import static org.royllo.explorer.web.util.constants.ModelAttributeConstants.QUERY_ATTRIBUTE; @@ -14,8 +17,12 @@ * Home page controller. */ @Controller +@RequiredArgsConstructor public class HomeController extends BaseController { + /** Statistic service. */ + private final StatisticService statisticService; + /** * Page displaying home. * @@ -32,6 +39,9 @@ public String home(final Model model, // Update the model with the query. model.addAttribute(QUERY_ATTRIBUTE, query); + // Add the statistics to the model. + model.addAttribute(GLOBAL_STATISTICS_ATTRIBUTE, statisticService.getGlobalStatistics()); + return getPageOrFragment(request, HOME_PAGE); } diff --git a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/util/constants/HomePagesConstants.java b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/util/constants/HomePagesConstants.java index b3e8f97b5..4d35c695e 100644 --- a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/util/constants/HomePagesConstants.java +++ b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/util/constants/HomePagesConstants.java @@ -12,4 +12,6 @@ public class HomePagesConstants { /** Home page. */ public static final String HOME_PAGE = "home"; + /** Global statistics constants. */ + public static final String GLOBAL_STATISTICS_ATTRIBUTE = "globalStatistics"; } diff --git a/backend/servers/explorer-web/src/main/resources/i18n/html.properties b/backend/servers/explorer-web/src/main/resources/i18n/html.properties index 6087a44bc..19062a3fe 100644 --- a/backend/servers/explorer-web/src/main/resources/i18n/html.properties +++ b/backend/servers/explorer-web/src/main/resources/i18n/html.properties @@ -14,7 +14,7 @@ og.image=https://explorer.royllo.org/images/open_graph/royllo.png # # ====================================================================================================================== # Home -home.message=Search for a Taproot asset like "roylloCoin". +home.message=Search for a Taproot asset like "roylloCoin" # # ====================================================================================================================== # Footer diff --git a/backend/servers/explorer-web/src/main/resources/i18n/statistic.properties b/backend/servers/explorer-web/src/main/resources/i18n/statistic.properties new file mode 100644 index 000000000..9d48f2b57 --- /dev/null +++ b/backend/servers/explorer-web/src/main/resources/i18n/statistic.properties @@ -0,0 +1,7 @@ +# ====================================================================================================================== +# Statistics +# +# Global statistics. +statistics.global.universeCount=Universe count +statistics.global.assetCount=Asset count +statistics.global.assetStateCount=Asset state count \ No newline at end of file diff --git a/backend/servers/explorer-web/src/main/resources/templates/home.html b/backend/servers/explorer-web/src/main/resources/templates/home.html index acd2cbd79..005ebd886 100644 --- a/backend/servers/explorer-web/src/main/resources/templates/home.html +++ b/backend/servers/explorer-web/src/main/resources/templates/home.html @@ -34,6 +34,11 @@ */-->
+ +
+
+
+ diff --git a/backend/servers/explorer-web/src/main/resources/templates/util/fragments/components/global_statistics.html b/backend/servers/explorer-web/src/main/resources/templates/util/fragments/components/global_statistics.html new file mode 100644 index 000000000..11d9a89b1 --- /dev/null +++ b/backend/servers/explorer-web/src/main/resources/templates/util/fragments/components/global_statistics.html @@ -0,0 +1,18 @@ +
+ +
+
+
+
+ +
+
+
+
+ +
+
New
+
+
+ +
\ No newline at end of file diff --git a/backend/servers/explorer-web/src/main/resources/templates/util/fragments/layouts/default/header.html b/backend/servers/explorer-web/src/main/resources/templates/util/fragments/layouts/default/header.html index cf62430e7..32b3a6e89 100644 --- a/backend/servers/explorer-web/src/main/resources/templates/util/fragments/layouts/default/header.html +++ b/backend/servers/explorer-web/src/main/resources/templates/util/fragments/layouts/default/header.html @@ -17,7 +17,7 @@ -
+
diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/HomeControllerTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/HomeControllerTest.java index 4c0141d93..3ec6ab58e 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/HomeControllerTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/HomeControllerTest.java @@ -4,6 +4,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; +import org.royllo.explorer.core.repository.asset.AssetRepository; +import org.royllo.explorer.core.repository.asset.AssetStateRepository; +import org.royllo.explorer.core.repository.universe.UniverseServerRepository; import org.royllo.explorer.web.test.util.BaseTest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; @@ -32,6 +35,15 @@ public class HomeControllerTest extends BaseTest { @Autowired MessageSource messages; + @Autowired + UniverseServerRepository universeServerRepository; + + @Autowired + AssetRepository assetRepository; + + @Autowired + AssetStateRepository assetStateRepository; + @Test @DisplayName("Display home page") void homePage() throws Exception { @@ -50,6 +62,13 @@ void homePage() throws Exception { .andExpect(content().string(containsString("value=\"\""))) // Checking the message on the homepage. .andExpect(content().string(containsString(getMessage(messages, "home.message")))) + // Checking the statistics are here. + .andExpect(content().string(containsString(getMessage(messages, "statistics.global.universeCount")))) + .andExpect(content().string(containsString(">" + universeServerRepository.count() + "<"))) + .andExpect(content().string(containsString(getMessage(messages, "statistics.global.assetCount")))) + .andExpect(content().string(containsString(">" + assetRepository.count() + "<"))) + .andExpect(content().string(containsString(getMessage(messages, "statistics.global.assetStateCount")))) + .andExpect(content().string(containsString(">" + assetStateRepository.count() + "<"))) // Checking the footer is here. .andExpect(content().string(containsString("https://www.royllo.org"))) .andExpect(content().string(containsString("http://localhost:9090/api"))) @@ -76,6 +95,13 @@ void homePageFragment() throws Exception { .andExpect(content().string(containsString("value=\"\""))) // Checking the message on the homepage. .andExpect(content().string(containsString(getMessage(messages, "home.message")))) + // Checking the statistics are here. + .andExpect(content().string(containsString(getMessage(messages, "statistics.global.universeCount")))) + .andExpect(content().string(containsString(">" + universeServerRepository.count() + "<"))) + .andExpect(content().string(containsString(getMessage(messages, "statistics.global.assetCount")))) + .andExpect(content().string(containsString(">" + assetRepository.count() + "<"))) + .andExpect(content().string(containsString(getMessage(messages, "statistics.global.assetStateCount")))) + .andExpect(content().string(containsString(">" + assetStateRepository.count() + "<"))) // Checking the footer is NOT RETURNED. .andExpect(content().string(not(containsString("https://www.royllo.org")))) .andExpect(content().string(not(containsString("http://localhost:9090/api")))) From a2fff02241df352645f4360697d9ce5337cb9ac4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:49:36 +0000 Subject: [PATCH 17/57] Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- util/test/common-test/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 941f4754b..4658188c5 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 3.3.1 1.50 10.12.6 - 3.11.0 + 3.12.0 3.3.0 3.3.1 diff --git a/util/test/common-test/pom.xml b/util/test/common-test/pom.xml index 48b44c9f3..17bc7c844 100644 --- a/util/test/common-test/pom.xml +++ b/util/test/common-test/pom.xml @@ -125,7 +125,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.0 -Xlint:unchecked 17 From 611b34f88bac89ab35549c9f053d5ca7ca92e45c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:49:49 +0000 Subject: [PATCH 18/57] Bump org.liquibase:liquibase-core from 4.25.0 to 4.25.1 Bumps [org.liquibase:liquibase-core](https://github.com/liquibase/liquibase) from 4.25.0 to 4.25.1. - [Release notes](https://github.com/liquibase/liquibase/releases) - [Changelog](https://github.com/liquibase/liquibase/blob/v4.25.1/changelog.txt) - [Commits](https://github.com/liquibase/liquibase/compare/v4.25.0...v4.25.1) --- updated-dependencies: - dependency-name: org.liquibase:liquibase-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 941f4754b..d45e587ee 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 6.1.1 5.1.17 - 4.25.0 + 4.25.1 2.7.2 42.7.1 8.2.0 From 7ba992fc02c2de271fb7830eb51f2ad7f695209e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:51:24 +0000 Subject: [PATCH 19/57] Bump tailwindcss from 3.3.6 to 3.3.7 in /backend/servers/explorer-web Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.3.6 to 3.3.7. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/v3.3.7/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.3.6...v3.3.7) --- updated-dependencies: - dependency-name: tailwindcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- backend/servers/explorer-web/package-lock.json | 14 +++++++------- backend/servers/explorer-web/package.json | 2 +- backend/servers/explorer-web/yarn.lock | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/backend/servers/explorer-web/package-lock.json b/backend/servers/explorer-web/package-lock.json index 1617a254a..9f2a25a89 100644 --- a/backend/servers/explorer-web/package-lock.json +++ b/backend/servers/explorer-web/package-lock.json @@ -20,7 +20,7 @@ "onchange": "^7.1.0", "postcss": "^8.4.32", "postcss-cli": "^11.0.0", - "tailwindcss": "^3.3.6" + "tailwindcss": "^3.3.7" } }, "node_modules/@alloc/quick-lru": { @@ -4459,9 +4459,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.6.tgz", - "integrity": "sha512-AKjF7qbbLvLaPieoKeTjG1+FyNZT6KaJMJPFeQyLfIp7l82ggH1fbHJSsYIvnbTFQOlkh+gBYpyby5GT1LIdLw==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.7.tgz", + "integrity": "sha512-pjgQxDZPvyS/nG3ZYkyCvsbONJl7GdOejfm24iMt2ElYQQw8Jc4p0m8RdMp7mznPD0kUhfzwV3zAwa80qI0zmQ==", "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", @@ -8079,9 +8079,9 @@ } }, "tailwindcss": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.6.tgz", - "integrity": "sha512-AKjF7qbbLvLaPieoKeTjG1+FyNZT6KaJMJPFeQyLfIp7l82ggH1fbHJSsYIvnbTFQOlkh+gBYpyby5GT1LIdLw==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.7.tgz", + "integrity": "sha512-pjgQxDZPvyS/nG3ZYkyCvsbONJl7GdOejfm24iMt2ElYQQw8Jc4p0m8RdMp7mznPD0kUhfzwV3zAwa80qI0zmQ==", "requires": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", diff --git a/backend/servers/explorer-web/package.json b/backend/servers/explorer-web/package.json index bb5f35c7c..8776cb783 100644 --- a/backend/servers/explorer-web/package.json +++ b/backend/servers/explorer-web/package.json @@ -27,7 +27,7 @@ "onchange": "^7.1.0", "postcss": "^8.4.32", "postcss-cli": "^11.0.0", - "tailwindcss": "^3.3.6" + "tailwindcss": "^3.3.7" }, "dependencies": { "@tailwindcss/forms": "^0.5.7" diff --git a/backend/servers/explorer-web/yarn.lock b/backend/servers/explorer-web/yarn.lock index efddc406e..adf6b73b5 100644 --- a/backend/servers/explorer-web/yarn.lock +++ b/backend/servers/explorer-web/yarn.lock @@ -2455,10 +2455,10 @@ svgo@^3.0.5: csso "5.0.5" picocolors "^1.0.0" -tailwindcss@^3.3.6: - version "3.3.6" - resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.6.tgz" - integrity sha512-AKjF7qbbLvLaPieoKeTjG1+FyNZT6KaJMJPFeQyLfIp7l82ggH1fbHJSsYIvnbTFQOlkh+gBYpyby5GT1LIdLw== +tailwindcss@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.7.tgz#9e3c0cb7c6867b4cda4557a447bd2bb6fe20c6fa" + integrity sha512-pjgQxDZPvyS/nG3ZYkyCvsbONJl7GdOejfm24iMt2ElYQQw8Jc4p0m8RdMp7mznPD0kUhfzwV3zAwa80qI0zmQ== dependencies: "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" From 6550b6659cc1c777754b181cef2618dbe87719c2 Mon Sep 17 00:00:00 2001 From: straumat Date: Wed, 20 Dec 2023 09:19:42 +0100 Subject: [PATCH 20/57] Manage meta_reveal field --- .../tapd/asset/DecodedProofValueResponse.java | 27 ++++++++++++++++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 2 +- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 6 ++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 6 ++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 6 ++++- ...roof-proofFile2-proofAtDepth0-request.json | 2 +- ...oof-proofFile2-proofAtDepth0-response.json | 6 ++++- ...roof-proofFile3-proofAtDepth0-request.json | 2 +- ...oof-proofFile3-proofAtDepth0-response.json | 6 ++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 6 ++++- ...roof-proofFile2-proofAtDepth1-request.json | 2 +- ...oof-proofFile2-proofAtDepth1-response.json | 6 ++++- ...roof-proofFile3-proofAtDepth2-request.json | 2 +- ...oof-proofFile3-proofAtDepth2-response.json | 6 ++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 6 ++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 6 ++++- ...roof-proofFile1-proofAtDepth0-request.json | 2 +- ...oof-proofFile1-proofAtDepth0-response.json | 6 ++++- .../java/org/royllo/test/TapdDataTest.java | 7 +++++ 26 files changed, 101 insertions(+), 25 deletions(-) diff --git a/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java b/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java index cd2177c09..efc329c57 100644 --- a/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java +++ b/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java @@ -56,7 +56,11 @@ public static class DecodedProof { @JsonProperty("asset") Asset asset; - /** Transaction merkle proof. */ + /** The reveal meta-data associated with the proof, if available. */ + @JsonProperty("meta_reveal") + Asset.MetaReveal metaReveal; + + /** The merkle proof for AnchorTx used to prove its inclusion within BlockHeader. */ @JsonProperty("tx_merkle_proof") String txMerkleProof; @@ -185,6 +189,27 @@ public String getAssetStateId() { } } + @Getter + @Setter + @NoArgsConstructor + @ToString + @JsonIgnoreProperties(ignoreUnknown = true) + public static class MetaReveal { + + /** The raw data of the asset meta-data. Based on the type below, this may be structured data such as a text file or PDF. The size of the data is limited to 1MiB. */ + @JsonProperty("data") + private String data; + + /** The type of the meta-data. */ + @JsonProperty("type") + private String type; + + /** The hash of the meta. This is the hash of the TLV serialization of the meta itself. */ + @JsonProperty("meta_hash") + private String metaHash; + + } + @Getter @Setter @NoArgsConstructor diff --git a/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-request.json index 752484fe0..78fcc2b01 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-request.json +++ b/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-request.json @@ -2,5 +2,5 @@ "raw_proof": "INVALID_PROOF", "proof_at_depth": 0, "with_prev_witnesses": true, - "with_meta_reveal": false + "with_meta_reveal": true } \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-response.json index 6e515944e..84aa31523 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-response.json +++ b/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-response.json @@ -1,5 +1,5 @@ { "code": 3, - "message": "proto: (line 1:17): invalid value for bytes type: \"INVALID_PROOF\"", + "message": "proto: (line 1:17): invalid value for bytes type: \"INVALID_PROOF\"", "details": [] } diff --git a/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json index 19d9d5b81..7c03124d5 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json +++ b/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json @@ -2,5 +2,5 @@ "raw_proof": "544150460000000001fd054e544150500004000000000224cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd20000000404500060da25a5c4ac850d9b2bb53264a39577ad4b37b5b6e356adb502000000000000000000a82669d71121cb48e9687c782551e0063c0552f8e9bf499d5b6100b8df1575284d365265125a041746cca20f06f702000000000101cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd20400000000ffffffff02e8030000000000002251200e7b1c167645f8fea7d7d52d9fd2655822d53e9f56e7ce5261635955d18906f1542e040000000000225120350e820feb4e9ae48a0f6281f7aebc64434132302cd204f71bb0d53f5e8fdf600248304502210094efb25003c9ced0c59a50c486f34351f23fcf72d5994b788e21be14e0d7e91f02203b1101052c06ca423891bcef245857e0073137a4d9eb62fcc0cde6c28a5becfc012103a23aa11f7f890650feaf48f09006d9c3e800f37b5b48c47dcfef27e7554cd5900000000008fd01830c6a7ccb693cd1d079239846914c0f6321988a3ab9efe6265191669bcb74c487f005e70b97110aa74310d5758156a887b8a1cfe6034ed8d2b4afba0ef89d3d0c1bb18c04cfe7fbc25a72fc5f9298c19f8e2d0ee5a127c5244f66a6edbc29df1c3764deda4f5dbcf2aad84cece706a48d1ead1aff3c3a54cf651c5803c710e697208b453cf2d5d65fb39948b24709616e6ce502ba78c72dc48f732608ec17af1109980f804c959933be7c02b6b1491a40a9182cf1b5f9b7bb3a8b5eeffad7dcc72bbc3c649ec93c31c5b0acff3a4275edf9e95046a9911276ec256ff3410bdfc513aeab02ad7ab1d0bda062fb9ff3828a367139363265ac7b96076018dcddc4c64f2ae2be52f40637b6c75d7d1b8d62316aabd2948da02e5e61988615faa014c78b1defa9f97f3897ae8d0f27a0ef87f87af2f153f15f27ba3dd35a65dc4743b7570bf824800d0451c3d7b7f0619176a6b13655380a272c06925ecf77508e70e578c6fb76a872f68b0832f60b124b9aedcee1596bc5692b1cf02c7fcd60dfd0bca5cf0b0af50001000254cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd2000000040a726f796c6c6f436f696ee08c74d75554e2c9d6d8452a3584d191f8727963b05e497bba84ada8ae82920800000000000401000605fe000186a00b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e020000102102fe0898805795bd2b698c8819ea3bfcbf1c7aa2330d0f7228723899b825848ee60c9f00040000000002210215305a361d0919c3be1a756ec45514feff098ddeb5b2731c4bf8068e19a69de903740149000100022024a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e00040000000102210238636cf0d229ba3c9c46e2d832db0f41a827de003ff5a16edc0611e1b71806f105030401011124000100021f726f796c6c6f436f696e206f6e206d61696e6e657420627920526f796c6c6f1604000c75e21754cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd2000000040a726f796c6c6f436f696ee08c74d75554e2c9d6d8452a3584d191f8727963b05e497bba84ada8ae82920800000000004ef51f2a52c89668c2bb425dbe7c89d7f6dc9f1869635a80a2e13bf4d3d085e9", "proof_at_depth": 0, "with_prev_witnesses": true, - "with_meta_reveal": false + "with_meta_reveal": true } \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json index 097ad5208..2a9d0da98 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json +++ b/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json @@ -46,7 +46,11 @@ "lease_expiry": "0", "is_burn": false }, - "meta_reveal": null, + "meta_reveal": { + "data": "726f796c6c6f436f696e206f6e206d61696e6e657420627920526f796c6c6f", + "type": "META_TYPE_OPAQUE", + "meta_hash": "e08c74d75554e2c9d6d8452a3584d191f8727963b05e497bba84ada8ae829208" + }, "tx_merkle_proof": "0c6a7ccb693cd1d079239846914c0f6321988a3ab9efe6265191669bcb74c487f005e70b97110aa74310d5758156a887b8a1cfe6034ed8d2b4afba0ef89d3d0c1bb18c04cfe7fbc25a72fc5f9298c19f8e2d0ee5a127c5244f66a6edbc29df1c3764deda4f5dbcf2aad84cece706a48d1ead1aff3c3a54cf651c5803c710e697208b453cf2d5d65fb39948b24709616e6ce502ba78c72dc48f732608ec17af1109980f804c959933be7c02b6b1491a40a9182cf1b5f9b7bb3a8b5eeffad7dcc72bbc3c649ec93c31c5b0acff3a4275edf9e95046a9911276ec256ff3410bdfc513aeab02ad7ab1d0bda062fb9ff3828a367139363265ac7b96076018dcddc4c64f2ae2be52f40637b6c75d7d1b8d62316aabd2948da02e5e61988615faa014c78b1defa9f97f3897ae8d0f27a0ef87f87af2f153f15f27ba3dd35a65dc4743b7570bf824800d0451c3d7b7f0619176a6b13655380a272c06925ecf77508e70e578c6fb76a872f68b0832f60b124b9aedcee1596bc5692b1cf02c7fcd60dfd0bca5cf0b", "inclusion_proof": "00040000000002210215305a361d0919c3be1a756ec45514feff098ddeb5b2731c4bf8068e19a69de903740149000100022024a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "exclusion_proofs": [ diff --git a/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json index cb7230a41..807379a2d 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json +++ b/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json @@ -2,5 +2,5 @@ "raw_proof": "544150460000000001fd044f544150500004000000000224c7d9b3d5ba2bd02625c8db243157726517982d79da366d9c49ac366b58428ac200000001045000404c26ab895241cab30f73e269d547a15cf47dc4d32e590c58a0e03300000000000000411da01ab0367a8b76b9762432536d24a90dbba835f82f083ee517d992ccbd2f68903165ffff001d012a4d4e06cd02000000000101c7d9b3d5ba2bd02625c8db243157726517982d79da366d9c49ac366b58428ac20100000000ffffffff02e8030000000000002251200abf9c151df80edc22d2fd1b8c0dcd07dcdda6e859cdcb513102d50cc5cbfdfecbaf100000000000225120d9c5d97fb55abcdf85102d90fb4c7b76d9f1656ae900d3127c861d0e814fa699014035721b41acdd8960274338bfa9ec0c5bb7627ee8b089607a17a66b98247203c2dd34ac0db9f30b24aaf8a7b9091223d49971d38e8f6a62af3f1d72cc77118b260000000008c206c5e3e5655b34f206b2d585164027205db435c9247da0d879e3a24e3c94122b95d6cada816f37904258e125211f84dc0f0cd5f3352b8d9fac3eb1df4700cc970a16014e73d4cc2896d7f4f0511a70a9ace483be4c310ca922ea0aea9298a645ce670140fe73e9c733a7a53673c9de8a73285072b671d8220cd838249853fd914c586d23a902388394972f1bb1510ce665f94b483b71457e18f95f4a206aaedaa8dc918cd64121fdbbc1e7ec0695411090ca8d7ebd8925f1ad88a27b9b39161ee3350af00001000253c7d9b3d5ba2bd02625c8db243157726517982d79da366d9c49ac366b58428ac20000000109726f796c6c6f4e465430ae42839b3e9022afee9193d3ad170ab280a96b1543847d281bf0e46ffc933600000000010401010601010b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e020000102102368d08b148b5a0867e38a1187f9fb4ab0a36c21159502e701beafc8cdda1dec90c9f0004000000000221033b8449aae83eb0ed04f7952108637d078836bb5d3353a33b6486248b401f60da03740149000100022089c9d3ff7cb9dbc4615f854f7127e94db10edd430f8bcf82d7309d0c8b75005104220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221023b5987e9f7c02c2502ce518a6b0f5cc18aae4579a45268105c0b2d0d1c324e95050304010111180001000213726f796c6c6f4e465420627920526f796c6c6f16040026ab5e1753c7d9b3d5ba2bd02625c8db243157726517982d79da366d9c49ac366b58428ac20000000109726f796c6c6f4e465430ae42839b3e9022afee9193d3ad170ab280a96b1543847d281bf0e46ffc9336000000000101f9793e346f85ade2877a5ef0679ef4640895b51317862bcb9b222ba62332da", "proof_at_depth": 0, "with_prev_witnesses": true, - "with_meta_reveal": false + "with_meta_reveal": true } \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json index ac9854dbe..40ab4cc92 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json +++ b/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json @@ -46,7 +46,11 @@ "lease_expiry": "0", "is_burn": false }, - "meta_reveal": null, + "meta_reveal": { + "data": "726f796c6c6f4e465420627920526f796c6c6f", + "type": "META_TYPE_OPAQUE", + "meta_hash": "30ae42839b3e9022afee9193d3ad170ab280a96b1543847d281bf0e46ffc9336" + }, "tx_merkle_proof": "06c5e3e5655b34f206b2d585164027205db435c9247da0d879e3a24e3c94122b95d6cada816f37904258e125211f84dc0f0cd5f3352b8d9fac3eb1df4700cc970a16014e73d4cc2896d7f4f0511a70a9ace483be4c310ca922ea0aea9298a645ce670140fe73e9c733a7a53673c9de8a73285072b671d8220cd838249853fd914c586d23a902388394972f1bb1510ce665f94b483b71457e18f95f4a206aaedaa8dc918cd64121fdbbc1e7ec0695411090ca8d7ebd8925f1ad88a27b9b39161ee335", "inclusion_proof": "0004000000000221033b8449aae83eb0ed04f7952108637d078836bb5d3353a33b6486248b401f60da03740149000100022089c9d3ff7cb9dbc4615f854f7127e94db10edd430f8bcf82d7309d0c8b75005104220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "exclusion_proofs": [ diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json index 3bd38471a..abeb4170b 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json +++ b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json @@ -2,5 +2,5 @@ "raw_proof": "544150460000000001fd055a544150500004000000000224900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010450008004326ab5c17f2ded3596b047247d63f70a33f70446c9096dc4982000000000000000ef61438cd2c2405693b046c63c514df4a47f5db553b5e20cc48c86d1b41c4d6c6a3032655f293b194efac01206cd02000000000101900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d0100000000ffffffff02e803000000000000225120d6484a40e7a0c5bcb5a958bd6251554feee22c1c94b0c058d7891105b34f309b0ba7100000000000225120c746196e62f7e88c99a96fab48967d38c58dcd415ccc87a51b5bd96fcf34de840140ae44a092025c5c182a52f0b542489395196b147b6b908f220205a562b86de46a2fd83770100e8aa5f775496c518ec3be8846fcc727cc3467adc8eb149cc767790000000008e207e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e0afd015c0001000258900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010e7365744f66526f796c6c6f4e46545d24eb6c3942d4919bdf6aa059ccd193afcbace8cfaf3cf9138ad43cafadc38e00000000010401010601010bad01ab0165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003420140b21995d3080a44a6402faddc4c8976e50c72230a811754f9f2656072cc1d95bfb15fa1e937ad6381ecfb3bcd821ffef583aeb90b08b8e47d5dc51e2c932a7b510e0200001021022dd926192ebdfd038b85ae326efd0ee3919c435da9e1d43186f994706cf245081121039511fd8c1f51acfbd85d9d742268d1ca03ce3b69d0436e71130192c085394c990cef000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b03c4019900010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a04720002e9c90ee43476c7623bd5392f7197c8ac6a7f1eabb535264e515e82dbdc16d1b800000000000000017e079338ba0a60e64b794492e39e4a10ce06083578677aa95b6c6c9a373cc6dc0000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e000400000001022102f202542e41672bec22302c29d8e002c953c9c9abb1c4f8cdeefd1e075753e3060503040101111d00010002187365744f66526f796c6c6f4e465420627920526f796c6c6f16040026abaf1758900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010e7365744f66526f796c6c6f4e46545d24eb6c3942d4919bdf6aa059ccd193afcbace8cfaf3cf9138ad43cafadc38e0000000001192102575af07788bda54cc640cfb9b05ad0a621c171e8c581e12e4cbdf3d2d7b8da8241765d6ecc379d1595d8af0fff01fab52a0675e56d4e8dfa4cf197884739d20a", "proof_at_depth": 0, "with_prev_witnesses": true, - "with_meta_reveal": false + "with_meta_reveal": true } \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json index 46384ee1e..4af38be02 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json +++ b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json @@ -52,7 +52,11 @@ "lease_expiry": "0", "is_burn": false }, - "meta_reveal": null, + "meta_reveal": { + "data": "7365744f66526f796c6c6f4e465420627920526f796c6c6f", + "type": "META_TYPE_OPAQUE", + "meta_hash": "5d24eb6c3942d4919bdf6aa059ccd193afcbace8cfaf3cf9138ad43cafadc38e" + }, "tx_merkle_proof": "07e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e", "inclusion_proof": "000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b03c4019900010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a04720002e9c90ee43476c7623bd5392f7197c8ac6a7f1eabb535264e515e82dbdc16d1b800000000000000017e079338ba0a60e64b794492e39e4a10ce06083578677aa95b6c6c9a373cc6dc0000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "exclusion_proofs": [ diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-request.json index c8e2c65e0..1f108cea8 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-request.json +++ b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-request.json @@ -2,5 +2,5 @@ "raw_proof": "544150460000000001fd053a544150500004000000000224900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010450008004326ab5c17f2ded3596b047247d63f70a33f70446c9096dc4982000000000000000ef61438cd2c2405693b046c63c514df4a47f5db553b5e20cc48c86d1b41c4d6c6a3032655f293b194efac01206cd02000000000101900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d0100000000ffffffff02e803000000000000225120d6484a40e7a0c5bcb5a958bd6251554feee22c1c94b0c058d7891105b34f309b0ba7100000000000225120c746196e62f7e88c99a96fab48967d38c58dcd415ccc87a51b5bd96fcf34de840140ae44a092025c5c182a52f0b542489395196b147b6b908f220205a562b86de46a2fd83770100e8aa5f775496c518ec3be8846fcc727cc3467adc8eb149cc767790000000008e207e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e0afd015d0001000259900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010f7365744f66526f796c6c6f4e465432512dfac35a94760baf3dbd6682e3cd0d5cf4f3f8cc5b881931f73ed3a820c2a400000000010401010601010bad01ab01650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034201409a8b780e6e9fc9cb85424fdbdb0c86563ab4229007a572109baf7e4ef78419ed7fdeb8801a6e8811e70a64ab09376fbcb5e04cda5cc8a286b3bd679859bc02670e02000010210217c46686156f732035981526ea4f7e4cf5055fbdb6eeaa0254ea2b111b69328e1121039511fd8c1f51acfbd85d9d742268d1ca03ce3b69d0436e71130192c085394c990cef000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b03c4019900010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a04720002b3cd0b6af8976c1d9979ac0b63f85965e1cca16e9686b2406dfb063daf54140c00000000000000017e079338ba0a60e64b794492e39e4a10ce06083578677aa95b6c6c9a373cc6dc0000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e000400000001022102f202542e41672bec22302c29d8e002c953c9c9abb1c4f8cdeefd1e075753e3060503040101111e00010002197365744f66526f796c6c6f4e46543220627920526f796c6c6f16040026abaf1759900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010f7365744f66526f796c6c6f4e465432512dfac35a94760baf3dbd6682e3cd0d5cf4f3f8cc5b881931f73ed3a820c2a40000000001cd5aec6f7e1b80b906b4dcc157252585e1237fbc39e4635514fbbfe7992c10da", "proof_at_depth": 0, "with_prev_witnesses": true, - "with_meta_reveal": false + "with_meta_reveal": true } \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-response.json index 1551f52ff..6686c4101 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-response.json +++ b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-response.json @@ -52,7 +52,11 @@ "lease_expiry": "0", "is_burn": false }, - "meta_reveal": null, + "meta_reveal": { + "data": "7365744f66526f796c6c6f4e46543220627920526f796c6c6f", + "type": "META_TYPE_OPAQUE", + "meta_hash": "512dfac35a94760baf3dbd6682e3cd0d5cf4f3f8cc5b881931f73ed3a820c2a4" + }, "tx_merkle_proof": "07e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e", "inclusion_proof": "000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b03c4019900010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a04720002b3cd0b6af8976c1d9979ac0b63f85965e1cca16e9686b2406dfb063daf54140c00000000000000017e079338ba0a60e64b794492e39e4a10ce06083578677aa95b6c6c9a373cc6dc0000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "exclusion_proofs": [ diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-request.json index 67c52f9df..dea0f0cab 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-request.json +++ b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-request.json @@ -2,5 +2,5 @@ "raw_proof": "544150460000000001fd0512544150500004000000000224900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010450008004326ab5c17f2ded3596b047247d63f70a33f70446c9096dc4982000000000000000ef61438cd2c2405693b046c63c514df4a47f5db553b5e20cc48c86d1b41c4d6c6a3032655f293b194efac01206cd02000000000101900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d0100000000ffffffff02e803000000000000225120d6484a40e7a0c5bcb5a958bd6251554feee22c1c94b0c058d7891105b34f309b0ba7100000000000225120c746196e62f7e88c99a96fab48967d38c58dcd415ccc87a51b5bd96fcf34de840140ae44a092025c5c182a52f0b542489395196b147b6b908f220205a562b86de46a2fd83770100e8aa5f775496c518ec3be8846fcc727cc3467adc8eb149cc767790000000008e207e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e0afd015d0001000259900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010f7365744f66526f796c6c6f4e46543357321df398180b331e6a8207abe9412a19e5b5c307348340fac9d450b5310cec00000000010401010601010bad01ab0165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003420140687db6a3598f2a507e8cda8ce94769de9446641c923fc69418796675cdb4a75ba1e8956812d2f81c33a7e4ef5f5c43e855683d9a7239fc281cb6d10a3058e4710e020000102102c8c3e030404c7f117a62aeebca5926a1693f917121465938cc5f215a8a3dc7e11121039511fd8c1f51acfbd85d9d742268d1ca03ce3b69d0436e71130192c085394c990cc7000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b039c017100010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a044a00012225bf1097c66530e2c0b7d13acee653ff40ca5ab078d2feb12a14a1dd825fd10000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e000400000001022102f202542e41672bec22302c29d8e002c953c9c9abb1c4f8cdeefd1e075753e3060503040101111e00010002197365744f66526f796c6c6f4e46543320627920526f796c6c6f16040026abaf1759900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010f7365744f66526f796c6c6f4e46543357321df398180b331e6a8207abe9412a19e5b5c307348340fac9d450b5310cec0000000001b805a6524902d9682bcbcfb45d1473eb35d85fd1f016e80b3227eaa33b3eb678", "proof_at_depth": 0, "with_prev_witnesses": true, - "with_meta_reveal": false + "with_meta_reveal": true } \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-response.json index c248a8577..42fa02d23 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-response.json +++ b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-response.json @@ -52,7 +52,11 @@ "lease_expiry": "0", "is_burn": false }, - "meta_reveal": null, + "meta_reveal": { + "data": "7365744f66526f796c6c6f4e46543320627920526f796c6c6f", + "type": "META_TYPE_OPAQUE", + "meta_hash": "57321df398180b331e6a8207abe9412a19e5b5c307348340fac9d450b5310cec" + }, "tx_merkle_proof": "07e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e", "inclusion_proof": "000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b039c017100010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a044a00012225bf1097c66530e2c0b7d13acee653ff40ca5ab078d2feb12a14a1dd825fd10000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "exclusion_proofs": [ diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json index b32dd69bb..bd28bd2da 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json @@ -2,5 +2,5 @@ "raw_proof": "544150460000000001fd04d154415050000400000000022476dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e3772700000001045000003635f365e8a493496b66b914c5725753fad8439edf0a567a90220a00000000000000eaf04296428e6aaec3fffbc67a0598e067a050839e6efb23ff9330c077da7426463432655f293b19663892b606f60200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c0000000008fd0102087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a20af9000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2af80b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0200001021023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff0c9f000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101111f000100021a747269636b79526f796c6c6f436f696e20627920526f796c6c6f16040026abb0175a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000008b27a67fc41942150b23743e9b88aeedfb8da174f90f9e21667eb455ac099dfa", "proof_at_depth": 0, "with_prev_witnesses": true, - "with_meta_reveal": false + "with_meta_reveal": true } \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json index c931fc7fa..b287c9fb9 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json @@ -46,7 +46,11 @@ "lease_expiry": "0", "is_burn": false }, - "meta_reveal": null, + "meta_reveal": { + "data": "747269636b79526f796c6c6f436f696e20627920526f796c6c6f", + "type": "META_TYPE_OPAQUE", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41" + }, "tx_merkle_proof": "087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a2", "inclusion_proof": "000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "exclusion_proofs": [ diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-request.json index 3dfef3549..1e17b8662 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-request.json +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-request.json @@ -2,5 +2,5 @@ "raw_proof": "544150460000000002fd04d154415050000400000000022476dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e3772700000001045000003635f365e8a493496b66b914c5725753fad8439edf0a567a90220a00000000000000eaf04296428e6aaec3fffbc67a0598e067a050839e6efb23ff9330c077da7426463432655f293b19663892b606f60200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c0000000008fd0102087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a20af9000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2af80b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0200001021023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff0c9f000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101111f000100021a747269636b79526f796c6c6f436f696e20627920526f796c6c6f16040026abb0175a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000008b27a67fc41942150b23743e9b88aeedfb8da174f90f9e21667eb455ac099dfafd07a7544150500004000000000224adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630000000004500000ff3f5dba5695789b34b2a4177c1918ff0aa9d20eef1bdfe78e302100000000000000ad2ec309a6f38f5bd7432d3ec39375dfcce23987a05de649086d09e43ee4ca1bd03732655f293b19e08c9a3e06fd016302000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c0000000008c20608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e0afd02b4000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000601320bfd022401fd02200165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005fd01b54a000133bb0d9d198714f699adcaaeba0da20feb35bb9c6cc7f954466ac980f39b2f650000000000002ac6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdffd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2ac60bad01ab0165adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff03420140098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a0d280ec4c71b4a0c96a3939c488fe60a268a8777e3016b1f41306ecf572a0540bdd70000000000002af80e0200001021022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb0e0200001021026e6f1ce5a4cf58f63f1c6d2421aaf3d011e3811bab92122cffd67dada97ab6100c9f000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a0001ad91c6726cfc6a35637fc28d8c6c5153ca6667faca459054a03195cf87cb014a0000000000002ac6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e1840205030401010f9f000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16040026abb20730ebfb00979ea9778521856c717b764370eaf504d79dc3aea33e1caa970d25", "proof_at_depth": 1, "with_prev_witnesses": true, - "with_meta_reveal": false + "with_meta_reveal": true } \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-response.json index 24172217e..2b85ac3db 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-response.json +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-response.json @@ -46,7 +46,11 @@ "lease_expiry": "0", "is_burn": false }, - "meta_reveal": null, + "meta_reveal": { + "data": "747269636b79526f796c6c6f436f696e20627920526f796c6c6f", + "type": "META_TYPE_OPAQUE", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41" + }, "tx_merkle_proof": "087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a2", "inclusion_proof": "000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "exclusion_proofs": [ diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-request.json index 328648b62..9fdc3d5ee 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-request.json +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-request.json @@ -2,5 +2,5 @@ "raw_proof": "544150460000000003fd04d154415050000400000000022476dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e3772700000001045000003635f365e8a493496b66b914c5725753fad8439edf0a567a90220a00000000000000eaf04296428e6aaec3fffbc67a0598e067a050839e6efb23ff9330c077da7426463432655f293b19663892b606f60200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c0000000008fd0102087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a20af9000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2af80b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0200001021023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff0c9f000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101111f000100021a747269636b79526f796c6c6f436f696e20627920526f796c6c6f16040026abb0175a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000008b27a67fc41942150b23743e9b88aeedfb8da174f90f9e21667eb455ac099dfafd05b9544150500004000000000224adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630000000004500000ff3f5dba5695789b34b2a4177c1918ff0aa9d20eef1bdfe78e302100000000000000ad2ec309a6f38f5bd7432d3ec39375dfcce23987a05de649086d09e43ee4ca1bd03732655f293b19e08c9a3e06fd016302000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c0000000008c20608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e0afd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2ac60bad01ab0165adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff03420140098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a0d280ec4c71b4a0c96a3939c488fe60a268a8777e3016b1f41306ecf572a0540bdd70000000000002af80e0200001021022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb0c9f000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a00019b28bc20e99078e38640e026115c0e6b214bba541ad194dffa5737983cddae1a0000000000000032ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e18402050304010116040026abb28f40a7bea7a33a37cd2194c330007dcbc532537b9ce5c77e357afae1ab30f799fd07c7544150500004000000000224d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000045000400020ed570e7c46d5584f76068799496d9317a4398e486a785ab4110000000000000087cfc858c94d3005d6c8880fafd773aed06e2fe748a081a2fc32d9e2f20ef5a3384032655f293b19668bd3c706fd016302000000000102d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf20200000000ffffffffd3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000000000000003e803000000000000225120acb9b163799c60c08c279c18a652ffe4bbbea9301831c3acca52b796a5fb7cc5e8030000000000002251203f475770dfc8d7e92e93632c251a5c01b6e90670e8522b81cb7b448bf86efffa03aa1600000000002251209706916002ac9ba36bab02ce2ed586da3ee2bfd271c54743143c9663ccfda56d01409867a537b52ee5c4bc798315397d89bf65380e4ed88a04ec9315f67bc08ed6bb275a51117feecf87da27a8b2761630c92fd81c6e4512ecfe9536819be6b3c5d00140a6df68be0be4f5c58b40e0463254e11e6848761ad77d538f53212ad78b5ab80640344e46de7bcd6d8350bf52769851a5b0abff9e8c08414075ea885ad86644ac0000000008e207ed5bc2ffc43424ee07fed779bdbbb19b8a264d6b3c7e4be7e48e1fc63196abe8e749d4950360f70c69103d539ae7a27a80ca78c226fd540b4fc84d687b71eb786b8fc0cc51efe9a546188902577e1f5d105dbe483b03077fd6ac643ef2dfd0a152a98a2916ce8948567b361ed53da743e455e575cef6380c1909aeeb597c377c476ce23a33c62d040495d94028ba3c503aa8d56ed27a3e323c2503277d03fddf89361e8d266148f7784cdadbcd47b21d8221418ec9b4b5f5ffad95a9e41159ca7be8c3138e935252798546897d2515404231693240af2dc052479c1403f9ef11640afd02b4000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41000000000004010006017d0bfd022401fd02200165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005fd01b54a0001c6360d41bd3cb4ddefc119acc1db551dd2a324c0364c3a6f42c8183e0ffe6cf50000000000002a49ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdffd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2a490bad01ab0165d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb034201408bd6b5306b3c03794c974922b7b6a4a5b9deeefd35a02d3ade39de88882e507cc9b62c8de4c4a6758efa9b756428e0d7666657794d1a8bd82cdbd6d02117139a0d2851efabb48146e9c53975cb2f0f71fdcc7c17b0a14d1787de7ad8dc8ac4d3c7a20000000000002ac60e02000010210223e1cfbdb232a9d98d3ddc2bf36d907c3c1bf3f40ad10eca0ebdb7eafe07db840e020000102102629f225f4ef29972e703b1086796dbe47e881ae913904a1c2eec15df35361fb60c9f0004000000010221034d6fd392fe86bdfc93973406f15050b36281f569be8335afa4b3586b36a0aaf8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a000179bef732bcc42581ed21a0673d739a0096c5b29c13e4170d59185ba1bf5a20650000000000002a49ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e000400000002022102fabb9caf70565dd69dabab7e38cd8932843de0a2e620d8c8964d375387e764bc05030401010f9f000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16040026abb7d3a36b396d7e73af998dd2ef8e0501379740114177ff1f93b08f17a9a8e4c767", "proof_at_depth": 2, "with_prev_witnesses": true, - "with_meta_reveal": false + "with_meta_reveal": true } \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-response.json index 1ce295d45..d3002b4f2 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-response.json +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-response.json @@ -46,7 +46,11 @@ "lease_expiry": "0", "is_burn": false }, - "meta_reveal": null, + "meta_reveal": { + "data": "747269636b79526f796c6c6f436f696e20627920526f796c6c6f", + "type": "META_TYPE_OPAQUE", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41" + }, "tx_merkle_proof": "087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a2", "inclusion_proof": "000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "exclusion_proofs": [ diff --git a/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json index 89ff250ec..a00135bdb 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json +++ b/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json @@ -2,5 +2,5 @@ "raw_proof": "544150460000000001fd0449544150500004000000000224c83e55a8e6ee8f88237521bd836ddf168dcdb0042a23f952a5ef71c79c2227270000000204500000c0204e108876d6ec31c81cbc67d0d3d176bc51566560f2129fbf090000000000000097d7abd1c7dadb5e5fe22c25220950f8ae40780812e27a4a7dd7ba923e6f5838774132655f293b196a2ce2c706cd02000000000101c83e55a8e6ee8f88237521bd836ddf168dcdb0042a23f952a5ef71c79c2227270200000000ffffffff02e8030000000000002251208d9cac51eda33283c63419190f12ffb2bf2ec5ac337ac8c9ea677b2af17e4a1079a21600000000002251202dc635ce603c8c9675f08276f2bb6c796576f80c65fd9a81249549a2488f6ef101404d19858b4046fb71ecbfffe5b8ed78baf5159cba1298e21a22c055307b549792f434178b2469a53dc3dc5b24a4311e3cef9f8075d47fe08796335ddd8d44b4df0000000008a205a99726a7ab1cfa6c0ad3cee5656f2e388d4b480d105df5d2eb307e7f68343f654c39a67f84c69fb0a45d3a7bedb1aad6062b6af1ab37f207986f4b74aabd371726ee0f70f0b608092b89446916403bbbb2dbf220b4d57905d4cd73efdb2eecd50aa80180053bcd4fd5d7a739983d842d6b62d4884ac09529e01e946e59ac705467caa6de490c506af99211ad73742d51e380d233618fcbefabefd3a1aed9166e140afa000100025bc83e55a8e6ee8f88237521bd836ddf168dcdb0042a23f952a5ef71c79c2227270000000211756e6b6e6f776e526f796c6c6f436f696e548c3d99c0f06a858b564e035f7bccb4354eb89f5cd044d0ba78b9fbd715288200000000000401000603fd2ee00b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e02000010210216fbf08fd0d3caf518a605c7e93587e7f66deb2460eb235fc54c151967cf69de0c9f0004000000000221027fb809fa2c53a98906e9d3fbbc56019a32fd8bef11d3fd5b5657c1f849e32f74037401490001000220a8e1cd6961301e8ef91df4f902f7af0bf261e30c122d85ebf7abc32c15bee00204220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e000400000001022102ac43972a2a4868a12d41db303d3d93ad0d86c251336e3ed69b0528f7d578a81b05030401011120000100021b756e6b6e6f776e526f796c6c6f436f696e20627920526f796c6c6f16040026abba175bc83e55a8e6ee8f88237521bd836ddf168dcdb0042a23f952a5ef71c79c2227270000000211756e6b6e6f776e526f796c6c6f436f696e548c3d99c0f06a858b564e035f7bccb4354eb89f5cd044d0ba78b9fbd71528820000000000b734e263f7583498a7851d5c16c0c4d8a2c0919b780847f537919974b1c900cc", "proof_at_depth": 0, "with_prev_witnesses": true, - "with_meta_reveal": false + "with_meta_reveal": true } \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json index 981a5250b..c97cb207c 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json +++ b/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json @@ -46,7 +46,11 @@ "lease_expiry": "0", "is_burn": false }, - "meta_reveal": null, + "meta_reveal": { + "data": "756e6b6e6f776e526f796c6c6f436f696e20627920526f796c6c6f", + "type": "META_TYPE_OPAQUE", + "meta_hash": "548c3d99c0f06a858b564e035f7bccb4354eb89f5cd044d0ba78b9fbd7152882" + }, "tx_merkle_proof": "05a99726a7ab1cfa6c0ad3cee5656f2e388d4b480d105df5d2eb307e7f68343f654c39a67f84c69fb0a45d3a7bedb1aad6062b6af1ab37f207986f4b74aabd371726ee0f70f0b608092b89446916403bbbb2dbf220b4d57905d4cd73efdb2eecd50aa80180053bcd4fd5d7a739983d842d6b62d4884ac09529e01e946e59ac705467caa6de490c506af99211ad73742d51e380d233618fcbefabefd3a1aed9166e14", "inclusion_proof": "0004000000000221027fb809fa2c53a98906e9d3fbbc56019a32fd8bef11d3fd5b5657c1f849e32f74037401490001000220a8e1cd6961301e8ef91df4f902f7af0bf261e30c122d85ebf7abc32c15bee00204220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "exclusion_proofs": [ diff --git a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-request.json index 36dccc56b..deb796987 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-request.json +++ b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-request.json @@ -2,5 +2,5 @@ "raw_proof": "544150460000000001fd05085441505000040000000002241304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770000000104500000002033b4e14d09dca9b6a47b283628a13a56fc625d00749b89dd1b0000000000000027a7b906a22308e5c62586eaf63a0755465193da34f88f38fcd16136a40837245c4c32655f293b199a10705906cd020000000001011304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770100000000ffffffff02e803000000000000225120e5d4f8a3b6b3087984f36182654e2deb91e2e567cf35f068e6d4362ac7958cceef9a1600000000002251207a9d28abfb419fa691b22c3967b61d8d358ed65031f92740604875e29aa0ff2801407fc9e637deacd43c5434d35a9db8f6634d049f30f9aa2f8521944b4654bad147848d20f1b96e081fa23604e3ad610c5b9b16fd553ec751e608ee79bd622dcca80000000008c20612f24121b3b09bca8dfd619a8412521cd5a0df3c3530e2f2e5aa7a4beebac8ba4ccd82f747699a0a1d1e4a99819fda33c8c9cccbc6b92e2e2ee6f7018ea3862b0574ac6910af8096a5531d803cad77a8a878972091f4a11404ecd009e75ebe40afd73ec375e791f7d7de16bee7fcb6e6e412a1fb03bd363f4a997af477ffe5caa538f8705031ec8da6da106429c44b289ef68e0cce784d0d91a47589b86ed27dbd5f81607a2e8dd37cb256c4179c5980ae45e8dff592a5dfea2ad06c9a8c4b412d0afd0164000100025e1304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770000000114756e6c696d69746564526f796c6c6f436f696e31ef35cbdef9f461dee0ad1c4753a481e30fb7b02d6356f342e573671f8044af5e00000000000401000603fd01f30bad01ab0165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003420140e0c383aaecabb44bee72683d825118b7ef7124a9c8be149c82b7c4c525340aceb4194a177bc1e13e0bee7df5425720f4b5f30335faed586bef129780146b7a2c0e0200001021025f121b76e25840b5fbe620ef331ac834abd964a35fff72bbae207bfe2bad9a4311210349d60c6689bbbb2ffc9b30b45b96a3d6e5fd5fd01c867344c0054f61050482410c9f00040000000002210261592c195dc3af641d2808184301edacd7596c7096358042c7873bee0ac110cf0374014900010002203eb8c5d0a5cf2a1c3ffbf1ad097e22260c783d2a2d6222a23647ff6791a6a04004220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221027b00a63bfb5c13093652e488eca57c924355d2f190f2a814982d193773e3d2760503040101112d0001000228756e6c696d69746564526f796c6c6f436f696e20656d697373696f6e203120627920526f796c6c6f16040026abc2175e1304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770000000114756e6c696d69746564526f796c6c6f436f696e31ef35cbdef9f461dee0ad1c4753a481e30fb7b02d6356f342e573671f8044af5e00000000001921036c1fb8f682b877b9caa27ddb7068a242f662332ea7eb99e3c32c12170c15a0bc7bffc046fd524f88aede26e5729447892286061bf1c950a6299d0a79061bd8df", "proof_at_depth": 0, "with_prev_witnesses": true, - "with_meta_reveal": false + "with_meta_reveal": true } \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-response.json index 4c8aa84c4..1b4509980 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-response.json +++ b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-response.json @@ -52,7 +52,11 @@ "lease_expiry": "0", "is_burn": false }, - "meta_reveal": null, + "meta_reveal": { + "data": "756e6c696d69746564526f796c6c6f436f696e20656d697373696f6e203120627920526f796c6c6f", + "type": "META_TYPE_OPAQUE", + "meta_hash": "ef35cbdef9f461dee0ad1c4753a481e30fb7b02d6356f342e573671f8044af5e" + }, "tx_merkle_proof": "0612f24121b3b09bca8dfd619a8412521cd5a0df3c3530e2f2e5aa7a4beebac8ba4ccd82f747699a0a1d1e4a99819fda33c8c9cccbc6b92e2e2ee6f7018ea3862b0574ac6910af8096a5531d803cad77a8a878972091f4a11404ecd009e75ebe40afd73ec375e791f7d7de16bee7fcb6e6e412a1fb03bd363f4a997af477ffe5caa538f8705031ec8da6da106429c44b289ef68e0cce784d0d91a47589b86ed27dbd5f81607a2e8dd37cb256c4179c5980ae45e8dff592a5dfea2ad06c9a8c4b412d", "inclusion_proof": "00040000000002210261592c195dc3af641d2808184301edacd7596c7096358042c7873bee0ac110cf0374014900010002203eb8c5d0a5cf2a1c3ffbf1ad097e22260c783d2a2d6222a23647ff6791a6a04004220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "exclusion_proofs": [ diff --git a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-request.json index ce540cc5c..f05442664 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-request.json +++ b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-request.json @@ -2,5 +2,5 @@ "raw_proof": "544150460000000001fd04c55441505000040000000002241f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890000000104500000202034a4f2a5fecc95d461212ad94ecb66d0c9ee7ac5fdb43d003100000000000000cf4a3cba30f469954f2fa882aeb881ae88294608a980abddd1595d48f9daf729a77539655f293b19402f697e06cd020000000001011f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890100000000ffffffff02e8030000000000002251206f479cbd41e4ffce26c55a28268877fd40b0e64c283c817b875930bed23cea1e2b8216000000000022512078523cac7967c76daecc63e1fce58e7035fa400f8e5516299443dd4b2deebe210140864ccb6887b5dd92e0592b95aa5af1e4c0c82bbb20688a44c1a42a784aab5c5d2d22dbef014b51dfab133c4ea5d24826ddbd857ab8744cf7665492aa3ad45f0f0000000008a205c0f934598d194699c7c789782caabb2442ec4bdd0cba397c9bef4763aab4e3cb925852af91b28490c3f7678303f382a8cd71ede1e12b136779836f78a14e8ddcf5d067675f07d4c4692aa81d552f47e69faa56b63a01d27bc44cb08f8a2036feb5e4fe06516959842e30fa5d75c60a6f5caf8f82ae1d694837f2f587d352471f7b592c21cdb6cf968e27038ad439167cea8d4399a5adc4a6d90797ca27fe6a78190afd0164000100025e1f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890000000114756e6c696d69746564526f796c6c6f436f696e3236a5ee53396cf2d45b9f7bfb306ec706bca2e5738d9bbf4cf52e3cd2cf45a31100000000000401000603fd01f50bad01ab01650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034201403c027fc40af5c14afedbbd9e08d61017ed36780f0b92d94ac97bb0f81fc8bf63a7c75c65bf37ee41be7a5287e1da049a8ccea15053ac2c11f0ad6a5000bc06590e020000102102ea041c360a308ee44466ca4e2b07c5692c02a8d01f0720982dcd0642366546ff11210349d60c6689bbbb2ffc9b30b45b96a3d6e5fd5fd01c867344c0054f61050482410c9f0004000000000221024b84c791ddceed288f4c832d047e67f8152ce1af352cc18930902d84bc6bf9130374014900010002203eb8c5d0a5cf2a1c3ffbf1ad097e22260c783d2a2d6222a23647ff6791a6a04004220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221022300be5ca01e926c7bb7f8e59dc06111bf2d13627e8e28c3a581a632a8437e2e0503040101112d0001000228756e6c696d69746564526f796c6c6f436f696e20656d697373696f6e203220627920526f796c6c6f16040026af10175e1f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890000000114756e6c696d69746564526f796c6c6f436f696e3236a5ee53396cf2d45b9f7bfb306ec706bca2e5738d9bbf4cf52e3cd2cf45a3110000000000e8d13eb083538735c4bb6a9354741d6187206bdfa196ff9f0534523182753408", "proof_at_depth": 0, "with_prev_witnesses": true, - "with_meta_reveal": false + "with_meta_reveal": true } \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-response.json index 5c74deeeb..fafcbc35a 100644 --- a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-response.json +++ b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-response.json @@ -52,7 +52,11 @@ "lease_expiry": "0", "is_burn": false }, - "meta_reveal": null, + "meta_reveal": { + "data": "756e6c696d69746564526f796c6c6f436f696e20656d697373696f6e203220627920526f796c6c6f", + "type": "META_TYPE_OPAQUE", + "meta_hash": "36a5ee53396cf2d45b9f7bfb306ec706bca2e5738d9bbf4cf52e3cd2cf45a311" + }, "tx_merkle_proof": "05c0f934598d194699c7c789782caabb2442ec4bdd0cba397c9bef4763aab4e3cb925852af91b28490c3f7678303f382a8cd71ede1e12b136779836f78a14e8ddcf5d067675f07d4c4692aa81d552f47e69faa56b63a01d27bc44cb08f8a2036feb5e4fe06516959842e30fa5d75c60a6f5caf8f82ae1d694837f2f587d352471f7b592c21cdb6cf968e27038ad439167cea8d4399a5adc4a6d90797ca27fe6a7819", "inclusion_proof": "0004000000000221024b84c791ddceed288f4c832d047e67f8152ce1af352cc18930902d84bc6bf9130374014900010002203eb8c5d0a5cf2a1c3ffbf1ad097e22260c783d2a2d6222a23647ff6791a6a04004220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "exclusion_proofs": [ diff --git a/util/test/common-test/src/test/java/org/royllo/test/TapdDataTest.java b/util/test/common-test/src/test/java/org/royllo/test/TapdDataTest.java index 2490614b2..f765a8070 100644 --- a/util/test/common-test/src/test/java/org/royllo/test/TapdDataTest.java +++ b/util/test/common-test/src/test/java/org/royllo/test/TapdDataTest.java @@ -111,6 +111,13 @@ public void roylloCoinValue() { assertEquals("", unlimitedRoylloCoin1Proof.getAsset().getAssetGroup().getRawGroupKey()); assertEquals("0349d60c6689bbbb2ffc9b30b45b96a3d6e5fd5fd01c867344c0054f6105048241", unlimitedRoylloCoin1Proof.getAsset().getAssetGroup().getTweakedGroupKey()); assertEquals("", unlimitedRoylloCoin1Proof.getAsset().getAssetGroup().getAssetWitness()); + + // Meta reveal + assertNotNull(roylloCoinProof.getMetaReveal()); + assertEquals("726f796c6c6f436f696e206f6e206d61696e6e657420627920526f796c6c6f", roylloCoinProof.getMetaReveal().getData()); + assertEquals("META_TYPE_OPAQUE", roylloCoinProof.getMetaReveal().getType()); + assertEquals("e08c74d75554e2c9d6d8452a3584d191f8727963b05e497bba84ada8ae829208", roylloCoinProof.getMetaReveal().getMetaHash()); + } @Test From a980ca8cec0421d26007298a459ab94bc9e0a38e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Traumat?= Date: Thu, 21 Dec 2023 10:24:16 +0100 Subject: [PATCH 21/57] Update CODE_OF_CONDUCT.md Change email address --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index c61835d9f..5a0155b72 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -52,7 +52,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at contact@cassandre.tech. All +reported by contacting the project team at contact@royllo.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. From 3bee0b99e45ebcd9eff9c46df2fe2289ac15d89c Mon Sep 17 00:00:00 2001 From: straumat Date: Fri, 22 Dec 2023 12:08:16 +0100 Subject: [PATCH 22/57] Meta_reveal request/response integrated in common test --- .../request/AddAssetMetaDataRequest.java | 6 +- .../request/AddAssetMetaDataRequestDTO.java | 6 +- .../core/service/asset/AssetService.java | 9 + .../asset/AssetServiceImplementation.java | 15 + .../request/RequestServiceImplementation.java | 1 - .../table-request_add_asset_meta_data.xml | 4 +- .../repository/RequestRepositoryTest.java | 2 - .../test/core/service/RequestServiceTest.java | 2 - .../tapd/TapdDecodeServiceTest.java | 2 +- .../core/test/util/TestWithMockServers.java | 2 +- .../resources/db/test/test-data-request.xml | 1 - .../graphql/request/RequestDataFetcher.java | 1 + .../resources/db/dev/dev-data-request.xml | 1 - .../schema/request-addAssetMetaData.graphqls | 4 +- .../test/graphql/RequestDataFetcherTest.java | 4 +- .../db/test/api-test-data-request.xml | 1 - backend/servers/explorer-batch/pom.xml | 5 + .../batch/request/AddAssetMetaDataBatch.java | 43 +++ .../configuration/SchedulerConfiguration.java | 4 +- .../resources/db/dev/test-data-request.xml | 1 - .../test/core/proof/InvalidProofTest.java | 2 +- .../resources/db/dev/dev-data-request.xml | 1 - .../db/test/web-test-data-request.xml | 1 - backend/servers/explorer-web/yarn.lock | 260 +++++++++--------- docs/design/meta-data/README.md | 32 +++ pom.xml | 2 + util/test/common-test/justfile | 135 +++++++-- util/test/common-test/pom.xml | 6 + .../main/java/org/royllo/test/TapdData.java | 94 +++++-- .../royllo/test/tapd/asset/AssetValue.java | 41 ++- .../tapd/asset/DecodedProofValueRequest.java | 11 +- ...proofAtDepth0-withMetaReveal-request.json} | 0 ...roofAtDepth0-withMetaReveal-response.json} | 0 ...oofAtDepth0-withoutMetaReveal-request.json | 6 + ...proofAtDepth0-withMetaReveal-request.json} | 0 ...roofAtDepth0-withMetaReveal-response.json} | 0 ...oofAtDepth0-withoutMetaReveal-request.json | 6 + ...proofAtDepth0-withMetaReveal-request.json} | 0 ...roofAtDepth0-withMetaReveal-response.json} | 0 ...oofAtDepth0-withoutMetaReveal-request.json | 6 + ...proofAtDepth0-withMetaReveal-request.json} | 0 ...roofAtDepth0-withMetaReveal-response.json} | 0 ...oofAtDepth0-withoutMetaReveal-request.json | 6 + ...proofAtDepth0-withMetaReveal-request.json} | 0 ...roofAtDepth0-withMetaReveal-response.json} | 0 ...oofAtDepth0-withoutMetaReveal-request.json | 6 + ...proofAtDepth0-withMetaReveal-request.json} | 0 ...roofAtDepth0-withMetaReveal-response.json} | 0 ...oofAtDepth0-withoutMetaReveal-request.json | 6 + ...proofAtDepth0-withMetaReveal-request.json} | 0 ...roofAtDepth0-withMetaReveal-response.json} | 0 ...oofAtDepth0-withoutMetaReveal-request.json | 6 + ...oof-proofFile2-proofAtDepth0-response.json | 105 ------- ...-proofAtDepth0-withMetaReveal-request.json | 6 + ...proofAtDepth0-withMetaReveal-response.json | 5 + ...ofAtDepth0-withoutMetaReveal-request.json} | 0 ...proofAtDepth1-withMetaReveal-request.json} | 0 ...roofAtDepth1-withMetaReveal-response.json} | 0 ...oofAtDepth1-withoutMetaReveal-request.json | 6 + ...oof-proofFile3-proofAtDepth0-response.json | 105 ------- ...-proofAtDepth0-withMetaReveal-request.json | 6 + ...proofAtDepth0-withMetaReveal-response.json | 5 + ...ofAtDepth0-withoutMetaReveal-request.json} | 0 ...oof-proofFile3-proofAtDepth1-response.json | 68 ----- ...-proofAtDepth1-withMetaReveal-request.json | 6 + ...proofAtDepth1-withMetaReveal-response.json | 5 + ...ofAtDepth1-withoutMetaReveal-request.json} | 0 ...proofAtDepth2-withMetaReveal-request.json} | 0 ...roofAtDepth2-withMetaReveal-response.json} | 0 ...oofAtDepth2-withoutMetaReveal-request.json | 6 + ...proofAtDepth0-withMetaReveal-request.json} | 0 ...roofAtDepth0-withMetaReveal-response.json} | 0 ...oofAtDepth0-withoutMetaReveal-request.json | 6 + ...proofAtDepth0-withMetaReveal-request.json} | 0 ...roofAtDepth0-withMetaReveal-response.json} | 0 ...oofAtDepth0-withoutMetaReveal-request.json | 6 + ...proofAtDepth0-withMetaReveal-request.json} | 0 ...roofAtDepth0-withMetaReveal-response.json} | 0 ...oofAtDepth0-withoutMetaReveal-request.json | 6 + .../java/org/royllo/test/TapdDataTest.java | 7 +- .../org/royllo/test/TapdMockServerTest.java | 4 +- 81 files changed, 588 insertions(+), 505 deletions(-) create mode 100644 backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddAssetMetaDataBatch.java create mode 100644 docs/design/meta-data/README.md rename util/test/common-test/src/main/resources/tapd/assets/invalidProof/{decodeProof-proofFile1-proofAtDepth0-request.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/invalidProof/{decodeProof-proofFile1-proofAtDepth0-response.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json} (100%) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json rename util/test/common-test/src/main/resources/tapd/assets/roylloCoin/{decodeProof-proofFile1-proofAtDepth0-request.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/roylloCoin/{decodeProof-proofFile1-proofAtDepth0-response.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json} (100%) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json rename util/test/common-test/src/main/resources/tapd/assets/roylloNFT/{decodeProof-proofFile1-proofAtDepth0-request.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/roylloNFT/{decodeProof-proofFile1-proofAtDepth0-response.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json} (100%) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json rename util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/{decodeProof-proofFile1-proofAtDepth0-request.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/{decodeProof-proofFile1-proofAtDepth0-response.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json} (100%) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json rename util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/{decodeProof-proofFile2-proofAtDepth0-request.json => decodeProof-proofFile2-proofAtDepth0-withMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/{decodeProof-proofFile2-proofAtDepth0-response.json => decodeProof-proofFile2-proofAtDepth0-withMetaReveal-response.json} (100%) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-request.json rename util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/{decodeProof-proofFile3-proofAtDepth0-request.json => decodeProof-proofFile3-proofAtDepth0-withMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/{decodeProof-proofFile3-proofAtDepth0-response.json => decodeProof-proofFile3-proofAtDepth0-withMetaReveal-response.json} (100%) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-request.json rename util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/{decodeProof-proofFile1-proofAtDepth0-request.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/{decodeProof-proofFile1-proofAtDepth0-response.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json} (100%) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json delete mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-request.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-response.json rename util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/{decodeProof-proofFile2-proofAtDepth0-request.json => decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/{decodeProof-proofFile2-proofAtDepth1-request.json => decodeProof-proofFile2-proofAtDepth1-withMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/{decodeProof-proofFile2-proofAtDepth1-response.json => decodeProof-proofFile2-proofAtDepth1-withMetaReveal-response.json} (100%) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withoutMetaReveal-request.json delete mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-request.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-response.json rename util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/{decodeProof-proofFile3-proofAtDepth0-request.json => decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-request.json} (100%) delete mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withMetaReveal-request.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withMetaReveal-response.json rename util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/{decodeProof-proofFile3-proofAtDepth1-request.json => decodeProof-proofFile3-proofAtDepth1-withoutMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/{decodeProof-proofFile3-proofAtDepth2-request.json => decodeProof-proofFile3-proofAtDepth2-withMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/{decodeProof-proofFile3-proofAtDepth2-response.json => decodeProof-proofFile3-proofAtDepth2-withMetaReveal-response.json} (100%) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withoutMetaReveal-request.json rename util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/{decodeProof-proofFile1-proofAtDepth0-request.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/{decodeProof-proofFile1-proofAtDepth0-response.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json} (100%) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json rename util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/{decodeProof-proofFile1-proofAtDepth0-request.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/{decodeProof-proofFile1-proofAtDepth0-response.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json} (100%) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json rename util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/{decodeProof-proofFile1-proofAtDepth0-request.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json} (100%) rename util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/{decodeProof-proofFile1-proofAtDepth0-response.json => decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json} (100%) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/request/AddAssetMetaDataRequest.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/request/AddAssetMetaDataRequest.java index 041d089b5..2a35df386 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/request/AddAssetMetaDataRequest.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/request/AddAssetMetaDataRequest.java @@ -28,14 +28,10 @@ @DiscriminatorValue("ADD_ASSET_META_DATA") public class AddAssetMetaDataRequest extends Request { - /** Taproot asset id. */ + /** Taproot asset id set by the user. */ @Column(name = "ASSET_ID", updatable = false) private String assetId; - /** Metadata corresponding to the meta hash stored in the genesis information. */ - @Column(name = "META_DATA", updatable = false) - private String metaData; - /** The asset created/updated by this request. */ @ManyToOne(fetch = EAGER) @JoinColumn(name = "FK_ASSET") diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/request/AddAssetMetaDataRequestDTO.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/request/AddAssetMetaDataRequestDTO.java index 3881f2d0b..44766c2de 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/request/AddAssetMetaDataRequestDTO.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/request/AddAssetMetaDataRequestDTO.java @@ -15,14 +15,10 @@ @SuppressWarnings("checkstyle:VisibilityModifier") public class AddAssetMetaDataRequestDTO extends RequestDTO { - /** Taproot asset id. */ + /** Taproot asset id set by the user. */ @NotBlank(message = "Asset id is required") String assetId; - /** Metadata corresponding to the meta hash stored in the genesis information. */ - @NotBlank(message = "Metadata is required") - String metaData; - /** The asset created/updated by this request. */ AssetDTO asset; diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java index 23cf1dc47..97aaeb632 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java @@ -31,6 +31,15 @@ public interface AssetService { */ AssetDTO addAsset(AssetDTO newAsset); + /** + * add metadata to an asset. + * + * @param assetId asset id + * @param filename filename + * @return true if metadata added + */ + boolean addMetaDataToAsset(String assetId, String filename); + /** * Get an asset. * diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java index ebb237cfe..fe0aa5265 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java @@ -138,6 +138,21 @@ public AssetDTO addAsset(@NonNull final AssetDTO newAsset) { return assetCreated; } + @Override + public boolean addMetaDataToAsset(final String assetId, final String filename) { + // We check that the asset exists. + + // We get the content of the file. + + // We calculate the hash of the file and compare it with the metaDataHash of the asset in database. + + // We use tika to extract the file type of filename. + + // We rename the file to assetId.fileType and set the filename on the asset object. + + return true; + } + @Override public Optional getAsset(final long id) { logger.info("Getting asset with id {}", id); diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java index 78be043e6..22d64fe36 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java @@ -114,7 +114,6 @@ public AddAssetMetaDataRequestDTO createAddAssetMetaDataRequest(@NonNull final S .creator(ANONYMOUS_USER) .status(OPENED) .assetId(assetId) - .metaData(metaData) .build(); AddAssetMetaDataRequestDTO savedRequest = REQUEST_MAPPER.mapToAddAssetMetaRequestDTO(requestRepository.save(request)); diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-request_add_asset_meta_data.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-request_add_asset_meta_data.xml index 56dabd078..9f8a456c6 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-request_add_asset_meta_data.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-request_add_asset_meta_data.xml @@ -16,9 +16,7 @@ - + remarks="Taproot asset id set by the user"/> diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/RequestRepositoryTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/RequestRepositoryTest.java index 8dab3a25e..b1e520d3b 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/RequestRepositoryTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/RequestRepositoryTest.java @@ -72,7 +72,6 @@ public void requestsInheritance() { request2.setCreator(ANONYMOUS_USER); request2.setStatus(SUCCESS); request2.setAssetId("TaprootAssetId1"); - request2.setMetaData("Meta1"); long request2ID = requestRepository.save(request2).getId(); // See what's in database with JPA. @@ -84,7 +83,6 @@ public void requestsInheritance() { assertEquals(SUCCESS, addAssetMeatRequest2FromJPA.getStatus()); assertNull(addAssetMeatRequest2FromJPA.getErrorMessage()); assertEquals("TaprootAssetId1", addAssetMeatRequest2FromJPA.getAssetId()); - assertEquals("Meta1", addAssetMeatRequest2FromJPA.getMetaData()); // See what's in database with JDBC. jdbcTemplate = new JdbcTemplate(dataSource); diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java index 15327a3f9..af9d1e7f3 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java @@ -61,7 +61,6 @@ public void getOpenedRequests() { assertEquals(OPENED, request2.getStatus()); assertNull(request2.getErrorMessage()); assertEquals("AI2", request2.getAssetId()); - assertEquals("MD2", request2.getMetaData()); // Request 3. AddProofRequestDTO request3 = (AddProofRequestDTO) openedRequests.get(2); @@ -144,7 +143,6 @@ public void addRequests() { assertEquals(OPENED, request2Casted.getStatus()); assertNull(request2Casted.getErrorMessage()); assertEquals("TaprootAssetId1", request2Casted.getAssetId()); - assertEquals("meta1", request2Casted.getMetaData()); // ============================================================================================================= // Request 3 (addAssetDTO). diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java index 9ec248e6b..cbde6c75a 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java @@ -32,7 +32,7 @@ public void decodeTest() { assertNotNull(response); // Value coming from our test data. - final DecodedProofValue decodedProofValueFromTest = UNLIMITED_ROYLLO_COIN_1_FROM_TEST.getDecodedProofValues().get(0); + final DecodedProofValue decodedProofValueFromTest = UNLIMITED_ROYLLO_COIN_1_FROM_TEST.getDecodedProofValuesWithoutMetaReveal().get(0); assertNotNull(decodedProofValueFromTest); // ============================================================================================================= diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java index ceb5384a6..0a36c5484 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java @@ -150,7 +150,7 @@ public void verifyAsset(final AssetDTO assetDTO, final AssetValue assetValue = TapdData.findAssetValueByAssetId(assetId); // We retrieve an asset value from test data. We should to get the data from the first decioded proof. - final DecodedProofValueResponse.DecodedProof.Asset assetFromTest = assetValue.getDecodedProofValues().get(0).getResponse().getDecodedProof().getAsset(); + final DecodedProofValueResponse.DecodedProof.Asset assetFromTest = assetValue.getDecodedProofValuesWithoutMetaReveal().get(0).getResponse().getDecodedProof().getAsset(); // We check asset group. boolean assetGroupEquality = true; diff --git a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-request.xml b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-request.xml index 3cd78fb58..b03bedf90 100644 --- a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-request.xml +++ b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-request.xml @@ -41,7 +41,6 @@ - diff --git a/backend/servers/explorer-api/src/main/java/org/royllo/explorer/api/graphql/request/RequestDataFetcher.java b/backend/servers/explorer-api/src/main/java/org/royllo/explorer/api/graphql/request/RequestDataFetcher.java index b03be85e7..206a5405c 100644 --- a/backend/servers/explorer-api/src/main/java/org/royllo/explorer/api/graphql/request/RequestDataFetcher.java +++ b/backend/servers/explorer-api/src/main/java/org/royllo/explorer/api/graphql/request/RequestDataFetcher.java @@ -74,6 +74,7 @@ public final AddProofRequestDTO createAddProofRequest(final @InputArgument AddPr */ @DgsMutation public final AddAssetMetaDataRequestDTO createAddAssetMetaDataRequest(final @InputArgument AddAssetMetaDataRequestInputs input) { + // TODO Manage file upload. return requestService.createAddAssetMetaDataRequest(input.getAssetId(), input.getMetaData()); } diff --git a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-request.xml b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-request.xml index 3cd78fb58..b03bedf90 100644 --- a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-request.xml +++ b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-request.xml @@ -41,7 +41,6 @@ - diff --git a/backend/servers/explorer-api/src/main/resources/schema/request-addAssetMetaData.graphqls b/backend/servers/explorer-api/src/main/resources/schema/request-addAssetMetaData.graphqls index 0d660a405..f826a6b14 100644 --- a/backend/servers/explorer-api/src/main/resources/schema/request-addAssetMetaData.graphqls +++ b/backend/servers/explorer-api/src/main/resources/schema/request-addAssetMetaData.graphqls @@ -10,6 +10,4 @@ type AddAssetMetaDataRequest implements Request { errorMessage: String "Taproot asset id" assetId: String! - "Metadata corresponding to the meta hash stored in the genesis information" - metaData: String! -} \ No newline at end of file +} diff --git a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/RequestDataFetcherTest.java b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/RequestDataFetcherTest.java index c5c500d7f..19e5d2cef 100644 --- a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/RequestDataFetcherTest.java +++ b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/RequestDataFetcherTest.java @@ -54,7 +54,7 @@ public void requestByRequestId() { .status().getParent() .errorMessage() .onAddProofRequest().proof().parent() - .onAddAssetMetaDataRequest().assetId().metaData() + .onAddAssetMetaDataRequest().assetId() ).serialize(), "data." + DgsConstants.QUERY.RequestByRequestId, new TypeRef<>() { @@ -118,7 +118,6 @@ public void createAddAssetMetaDataRequest() { .status().getParent() .errorMessage() .assetId() - .metaData() ).serialize(), "data." + DgsConstants.MUTATION.CreateAddAssetMetaDataRequest, new TypeRef<>() { @@ -131,7 +130,6 @@ public void createAddAssetMetaDataRequest() { assertEquals(OPENED.toString(), requestCreated.getStatus().toString()); assertNull(requestCreated.getErrorMessage()); assertEquals("AssetID1", requestCreated.getAssetId()); - assertEquals("MetaData01", requestCreated.getMetaData()); } @Test diff --git a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-request.xml b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-request.xml index 3cd78fb58..b03bedf90 100644 --- a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-request.xml +++ b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-request.xml @@ -41,7 +41,6 @@ - diff --git a/backend/servers/explorer-batch/pom.xml b/backend/servers/explorer-batch/pom.xml index 61b320d18..edf9fbc95 100644 --- a/backend/servers/explorer-batch/pom.xml +++ b/backend/servers/explorer-batch/pom.xml @@ -47,6 +47,11 @@ ${lombok.version} provided + + org.apache.tika + tika-core + ${tika.version} + diff --git a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddAssetMetaDataBatch.java b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddAssetMetaDataBatch.java new file mode 100644 index 000000000..6f1997077 --- /dev/null +++ b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddAssetMetaDataBatch.java @@ -0,0 +1,43 @@ +package org.royllo.explorer.batch.batch.request; + +import lombok.RequiredArgsConstructor; +import org.royllo.explorer.batch.util.base.BaseBatch; +import org.royllo.explorer.core.dto.request.AddAssetMetaDataRequestDTO; +import org.royllo.explorer.core.service.request.RequestService; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * Batch treating {@link AddAssetMetaDataBatch}. + */ +@Component +@RequiredArgsConstructor +@SuppressWarnings("checkstyle:DesignForExtension") +public class AddAssetMetaDataBatch extends BaseBatch { + + /** Start delay in milliseconds (1 000 ms = 1 second). */ + private static final int START_DELAY_IN_MILLISECONDS = 1_000; + + /** Delay between two calls to process requests (1 000 ms = 1 second). */ + private static final int DELAY_BETWEEN_TWO_PROCESS_IN_MILLISECONDS = 1_000; + + /** Request service. */ + private final RequestService requestService; + + /** + * Recurrent calls to process requests. + */ + @Scheduled(initialDelay = START_DELAY_IN_MILLISECONDS, fixedDelay = DELAY_BETWEEN_TWO_PROCESS_IN_MILLISECONDS) + public void processRequests() { + if (enabled.get()) { + requestService.getOpenedRequests() + .stream() + .filter(request -> request instanceof AddAssetMetaDataRequestDTO) + .map(requestDTO -> (AddAssetMetaDataRequestDTO) requestDTO) + .forEach(request -> { + logger.info("Processing request {}: {}", request.getId(), request); + }); + } + } + +} diff --git a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/configuration/SchedulerConfiguration.java b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/configuration/SchedulerConfiguration.java index 5e6aa13d7..c3f5b17e8 100644 --- a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/configuration/SchedulerConfiguration.java +++ b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/configuration/SchedulerConfiguration.java @@ -19,7 +19,7 @@ public class SchedulerConfiguration extends BaseConfiguration { /** Scheduler pool size. */ - private static final int SCHEDULER_POOL_SIZE = 3; + private static final int SCHEDULER_POOL_SIZE = 5; /** Termination delay in milliseconds (10 000 ms = 10 seconds). */ private static final int TERMINATION_DELAY_IN_MILLISECONDS = 10_000; @@ -34,7 +34,7 @@ public TaskScheduler taskScheduler() { ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); scheduler.setWaitForTasksToCompleteOnShutdown(true); scheduler.setAwaitTerminationMillis(TERMINATION_DELAY_IN_MILLISECONDS); - scheduler.setThreadNamePrefix("royllo-processor-"); + scheduler.setThreadNamePrefix("royllo-process-"); scheduler.setPoolSize(SCHEDULER_POOL_SIZE); scheduler.setErrorHandler(throwable -> { try { diff --git a/backend/servers/explorer-batch/src/main/resources/db/dev/test-data-request.xml b/backend/servers/explorer-batch/src/main/resources/db/dev/test-data-request.xml index 9c16f4470..a2264caa5 100644 --- a/backend/servers/explorer-batch/src/main/resources/db/dev/test-data-request.xml +++ b/backend/servers/explorer-batch/src/main/resources/db/dev/test-data-request.xml @@ -41,7 +41,6 @@ - diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/InvalidProofTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/InvalidProofTest.java index 10977b8e0..f2bcb68ea 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/InvalidProofTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/InvalidProofTest.java @@ -50,7 +50,7 @@ public void processProof() { assertTrue(invalidProofRequestTreated.isPresent()); assertFalse(invalidProofRequestTreated.get().isSuccessful()); assertEquals(FAILURE, invalidProofRequestTreated.get().getStatus()); - assertEquals("proto: (line 1:17): invalid value for bytes type: \"INVALID_PROOF\"", invalidProofRequestTreated.get().getErrorMessage()); + assertEquals("proto: (line 1:17): invalid value for bytes type: \"INVALID_PROOF\"", invalidProofRequestTreated.get().getErrorMessage()); } } diff --git a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-request.xml b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-request.xml index 79bc4d301..74459e1d9 100644 --- a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-request.xml +++ b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-request.xml @@ -42,7 +42,6 @@ - diff --git a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-request.xml b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-request.xml index 9a6b43c35..9d44ff021 100644 --- a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-request.xml +++ b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-request.xml @@ -42,7 +42,6 @@ - diff --git a/backend/servers/explorer-web/yarn.lock b/backend/servers/explorer-web/yarn.lock index efddc406e..efbf148dc 100644 --- a/backend/servers/explorer-web/yarn.lock +++ b/backend/servers/explorer-web/yarn.lock @@ -36,7 +36,7 @@ resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@1.4.14": version "1.4.14" resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== @@ -57,7 +57,7 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": +"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": version "2.0.5" resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== @@ -139,7 +139,14 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -ansi-styles@^4.0.0, ansi-styles@^4.1.0: +ansi-styles@^4.0.0: + version "4.3.0" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== @@ -210,7 +217,7 @@ balanced-match@^1.0.0: resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64id@2.0.0, base64id@~2.0.0: +base64id@~2.0.0, base64id@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz" integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== @@ -302,7 +309,7 @@ browser-sync@^2.29.3: ua-parser-js "^1.0.33" yargs "^17.3.1" -browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.4: +browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.4, "browserslist@>= 4.21.0": version "4.21.10" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz" integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ== @@ -350,14 +357,6 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001538: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001539.tgz" integrity sha512-hfS5tE8bnNiNvEOEkm8HElUHroYwlqMMENEzELymy77+tJ6m+gA2krtHl5hxJaj71OlpC2cHZbdSMX1/YEqEkA== -chalk@4.1.2: - version "4.1.2" - resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chalk@^2.4.1: version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" @@ -367,6 +366,14 @@ chalk@^2.4.1: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@4.1.2: + version "4.1.2" + resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chokidar@^3.3.0, chokidar@^3.3.1, chokidar@^3.5.1, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" @@ -414,16 +421,16 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - color-name@~1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== + colord@^2.9.1: version "2.9.3" resolved "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz" @@ -499,7 +506,7 @@ cross-spawn@^7.0.1: css-declaration-sorter@^7.0.0: version "7.1.1" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.1.1.tgz#9796bcc257b4647c39993bda8d431ce32b666f80" + resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.1.1.tgz" integrity sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ== css-select@^5.1.0: @@ -549,7 +556,7 @@ cssesc@^3.0.0: cssnano-preset-default@^6.0.2: version "6.0.2" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-6.0.2.tgz#0cc13e2da462b0d1632b1ebea4af78e7484592e8" + resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.2.tgz" integrity sha512-VnZybFeZ63AiVqIUNlxqMxpj9VU8B5j0oKgP7WyVt/7mkyf97KsYkNzsPTV/RVmy54Pg7cBhOK4WATbdCB44gw== dependencies: css-declaration-sorter "^7.0.0" @@ -584,12 +591,12 @@ cssnano-preset-default@^6.0.2: cssnano-utils@^4.0.1: version "4.0.1" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-4.0.1.tgz#fd18b42f95938bf55ab47967705355d6047bf1da" + resolved "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.1.tgz" integrity sha512-6qQuYDqsGoiXssZ3zct6dcMxiqfT6epy7x4R0TQJadd4LWO3sPR6JH6ZByOvVLoZ6EdwPGgd7+DR1EmX3tiXQQ== cssnano@^6.0.2: version "6.0.2" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-6.0.2.tgz#7b49d60ce51e1dea3d569795f751ee49e97124c9" + resolved "https://registry.npmjs.org/cssnano/-/cssnano-6.0.2.tgz" integrity sha512-Tu9wv8UdN6CoiQnIVkCNvi+0rw/BwFWOJBlg2bVfEyKaadSuE3Gq/DD8tniVvggTJGwK88UjqZp7zL5sv6t1aA== dependencies: cssnano-preset-default "^6.0.2" @@ -597,7 +604,7 @@ cssnano@^6.0.2: csso@5.0.5: version "5.0.5" - resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6" + resolved "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz" integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ== dependencies: css-tree "~2.2.0" @@ -609,7 +616,7 @@ culori@^3: daisyui@^4.4.20: version "4.4.20" - resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.4.20.tgz#3f010eb3d1fc7b4b5824524d27a07adea6e4578d" + resolved "https://registry.npmjs.org/daisyui/-/daisyui-4.4.20.tgz" integrity sha512-AR2fuFVVLHVTdbkV+XWAqjtymEoxXksrsEMkdzPQo2wANtWjSXuODUzePNade64gJ0Y2CdQtiQkaZI7fWcp13g== dependencies: css-selector-tokenizer "^0.8" @@ -617,20 +624,13 @@ daisyui@^4.4.20: picocolors "^1" postcss-js "^4" -debug@2.6.9, debug@^2.2.0: +debug@^2.2.0: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@4.3.2: - version "4.3.2" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - debug@~4.3.1, debug@~4.3.2: version "4.3.4" resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" @@ -638,6 +638,20 @@ debug@~4.3.1, debug@~4.3.2: dependencies: ms "2.1.2" +debug@2.6.9: + version "2.6.9" + resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@4.3.2: + version "4.3.2" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz" @@ -646,16 +660,16 @@ define-properties@^1.1.3, define-properties@^1.1.4: has-property-descriptors "^1.0.0" object-keys "^1.1.1" -depd@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - depd@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== +depd@2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + dependency-graph@^0.11.0: version "0.11.0" resolved "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz" @@ -861,7 +875,7 @@ escape-string-regexp@^1.0.5: resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== -etag@1.8.1, etag@^1.8.1, etag@~1.8.1: +etag@^1.8.1, etag@~1.8.1, etag@1.8.1: version "1.8.1" resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== @@ -931,20 +945,11 @@ fraction.js@^4.3.6: resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz" integrity sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg== -fresh@0.5.2, fresh@^0.5.2: +fresh@^0.5.2, fresh@0.5.2: version "0.5.2" resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== -fs-extra@3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz" - integrity sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^3.0.0" - universalify "^0.1.0" - fs-extra@^11.0.0: version "11.1.0" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz" @@ -954,16 +959,20 @@ fs-extra@^11.0.0: jsonfile "^6.0.1" universalify "^2.0.0" +fs-extra@3.0.1: + version "3.0.1" + resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz" + integrity sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^3.0.0" + universalify "^0.1.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -fsevents@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" - integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== - function-bind@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" @@ -1119,6 +1128,16 @@ hosted-git-info@^2.1.4: resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== +http-errors@~1.6.2: + version "1.6.3" + resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz" + integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + http-errors@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz" @@ -1130,16 +1149,6 @@ http-errors@2.0.0: statuses "2.0.1" toidentifier "1.0.1" -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz" - integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - http-proxy@^1.18.1: version "1.18.1" resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz" @@ -1346,7 +1355,7 @@ isexe@^2.0.0: resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -jiti@^1.19.1: +jiti@^1.19.1, jiti@>=1.21.0: version "1.21.0" resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz" integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== @@ -1754,7 +1763,7 @@ portscanner@2.2.0: postcss-calc@^9.0.1: version "9.0.1" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-9.0.1.tgz#a744fd592438a93d6de0f1434c572670361eb6c6" + resolved "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz" integrity sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ== dependencies: postcss-selector-parser "^6.0.11" @@ -1780,7 +1789,7 @@ postcss-cli@^11.0.0: postcss-colormin@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-6.0.1.tgz#3aa61d38a88dbdeeb7252fae67809a7ac547a129" + resolved "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.1.tgz" integrity sha512-Tb9aR2wCJCzKuNjIeMzVNd0nXjQy25HDgFmmaRsHnP0eP/k8uQWE4S8voX5S2coO5CeKrp+USFs1Ayv9Tpxx6w== dependencies: browserslist "^4.21.4" @@ -1790,7 +1799,7 @@ postcss-colormin@^6.0.1: postcss-convert-values@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-6.0.1.tgz#a1451cb7e53b67b3db95c37276c5decb997409f2" + resolved "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.1.tgz" integrity sha512-zTd4Vh0HxGkhg5aHtfCogcRHzGkvblfdWlQ53lIh1cJhYcGyIxh2hgtKoVh40AMktRERet+JKdB04nNG19kjmA== dependencies: browserslist "^4.21.4" @@ -1798,22 +1807,22 @@ postcss-convert-values@^6.0.1: postcss-discard-comments@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-6.0.1.tgz#46176212bd9c3e5f48aa4b8b4868786726c41d36" + resolved "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.1.tgz" integrity sha512-f1KYNPtqYLUeZGCHQPKzzFtsHaRuECe6jLakf/RjSRqvF5XHLZnM2+fXLhb8Qh/HBFHs3M4cSLb1k3B899RYIg== postcss-discard-duplicates@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.1.tgz#112b1a95948e69b3484fdd43584dda6930977939" + resolved "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.1.tgz" integrity sha512-1hvUs76HLYR8zkScbwyJ8oJEugfPV+WchpnA+26fpJ7Smzs51CzGBHC32RS03psuX/2l0l0UKh2StzNxOrKCYg== postcss-discard-empty@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-6.0.1.tgz#b34cb45ec891246da4506b53e352390fdef126c4" + resolved "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.1.tgz" integrity sha512-yitcmKwmVWtNsrrRqGJ7/C0YRy53i0mjexBDQ9zYxDwTWVBgbU4+C9jIZLmQlTDT9zhml+u0OMFJh8+31krmOg== postcss-discard-overridden@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.1.tgz#c63c559237758d74bc505452393a64dda9b19ef4" + resolved "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.1.tgz" integrity sha512-qs0ehZMMZpSESbRkw1+inkf51kak6OOzNRaoLd/U7Fatp0aN2HQ1rxGOrJvYcRAN9VpX8kUF13R2ofn8OlvFVA== postcss-import@^15.1.0: @@ -1850,7 +1859,7 @@ postcss-load-config@^5.0.0: postcss-merge-longhand@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.1.tgz#5a1145868c615e643ca0996d9e9c3f09ad8de854" + resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.1.tgz" integrity sha512-vmr/HZQzaPXc45FRvSctqFTF05UaDnTn5ABX+UtQPJznDWT/QaFbVc/pJ5C2YPxx2J2XcfmWowlKwtCDwiQ5hA== dependencies: postcss-value-parser "^4.2.0" @@ -1858,7 +1867,7 @@ postcss-merge-longhand@^6.0.1: postcss-merge-rules@^6.0.2: version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-6.0.2.tgz#b0f0063a05d671b7093a86f0faa6d2c6695dc036" + resolved "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.2.tgz" integrity sha512-6lm8bl0UfriSfxI+F/cezrebqqP8w702UC6SjZlUlBYwuRVNbmgcJuQU7yePIvD4MNT53r/acQCUAyulrpgmeQ== dependencies: browserslist "^4.21.4" @@ -1868,14 +1877,14 @@ postcss-merge-rules@^6.0.2: postcss-minify-font-values@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.1.tgz#788eb930168be90225f3937f0b70aa19d8b532b2" + resolved "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.1.tgz" integrity sha512-tIwmF1zUPoN6xOtA/2FgVk1ZKrLcCvE0dpZLtzyyte0j9zUeB8RTbCqrHZGjJlxOvNWKMYtunLrrl7HPOiR46w== dependencies: postcss-value-parser "^4.2.0" postcss-minify-gradients@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.1.tgz#4faf1880b483dc37016658aa186b42194ff9b5bc" + resolved "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.1.tgz" integrity sha512-M1RJWVjd6IOLPl1hYiOd5HQHgpp6cvJVLrieQYS9y07Yo8itAr6jaekzJphaJFR0tcg4kRewCk3kna9uHBxn/w== dependencies: colord "^2.9.1" @@ -1884,7 +1893,7 @@ postcss-minify-gradients@^6.0.1: postcss-minify-params@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-6.0.1.tgz#79b83947bae2aa991df12646c7f463276abb0aef" + resolved "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.1.tgz" integrity sha512-eFvGWArqh4khPIgPDu6SZNcaLctx97nO7c59OXnRtGntAp5/VS4gjMhhW9qUFsK6mQ27pEZGt2kR+mPizI+Z9g== dependencies: browserslist "^4.21.4" @@ -1893,7 +1902,7 @@ postcss-minify-params@^6.0.1: postcss-minify-selectors@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-6.0.1.tgz#7b2f05651a2f734da1fa50dea62cfc47e67d68f9" + resolved "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.1.tgz" integrity sha512-mfReq5wrS6vkunxvJp6GDuOk+Ak6JV7134gp8L+ANRnV9VwqzTvBtX6lpohooVU750AR0D3pVx2Zn6uCCwOAfQ== dependencies: postcss-selector-parser "^6.0.5" @@ -1907,47 +1916,47 @@ postcss-nested@^6.0.1: postcss-normalize-charset@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-6.0.1.tgz#5f70e1eb8bbdbcfcbed060ef70f179e8fef57d0c" + resolved "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.1.tgz" integrity sha512-aW5LbMNRZ+oDV57PF9K+WI1Z8MPnF+A8qbajg/T8PP126YrGX1f9IQx21GI2OlGz7XFJi/fNi0GTbY948XJtXg== postcss-normalize-display-values@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.1.tgz#ff9aa30bbf1283294bfd9cc8b6fb81ff060a7f2d" + resolved "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.1.tgz" integrity sha512-mc3vxp2bEuCb4LgCcmG1y6lKJu1Co8T+rKHrcbShJwUmKJiEl761qb/QQCfFwlrvSeET3jksolCR/RZuMURudw== dependencies: postcss-value-parser "^4.2.0" postcss-normalize-positions@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-6.0.1.tgz#41ffdc72994f024c6cd6e91dbfb40ab9abe6fe90" + resolved "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.1.tgz" integrity sha512-HRsq8u/0unKNvm0cvwxcOUEcakFXqZ41fv3FOdPn916XFUrympjr+03oaLkuZENz3HE9RrQE9yU0Xv43ThWjQg== dependencies: postcss-value-parser "^4.2.0" postcss-normalize-repeat-style@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.1.tgz#55dc54b6f80305b280a379899a6626e0a07b04a8" + resolved "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.1.tgz" integrity sha512-Gbb2nmCy6tTiA7Sh2MBs3fj9W8swonk6lw+dFFeQT68B0Pzwp1kvisJQkdV6rbbMSd9brMlS8I8ts52tAGWmGQ== dependencies: postcss-value-parser "^4.2.0" postcss-normalize-string@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-6.0.1.tgz#7605e0fb4ec7bf2709709991d13a949e4419db1d" + resolved "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.1.tgz" integrity sha512-5Fhx/+xzALJD9EI26Aq23hXwmv97Zfy2VFrt5PLT8lAhnBIZvmaT5pQk+NuJ/GWj/QWaKSKbnoKDGLbV6qnhXg== dependencies: postcss-value-parser "^4.2.0" postcss-normalize-timing-functions@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.1.tgz#ef937b7ca2fd62ed0b46645ea5728b842a3600db" + resolved "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.1.tgz" integrity sha512-4zcczzHqmCU7L5dqTB9rzeqPWRMc0K2HoR+Bfl+FSMbqGBUcP5LRfgcH4BdRtLuzVQK1/FHdFoGT3F7rkEnY+g== dependencies: postcss-value-parser "^4.2.0" postcss-normalize-unicode@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.1.tgz#a652faa02fc8ce5d1429ac0782575d8d66a60d9b" + resolved "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.1.tgz" integrity sha512-ok9DsI94nEF79MkvmLfHfn8ddnKXA7w+8YuUoz5m7b6TOdoaRCpvu/QMHXQs9+DwUbvp+ytzz04J55CPy77PuQ== dependencies: browserslist "^4.21.4" @@ -1955,21 +1964,21 @@ postcss-normalize-unicode@^6.0.1: postcss-normalize-url@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-6.0.1.tgz#eae58cb4f5f9a4fa5bbbf6d4222dff534ad46186" + resolved "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.1.tgz" integrity sha512-jEXL15tXSvbjm0yzUV7FBiEXwhIa9H88JOXDGQzmcWoB4mSjZIsmtto066s2iW9FYuIrIF4k04HA2BKAOpbsaQ== dependencies: postcss-value-parser "^4.2.0" postcss-normalize-whitespace@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.1.tgz#b5933750b938814c028d3d2b2e5c0199e0037b53" + resolved "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.1.tgz" integrity sha512-76i3NpWf6bB8UHlVuLRxG4zW2YykF9CTEcq/9LGAiz2qBuX5cBStadkk0jSkg9a9TCIXbMQz7yzrygKoCW9JuA== dependencies: postcss-value-parser "^4.2.0" postcss-ordered-values@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-6.0.1.tgz#553e735d009065b362da93340e57f43d5f2d0fbc" + resolved "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.1.tgz" integrity sha512-XXbb1O/MW9HdEhnBxitZpPFbIvDgbo9NK4c/5bOfiKpnIGZDoL2xd7/e6jW5DYLsWxBbs+1nZEnVgnjnlFViaA== dependencies: cssnano-utils "^4.0.1" @@ -1977,7 +1986,7 @@ postcss-ordered-values@^6.0.1: postcss-reduce-initial@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-6.0.1.tgz#37621ba31a18fd75eb9c76e818cca2a2adb13238" + resolved "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.1.tgz" integrity sha512-cgzsI2ThG1PMSdSyM9A+bVxiiVgPIVz9f5c6H+TqEv0CA89iCOO81mwLWRWLgOKFtQkKob9nNpnkxG/1RlgFcA== dependencies: browserslist "^4.21.4" @@ -1985,7 +1994,7 @@ postcss-reduce-initial@^6.0.1: postcss-reduce-transforms@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.1.tgz#7bf59d7c6e7066e3b18ef17237d2344bd3da6d75" + resolved "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.1.tgz" integrity sha512-fUbV81OkUe75JM+VYO1gr/IoA2b/dRiH6HvMwhrIBSUrxq3jNZQZitSnugcTLDi1KkQh1eR/zi+iyxviUNBkcQ== dependencies: postcss-value-parser "^4.2.0" @@ -1998,14 +2007,6 @@ postcss-reporter@^7.0.0: picocolors "^1.0.0" thenby "^1.3.4" -postcss-selector-parser@6.0.10: - version "6.0.10" - resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz" - integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5: version "6.0.11" resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz" @@ -2014,9 +2015,17 @@ postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.4, postcss-selecto cssesc "^3.0.0" util-deprecate "^1.0.2" +postcss-selector-parser@6.0.10: + version "6.0.10" + resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz" + integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + postcss-svgo@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-6.0.1.tgz#6bf63713ef5cb40f1bedd2c2cfca2486b41d5184" + resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.1.tgz" integrity sha512-eWV4Rrqa06LzTgqirOv5Ln6WTGyU7Pbeqj9WEyKo9tpnWixNATVJMeaEcOHOW1ZYyjcG8wSJwX/28DvU3oy3HA== dependencies: postcss-value-parser "^4.2.0" @@ -2024,7 +2033,7 @@ postcss-svgo@^6.0.1: postcss-unique-selectors@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-6.0.1.tgz#e6d071c2ea64ce265eb55ea9c170ff951183c712" + resolved "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.1.tgz" integrity sha512-/KCCEpNNR7oXVJ38/Id7GC9Nt0zxO1T3zVbhVaq6F6LSG+3gU3B7+QuTHfD0v8NPEHlzewAout29S0InmB78EQ== dependencies: postcss-selector-parser "^6.0.5" @@ -2034,7 +2043,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0: resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.4.23, postcss@^8.4.32: +postcss@^8.0.0, postcss@^8.0.9, postcss@^8.1.0, postcss@^8.2.14, postcss@^8.2.2, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.31, postcss@^8.4.32, postcss@>=8.0.9: version "8.4.32" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz" integrity sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw== @@ -2158,7 +2167,12 @@ safe-regex-test@^1.0.0: resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -"semver@2 || 3 || 4 || 5", semver@^5.5.0: +semver@^5.5.0: + version "5.7.1" + resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +"semver@2 || 3 || 4 || 5": version "5.7.1" resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -2331,11 +2345,6 @@ spdx-license-ids@^3.0.0: resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz" integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== - "statuses@>= 1.4.0 < 2", statuses@~1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz" @@ -2346,6 +2355,11 @@ statuses@~1.3.1: resolved "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz" integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg== +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + stream-throttle@^0.1.3: version "0.1.3" resolved "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz" @@ -2404,7 +2418,7 @@ strip-bom@^3.0.0: stylehacks@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-6.0.1.tgz#c103f0149e268a290a0dda3fce8fd4c5459a13c3" + resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.1.tgz" integrity sha512-jTqG2aIoX2fYg0YsGvqE4ooE/e75WmaEjnNiP6Ag7irLtHxML8NJRxRxS0HyDpde8DRGuEXTFVHVfR5Tmbxqzg== dependencies: browserslist "^4.21.4" @@ -2444,7 +2458,7 @@ supports-preserve-symlinks-flag@^1.0.0: svgo@^3.0.5: version "3.1.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.1.0.tgz#7e63855c8da73297d5d5765e968f9679a0f8d24a" + resolved "https://registry.npmjs.org/svgo/-/svgo-3.1.0.tgz" integrity sha512-R5SnNA89w1dYgNv570591F66v34b3eQShpIBcQtZtM5trJwm1VvxbIoMpRYY3ybTAutcKTLEmTsdnaknOHbiQA== dependencies: "@trysound/sax" "0.2.0" @@ -2455,7 +2469,7 @@ svgo@^3.0.5: csso "5.0.5" picocolors "^1.0.0" -tailwindcss@^3.3.6: +tailwindcss@^3.3.6, "tailwindcss@>=3.0.0 || >= 3.0.0-alpha.1", "tailwindcss@>=3.0.0 || insiders": version "3.3.6" resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.6.tgz" integrity sha512-AKjF7qbbLvLaPieoKeTjG1+FyNZT6KaJMJPFeQyLfIp7l82ggH1fbHJSsYIvnbTFQOlkh+gBYpyby5GT1LIdLw== @@ -2563,7 +2577,7 @@ universalify@^2.0.0: resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -unpipe@1.0.0, unpipe@~1.0.0: +unpipe@~1.0.0, unpipe@1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== @@ -2680,19 +2694,6 @@ yargs-parser@^21.1.1: resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@17.1.1: - version "17.1.1" - resolved "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz" - integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - yargs@^17.0.0, yargs@^17.3.1: version "17.6.2" resolved "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz" @@ -2705,3 +2706,16 @@ yargs@^17.0.0, yargs@^17.3.1: string-width "^4.2.3" y18n "^5.0.5" yargs-parser "^21.1.1" + +yargs@17.1.1: + version "17.1.1" + resolved "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz" + integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" diff --git a/docs/design/meta-data/README.md b/docs/design/meta-data/README.md new file mode 100644 index 000000000..ac5b30455 --- /dev/null +++ b/docs/design/meta-data/README.md @@ -0,0 +1,32 @@ +# Getting meta-data from the API + +```bash +curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-mainnet.macaroon)" \ +--insecure https://universe.royllo.org:8089/v1/taproot-assets/assets/meta/asset-id/24a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d | \ +jq '.data' | tr -d '"' | xxd -r -p +``` + +Asset meta data can be added by adding a specific request. + +A menu "Add meta data" is added to the "add data" button you can find on the homepage. +A form is displayed to add the meta data with three fields: + +- asset id: the asset id of the asset you want to add meta data to. +- meta data file: a file containing the meta you want to add. + +When you click on the "Add meta data" button, a request is sent to the API to create the add meta data request. +If a meta data file is present, the file will be put in our storage system. + +note : on an asset page, next to the meta data hash field : + +- if meta data is known: a button "Get meta data" is displayed. When you click on it, a request is sent to the API to + get the meta data of the asset. +- If meta data is not known: a button "Add meta data" is displayed. When you click on it, the form is displayed (and + asset id is already filled). + +A batch is in charge of getting all request to add meta data. +For each one, we search for the asset id in our database. If it's found, we calculate the hash of the meta data and +compare it to the one in the asset. +If it's the same, we add the file to our storage service and update the asset with the meta data file name. + + diff --git a/pom.xml b/pom.xml index 941f4754b..80ca815f0 100644 --- a/pom.xml +++ b/pom.xml @@ -81,6 +81,8 @@ 0.2.0 1.5.5.Final + 2.9.1 + 8.7.0 diff --git a/util/test/common-test/justfile b/util/test/common-test/justfile index 8f83846f9..cce0ff24f 100644 --- a/util/test/common-test/justfile +++ b/util/test/common-test/justfile @@ -46,9 +46,14 @@ retrieve_lighting_labs_mainnet_universe_roots: generate_roylloCoin_data: curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-mainnet.macaroon)" \ - --data @src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json \ + --data @src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json \ --insecure https://universe.royllo.org:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json + jq > src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-mainnet.macaroon)" \ + --data @src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json \ + --insecure https://universe.royllo.org:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json curl https://mempool.space/api/tx/d22de9a2de657c262a2c20c14500b8adca593c96f3fb85bfd756ba66626b9fcb | \ jq > src/main/resources/mempool/d22de9a2de657c262a2c20c14500b8adca593c96f3fb85bfd756ba66626b9fcb-response.json @@ -58,9 +63,14 @@ generate_roylloCoin_data: generate_roylloNFT_data: curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json \ + --data @src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json + jq > src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json curl https://mempool.space/testnet/api/tx/c28a42586b36ac499c6d36da792d98176572573124dbc82526d02bbad5b3d9c7 | \ jq > src/main/resources/mempool/c28a42586b36ac499c6d36da792d98176572573124dbc82526d02bbad5b3d9c7-response.json @@ -70,19 +80,34 @@ generate_roylloNFT_data: generate_setOfRoylloNFT_data: curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json \ + --data @src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json + jq > src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-response.json curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-request.json \ + --data @src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-response.json + jq > src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-response.json curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-request.json \ + --data @src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-response.json + jq > src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-response.json curl https://mempool.space/testnet/api/tx/6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90 | \ jq > src/main/resources/mempool/6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90-response.json @@ -92,34 +117,64 @@ generate_setOfRoylloNFT_data: generate_trickyRoylloCoin_data: curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json \ + --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json + jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-request.json \ + --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-response.json + jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-response.json curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-request.json \ + --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-response.json + jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-response.json curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-request.json \ + --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-response.json + jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withMetaReveal-response.json curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-request.json \ + --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withoutMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-response.json + jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withoutMetaReveal-response.json curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-request.json \ + --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-response.json + jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withoutMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withoutMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withoutMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withoutMetaReveal-response.json curl https://mempool.space/testnet/api/tx/2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76 | \ jq > src/main/resources/mempool/2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76-response.json @@ -135,9 +190,14 @@ generate_trickyRoylloCoin_data: generate_unknownRoylloCoin_data: curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json \ + --data @src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json + jq > src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json curl https://mempool.space/testnet/api/tx/2727229cc771efa552f9232a04b0cd8d16df6d83bd217523888feee6a8553ec8 | \ jq > src/main/resources/mempool/2727229cc771efa552f9232a04b0cd8d16df6d83bd217523888feee6a8553ec8-response.json @@ -147,14 +207,24 @@ generate_unknownRoylloCoin_data: generate_unlimitedRoylloCoin_data: curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-request.json \ + --data @src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-response.json + jq > src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-request.json \ + --data @src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-response.json + jq > src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json curl https://mempool.space/testnet/api/tx/77b550de10ad347daf314f4982a979db6d101573afe6fbf20c35935ce4bb0413 | \ jq > src/main/resources/mempool/77b550de10ad347daf314f4982a979db6d101573afe6fbf20c35935ce4bb0413-response.json @@ -170,6 +240,11 @@ generate_unlimitedRoylloCoin_data: generate_invalidProof_data: curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ - --data @src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-request.json \ + --data @src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json \ + --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ + jq > src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json + + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-local.macaroon)" \ + --data @src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json \ --insecure https://localhost:8089/v1/taproot-assets/proofs/decode | \ - jq > src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-response.json \ No newline at end of file + jq > src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json \ No newline at end of file diff --git a/util/test/common-test/pom.xml b/util/test/common-test/pom.xml index 48b44c9f3..4dd271d07 100644 --- a/util/test/common-test/pom.xml +++ b/util/test/common-test/pom.xml @@ -139,6 +139,12 @@ + + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + com.amashchenko.maven.plugin diff --git a/util/test/common-test/src/main/java/org/royllo/test/TapdData.java b/util/test/common-test/src/main/java/org/royllo/test/TapdData.java index aa0f5bfb8..7808843e1 100644 --- a/util/test/common-test/src/main/java/org/royllo/test/TapdData.java +++ b/util/test/common-test/src/main/java/org/royllo/test/TapdData.java @@ -91,66 +91,81 @@ public class TapdData { // RoylloCoin. LOGGER.info("Loading RoylloCoin..."); ROYLLO_COIN_FROM_TEST = new AssetValue(); - ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("roylloCoin", 1, 0)); + ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("roylloCoin", 1, 0, true)); + ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("roylloCoin", 1, 0, false)); ASSETS.put(ROYLLO_COIN_ASSET_ID, ROYLLO_COIN_FROM_TEST); // ============================================================================================================= - // roylloNFT + // roylloNFT. LOGGER.info("Loading roylloNFT..."); ROYLLO_NFT_FROM_TEST = new AssetValue(); - ROYLLO_NFT_FROM_TEST.addDecodedProofValue(getDecodedProofValue("roylloNFT", 1, 0)); + ROYLLO_NFT_FROM_TEST.addDecodedProofValue(getDecodedProofValue("roylloNFT", 1, 0, true)); + ROYLLO_NFT_FROM_TEST.addDecodedProofValue(getDecodedProofValue("roylloNFT", 1, 0, false)); ASSETS.put(ROYLLO_NFT_ASSET_ID, ROYLLO_NFT_FROM_TEST); // ============================================================================================================= - // setOfRoylloNFT + // setOfRoylloNFT. LOGGER.info("Loading setOfRoylloNFT..."); SET_OF_ROYLLO_NFT_1_FROM_TEST = new AssetValue(); - SET_OF_ROYLLO_NFT_1_FROM_TEST.addDecodedProofValue(getDecodedProofValue("setOfRoylloNFT", 1, 0)); + SET_OF_ROYLLO_NFT_1_FROM_TEST.addDecodedProofValue(getDecodedProofValue("setOfRoylloNFT", 1, 0, true)); + SET_OF_ROYLLO_NFT_1_FROM_TEST.addDecodedProofValue(getDecodedProofValue("setOfRoylloNFT", 1, 0, false)); ASSETS.put(SET_OF_ROYLLO_NFT_1_ASSET_ID, SET_OF_ROYLLO_NFT_1_FROM_TEST); SET_OF_ROYLLO_NFT_2_FROM_TEST = new AssetValue(); - SET_OF_ROYLLO_NFT_2_FROM_TEST.addDecodedProofValue(getDecodedProofValue("setOfRoylloNFT", 2, 0)); + SET_OF_ROYLLO_NFT_2_FROM_TEST.addDecodedProofValue(getDecodedProofValue("setOfRoylloNFT", 2, 0, true)); + SET_OF_ROYLLO_NFT_2_FROM_TEST.addDecodedProofValue(getDecodedProofValue("setOfRoylloNFT", 2, 0, false)); ASSETS.put(SET_OF_ROYLLO_NFT_2_ASSET_ID, SET_OF_ROYLLO_NFT_2_FROM_TEST); SET_OF_ROYLLO_NFT_3_FROM_TEST = new AssetValue(); - SET_OF_ROYLLO_NFT_3_FROM_TEST.addDecodedProofValue(getDecodedProofValue("setOfRoylloNFT", 3, 0)); + SET_OF_ROYLLO_NFT_3_FROM_TEST.addDecodedProofValue(getDecodedProofValue("setOfRoylloNFT", 3, 0, true)); + SET_OF_ROYLLO_NFT_3_FROM_TEST.addDecodedProofValue(getDecodedProofValue("setOfRoylloNFT", 3, 0, false)); ASSETS.put(SET_OF_ROYLLO_NFT_3_ASSET_ID, SET_OF_ROYLLO_NFT_3_FROM_TEST); // ============================================================================================================= // trickyRoylloCoin. LOGGER.info("Loading trickyRoylloCoin..."); TRICKY_ROYLLO_COIN_FROM_TEST = new AssetValue(); - TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 1, 0)); - TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 2, 0)); - TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 2, 1)); - TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 3, 0)); - TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 3, 1)); - TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 3, 2)); + TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 1, 0, true)); + TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 1, 0, false)); + TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 2, 0, true)); + TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 2, 0, false)); + TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 2, 1, true)); + TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 2, 1, false)); + TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 3, 0, true)); + TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 3, 0, false)); + TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 3, 1, true)); + TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 3, 1, false)); + TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 3, 2, true)); + TRICKY_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("trickyRoylloCoin", 3, 2, false)); ASSETS.put(TRICKY_ROYLLO_COIN_ASSET_ID, TRICKY_ROYLLO_COIN_FROM_TEST); // ============================================================================================================= // UnknownRoylloCoin. LOGGER.info("Loading unknownRoylloCoin..."); UNKNOWN_ROYLLO_COIN_FROM_TEST = new AssetValue(); - UNKNOWN_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("unknownRoylloCoin", 1, 0)); + UNKNOWN_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("unknownRoylloCoin", 1, 0, true)); + UNKNOWN_ROYLLO_COIN_FROM_TEST.addDecodedProofValue(getDecodedProofValue("unknownRoylloCoin", 1, 0, false)); ASSETS.put(UNKNOWN_ROYLLO_COIN_ASSET_ID, UNKNOWN_ROYLLO_COIN_FROM_TEST); // ============================================================================================================= // unlimitedRoylloCoin. LOGGER.info("Loading unlimitedRoylloCoin..."); UNLIMITED_ROYLLO_COIN_1_FROM_TEST = new AssetValue(); - UNLIMITED_ROYLLO_COIN_1_FROM_TEST.addDecodedProofValue(getDecodedProofValue("unlimitedRoylloCoin/firstEmission", 1, 0)); + UNLIMITED_ROYLLO_COIN_1_FROM_TEST.addDecodedProofValue(getDecodedProofValue("unlimitedRoylloCoin/firstEmission", 1, 0, true)); + UNLIMITED_ROYLLO_COIN_1_FROM_TEST.addDecodedProofValue(getDecodedProofValue("unlimitedRoylloCoin/firstEmission", 1, 0, false)); ASSETS.put(UNLIMITED_ROYLLO_COIN_1_ASSET_ID, UNLIMITED_ROYLLO_COIN_1_FROM_TEST); UNLIMITED_ROYLLO_COIN_2_FROM_TEST = new AssetValue(); - UNLIMITED_ROYLLO_COIN_2_FROM_TEST.addDecodedProofValue(getDecodedProofValue("unlimitedRoylloCoin/secondEmission", 1, 0)); + UNLIMITED_ROYLLO_COIN_2_FROM_TEST.addDecodedProofValue(getDecodedProofValue("unlimitedRoylloCoin/secondEmission", 1, 0, true)); + UNLIMITED_ROYLLO_COIN_2_FROM_TEST.addDecodedProofValue(getDecodedProofValue("unlimitedRoylloCoin/secondEmission", 1, 0, false)); ASSETS.put(UNLIMITED_ROYLLO_COIN_2_ASSET_ID, UNLIMITED_ROYLLO_COIN_2_FROM_TEST); // ============================================================================================================= - // Invalid proof + // Invalid proof. LOGGER.info("Loading invalidProof..."); final AssetValue invalidProof = new AssetValue(); - invalidProof.addDecodedProofValue(getDecodedProofValue("invalidProof", 1, 0)); + invalidProof.addDecodedProofValue(getDecodedProofValue("invalidProof", 1, 0, true)); + invalidProof.addDecodedProofValue(getDecodedProofValue("invalidProof", 1, 0, false)); ASSETS.put("invalidProof", invalidProof); LOGGER.info("TapdData loaded."); @@ -184,7 +199,7 @@ public static DecodedProofValueResponse.DecodedProof findFirstDecodedProof(final */ public static Optional findAssetStateByAssetStateId(final String assetStateId) { return ASSETS.values().stream() - .flatMap(assetValue -> assetValue.getDecodedProofValues().stream()) + .flatMap(assetValue -> assetValue.getDecodedProofValuesWithoutMetaReveal().stream()) .filter(decodedProofValue -> decodedProofValue.getAssetStateId().equals(assetStateId)) .map(DecodedProofValue::getResponse) .map(DecodedProofValueResponse::getDecodedProof) @@ -202,20 +217,42 @@ public static void setMockServerRules(final ClientAndServer mockServer) { for (Map.Entry entry : ASSETS.entrySet()) { // For each decoded proof values, we mock the request. AtomicInteger i = new AtomicInteger(0); - entry.getValue().getDecodedProofValues().forEach(decodedProofValue -> { + + // Adding decoded proof values without meta reveal. + entry.getValue().getDecodedProofValuesWithoutMetaReveal().forEach(decodedProofValue -> { + int index = i.getAndIncrement(); + mockServer.when(request().withBody( + JsonBody.json( + "{" + + "\"raw_proof\" : \"" + entry.getValue().getDecodedProofValuesWithoutMetaReveal().get(index).getRequest().getRawProof() + "\"," + + "\"proof_at_depth\" : " + entry.getValue().getDecodedProofValuesWithoutMetaReveal().get(index).getRequest().getProofAtDepth() + "," + + "\"with_meta_reveal\" : " + entry.getValue().getDecodedProofValuesWithoutMetaReveal().get(index).getRequest().isWithMetaReveal() + + "}", + MatchType.ONLY_MATCHING_FIELDS + ) + )) + .respond(response().withStatusCode(200) + .withContentType(APPLICATION_JSON) + .withBody(entry.getValue().getDecodedProofValuesWithoutMetaReveal().get(index).getJSONResponse())); + }); + + // Adding decoded proof values with meta reveal. + i.set(0); + entry.getValue().getDecodedProofValuesWithMetaReveal().forEach(decodedProofValue -> { int index = i.getAndIncrement(); mockServer.when(request().withBody( JsonBody.json( "{" - + "\"raw_proof\" : \"" + entry.getValue().getDecodedProofValues().get(index).getRequest().getRawProof() + "\"," - + "\"proof_at_depth\" : " + entry.getValue().getDecodedProofValues().get(index).getRequest().getProofAtDepth() + + "\"raw_proof\" : \"" + entry.getValue().getDecodedProofValuesWithMetaReveal().get(index).getRequest().getRawProof() + "\"," + + "\"proof_at_depth\" : " + entry.getValue().getDecodedProofValuesWithMetaReveal().get(index).getRequest().getProofAtDepth() + "," + + "\"with_meta_reveal\" : " + entry.getValue().getDecodedProofValuesWithMetaReveal().get(index).getRequest().isWithMetaReveal() + "}", MatchType.ONLY_MATCHING_FIELDS ) )) .respond(response().withStatusCode(200) .withContentType(APPLICATION_JSON) - .withBody(entry.getValue().getDecodedProofValues().get(index).getJSONResponse())); + .withBody(entry.getValue().getDecodedProofValuesWithoutMetaReveal().get(index).getJSONResponse())); }); } } @@ -226,12 +263,19 @@ public static void setMockServerRules(final ClientAndServer mockServer) { * @param coinName coin name * @param proofFileIndex proof file index * @param proofAtDepth proof at depth + * @param withMetaReveal with meta reveal * @return decoded proof value */ private static DecodedProofValue getDecodedProofValue(final String coinName, final int proofFileIndex, - final int proofAtDepth) { - final String baseFileName = "/tapd/assets/" + coinName + "/decodeProof-proofFile" + proofFileIndex + "-proofAtDepth" + proofAtDepth; + final int proofAtDepth, + final boolean withMetaReveal) { + String baseFileName = "/tapd/assets/" + coinName + "/decodeProof-proofFile" + proofFileIndex + "-proofAtDepth" + proofAtDepth; + if (withMetaReveal) { + baseFileName += "-withMetaReveal"; + } else { + baseFileName += "-withoutMetaReveal"; + } try { return new DecodedProofValue( getDecodedProofRequestFromFile(baseFileName + "-request.json"), diff --git a/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/AssetValue.java b/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/AssetValue.java index c0720136f..a48a6ae76 100644 --- a/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/AssetValue.java +++ b/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/AssetValue.java @@ -12,8 +12,13 @@ @SuppressWarnings("checkstyle:VisibilityModifier") public class AssetValue { - /** Decoded proof value. */ - List decodedProofValues = new LinkedList<>(); + /** Decoded proof value (with meta reveal). */ + @Getter + List decodedProofValuesWithoutMetaReveal = new LinkedList<>(); + + /** Decoded proof value (without meta reveal). */ + @Getter + List decodedProofValuesWithMetaReveal = new LinkedList<>(); /** Asset id. */ private String assetId; @@ -27,7 +32,13 @@ public void addDecodedProofValue(final DecodedProofValue newDecodedProofValue) { if (assetId == null && newDecodedProofValue.getResponse().getDecodedProof() != null) { assetId = newDecodedProofValue.getResponse().getDecodedProof().getAsset().getAssetGenesis().getAssetId(); } - this.decodedProofValues.add(newDecodedProofValue); + + // We have two different lists for decoded proof values with and without meta reveal. + if (newDecodedProofValue.getRequest().isWithMetaReveal()) { + this.decodedProofValuesWithMetaReveal.add(newDecodedProofValue); + } else { + this.decodedProofValuesWithoutMetaReveal.add(newDecodedProofValue); + } } /** @@ -37,7 +48,7 @@ public void addDecodedProofValue(final DecodedProofValue newDecodedProofValue) { * @return decoded proof */ public DecodedProofValueRequest getDecodedProofRequest(final int i) { - return decodedProofValues.get(i).getRequest(); + return decodedProofValuesWithoutMetaReveal.get(i).getRequest(); } /** @@ -47,7 +58,27 @@ public DecodedProofValueRequest getDecodedProofRequest(final int i) { * @return decoded proof */ public DecodedProofValueResponse.DecodedProof getDecodedProofResponse(final int i) { - return decodedProofValues.get(i).getResponse().getDecodedProof(); + return decodedProofValuesWithoutMetaReveal.get(i).getResponse().getDecodedProof(); + } + + /** + * Returns the decoded proof requested (with meta reveal). + * + * @param i index + * @return decoded proof + */ + public DecodedProofValueRequest getDecodedProofRequestWithMetaReveal(final int i) { + return decodedProofValuesWithMetaReveal.get(i).getRequest(); + } + + /** + * Returns the decoded proof requested (with meta reveal). + * + * @param i index + * @return decoded proof + */ + public DecodedProofValueResponse.DecodedProof getDecodedProofResponseWithMetaReveal(final int i) { + return decodedProofValuesWithMetaReveal.get(i).getResponse().getDecodedProof(); } } diff --git a/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueRequest.java b/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueRequest.java index a48b52918..951e250da 100644 --- a/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueRequest.java +++ b/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueRequest.java @@ -6,10 +6,11 @@ import lombok.Data; import lombok.extern.jackson.Jacksonized; -import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Decoded proof request (for tests). */ @@ -43,11 +44,15 @@ public class DecodedProofValueRequest { @JsonProperty("with_meta_reveal") boolean withMetaReveal; - // sha256 of rawProof field + /** + * Returns proof id. + * + * @return proof id + */ public final String getProofId() { try { MessageDigest md = MessageDigest.getInstance("SHA-256"); - byte[] digest = md.digest(rawProof.getBytes(StandardCharsets.UTF_8)); + byte[] digest = md.digest(rawProof.getBytes(UTF_8)); return DatatypeConverter.printHexBinary(digest).toLowerCase(); } catch (NoSuchAlgorithmException e) { throw new RuntimeException("SHA-256 is not available: " + e.getMessage()); diff --git a/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-request.json rename to util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-response.json rename to util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json new file mode 100644 index 000000000..752484fe0 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "INVALID_PROOF", + "proof_at_depth": 0, + "with_prev_witnesses": true, + "with_meta_reveal": false +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json rename to util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json rename to util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json new file mode 100644 index 000000000..19d9d5b81 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000001fd054e544150500004000000000224cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd20000000404500060da25a5c4ac850d9b2bb53264a39577ad4b37b5b6e356adb502000000000000000000a82669d71121cb48e9687c782551e0063c0552f8e9bf499d5b6100b8df1575284d365265125a041746cca20f06f702000000000101cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd20400000000ffffffff02e8030000000000002251200e7b1c167645f8fea7d7d52d9fd2655822d53e9f56e7ce5261635955d18906f1542e040000000000225120350e820feb4e9ae48a0f6281f7aebc64434132302cd204f71bb0d53f5e8fdf600248304502210094efb25003c9ced0c59a50c486f34351f23fcf72d5994b788e21be14e0d7e91f02203b1101052c06ca423891bcef245857e0073137a4d9eb62fcc0cde6c28a5becfc012103a23aa11f7f890650feaf48f09006d9c3e800f37b5b48c47dcfef27e7554cd5900000000008fd01830c6a7ccb693cd1d079239846914c0f6321988a3ab9efe6265191669bcb74c487f005e70b97110aa74310d5758156a887b8a1cfe6034ed8d2b4afba0ef89d3d0c1bb18c04cfe7fbc25a72fc5f9298c19f8e2d0ee5a127c5244f66a6edbc29df1c3764deda4f5dbcf2aad84cece706a48d1ead1aff3c3a54cf651c5803c710e697208b453cf2d5d65fb39948b24709616e6ce502ba78c72dc48f732608ec17af1109980f804c959933be7c02b6b1491a40a9182cf1b5f9b7bb3a8b5eeffad7dcc72bbc3c649ec93c31c5b0acff3a4275edf9e95046a9911276ec256ff3410bdfc513aeab02ad7ab1d0bda062fb9ff3828a367139363265ac7b96076018dcddc4c64f2ae2be52f40637b6c75d7d1b8d62316aabd2948da02e5e61988615faa014c78b1defa9f97f3897ae8d0f27a0ef87f87af2f153f15f27ba3dd35a65dc4743b7570bf824800d0451c3d7b7f0619176a6b13655380a272c06925ecf77508e70e578c6fb76a872f68b0832f60b124b9aedcee1596bc5692b1cf02c7fcd60dfd0bca5cf0b0af50001000254cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd2000000040a726f796c6c6f436f696ee08c74d75554e2c9d6d8452a3584d191f8727963b05e497bba84ada8ae82920800000000000401000605fe000186a00b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e020000102102fe0898805795bd2b698c8819ea3bfcbf1c7aa2330d0f7228723899b825848ee60c9f00040000000002210215305a361d0919c3be1a756ec45514feff098ddeb5b2731c4bf8068e19a69de903740149000100022024a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e00040000000102210238636cf0d229ba3c9c46e2d832db0f41a827de003ff5a16edc0611e1b71806f105030401011124000100021f726f796c6c6f436f696e206f6e206d61696e6e657420627920526f796c6c6f1604000c75e21754cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd2000000040a726f796c6c6f436f696ee08c74d75554e2c9d6d8452a3584d191f8727963b05e497bba84ada8ae82920800000000004ef51f2a52c89668c2bb425dbe7c89d7f6dc9f1869635a80a2e13bf4d3d085e9", + "proof_at_depth": 0, + "with_prev_witnesses": true, + "with_meta_reveal": false +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json rename to util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json rename to util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json new file mode 100644 index 000000000..cb7230a41 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000001fd044f544150500004000000000224c7d9b3d5ba2bd02625c8db243157726517982d79da366d9c49ac366b58428ac200000001045000404c26ab895241cab30f73e269d547a15cf47dc4d32e590c58a0e03300000000000000411da01ab0367a8b76b9762432536d24a90dbba835f82f083ee517d992ccbd2f68903165ffff001d012a4d4e06cd02000000000101c7d9b3d5ba2bd02625c8db243157726517982d79da366d9c49ac366b58428ac20100000000ffffffff02e8030000000000002251200abf9c151df80edc22d2fd1b8c0dcd07dcdda6e859cdcb513102d50cc5cbfdfecbaf100000000000225120d9c5d97fb55abcdf85102d90fb4c7b76d9f1656ae900d3127c861d0e814fa699014035721b41acdd8960274338bfa9ec0c5bb7627ee8b089607a17a66b98247203c2dd34ac0db9f30b24aaf8a7b9091223d49971d38e8f6a62af3f1d72cc77118b260000000008c206c5e3e5655b34f206b2d585164027205db435c9247da0d879e3a24e3c94122b95d6cada816f37904258e125211f84dc0f0cd5f3352b8d9fac3eb1df4700cc970a16014e73d4cc2896d7f4f0511a70a9ace483be4c310ca922ea0aea9298a645ce670140fe73e9c733a7a53673c9de8a73285072b671d8220cd838249853fd914c586d23a902388394972f1bb1510ce665f94b483b71457e18f95f4a206aaedaa8dc918cd64121fdbbc1e7ec0695411090ca8d7ebd8925f1ad88a27b9b39161ee3350af00001000253c7d9b3d5ba2bd02625c8db243157726517982d79da366d9c49ac366b58428ac20000000109726f796c6c6f4e465430ae42839b3e9022afee9193d3ad170ab280a96b1543847d281bf0e46ffc933600000000010401010601010b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e020000102102368d08b148b5a0867e38a1187f9fb4ab0a36c21159502e701beafc8cdda1dec90c9f0004000000000221033b8449aae83eb0ed04f7952108637d078836bb5d3353a33b6486248b401f60da03740149000100022089c9d3ff7cb9dbc4615f854f7127e94db10edd430f8bcf82d7309d0c8b75005104220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221023b5987e9f7c02c2502ce518a6b0f5cc18aae4579a45268105c0b2d0d1c324e95050304010111180001000213726f796c6c6f4e465420627920526f796c6c6f16040026ab5e1753c7d9b3d5ba2bd02625c8db243157726517982d79da366d9c49ac366b58428ac20000000109726f796c6c6f4e465430ae42839b3e9022afee9193d3ad170ab280a96b1543847d281bf0e46ffc9336000000000101f9793e346f85ade2877a5ef0679ef4640895b51317862bcb9b222ba62332da", + "proof_at_depth": 0, + "with_prev_witnesses": true, + "with_meta_reveal": false +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-request.json rename to util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-response.json rename to util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json new file mode 100644 index 000000000..3bd38471a --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000001fd055a544150500004000000000224900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010450008004326ab5c17f2ded3596b047247d63f70a33f70446c9096dc4982000000000000000ef61438cd2c2405693b046c63c514df4a47f5db553b5e20cc48c86d1b41c4d6c6a3032655f293b194efac01206cd02000000000101900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d0100000000ffffffff02e803000000000000225120d6484a40e7a0c5bcb5a958bd6251554feee22c1c94b0c058d7891105b34f309b0ba7100000000000225120c746196e62f7e88c99a96fab48967d38c58dcd415ccc87a51b5bd96fcf34de840140ae44a092025c5c182a52f0b542489395196b147b6b908f220205a562b86de46a2fd83770100e8aa5f775496c518ec3be8846fcc727cc3467adc8eb149cc767790000000008e207e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e0afd015c0001000258900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010e7365744f66526f796c6c6f4e46545d24eb6c3942d4919bdf6aa059ccd193afcbace8cfaf3cf9138ad43cafadc38e00000000010401010601010bad01ab0165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003420140b21995d3080a44a6402faddc4c8976e50c72230a811754f9f2656072cc1d95bfb15fa1e937ad6381ecfb3bcd821ffef583aeb90b08b8e47d5dc51e2c932a7b510e0200001021022dd926192ebdfd038b85ae326efd0ee3919c435da9e1d43186f994706cf245081121039511fd8c1f51acfbd85d9d742268d1ca03ce3b69d0436e71130192c085394c990cef000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b03c4019900010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a04720002e9c90ee43476c7623bd5392f7197c8ac6a7f1eabb535264e515e82dbdc16d1b800000000000000017e079338ba0a60e64b794492e39e4a10ce06083578677aa95b6c6c9a373cc6dc0000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e000400000001022102f202542e41672bec22302c29d8e002c953c9c9abb1c4f8cdeefd1e075753e3060503040101111d00010002187365744f66526f796c6c6f4e465420627920526f796c6c6f16040026abaf1758900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010e7365744f66526f796c6c6f4e46545d24eb6c3942d4919bdf6aa059ccd193afcbace8cfaf3cf9138ad43cafadc38e0000000001192102575af07788bda54cc640cfb9b05ad0a621c171e8c581e12e4cbdf3d2d7b8da8241765d6ecc379d1595d8af0fff01fab52a0675e56d4e8dfa4cf197884739d20a", + "proof_at_depth": 0, + "with_prev_witnesses": true, + "with_meta_reveal": false +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-request.json rename to util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-response.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-response.json rename to util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-request.json new file mode 100644 index 000000000..c8e2c65e0 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000001fd053a544150500004000000000224900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010450008004326ab5c17f2ded3596b047247d63f70a33f70446c9096dc4982000000000000000ef61438cd2c2405693b046c63c514df4a47f5db553b5e20cc48c86d1b41c4d6c6a3032655f293b194efac01206cd02000000000101900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d0100000000ffffffff02e803000000000000225120d6484a40e7a0c5bcb5a958bd6251554feee22c1c94b0c058d7891105b34f309b0ba7100000000000225120c746196e62f7e88c99a96fab48967d38c58dcd415ccc87a51b5bd96fcf34de840140ae44a092025c5c182a52f0b542489395196b147b6b908f220205a562b86de46a2fd83770100e8aa5f775496c518ec3be8846fcc727cc3467adc8eb149cc767790000000008e207e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e0afd015d0001000259900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010f7365744f66526f796c6c6f4e465432512dfac35a94760baf3dbd6682e3cd0d5cf4f3f8cc5b881931f73ed3a820c2a400000000010401010601010bad01ab01650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034201409a8b780e6e9fc9cb85424fdbdb0c86563ab4229007a572109baf7e4ef78419ed7fdeb8801a6e8811e70a64ab09376fbcb5e04cda5cc8a286b3bd679859bc02670e02000010210217c46686156f732035981526ea4f7e4cf5055fbdb6eeaa0254ea2b111b69328e1121039511fd8c1f51acfbd85d9d742268d1ca03ce3b69d0436e71130192c085394c990cef000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b03c4019900010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a04720002b3cd0b6af8976c1d9979ac0b63f85965e1cca16e9686b2406dfb063daf54140c00000000000000017e079338ba0a60e64b794492e39e4a10ce06083578677aa95b6c6c9a373cc6dc0000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e000400000001022102f202542e41672bec22302c29d8e002c953c9c9abb1c4f8cdeefd1e075753e3060503040101111e00010002197365744f66526f796c6c6f4e46543220627920526f796c6c6f16040026abaf1759900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010f7365744f66526f796c6c6f4e465432512dfac35a94760baf3dbd6682e3cd0d5cf4f3f8cc5b881931f73ed3a820c2a40000000001cd5aec6f7e1b80b906b4dcc157252585e1237fbc39e4635514fbbfe7992c10da", + "proof_at_depth": 0, + "with_prev_witnesses": true, + "with_meta_reveal": false +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-request.json rename to util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-response.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-response.json rename to util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-request.json new file mode 100644 index 000000000..67c52f9df --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000001fd0512544150500004000000000224900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010450008004326ab5c17f2ded3596b047247d63f70a33f70446c9096dc4982000000000000000ef61438cd2c2405693b046c63c514df4a47f5db553b5e20cc48c86d1b41c4d6c6a3032655f293b194efac01206cd02000000000101900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d0100000000ffffffff02e803000000000000225120d6484a40e7a0c5bcb5a958bd6251554feee22c1c94b0c058d7891105b34f309b0ba7100000000000225120c746196e62f7e88c99a96fab48967d38c58dcd415ccc87a51b5bd96fcf34de840140ae44a092025c5c182a52f0b542489395196b147b6b908f220205a562b86de46a2fd83770100e8aa5f775496c518ec3be8846fcc727cc3467adc8eb149cc767790000000008e207e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e0afd015d0001000259900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010f7365744f66526f796c6c6f4e46543357321df398180b331e6a8207abe9412a19e5b5c307348340fac9d450b5310cec00000000010401010601010bad01ab0165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003420140687db6a3598f2a507e8cda8ce94769de9446641c923fc69418796675cdb4a75ba1e8956812d2f81c33a7e4ef5f5c43e855683d9a7239fc281cb6d10a3058e4710e020000102102c8c3e030404c7f117a62aeebca5926a1693f917121465938cc5f215a8a3dc7e11121039511fd8c1f51acfbd85d9d742268d1ca03ce3b69d0436e71130192c085394c990cc7000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b039c017100010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a044a00012225bf1097c66530e2c0b7d13acee653ff40ca5ab078d2feb12a14a1dd825fd10000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e000400000001022102f202542e41672bec22302c29d8e002c953c9c9abb1c4f8cdeefd1e075753e3060503040101111e00010002197365744f66526f796c6c6f4e46543320627920526f796c6c6f16040026abaf1759900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010f7365744f66526f796c6c6f4e46543357321df398180b331e6a8207abe9412a19e5b5c307348340fac9d450b5310cec0000000001b805a6524902d9682bcbcfb45d1473eb35d85fd1f016e80b3227eaa33b3eb678", + "proof_at_depth": 0, + "with_prev_witnesses": true, + "with_meta_reveal": false +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json rename to util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json rename to util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json new file mode 100644 index 000000000..b32dd69bb --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000001fd04d154415050000400000000022476dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e3772700000001045000003635f365e8a493496b66b914c5725753fad8439edf0a567a90220a00000000000000eaf04296428e6aaec3fffbc67a0598e067a050839e6efb23ff9330c077da7426463432655f293b19663892b606f60200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c0000000008fd0102087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a20af9000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2af80b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0200001021023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff0c9f000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101111f000100021a747269636b79526f796c6c6f436f696e20627920526f796c6c6f16040026abb0175a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000008b27a67fc41942150b23743e9b88aeedfb8da174f90f9e21667eb455ac099dfa", + "proof_at_depth": 0, + "with_prev_witnesses": true, + "with_meta_reveal": false +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-response.json deleted file mode 100644 index f71a9a47b..000000000 --- a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-response.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "decoded_proof": { - "proof_at_depth": 0, - "number_of_proofs": 2, - "asset": { - "version": "ASSET_VERSION_V0", - "asset_genesis": { - "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", - "name": "trickyRoylloCoin", - "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", - "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", - "asset_type": "NORMAL", - "output_index": 0, - "version": 0 - }, - "amount": "50", - "lock_time": 0, - "relative_lock_time": 0, - "script_version": 0, - "script_key": "026e6f1ce5a4cf58f63f1c6d2421aaf3d011e3811bab92122cffd67dada97ab610", - "script_key_is_local": false, - "asset_group": null, - "chain_anchor": { - "anchor_tx": "02000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c00000000", - "anchor_block_hash": "000000000000000e2191e5cc5836eea96ecb93e85917dcbb43ddff45c7f48b70", - "anchor_outpoint": "f2acf1235882a7683bad5baeb1b84c2f1dbf33f0fc4a7c85f2191aa8d49ce0d3:1", - "internal_key": "02db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad", - "merkle_root": "89997fe9f8aadf6618cc2e7506efd4c9d81aba84b17001e33491436a626e7301", - "tapscript_sibling": "", - "block_height": 2534322 - }, - "prev_witnesses": [ - { - "prev_id": { - "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", - "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", - "script_key": "000000000000000000000000000000000000000000000000000000000000000000", - "amount": "0" - }, - "tx_witness": [], - "split_commitment": { - "root_asset": { - "version": "ASSET_VERSION_V0", - "asset_genesis": { - "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", - "name": "trickyRoylloCoin", - "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", - "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", - "asset_type": "NORMAL", - "output_index": 0, - "version": 0 - }, - "amount": "10950", - "lock_time": 0, - "relative_lock_time": 0, - "script_version": 0, - "script_key": "022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb", - "script_key_is_local": false, - "asset_group": null, - "chain_anchor": null, - "prev_witnesses": [ - { - "prev_id": { - "anchor_point": "632d0c3935fff230aa3718e268dce5517786d7976f7aa33efb615b408737b0ad:0", - "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", - "script_key": "023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff", - "amount": "0" - }, - "tx_witness": [ - "098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a" - ], - "split_commitment": null - } - ], - "is_spent": false, - "lease_owner": "", - "lease_expiry": "0", - "is_burn": false - } - } - } - ], - "is_spent": false, - "lease_owner": "", - "lease_expiry": "0", - "is_burn": false - }, - "meta_reveal": null, - "tx_merkle_proof": "0608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e", - "inclusion_proof": "000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", - "exclusion_proofs": [ - "000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a0001ad91c6726cfc6a35637fc28d8c6c5153ca6667faca459054a03195cf87cb014a0000000000002ac6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", - "0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e184020503040101" - ], - "split_root_proof": "000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", - "num_additional_inputs": 0, - "challenge_witness": [], - "is_burn": false, - "genesis_reveal": null, - "group_key_reveal": { - "raw_group_key": "", - "tapscript_root": "" - } - } -} diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-request.json new file mode 100644 index 000000000..b0a1f385c --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000002fd04d154415050000400000000022476dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e3772700000001045000003635f365e8a493496b66b914c5725753fad8439edf0a567a90220a00000000000000eaf04296428e6aaec3fffbc67a0598e067a050839e6efb23ff9330c077da7426463432655f293b19663892b606f60200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c0000000008fd0102087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a20af9000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2af80b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0200001021023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff0c9f000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101111f000100021a747269636b79526f796c6c6f436f696e20627920526f796c6c6f16040026abb0175a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000008b27a67fc41942150b23743e9b88aeedfb8da174f90f9e21667eb455ac099dfafd07a7544150500004000000000224adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630000000004500000ff3f5dba5695789b34b2a4177c1918ff0aa9d20eef1bdfe78e302100000000000000ad2ec309a6f38f5bd7432d3ec39375dfcce23987a05de649086d09e43ee4ca1bd03732655f293b19e08c9a3e06fd016302000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c0000000008c20608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e0afd02b4000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000601320bfd022401fd02200165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005fd01b54a000133bb0d9d198714f699adcaaeba0da20feb35bb9c6cc7f954466ac980f39b2f650000000000002ac6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdffd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2ac60bad01ab0165adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff03420140098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a0d280ec4c71b4a0c96a3939c488fe60a268a8777e3016b1f41306ecf572a0540bdd70000000000002af80e0200001021022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb0e0200001021026e6f1ce5a4cf58f63f1c6d2421aaf3d011e3811bab92122cffd67dada97ab6100c9f000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a0001ad91c6726cfc6a35637fc28d8c6c5153ca6667faca459054a03195cf87cb014a0000000000002ac6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e1840205030401010f9f000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16040026abb20730ebfb00979ea9778521856c717b764370eaf504d79dc3aea33e1caa970d25", + "proof_at_depth": 0, + "with_prev_witnesses": true, + "with_meta_reveal": true +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-response.json new file mode 100644 index 000000000..bd2ca2a66 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withMetaReveal-response.json @@ -0,0 +1,5 @@ +{ + "code": 2, + "message": "unable to marshal proof: unable to fetch asset meta: asset meta not found", + "details": [] +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-request.json rename to util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-request.json rename to util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withMetaReveal-response.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-response.json rename to util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withoutMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withoutMetaReveal-request.json new file mode 100644 index 000000000..3dfef3549 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withoutMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000002fd04d154415050000400000000022476dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e3772700000001045000003635f365e8a493496b66b914c5725753fad8439edf0a567a90220a00000000000000eaf04296428e6aaec3fffbc67a0598e067a050839e6efb23ff9330c077da7426463432655f293b19663892b606f60200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c0000000008fd0102087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a20af9000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2af80b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0200001021023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff0c9f000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101111f000100021a747269636b79526f796c6c6f436f696e20627920526f796c6c6f16040026abb0175a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000008b27a67fc41942150b23743e9b88aeedfb8da174f90f9e21667eb455ac099dfafd07a7544150500004000000000224adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630000000004500000ff3f5dba5695789b34b2a4177c1918ff0aa9d20eef1bdfe78e302100000000000000ad2ec309a6f38f5bd7432d3ec39375dfcce23987a05de649086d09e43ee4ca1bd03732655f293b19e08c9a3e06fd016302000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c0000000008c20608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e0afd02b4000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000601320bfd022401fd02200165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005fd01b54a000133bb0d9d198714f699adcaaeba0da20feb35bb9c6cc7f954466ac980f39b2f650000000000002ac6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdffd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2ac60bad01ab0165adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff03420140098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a0d280ec4c71b4a0c96a3939c488fe60a268a8777e3016b1f41306ecf572a0540bdd70000000000002af80e0200001021022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb0e0200001021026e6f1ce5a4cf58f63f1c6d2421aaf3d011e3811bab92122cffd67dada97ab6100c9f000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a0001ad91c6726cfc6a35637fc28d8c6c5153ca6667faca459054a03195cf87cb014a0000000000002ac6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e1840205030401010f9f000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16040026abb20730ebfb00979ea9778521856c717b764370eaf504d79dc3aea33e1caa970d25", + "proof_at_depth": 1, + "with_prev_witnesses": true, + "with_meta_reveal": false +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-response.json deleted file mode 100644 index f767368f1..000000000 --- a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-response.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "decoded_proof": { - "proof_at_depth": 0, - "number_of_proofs": 3, - "asset": { - "version": "ASSET_VERSION_V0", - "asset_genesis": { - "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", - "name": "trickyRoylloCoin", - "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", - "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", - "asset_type": "NORMAL", - "output_index": 0, - "version": 0 - }, - "amount": "125", - "lock_time": 0, - "relative_lock_time": 0, - "script_version": 0, - "script_key": "02629f225f4ef29972e703b1086796dbe47e881ae913904a1c2eec15df35361fb6", - "script_key_is_local": false, - "asset_group": null, - "chain_anchor": { - "anchor_tx": "02000000000102d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf20200000000ffffffffd3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000000000000003e803000000000000225120acb9b163799c60c08c279c18a652ffe4bbbea9301831c3acca52b796a5fb7cc5e8030000000000002251203f475770dfc8d7e92e93632c251a5c01b6e90670e8522b81cb7b448bf86efffa03aa1600000000002251209706916002ac9ba36bab02ce2ed586da3ee2bfd271c54743143c9663ccfda56d01409867a537b52ee5c4bc798315397d89bf65380e4ed88a04ec9315f67bc08ed6bb275a51117feecf87da27a8b2761630c92fd81c6e4512ecfe9536819be6b3c5d00140a6df68be0be4f5c58b40e0463254e11e6848761ad77d538f53212ad78b5ab80640344e46de7bcd6d8350bf52769851a5b0abff9e8c08414075ea885ad86644ac00000000", - "anchor_block_hash": "000000000000001a569a96b191eb6fb89a7e32beab1a9ceca5e88e2e264c645e", - "anchor_outpoint": "2727229cc771efa552f9232a04b0cd8d16df6d83bd217523888feee6a8553ec8:1", - "internal_key": "034d6fd392fe86bdfc93973406f15050b36281f569be8335afa4b3586b36a0aaf8", - "merkle_root": "3dba25fa8dbc57f111da04477792ba54d4cad983e28c369c4a4189dd4a836aac", - "tapscript_sibling": "", - "block_height": 2534327 - }, - "prev_witnesses": [ - { - "prev_id": { - "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", - "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", - "script_key": "000000000000000000000000000000000000000000000000000000000000000000", - "amount": "0" - }, - "tx_witness": [], - "split_commitment": { - "root_asset": { - "version": "ASSET_VERSION_V0", - "asset_genesis": { - "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", - "name": "trickyRoylloCoin", - "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", - "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", - "asset_type": "NORMAL", - "output_index": 0, - "version": 0 - }, - "amount": "10825", - "lock_time": 0, - "relative_lock_time": 0, - "script_version": 0, - "script_key": "0223e1cfbdb232a9d98d3ddc2bf36d907c3c1bf3f40ad10eca0ebdb7eafe07db84", - "script_key_is_local": false, - "asset_group": null, - "chain_anchor": null, - "prev_witnesses": [ - { - "prev_id": { - "anchor_point": "f2acf1235882a7683bad5baeb1b84c2f1dbf33f0fc4a7c85f2191aa8d49ce0d3:0", - "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", - "script_key": "022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb", - "amount": "0" - }, - "tx_witness": [ - "8bd6b5306b3c03794c974922b7b6a4a5b9deeefd35a02d3ade39de88882e507cc9b62c8de4c4a6758efa9b756428e0d7666657794d1a8bd82cdbd6d02117139a" - ], - "split_commitment": null - } - ], - "is_spent": false, - "lease_owner": "", - "lease_expiry": "0", - "is_burn": false - } - } - } - ], - "is_spent": false, - "lease_owner": "", - "lease_expiry": "0", - "is_burn": false - }, - "meta_reveal": null, - "tx_merkle_proof": "07ed5bc2ffc43424ee07fed779bdbbb19b8a264d6b3c7e4be7e48e1fc63196abe8e749d4950360f70c69103d539ae7a27a80ca78c226fd540b4fc84d687b71eb786b8fc0cc51efe9a546188902577e1f5d105dbe483b03077fd6ac643ef2dfd0a152a98a2916ce8948567b361ed53da743e455e575cef6380c1909aeeb597c377c476ce23a33c62d040495d94028ba3c503aa8d56ed27a3e323c2503277d03fddf89361e8d266148f7784cdadbcd47b21d8221418ec9b4b5f5ffad95a9e41159ca7be8c3138e935252798546897d2515404231693240af2dc052479c1403f9ef1164", - "inclusion_proof": "0004000000010221034d6fd392fe86bdfc93973406f15050b36281f569be8335afa4b3586b36a0aaf8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", - "exclusion_proofs": [ - "000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a000179bef732bcc42581ed21a0673d739a0096c5b29c13e4170d59185ba1bf5a20650000000000002a49ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", - "000400000002022102fabb9caf70565dd69dabab7e38cd8932843de0a2e620d8c8964d375387e764bc0503040101" - ], - "split_root_proof": "000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", - "num_additional_inputs": 0, - "challenge_witness": [], - "is_burn": false, - "genesis_reveal": null, - "group_key_reveal": { - "raw_group_key": "", - "tapscript_root": "" - } - } -} diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-request.json new file mode 100644 index 000000000..cab48c16f --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000003fd04d154415050000400000000022476dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e3772700000001045000003635f365e8a493496b66b914c5725753fad8439edf0a567a90220a00000000000000eaf04296428e6aaec3fffbc67a0598e067a050839e6efb23ff9330c077da7426463432655f293b19663892b606f60200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c0000000008fd0102087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a20af9000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2af80b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0200001021023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff0c9f000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101111f000100021a747269636b79526f796c6c6f436f696e20627920526f796c6c6f16040026abb0175a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000008b27a67fc41942150b23743e9b88aeedfb8da174f90f9e21667eb455ac099dfafd05b9544150500004000000000224adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630000000004500000ff3f5dba5695789b34b2a4177c1918ff0aa9d20eef1bdfe78e302100000000000000ad2ec309a6f38f5bd7432d3ec39375dfcce23987a05de649086d09e43ee4ca1bd03732655f293b19e08c9a3e06fd016302000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c0000000008c20608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e0afd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2ac60bad01ab0165adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff03420140098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a0d280ec4c71b4a0c96a3939c488fe60a268a8777e3016b1f41306ecf572a0540bdd70000000000002af80e0200001021022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb0c9f000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a00019b28bc20e99078e38640e026115c0e6b214bba541ad194dffa5737983cddae1a0000000000000032ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e18402050304010116040026abb28f40a7bea7a33a37cd2194c330007dcbc532537b9ce5c77e357afae1ab30f799fd07c7544150500004000000000224d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000045000400020ed570e7c46d5584f76068799496d9317a4398e486a785ab4110000000000000087cfc858c94d3005d6c8880fafd773aed06e2fe748a081a2fc32d9e2f20ef5a3384032655f293b19668bd3c706fd016302000000000102d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf20200000000ffffffffd3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000000000000003e803000000000000225120acb9b163799c60c08c279c18a652ffe4bbbea9301831c3acca52b796a5fb7cc5e8030000000000002251203f475770dfc8d7e92e93632c251a5c01b6e90670e8522b81cb7b448bf86efffa03aa1600000000002251209706916002ac9ba36bab02ce2ed586da3ee2bfd271c54743143c9663ccfda56d01409867a537b52ee5c4bc798315397d89bf65380e4ed88a04ec9315f67bc08ed6bb275a51117feecf87da27a8b2761630c92fd81c6e4512ecfe9536819be6b3c5d00140a6df68be0be4f5c58b40e0463254e11e6848761ad77d538f53212ad78b5ab80640344e46de7bcd6d8350bf52769851a5b0abff9e8c08414075ea885ad86644ac0000000008e207ed5bc2ffc43424ee07fed779bdbbb19b8a264d6b3c7e4be7e48e1fc63196abe8e749d4950360f70c69103d539ae7a27a80ca78c226fd540b4fc84d687b71eb786b8fc0cc51efe9a546188902577e1f5d105dbe483b03077fd6ac643ef2dfd0a152a98a2916ce8948567b361ed53da743e455e575cef6380c1909aeeb597c377c476ce23a33c62d040495d94028ba3c503aa8d56ed27a3e323c2503277d03fddf89361e8d266148f7784cdadbcd47b21d8221418ec9b4b5f5ffad95a9e41159ca7be8c3138e935252798546897d2515404231693240af2dc052479c1403f9ef11640afd02b4000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41000000000004010006017d0bfd022401fd02200165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005fd01b54a0001c6360d41bd3cb4ddefc119acc1db551dd2a324c0364c3a6f42c8183e0ffe6cf50000000000002a49ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdffd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2a490bad01ab0165d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb034201408bd6b5306b3c03794c974922b7b6a4a5b9deeefd35a02d3ade39de88882e507cc9b62c8de4c4a6758efa9b756428e0d7666657794d1a8bd82cdbd6d02117139a0d2851efabb48146e9c53975cb2f0f71fdcc7c17b0a14d1787de7ad8dc8ac4d3c7a20000000000002ac60e02000010210223e1cfbdb232a9d98d3ddc2bf36d907c3c1bf3f40ad10eca0ebdb7eafe07db840e020000102102629f225f4ef29972e703b1086796dbe47e881ae913904a1c2eec15df35361fb60c9f0004000000010221034d6fd392fe86bdfc93973406f15050b36281f569be8335afa4b3586b36a0aaf8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a000179bef732bcc42581ed21a0673d739a0096c5b29c13e4170d59185ba1bf5a20650000000000002a49ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e000400000002022102fabb9caf70565dd69dabab7e38cd8932843de0a2e620d8c8964d375387e764bc05030401010f9f000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16040026abb7d3a36b396d7e73af998dd2ef8e0501379740114177ff1f93b08f17a9a8e4c767", + "proof_at_depth": 0, + "with_prev_witnesses": true, + "with_meta_reveal": true +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-response.json new file mode 100644 index 000000000..bd2ca2a66 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withMetaReveal-response.json @@ -0,0 +1,5 @@ +{ + "code": 2, + "message": "unable to marshal proof: unable to fetch asset meta: asset meta not found", + "details": [] +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-request.json rename to util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-response.json deleted file mode 100644 index d4d8b54e0..000000000 --- a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-response.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "decoded_proof": { - "proof_at_depth": 1, - "number_of_proofs": 3, - "asset": { - "version": "ASSET_VERSION_V0", - "asset_genesis": { - "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", - "name": "trickyRoylloCoin", - "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", - "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", - "asset_type": "NORMAL", - "output_index": 0, - "version": 0 - }, - "amount": "10950", - "lock_time": 0, - "relative_lock_time": 0, - "script_version": 0, - "script_key": "022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb", - "script_key_is_local": false, - "asset_group": null, - "chain_anchor": { - "anchor_tx": "02000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c00000000", - "anchor_block_hash": "000000000000000e2191e5cc5836eea96ecb93e85917dcbb43ddff45c7f48b70", - "anchor_outpoint": "f2acf1235882a7683bad5baeb1b84c2f1dbf33f0fc4a7c85f2191aa8d49ce0d3:0", - "internal_key": "02ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8", - "merkle_root": "109fac101b0893f13b84b5f2a13551501237dd381c02f8f591dab43026d4bd73", - "tapscript_sibling": "", - "block_height": 2534322 - }, - "prev_witnesses": [ - { - "prev_id": { - "anchor_point": "632d0c3935fff230aa3718e268dce5517786d7976f7aa33efb615b408737b0ad:0", - "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", - "script_key": "023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff", - "amount": "0" - }, - "tx_witness": [ - "098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a" - ], - "split_commitment": null - } - ], - "is_spent": false, - "lease_owner": "", - "lease_expiry": "0", - "is_burn": false - }, - "meta_reveal": null, - "tx_merkle_proof": "0608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e", - "inclusion_proof": "000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", - "exclusion_proofs": [ - "000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a00019b28bc20e99078e38640e026115c0e6b214bba541ad194dffa5737983cddae1a0000000000000032ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", - "0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e184020503040101" - ], - "split_root_proof": "", - "num_additional_inputs": 0, - "challenge_witness": [], - "is_burn": false, - "genesis_reveal": null, - "group_key_reveal": { - "raw_group_key": "", - "tapscript_root": "" - } - } -} diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withMetaReveal-request.json new file mode 100644 index 000000000..032ea6971 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000003fd04d154415050000400000000022476dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e3772700000001045000003635f365e8a493496b66b914c5725753fad8439edf0a567a90220a00000000000000eaf04296428e6aaec3fffbc67a0598e067a050839e6efb23ff9330c077da7426463432655f293b19663892b606f60200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c0000000008fd0102087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a20af9000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2af80b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0200001021023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff0c9f000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101111f000100021a747269636b79526f796c6c6f436f696e20627920526f796c6c6f16040026abb0175a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000008b27a67fc41942150b23743e9b88aeedfb8da174f90f9e21667eb455ac099dfafd05b9544150500004000000000224adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630000000004500000ff3f5dba5695789b34b2a4177c1918ff0aa9d20eef1bdfe78e302100000000000000ad2ec309a6f38f5bd7432d3ec39375dfcce23987a05de649086d09e43ee4ca1bd03732655f293b19e08c9a3e06fd016302000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c0000000008c20608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e0afd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2ac60bad01ab0165adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff03420140098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a0d280ec4c71b4a0c96a3939c488fe60a268a8777e3016b1f41306ecf572a0540bdd70000000000002af80e0200001021022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb0c9f000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a00019b28bc20e99078e38640e026115c0e6b214bba541ad194dffa5737983cddae1a0000000000000032ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e18402050304010116040026abb28f40a7bea7a33a37cd2194c330007dcbc532537b9ce5c77e357afae1ab30f799fd07c7544150500004000000000224d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000045000400020ed570e7c46d5584f76068799496d9317a4398e486a785ab4110000000000000087cfc858c94d3005d6c8880fafd773aed06e2fe748a081a2fc32d9e2f20ef5a3384032655f293b19668bd3c706fd016302000000000102d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf20200000000ffffffffd3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000000000000003e803000000000000225120acb9b163799c60c08c279c18a652ffe4bbbea9301831c3acca52b796a5fb7cc5e8030000000000002251203f475770dfc8d7e92e93632c251a5c01b6e90670e8522b81cb7b448bf86efffa03aa1600000000002251209706916002ac9ba36bab02ce2ed586da3ee2bfd271c54743143c9663ccfda56d01409867a537b52ee5c4bc798315397d89bf65380e4ed88a04ec9315f67bc08ed6bb275a51117feecf87da27a8b2761630c92fd81c6e4512ecfe9536819be6b3c5d00140a6df68be0be4f5c58b40e0463254e11e6848761ad77d538f53212ad78b5ab80640344e46de7bcd6d8350bf52769851a5b0abff9e8c08414075ea885ad86644ac0000000008e207ed5bc2ffc43424ee07fed779bdbbb19b8a264d6b3c7e4be7e48e1fc63196abe8e749d4950360f70c69103d539ae7a27a80ca78c226fd540b4fc84d687b71eb786b8fc0cc51efe9a546188902577e1f5d105dbe483b03077fd6ac643ef2dfd0a152a98a2916ce8948567b361ed53da743e455e575cef6380c1909aeeb597c377c476ce23a33c62d040495d94028ba3c503aa8d56ed27a3e323c2503277d03fddf89361e8d266148f7784cdadbcd47b21d8221418ec9b4b5f5ffad95a9e41159ca7be8c3138e935252798546897d2515404231693240af2dc052479c1403f9ef11640afd02b4000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41000000000004010006017d0bfd022401fd02200165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005fd01b54a0001c6360d41bd3cb4ddefc119acc1db551dd2a324c0364c3a6f42c8183e0ffe6cf50000000000002a49ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdffd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2a490bad01ab0165d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb034201408bd6b5306b3c03794c974922b7b6a4a5b9deeefd35a02d3ade39de88882e507cc9b62c8de4c4a6758efa9b756428e0d7666657794d1a8bd82cdbd6d02117139a0d2851efabb48146e9c53975cb2f0f71fdcc7c17b0a14d1787de7ad8dc8ac4d3c7a20000000000002ac60e02000010210223e1cfbdb232a9d98d3ddc2bf36d907c3c1bf3f40ad10eca0ebdb7eafe07db840e020000102102629f225f4ef29972e703b1086796dbe47e881ae913904a1c2eec15df35361fb60c9f0004000000010221034d6fd392fe86bdfc93973406f15050b36281f569be8335afa4b3586b36a0aaf8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a000179bef732bcc42581ed21a0673d739a0096c5b29c13e4170d59185ba1bf5a20650000000000002a49ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e000400000002022102fabb9caf70565dd69dabab7e38cd8932843de0a2e620d8c8964d375387e764bc05030401010f9f000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16040026abb7d3a36b396d7e73af998dd2ef8e0501379740114177ff1f93b08f17a9a8e4c767", + "proof_at_depth": 1, + "with_prev_witnesses": true, + "with_meta_reveal": true +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withMetaReveal-response.json new file mode 100644 index 000000000..bd2ca2a66 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withMetaReveal-response.json @@ -0,0 +1,5 @@ +{ + "code": 2, + "message": "unable to marshal proof: unable to fetch asset meta: asset meta not found", + "details": [] +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withoutMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-request.json rename to util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withoutMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-request.json rename to util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withMetaReveal-response.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-response.json rename to util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withoutMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withoutMetaReveal-request.json new file mode 100644 index 000000000..328648b62 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withoutMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000003fd04d154415050000400000000022476dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e3772700000001045000003635f365e8a493496b66b914c5725753fad8439edf0a567a90220a00000000000000eaf04296428e6aaec3fffbc67a0598e067a050839e6efb23ff9330c077da7426463432655f293b19663892b606f60200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c0000000008fd0102087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a20af9000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2af80b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0200001021023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff0c9f000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101111f000100021a747269636b79526f796c6c6f436f696e20627920526f796c6c6f16040026abb0175a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000008b27a67fc41942150b23743e9b88aeedfb8da174f90f9e21667eb455ac099dfafd05b9544150500004000000000224adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630000000004500000ff3f5dba5695789b34b2a4177c1918ff0aa9d20eef1bdfe78e302100000000000000ad2ec309a6f38f5bd7432d3ec39375dfcce23987a05de649086d09e43ee4ca1bd03732655f293b19e08c9a3e06fd016302000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c0000000008c20608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e0afd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2ac60bad01ab0165adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff03420140098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a0d280ec4c71b4a0c96a3939c488fe60a268a8777e3016b1f41306ecf572a0540bdd70000000000002af80e0200001021022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb0c9f000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a00019b28bc20e99078e38640e026115c0e6b214bba541ad194dffa5737983cddae1a0000000000000032ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e18402050304010116040026abb28f40a7bea7a33a37cd2194c330007dcbc532537b9ce5c77e357afae1ab30f799fd07c7544150500004000000000224d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000045000400020ed570e7c46d5584f76068799496d9317a4398e486a785ab4110000000000000087cfc858c94d3005d6c8880fafd773aed06e2fe748a081a2fc32d9e2f20ef5a3384032655f293b19668bd3c706fd016302000000000102d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf20200000000ffffffffd3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000000000000003e803000000000000225120acb9b163799c60c08c279c18a652ffe4bbbea9301831c3acca52b796a5fb7cc5e8030000000000002251203f475770dfc8d7e92e93632c251a5c01b6e90670e8522b81cb7b448bf86efffa03aa1600000000002251209706916002ac9ba36bab02ce2ed586da3ee2bfd271c54743143c9663ccfda56d01409867a537b52ee5c4bc798315397d89bf65380e4ed88a04ec9315f67bc08ed6bb275a51117feecf87da27a8b2761630c92fd81c6e4512ecfe9536819be6b3c5d00140a6df68be0be4f5c58b40e0463254e11e6848761ad77d538f53212ad78b5ab80640344e46de7bcd6d8350bf52769851a5b0abff9e8c08414075ea885ad86644ac0000000008e207ed5bc2ffc43424ee07fed779bdbbb19b8a264d6b3c7e4be7e48e1fc63196abe8e749d4950360f70c69103d539ae7a27a80ca78c226fd540b4fc84d687b71eb786b8fc0cc51efe9a546188902577e1f5d105dbe483b03077fd6ac643ef2dfd0a152a98a2916ce8948567b361ed53da743e455e575cef6380c1909aeeb597c377c476ce23a33c62d040495d94028ba3c503aa8d56ed27a3e323c2503277d03fddf89361e8d266148f7784cdadbcd47b21d8221418ec9b4b5f5ffad95a9e41159ca7be8c3138e935252798546897d2515404231693240af2dc052479c1403f9ef11640afd02b4000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41000000000004010006017d0bfd022401fd02200165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005fd01b54a0001c6360d41bd3cb4ddefc119acc1db551dd2a324c0364c3a6f42c8183e0ffe6cf50000000000002a49ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdffd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2a490bad01ab0165d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb034201408bd6b5306b3c03794c974922b7b6a4a5b9deeefd35a02d3ade39de88882e507cc9b62c8de4c4a6758efa9b756428e0d7666657794d1a8bd82cdbd6d02117139a0d2851efabb48146e9c53975cb2f0f71fdcc7c17b0a14d1787de7ad8dc8ac4d3c7a20000000000002ac60e02000010210223e1cfbdb232a9d98d3ddc2bf36d907c3c1bf3f40ad10eca0ebdb7eafe07db840e020000102102629f225f4ef29972e703b1086796dbe47e881ae913904a1c2eec15df35361fb60c9f0004000000010221034d6fd392fe86bdfc93973406f15050b36281f569be8335afa4b3586b36a0aaf8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a000179bef732bcc42581ed21a0673d739a0096c5b29c13e4170d59185ba1bf5a20650000000000002a49ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e000400000002022102fabb9caf70565dd69dabab7e38cd8932843de0a2e620d8c8964d375387e764bc05030401010f9f000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16040026abb7d3a36b396d7e73af998dd2ef8e0501379740114177ff1f93b08f17a9a8e4c767", + "proof_at_depth": 2, + "with_prev_witnesses": true, + "with_meta_reveal": false +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-request.json rename to util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-response.json rename to util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json new file mode 100644 index 000000000..89ff250ec --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000001fd0449544150500004000000000224c83e55a8e6ee8f88237521bd836ddf168dcdb0042a23f952a5ef71c79c2227270000000204500000c0204e108876d6ec31c81cbc67d0d3d176bc51566560f2129fbf090000000000000097d7abd1c7dadb5e5fe22c25220950f8ae40780812e27a4a7dd7ba923e6f5838774132655f293b196a2ce2c706cd02000000000101c83e55a8e6ee8f88237521bd836ddf168dcdb0042a23f952a5ef71c79c2227270200000000ffffffff02e8030000000000002251208d9cac51eda33283c63419190f12ffb2bf2ec5ac337ac8c9ea677b2af17e4a1079a21600000000002251202dc635ce603c8c9675f08276f2bb6c796576f80c65fd9a81249549a2488f6ef101404d19858b4046fb71ecbfffe5b8ed78baf5159cba1298e21a22c055307b549792f434178b2469a53dc3dc5b24a4311e3cef9f8075d47fe08796335ddd8d44b4df0000000008a205a99726a7ab1cfa6c0ad3cee5656f2e388d4b480d105df5d2eb307e7f68343f654c39a67f84c69fb0a45d3a7bedb1aad6062b6af1ab37f207986f4b74aabd371726ee0f70f0b608092b89446916403bbbb2dbf220b4d57905d4cd73efdb2eecd50aa80180053bcd4fd5d7a739983d842d6b62d4884ac09529e01e946e59ac705467caa6de490c506af99211ad73742d51e380d233618fcbefabefd3a1aed9166e140afa000100025bc83e55a8e6ee8f88237521bd836ddf168dcdb0042a23f952a5ef71c79c2227270000000211756e6b6e6f776e526f796c6c6f436f696e548c3d99c0f06a858b564e035f7bccb4354eb89f5cd044d0ba78b9fbd715288200000000000401000603fd2ee00b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e02000010210216fbf08fd0d3caf518a605c7e93587e7f66deb2460eb235fc54c151967cf69de0c9f0004000000000221027fb809fa2c53a98906e9d3fbbc56019a32fd8bef11d3fd5b5657c1f849e32f74037401490001000220a8e1cd6961301e8ef91df4f902f7af0bf261e30c122d85ebf7abc32c15bee00204220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e000400000001022102ac43972a2a4868a12d41db303d3d93ad0d86c251336e3ed69b0528f7d578a81b05030401011120000100021b756e6b6e6f776e526f796c6c6f436f696e20627920526f796c6c6f16040026abba175bc83e55a8e6ee8f88237521bd836ddf168dcdb0042a23f952a5ef71c79c2227270000000211756e6b6e6f776e526f796c6c6f436f696e548c3d99c0f06a858b564e035f7bccb4354eb89f5cd044d0ba78b9fbd71528820000000000b734e263f7583498a7851d5c16c0c4d8a2c0919b780847f537919974b1c900cc", + "proof_at_depth": 0, + "with_prev_witnesses": true, + "with_meta_reveal": false +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-request.json rename to util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-response.json rename to util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json new file mode 100644 index 000000000..36dccc56b --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000001fd05085441505000040000000002241304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770000000104500000002033b4e14d09dca9b6a47b283628a13a56fc625d00749b89dd1b0000000000000027a7b906a22308e5c62586eaf63a0755465193da34f88f38fcd16136a40837245c4c32655f293b199a10705906cd020000000001011304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770100000000ffffffff02e803000000000000225120e5d4f8a3b6b3087984f36182654e2deb91e2e567cf35f068e6d4362ac7958cceef9a1600000000002251207a9d28abfb419fa691b22c3967b61d8d358ed65031f92740604875e29aa0ff2801407fc9e637deacd43c5434d35a9db8f6634d049f30f9aa2f8521944b4654bad147848d20f1b96e081fa23604e3ad610c5b9b16fd553ec751e608ee79bd622dcca80000000008c20612f24121b3b09bca8dfd619a8412521cd5a0df3c3530e2f2e5aa7a4beebac8ba4ccd82f747699a0a1d1e4a99819fda33c8c9cccbc6b92e2e2ee6f7018ea3862b0574ac6910af8096a5531d803cad77a8a878972091f4a11404ecd009e75ebe40afd73ec375e791f7d7de16bee7fcb6e6e412a1fb03bd363f4a997af477ffe5caa538f8705031ec8da6da106429c44b289ef68e0cce784d0d91a47589b86ed27dbd5f81607a2e8dd37cb256c4179c5980ae45e8dff592a5dfea2ad06c9a8c4b412d0afd0164000100025e1304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770000000114756e6c696d69746564526f796c6c6f436f696e31ef35cbdef9f461dee0ad1c4753a481e30fb7b02d6356f342e573671f8044af5e00000000000401000603fd01f30bad01ab0165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003420140e0c383aaecabb44bee72683d825118b7ef7124a9c8be149c82b7c4c525340aceb4194a177bc1e13e0bee7df5425720f4b5f30335faed586bef129780146b7a2c0e0200001021025f121b76e25840b5fbe620ef331ac834abd964a35fff72bbae207bfe2bad9a4311210349d60c6689bbbb2ffc9b30b45b96a3d6e5fd5fd01c867344c0054f61050482410c9f00040000000002210261592c195dc3af641d2808184301edacd7596c7096358042c7873bee0ac110cf0374014900010002203eb8c5d0a5cf2a1c3ffbf1ad097e22260c783d2a2d6222a23647ff6791a6a04004220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221027b00a63bfb5c13093652e488eca57c924355d2f190f2a814982d193773e3d2760503040101112d0001000228756e6c696d69746564526f796c6c6f436f696e20656d697373696f6e203120627920526f796c6c6f16040026abc2175e1304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770000000114756e6c696d69746564526f796c6c6f436f696e31ef35cbdef9f461dee0ad1c4753a481e30fb7b02d6356f342e573671f8044af5e00000000001921036c1fb8f682b877b9caa27ddb7068a242f662332ea7eb99e3c32c12170c15a0bc7bffc046fd524f88aede26e5729447892286061bf1c950a6299d0a79061bd8df", + "proof_at_depth": 0, + "with_prev_witnesses": true, + "with_meta_reveal": false +} \ No newline at end of file diff --git a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-request.json b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-request.json rename to util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-request.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-response.json b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json similarity index 100% rename from util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-response.json rename to util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json new file mode 100644 index 000000000..ce540cc5c --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-request.json @@ -0,0 +1,6 @@ +{ + "raw_proof": "544150460000000001fd04c55441505000040000000002241f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890000000104500000202034a4f2a5fecc95d461212ad94ecb66d0c9ee7ac5fdb43d003100000000000000cf4a3cba30f469954f2fa882aeb881ae88294608a980abddd1595d48f9daf729a77539655f293b19402f697e06cd020000000001011f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890100000000ffffffff02e8030000000000002251206f479cbd41e4ffce26c55a28268877fd40b0e64c283c817b875930bed23cea1e2b8216000000000022512078523cac7967c76daecc63e1fce58e7035fa400f8e5516299443dd4b2deebe210140864ccb6887b5dd92e0592b95aa5af1e4c0c82bbb20688a44c1a42a784aab5c5d2d22dbef014b51dfab133c4ea5d24826ddbd857ab8744cf7665492aa3ad45f0f0000000008a205c0f934598d194699c7c789782caabb2442ec4bdd0cba397c9bef4763aab4e3cb925852af91b28490c3f7678303f382a8cd71ede1e12b136779836f78a14e8ddcf5d067675f07d4c4692aa81d552f47e69faa56b63a01d27bc44cb08f8a2036feb5e4fe06516959842e30fa5d75c60a6f5caf8f82ae1d694837f2f587d352471f7b592c21cdb6cf968e27038ad439167cea8d4399a5adc4a6d90797ca27fe6a78190afd0164000100025e1f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890000000114756e6c696d69746564526f796c6c6f436f696e3236a5ee53396cf2d45b9f7bfb306ec706bca2e5738d9bbf4cf52e3cd2cf45a31100000000000401000603fd01f50bad01ab01650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034201403c027fc40af5c14afedbbd9e08d61017ed36780f0b92d94ac97bb0f81fc8bf63a7c75c65bf37ee41be7a5287e1da049a8ccea15053ac2c11f0ad6a5000bc06590e020000102102ea041c360a308ee44466ca4e2b07c5692c02a8d01f0720982dcd0642366546ff11210349d60c6689bbbb2ffc9b30b45b96a3d6e5fd5fd01c867344c0054f61050482410c9f0004000000000221024b84c791ddceed288f4c832d047e67f8152ce1af352cc18930902d84bc6bf9130374014900010002203eb8c5d0a5cf2a1c3ffbf1ad097e22260c783d2a2d6222a23647ff6791a6a04004220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221022300be5ca01e926c7bb7f8e59dc06111bf2d13627e8e28c3a581a632a8437e2e0503040101112d0001000228756e6c696d69746564526f796c6c6f436f696e20656d697373696f6e203220627920526f796c6c6f16040026af10175e1f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890000000114756e6c696d69746564526f796c6c6f436f696e3236a5ee53396cf2d45b9f7bfb306ec706bca2e5738d9bbf4cf52e3cd2cf45a3110000000000e8d13eb083538735c4bb6a9354741d6187206bdfa196ff9f0534523182753408", + "proof_at_depth": 0, + "with_prev_witnesses": true, + "with_meta_reveal": false +} \ No newline at end of file diff --git a/util/test/common-test/src/test/java/org/royllo/test/TapdDataTest.java b/util/test/common-test/src/test/java/org/royllo/test/TapdDataTest.java index f765a8070..a287b1d5e 100644 --- a/util/test/common-test/src/test/java/org/royllo/test/TapdDataTest.java +++ b/util/test/common-test/src/test/java/org/royllo/test/TapdDataTest.java @@ -32,7 +32,7 @@ public void findAssetValueByAssetId() { // Royllo coin. final AssetValue roylloCoin = TapdData.findAssetValueByAssetId(ROYLLO_COIN_ASSET_ID); assertNotNull(roylloCoin); - final List decodedProofValue = roylloCoin.getDecodedProofValues(); + final List decodedProofValue = roylloCoin.getDecodedProofValuesWithoutMetaReveal(); assertEquals(1, decodedProofValue.size()); // Decoded proof 1. final DecodedProofValue decodedProofValue1 = decodedProofValue.get(0); @@ -46,7 +46,7 @@ public void findAssetValueByAssetId() { // Tricky royllo coin. final AssetValue trickyRoylloCoin = TapdData.findAssetValueByAssetId(TRICKY_ROYLLO_COIN_ASSET_ID); assertNotNull(trickyRoylloCoin); - assertEquals(6, trickyRoylloCoin.getDecodedProofValues().size()); + assertEquals(6, trickyRoylloCoin.getDecodedProofValuesWithoutMetaReveal().size()); } @Test @@ -56,7 +56,7 @@ public void roylloCoinValue() { assertNotNull(roylloCoin); // Decoded proof 1. - final DecodedProofValueResponse.DecodedProof roylloCoinProof = roylloCoin.getDecodedProofResponse(0); + final DecodedProofValueResponse.DecodedProof roylloCoinProof = roylloCoin.getDecodedProofResponseWithMetaReveal(0); // Decoded proof. assertEquals(0, roylloCoinProof.getProofAtDepth()); assertEquals(1, roylloCoinProof.getNumberOfProofs()); @@ -117,7 +117,6 @@ public void roylloCoinValue() { assertEquals("726f796c6c6f436f696e206f6e206d61696e6e657420627920526f796c6c6f", roylloCoinProof.getMetaReveal().getData()); assertEquals("META_TYPE_OPAQUE", roylloCoinProof.getMetaReveal().getType()); assertEquals("e08c74d75554e2c9d6d8452a3584d191f8727963b05e497bba84ada8ae829208", roylloCoinProof.getMetaReveal().getMetaHash()); - } @Test diff --git a/util/test/common-test/src/test/java/org/royllo/test/TapdMockServerTest.java b/util/test/common-test/src/test/java/org/royllo/test/TapdMockServerTest.java index 31776233d..f3ed9e3a3 100644 --- a/util/test/common-test/src/test/java/org/royllo/test/TapdMockServerTest.java +++ b/util/test/common-test/src/test/java/org/royllo/test/TapdMockServerTest.java @@ -41,7 +41,7 @@ public void decodeResponse() { assertNotNull(roylloCoin); Request request = new Request.Builder() .url("http://localhost:" + MOCK_SERVER_PORT + "/v1/taproot-assets/proofs/decode") - .post(RequestBody.create(roylloCoin.getDecodedProofValues().get(0).getJSONRequest(), MediaType.parse("application/json; charset=utf-8"))) + .post(RequestBody.create(roylloCoin.getDecodedProofValuesWithoutMetaReveal().get(0).getJSONRequest(), MediaType.parse("application/json; charset=utf-8"))) .build(); try (Response response = client.newCall(request).execute()) { assertTrue(response.body().string().contains("\"genesis_point\" : \"" + ROYLLO_COIN_GENESIS_TXID + ":" + ROYLLO_COIN_GENESIS_VOUT + "" + "\"")); @@ -54,7 +54,7 @@ public void decodeResponse() { assertNotNull(testCoin); request = new Request.Builder() .url("http://localhost:" + MOCK_SERVER_PORT + "/v1/taproot-assets/proofs/decode") - .post(RequestBody.create(testCoin.getDecodedProofValues().get(2).getJSONRequest(), MediaType.parse("application/json; charset=utf-8"))) + .post(RequestBody.create(testCoin.getDecodedProofValuesWithoutMetaReveal().get(2).getJSONRequest(), MediaType.parse("application/json; charset=utf-8"))) .build(); try (Response response = client.newCall(request).execute()) { assertTrue(response.body().string().contains("\"script_key\" : \"023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff\"")); From 86a465152e391511d40fd7e2c0e08405dfd4ff48 Mon Sep 17 00:00:00 2001 From: straumat Date: Fri, 22 Dec 2023 12:08:46 +0100 Subject: [PATCH 23/57] Meta_reveal request/response integrated in common test --- ...ofAtDepth0-withoutMetaReveal-response.json | 5 + ...ofAtDepth0-withoutMetaReveal-response.json | 75 +++++++++++++ ...ofAtDepth0-withoutMetaReveal-response.json | 75 +++++++++++++ ...ofAtDepth0-withoutMetaReveal-response.json | 81 ++++++++++++++ ...ofAtDepth0-withoutMetaReveal-response.json | 81 ++++++++++++++ ...ofAtDepth0-withoutMetaReveal-response.json | 81 ++++++++++++++ ...ofAtDepth0-withoutMetaReveal-response.json | 75 +++++++++++++ ...ofAtDepth0-withoutMetaReveal-response.json | 105 ++++++++++++++++++ ...ofAtDepth1-withoutMetaReveal-response.json | 75 +++++++++++++ ...ofAtDepth0-withoutMetaReveal-response.json | 105 ++++++++++++++++++ ...ofAtDepth1-withoutMetaReveal-response.json | 68 ++++++++++++ ...ofAtDepth2-withoutMetaReveal-response.json | 75 +++++++++++++ ...ofAtDepth0-withoutMetaReveal-response.json | 75 +++++++++++++ ...ofAtDepth0-withoutMetaReveal-response.json | 81 ++++++++++++++ ...ofAtDepth0-withoutMetaReveal-response.json | 81 ++++++++++++++ 15 files changed, 1138 insertions(+) create mode 100644 util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json create mode 100644 util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json diff --git a/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json new file mode 100644 index 000000000..84aa31523 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/invalidProof/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json @@ -0,0 +1,5 @@ +{ + "code": 3, + "message": "proto: (line 1:17): invalid value for bytes type: \"INVALID_PROOF\"", + "details": [] +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json new file mode 100644 index 000000000..097ad5208 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/roylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json @@ -0,0 +1,75 @@ +{ + "decoded_proof": { + "proof_at_depth": 0, + "number_of_proofs": 1, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "d22de9a2de657c262a2c20c14500b8adca593c96f3fb85bfd756ba66626b9fcb:4", + "name": "roylloCoin", + "meta_hash": "e08c74d75554e2c9d6d8452a3584d191f8727963b05e497bba84ada8ae829208", + "asset_id": "24a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + }, + "amount": "100000", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "02fe0898805795bd2b698c8819ea3bfcbf1c7aa2330d0f7228723899b825848ee6", + "script_key_is_local": false, + "asset_group": null, + "chain_anchor": { + "anchor_tx": "02000000000101cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd20400000000ffffffff02e8030000000000002251200e7b1c167645f8fea7d7d52d9fd2655822d53e9f56e7ce5261635955d18906f1542e040000000000225120350e820feb4e9ae48a0f6281f7aebc64434132302cd204f71bb0d53f5e8fdf600248304502210094efb25003c9ced0c59a50c486f34351f23fcf72d5994b788e21be14e0d7e91f02203b1101052c06ca423891bcef245857e0073137a4d9eb62fcc0cde6c28a5becfc012103a23aa11f7f890650feaf48f09006d9c3e800f37b5b48c47dcfef27e7554cd59000000000", + "anchor_block_hash": "00000000000000000002b9a667c668ebd344f5905c537ff2f6588368d7bcc9a4", + "anchor_outpoint": "ca8d2eb13b25fd0b363d92de2655988b49bc5b519f282d41e10ce117beb97558:0", + "internal_key": "0215305a361d0919c3be1a756ec45514feff098ddeb5b2731c4bf8068e19a69de9", + "merkle_root": "c52672ccc8f393eaa1f41c31786d560b3603c3af082fd68d4b4fe4190458a77f", + "tapscript_sibling": "", + "block_height": 816610 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "0c6a7ccb693cd1d079239846914c0f6321988a3ab9efe6265191669bcb74c487f005e70b97110aa74310d5758156a887b8a1cfe6034ed8d2b4afba0ef89d3d0c1bb18c04cfe7fbc25a72fc5f9298c19f8e2d0ee5a127c5244f66a6edbc29df1c3764deda4f5dbcf2aad84cece706a48d1ead1aff3c3a54cf651c5803c710e697208b453cf2d5d65fb39948b24709616e6ce502ba78c72dc48f732608ec17af1109980f804c959933be7c02b6b1491a40a9182cf1b5f9b7bb3a8b5eeffad7dcc72bbc3c649ec93c31c5b0acff3a4275edf9e95046a9911276ec256ff3410bdfc513aeab02ad7ab1d0bda062fb9ff3828a367139363265ac7b96076018dcddc4c64f2ae2be52f40637b6c75d7d1b8d62316aabd2948da02e5e61988615faa014c78b1defa9f97f3897ae8d0f27a0ef87f87af2f153f15f27ba3dd35a65dc4743b7570bf824800d0451c3d7b7f0619176a6b13655380a272c06925ecf77508e70e578c6fb76a872f68b0832f60b124b9aedcee1596bc5692b1cf02c7fcd60dfd0bca5cf0b", + "inclusion_proof": "00040000000002210215305a361d0919c3be1a756ec45514feff098ddeb5b2731c4bf8068e19a69de903740149000100022024a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "00040000000102210238636cf0d229ba3c9c46e2d832db0f41a827de003ff5a16edc0611e1b71806f10503040101" + ], + "split_root_proof": "", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": { + "genesis_base_reveal": { + "genesis_point": "d22de9a2de657c262a2c20c14500b8adca593c96f3fb85bfd756ba66626b9fcb:4", + "name": "roylloCoin", + "meta_hash": "e08c74d75554e2c9d6d8452a3584d191f8727963b05e497bba84ada8ae829208", + "asset_id": "24a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + } + }, + "group_key_reveal": { + "raw_group_key": "", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json new file mode 100644 index 000000000..ac9854dbe --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/roylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json @@ -0,0 +1,75 @@ +{ + "decoded_proof": { + "proof_at_depth": 0, + "number_of_proofs": 1, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "c28a42586b36ac499c6d36da792d98176572573124dbc82526d02bbad5b3d9c7:1", + "name": "roylloNFT", + "meta_hash": "30ae42839b3e9022afee9193d3ad170ab280a96b1543847d281bf0e46ffc9336", + "asset_id": "89c9d3ff7cb9dbc4615f854f7127e94db10edd430f8bcf82d7309d0c8b750051", + "asset_type": "COLLECTIBLE", + "output_index": 0, + "version": 0 + }, + "amount": "1", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "02368d08b148b5a0867e38a1187f9fb4ab0a36c21159502e701beafc8cdda1dec9", + "script_key_is_local": false, + "asset_group": null, + "chain_anchor": { + "anchor_tx": "02000000000101c7d9b3d5ba2bd02625c8db243157726517982d79da366d9c49ac366b58428ac20100000000ffffffff02e8030000000000002251200abf9c151df80edc22d2fd1b8c0dcd07dcdda6e859cdcb513102d50cc5cbfdfecbaf100000000000225120d9c5d97fb55abcdf85102d90fb4c7b76d9f1656ae900d3127c861d0e814fa699014035721b41acdd8960274338bfa9ec0c5bb7627ee8b089607a17a66b98247203c2dd34ac0db9f30b24aaf8a7b9091223d49971d38e8f6a62af3f1d72cc77118b2600000000", + "anchor_block_hash": "0000000000002d538197af66e3d394bc5e88193e6edf3570874134c76f122897", + "anchor_outpoint": "6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90:0", + "internal_key": "033b8449aae83eb0ed04f7952108637d078836bb5d3353a33b6486248b401f60da", + "merkle_root": "99af00f8752ffd1f925029100416fd37b4678cdb65d1d7da20257f32d3e25aac", + "tapscript_sibling": "", + "block_height": 2534238 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "06c5e3e5655b34f206b2d585164027205db435c9247da0d879e3a24e3c94122b95d6cada816f37904258e125211f84dc0f0cd5f3352b8d9fac3eb1df4700cc970a16014e73d4cc2896d7f4f0511a70a9ace483be4c310ca922ea0aea9298a645ce670140fe73e9c733a7a53673c9de8a73285072b671d8220cd838249853fd914c586d23a902388394972f1bb1510ce665f94b483b71457e18f95f4a206aaedaa8dc918cd64121fdbbc1e7ec0695411090ca8d7ebd8925f1ad88a27b9b39161ee335", + "inclusion_proof": "0004000000000221033b8449aae83eb0ed04f7952108637d078836bb5d3353a33b6486248b401f60da03740149000100022089c9d3ff7cb9dbc4615f854f7127e94db10edd430f8bcf82d7309d0c8b75005104220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "0004000000010221023b5987e9f7c02c2502ce518a6b0f5cc18aae4579a45268105c0b2d0d1c324e950503040101" + ], + "split_root_proof": "", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": { + "genesis_base_reveal": { + "genesis_point": "c28a42586b36ac499c6d36da792d98176572573124dbc82526d02bbad5b3d9c7:1", + "name": "roylloNFT", + "meta_hash": "30ae42839b3e9022afee9193d3ad170ab280a96b1543847d281bf0e46ffc9336", + "asset_id": "89c9d3ff7cb9dbc4615f854f7127e94db10edd430f8bcf82d7309d0c8b750051", + "asset_type": "COLLECTIBLE", + "output_index": 0, + "version": 0 + } + }, + "group_key_reveal": { + "raw_group_key": "", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json new file mode 100644 index 000000000..46384ee1e --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json @@ -0,0 +1,81 @@ +{ + "decoded_proof": { + "proof_at_depth": 0, + "number_of_proofs": 1, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90:1", + "name": "setOfRoylloNFT", + "meta_hash": "5d24eb6c3942d4919bdf6aa059ccd193afcbace8cfaf3cf9138ad43cafadc38e", + "asset_id": "f643450242bb302284bab17e097982ad89790f94a9ad53db34d1902dfcccae5b", + "asset_type": "COLLECTIBLE", + "output_index": 0, + "version": 0 + }, + "amount": "1", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "022dd926192ebdfd038b85ae326efd0ee3919c435da9e1d43186f994706cf24508", + "script_key_is_local": false, + "asset_group": { + "raw_group_key": "", + "tweaked_group_key": "039511fd8c1f51acfbd85d9d742268d1ca03ce3b69d0436e71130192c085394c99", + "asset_witness": "" + }, + "chain_anchor": { + "anchor_tx": "02000000000101900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d0100000000ffffffff02e803000000000000225120d6484a40e7a0c5bcb5a958bd6251554feee22c1c94b0c058d7891105b34f309b0ba7100000000000225120c746196e62f7e88c99a96fab48967d38c58dcd415ccc87a51b5bd96fcf34de840140ae44a092025c5c182a52f0b542489395196b147b6b908f220205a562b86de46a2fd83770100e8aa5f775496c518ec3be8846fcc727cc3467adc8eb149cc7677900000000", + "anchor_block_hash": "000000000000000a22907a560adf9e43d8fa535772c514b9666b4993a4e865f3", + "anchor_outpoint": "ca93a44b534f410914c18ed4563c97b0a6c31194af236d789a79683c9ec76526:0", + "internal_key": "02cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b", + "merkle_root": "13a1ecd77e1eacee7d620b203f0ec13f65bbf9780e1c395dc1217f52ac3b10d7", + "tapscript_sibling": "", + "block_height": 2534319 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [ + "b21995d3080a44a6402faddc4c8976e50c72230a811754f9f2656072cc1d95bfb15fa1e937ad6381ecfb3bcd821ffef583aeb90b08b8e47d5dc51e2c932a7b51" + ], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "07e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e", + "inclusion_proof": "000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b03c4019900010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a04720002e9c90ee43476c7623bd5392f7197c8ac6a7f1eabb535264e515e82dbdc16d1b800000000000000017e079338ba0a60e64b794492e39e4a10ce06083578677aa95b6c6c9a373cc6dc0000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "000400000001022102f202542e41672bec22302c29d8e002c953c9c9abb1c4f8cdeefd1e075753e3060503040101" + ], + "split_root_proof": "", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": { + "genesis_base_reveal": { + "genesis_point": "6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90:1", + "name": "setOfRoylloNFT", + "meta_hash": "5d24eb6c3942d4919bdf6aa059ccd193afcbace8cfaf3cf9138ad43cafadc38e", + "asset_id": "f643450242bb302284bab17e097982ad89790f94a9ad53db34d1902dfcccae5b", + "asset_type": "COLLECTIBLE", + "output_index": 0, + "version": 0 + } + }, + "group_key_reveal": { + "raw_group_key": "02575af07788bda54cc640cfb9b05ad0a621c171e8c581e12e4cbdf3d2d7b8da82", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-response.json new file mode 100644 index 000000000..1551f52ff --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-response.json @@ -0,0 +1,81 @@ +{ + "decoded_proof": { + "proof_at_depth": 0, + "number_of_proofs": 1, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90:1", + "name": "setOfRoylloNFT2", + "meta_hash": "512dfac35a94760baf3dbd6682e3cd0d5cf4f3f8cc5b881931f73ed3a820c2a4", + "asset_id": "84be6e5954af62b40d1ea25f289e05414d579116e00b9fcaa76453efe8ee39ff", + "asset_type": "COLLECTIBLE", + "output_index": 0, + "version": 0 + }, + "amount": "1", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "0217c46686156f732035981526ea4f7e4cf5055fbdb6eeaa0254ea2b111b69328e", + "script_key_is_local": false, + "asset_group": { + "raw_group_key": "", + "tweaked_group_key": "039511fd8c1f51acfbd85d9d742268d1ca03ce3b69d0436e71130192c085394c99", + "asset_witness": "" + }, + "chain_anchor": { + "anchor_tx": "02000000000101900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d0100000000ffffffff02e803000000000000225120d6484a40e7a0c5bcb5a958bd6251554feee22c1c94b0c058d7891105b34f309b0ba7100000000000225120c746196e62f7e88c99a96fab48967d38c58dcd415ccc87a51b5bd96fcf34de840140ae44a092025c5c182a52f0b542489395196b147b6b908f220205a562b86de46a2fd83770100e8aa5f775496c518ec3be8846fcc727cc3467adc8eb149cc7677900000000", + "anchor_block_hash": "000000000000000a22907a560adf9e43d8fa535772c514b9666b4993a4e865f3", + "anchor_outpoint": "ca93a44b534f410914c18ed4563c97b0a6c31194af236d789a79683c9ec76526:0", + "internal_key": "02cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b", + "merkle_root": "13a1ecd77e1eacee7d620b203f0ec13f65bbf9780e1c395dc1217f52ac3b10d7", + "tapscript_sibling": "", + "block_height": 2534319 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [ + "9a8b780e6e9fc9cb85424fdbdb0c86563ab4229007a572109baf7e4ef78419ed7fdeb8801a6e8811e70a64ab09376fbcb5e04cda5cc8a286b3bd679859bc0267" + ], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "07e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e", + "inclusion_proof": "000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b03c4019900010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a04720002b3cd0b6af8976c1d9979ac0b63f85965e1cca16e9686b2406dfb063daf54140c00000000000000017e079338ba0a60e64b794492e39e4a10ce06083578677aa95b6c6c9a373cc6dc0000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "000400000001022102f202542e41672bec22302c29d8e002c953c9c9abb1c4f8cdeefd1e075753e3060503040101" + ], + "split_root_proof": "", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": { + "genesis_base_reveal": { + "genesis_point": "6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90:1", + "name": "setOfRoylloNFT2", + "meta_hash": "512dfac35a94760baf3dbd6682e3cd0d5cf4f3f8cc5b881931f73ed3a820c2a4", + "asset_id": "84be6e5954af62b40d1ea25f289e05414d579116e00b9fcaa76453efe8ee39ff", + "asset_type": "COLLECTIBLE", + "output_index": 0, + "version": 0 + } + }, + "group_key_reveal": { + "raw_group_key": "", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-response.json new file mode 100644 index 000000000..c248a8577 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/setOfRoylloNFT/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-response.json @@ -0,0 +1,81 @@ +{ + "decoded_proof": { + "proof_at_depth": 0, + "number_of_proofs": 1, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90:1", + "name": "setOfRoylloNFT3", + "meta_hash": "57321df398180b331e6a8207abe9412a19e5b5c307348340fac9d450b5310cec", + "asset_id": "23577de9f41b99b03ad8ed10e09120bf949f956b0702133102a566f5d33f2bd7", + "asset_type": "COLLECTIBLE", + "output_index": 0, + "version": 0 + }, + "amount": "1", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "02c8c3e030404c7f117a62aeebca5926a1693f917121465938cc5f215a8a3dc7e1", + "script_key_is_local": false, + "asset_group": { + "raw_group_key": "", + "tweaked_group_key": "039511fd8c1f51acfbd85d9d742268d1ca03ce3b69d0436e71130192c085394c99", + "asset_witness": "" + }, + "chain_anchor": { + "anchor_tx": "02000000000101900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d0100000000ffffffff02e803000000000000225120d6484a40e7a0c5bcb5a958bd6251554feee22c1c94b0c058d7891105b34f309b0ba7100000000000225120c746196e62f7e88c99a96fab48967d38c58dcd415ccc87a51b5bd96fcf34de840140ae44a092025c5c182a52f0b542489395196b147b6b908f220205a562b86de46a2fd83770100e8aa5f775496c518ec3be8846fcc727cc3467adc8eb149cc7677900000000", + "anchor_block_hash": "000000000000000a22907a560adf9e43d8fa535772c514b9666b4993a4e865f3", + "anchor_outpoint": "ca93a44b534f410914c18ed4563c97b0a6c31194af236d789a79683c9ec76526:0", + "internal_key": "02cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b", + "merkle_root": "13a1ecd77e1eacee7d620b203f0ec13f65bbf9780e1c395dc1217f52ac3b10d7", + "tapscript_sibling": "", + "block_height": 2534319 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [ + "687db6a3598f2a507e8cda8ce94769de9446641c923fc69418796675cdb4a75ba1e8956812d2f81c33a7e4ef5f5c43e855683d9a7239fc281cb6d10a3058e471" + ], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "07e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e", + "inclusion_proof": "000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b039c017100010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a044a00012225bf1097c66530e2c0b7d13acee653ff40ca5ab078d2feb12a14a1dd825fd10000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "000400000001022102f202542e41672bec22302c29d8e002c953c9c9abb1c4f8cdeefd1e075753e3060503040101" + ], + "split_root_proof": "", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": { + "genesis_base_reveal": { + "genesis_point": "6db79f5af2ba65bfb4044ced690f3acb4a791a6fc6a7450664e15559ad770b90:1", + "name": "setOfRoylloNFT3", + "meta_hash": "57321df398180b331e6a8207abe9412a19e5b5c307348340fac9d450b5310cec", + "asset_id": "23577de9f41b99b03ad8ed10e09120bf949f956b0702133102a566f5d33f2bd7", + "asset_type": "COLLECTIBLE", + "output_index": 0, + "version": 0 + } + }, + "group_key_reveal": { + "raw_group_key": "", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json new file mode 100644 index 000000000..c931fc7fa --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json @@ -0,0 +1,75 @@ +{ + "decoded_proof": { + "proof_at_depth": 0, + "number_of_proofs": 1, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", + "name": "trickyRoylloCoin", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + }, + "amount": "11000", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff", + "script_key_is_local": false, + "asset_group": null, + "chain_anchor": { + "anchor_tx": "0200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c00000000", + "anchor_block_hash": "000000000000003adbad005a04747fc9c84518a9d2784595d956b7491c455fb7", + "anchor_outpoint": "632d0c3935fff230aa3718e268dce5517786d7976f7aa33efb615b408737b0ad:0", + "internal_key": "03995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40", + "merkle_root": "38e886e5169ae100c68d9f3af9d66312a4d14797edfc2ae00cfd3fe1143a456f", + "tapscript_sibling": "", + "block_height": 2534320 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a2", + "inclusion_proof": "000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101" + ], + "split_root_proof": "", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": { + "genesis_base_reveal": { + "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", + "name": "trickyRoylloCoin", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + } + }, + "group_key_reveal": { + "raw_group_key": "", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-response.json new file mode 100644 index 000000000..f71a9a47b --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth0-withoutMetaReveal-response.json @@ -0,0 +1,105 @@ +{ + "decoded_proof": { + "proof_at_depth": 0, + "number_of_proofs": 2, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", + "name": "trickyRoylloCoin", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + }, + "amount": "50", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "026e6f1ce5a4cf58f63f1c6d2421aaf3d011e3811bab92122cffd67dada97ab610", + "script_key_is_local": false, + "asset_group": null, + "chain_anchor": { + "anchor_tx": "02000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c00000000", + "anchor_block_hash": "000000000000000e2191e5cc5836eea96ecb93e85917dcbb43ddff45c7f48b70", + "anchor_outpoint": "f2acf1235882a7683bad5baeb1b84c2f1dbf33f0fc4a7c85f2191aa8d49ce0d3:1", + "internal_key": "02db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad", + "merkle_root": "89997fe9f8aadf6618cc2e7506efd4c9d81aba84b17001e33491436a626e7301", + "tapscript_sibling": "", + "block_height": 2534322 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [], + "split_commitment": { + "root_asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", + "name": "trickyRoylloCoin", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + }, + "amount": "10950", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb", + "script_key_is_local": false, + "asset_group": null, + "chain_anchor": null, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "632d0c3935fff230aa3718e268dce5517786d7976f7aa33efb615b408737b0ad:0", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "script_key": "023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff", + "amount": "0" + }, + "tx_witness": [ + "098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a" + ], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + } + } + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "0608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e", + "inclusion_proof": "000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a0001ad91c6726cfc6a35637fc28d8c6c5153ca6667faca459054a03195cf87cb014a0000000000002ac6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e184020503040101" + ], + "split_root_proof": "000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": null, + "group_key_reveal": { + "raw_group_key": "", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withoutMetaReveal-response.json new file mode 100644 index 000000000..24172217e --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile2-proofAtDepth1-withoutMetaReveal-response.json @@ -0,0 +1,75 @@ +{ + "decoded_proof": { + "proof_at_depth": 1, + "number_of_proofs": 2, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", + "name": "trickyRoylloCoin", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + }, + "amount": "11000", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff", + "script_key_is_local": false, + "asset_group": null, + "chain_anchor": { + "anchor_tx": "0200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c00000000", + "anchor_block_hash": "000000000000003adbad005a04747fc9c84518a9d2784595d956b7491c455fb7", + "anchor_outpoint": "632d0c3935fff230aa3718e268dce5517786d7976f7aa33efb615b408737b0ad:0", + "internal_key": "03995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40", + "merkle_root": "38e886e5169ae100c68d9f3af9d66312a4d14797edfc2ae00cfd3fe1143a456f", + "tapscript_sibling": "", + "block_height": 2534320 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a2", + "inclusion_proof": "000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101" + ], + "split_root_proof": "", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": { + "genesis_base_reveal": { + "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", + "name": "trickyRoylloCoin", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + } + }, + "group_key_reveal": { + "raw_group_key": "", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-response.json new file mode 100644 index 000000000..f767368f1 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth0-withoutMetaReveal-response.json @@ -0,0 +1,105 @@ +{ + "decoded_proof": { + "proof_at_depth": 0, + "number_of_proofs": 3, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", + "name": "trickyRoylloCoin", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + }, + "amount": "125", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "02629f225f4ef29972e703b1086796dbe47e881ae913904a1c2eec15df35361fb6", + "script_key_is_local": false, + "asset_group": null, + "chain_anchor": { + "anchor_tx": "02000000000102d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf20200000000ffffffffd3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000000000000003e803000000000000225120acb9b163799c60c08c279c18a652ffe4bbbea9301831c3acca52b796a5fb7cc5e8030000000000002251203f475770dfc8d7e92e93632c251a5c01b6e90670e8522b81cb7b448bf86efffa03aa1600000000002251209706916002ac9ba36bab02ce2ed586da3ee2bfd271c54743143c9663ccfda56d01409867a537b52ee5c4bc798315397d89bf65380e4ed88a04ec9315f67bc08ed6bb275a51117feecf87da27a8b2761630c92fd81c6e4512ecfe9536819be6b3c5d00140a6df68be0be4f5c58b40e0463254e11e6848761ad77d538f53212ad78b5ab80640344e46de7bcd6d8350bf52769851a5b0abff9e8c08414075ea885ad86644ac00000000", + "anchor_block_hash": "000000000000001a569a96b191eb6fb89a7e32beab1a9ceca5e88e2e264c645e", + "anchor_outpoint": "2727229cc771efa552f9232a04b0cd8d16df6d83bd217523888feee6a8553ec8:1", + "internal_key": "034d6fd392fe86bdfc93973406f15050b36281f569be8335afa4b3586b36a0aaf8", + "merkle_root": "3dba25fa8dbc57f111da04477792ba54d4cad983e28c369c4a4189dd4a836aac", + "tapscript_sibling": "", + "block_height": 2534327 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [], + "split_commitment": { + "root_asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", + "name": "trickyRoylloCoin", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + }, + "amount": "10825", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "0223e1cfbdb232a9d98d3ddc2bf36d907c3c1bf3f40ad10eca0ebdb7eafe07db84", + "script_key_is_local": false, + "asset_group": null, + "chain_anchor": null, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "f2acf1235882a7683bad5baeb1b84c2f1dbf33f0fc4a7c85f2191aa8d49ce0d3:0", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "script_key": "022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb", + "amount": "0" + }, + "tx_witness": [ + "8bd6b5306b3c03794c974922b7b6a4a5b9deeefd35a02d3ade39de88882e507cc9b62c8de4c4a6758efa9b756428e0d7666657794d1a8bd82cdbd6d02117139a" + ], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + } + } + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "07ed5bc2ffc43424ee07fed779bdbbb19b8a264d6b3c7e4be7e48e1fc63196abe8e749d4950360f70c69103d539ae7a27a80ca78c226fd540b4fc84d687b71eb786b8fc0cc51efe9a546188902577e1f5d105dbe483b03077fd6ac643ef2dfd0a152a98a2916ce8948567b361ed53da743e455e575cef6380c1909aeeb597c377c476ce23a33c62d040495d94028ba3c503aa8d56ed27a3e323c2503277d03fddf89361e8d266148f7784cdadbcd47b21d8221418ec9b4b5f5ffad95a9e41159ca7be8c3138e935252798546897d2515404231693240af2dc052479c1403f9ef1164", + "inclusion_proof": "0004000000010221034d6fd392fe86bdfc93973406f15050b36281f569be8335afa4b3586b36a0aaf8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a000179bef732bcc42581ed21a0673d739a0096c5b29c13e4170d59185ba1bf5a20650000000000002a49ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "000400000002022102fabb9caf70565dd69dabab7e38cd8932843de0a2e620d8c8964d375387e764bc0503040101" + ], + "split_root_proof": "000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": null, + "group_key_reveal": { + "raw_group_key": "", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withoutMetaReveal-response.json new file mode 100644 index 000000000..d4d8b54e0 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth1-withoutMetaReveal-response.json @@ -0,0 +1,68 @@ +{ + "decoded_proof": { + "proof_at_depth": 1, + "number_of_proofs": 3, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", + "name": "trickyRoylloCoin", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + }, + "amount": "10950", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb", + "script_key_is_local": false, + "asset_group": null, + "chain_anchor": { + "anchor_tx": "02000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c00000000", + "anchor_block_hash": "000000000000000e2191e5cc5836eea96ecb93e85917dcbb43ddff45c7f48b70", + "anchor_outpoint": "f2acf1235882a7683bad5baeb1b84c2f1dbf33f0fc4a7c85f2191aa8d49ce0d3:0", + "internal_key": "02ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8", + "merkle_root": "109fac101b0893f13b84b5f2a13551501237dd381c02f8f591dab43026d4bd73", + "tapscript_sibling": "", + "block_height": 2534322 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "632d0c3935fff230aa3718e268dce5517786d7976f7aa33efb615b408737b0ad:0", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "script_key": "023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff", + "amount": "0" + }, + "tx_witness": [ + "098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a" + ], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "0608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e", + "inclusion_proof": "000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a00019b28bc20e99078e38640e026115c0e6b214bba541ad194dffa5737983cddae1a0000000000000032ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e184020503040101" + ], + "split_root_proof": "", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": null, + "group_key_reveal": { + "raw_group_key": "", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withoutMetaReveal-response.json new file mode 100644 index 000000000..1ce295d45 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/trickyRoylloCoin/decodeProof-proofFile3-proofAtDepth2-withoutMetaReveal-response.json @@ -0,0 +1,75 @@ +{ + "decoded_proof": { + "proof_at_depth": 2, + "number_of_proofs": 3, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", + "name": "trickyRoylloCoin", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + }, + "amount": "11000", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff", + "script_key_is_local": false, + "asset_group": null, + "chain_anchor": { + "anchor_tx": "0200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c00000000", + "anchor_block_hash": "000000000000003adbad005a04747fc9c84518a9d2784595d956b7491c455fb7", + "anchor_outpoint": "632d0c3935fff230aa3718e268dce5517786d7976f7aa33efb615b408737b0ad:0", + "internal_key": "03995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40", + "merkle_root": "38e886e5169ae100c68d9f3af9d66312a4d14797edfc2ae00cfd3fe1143a456f", + "tapscript_sibling": "", + "block_height": 2534320 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a2", + "inclusion_proof": "000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101" + ], + "split_root_proof": "", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": { + "genesis_base_reveal": { + "genesis_point": "2777e306451f6d5231f4b17b8286412e1e13ef153800086cf879baae89d9df76:1", + "name": "trickyRoylloCoin", + "meta_hash": "13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", + "asset_id": "e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + } + }, + "group_key_reveal": { + "raw_group_key": "", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json new file mode 100644 index 000000000..981a5250b --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/unknownRoylloCoin/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json @@ -0,0 +1,75 @@ +{ + "decoded_proof": { + "proof_at_depth": 0, + "number_of_proofs": 1, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "2727229cc771efa552f9232a04b0cd8d16df6d83bd217523888feee6a8553ec8:2", + "name": "unknownRoylloCoin", + "meta_hash": "548c3d99c0f06a858b564e035f7bccb4354eb89f5cd044d0ba78b9fbd7152882", + "asset_id": "a8e1cd6961301e8ef91df4f902f7af0bf261e30c122d85ebf7abc32c15bee002", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + }, + "amount": "12000", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "0216fbf08fd0d3caf518a605c7e93587e7f66deb2460eb235fc54c151967cf69de", + "script_key_is_local": false, + "asset_group": null, + "chain_anchor": { + "anchor_tx": "02000000000101c83e55a8e6ee8f88237521bd836ddf168dcdb0042a23f952a5ef71c79c2227270200000000ffffffff02e8030000000000002251208d9cac51eda33283c63419190f12ffb2bf2ec5ac337ac8c9ea677b2af17e4a1079a21600000000002251202dc635ce603c8c9675f08276f2bb6c796576f80c65fd9a81249549a2488f6ef101404d19858b4046fb71ecbfffe5b8ed78baf5159cba1298e21a22c055307b549792f434178b2469a53dc3dc5b24a4311e3cef9f8075d47fe08796335ddd8d44b4df00000000", + "anchor_block_hash": "00000000000000234003091791b7f3184360e92e4c9a5aad3947178c89b7e6e3", + "anchor_outpoint": "77b550de10ad347daf314f4982a979db6d101573afe6fbf20c35935ce4bb0413:0", + "internal_key": "027fb809fa2c53a98906e9d3fbbc56019a32fd8bef11d3fd5b5657c1f849e32f74", + "merkle_root": "1e29ca25477ad7dcdf6593a00bd1b8bfa0fc98754ca5990e00c02358e26db61c", + "tapscript_sibling": "", + "block_height": 2534330 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "05a99726a7ab1cfa6c0ad3cee5656f2e388d4b480d105df5d2eb307e7f68343f654c39a67f84c69fb0a45d3a7bedb1aad6062b6af1ab37f207986f4b74aabd371726ee0f70f0b608092b89446916403bbbb2dbf220b4d57905d4cd73efdb2eecd50aa80180053bcd4fd5d7a739983d842d6b62d4884ac09529e01e946e59ac705467caa6de490c506af99211ad73742d51e380d233618fcbefabefd3a1aed9166e14", + "inclusion_proof": "0004000000000221027fb809fa2c53a98906e9d3fbbc56019a32fd8bef11d3fd5b5657c1f849e32f74037401490001000220a8e1cd6961301e8ef91df4f902f7af0bf261e30c122d85ebf7abc32c15bee00204220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "000400000001022102ac43972a2a4868a12d41db303d3d93ad0d86c251336e3ed69b0528f7d578a81b0503040101" + ], + "split_root_proof": "", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": { + "genesis_base_reveal": { + "genesis_point": "2727229cc771efa552f9232a04b0cd8d16df6d83bd217523888feee6a8553ec8:2", + "name": "unknownRoylloCoin", + "meta_hash": "548c3d99c0f06a858b564e035f7bccb4354eb89f5cd044d0ba78b9fbd7152882", + "asset_id": "a8e1cd6961301e8ef91df4f902f7af0bf261e30c122d85ebf7abc32c15bee002", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + } + }, + "group_key_reveal": { + "raw_group_key": "", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json new file mode 100644 index 000000000..4c8aa84c4 --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/firstEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json @@ -0,0 +1,81 @@ +{ + "decoded_proof": { + "proof_at_depth": 0, + "number_of_proofs": 1, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "77b550de10ad347daf314f4982a979db6d101573afe6fbf20c35935ce4bb0413:1", + "name": "unlimitedRoylloCoin1", + "meta_hash": "ef35cbdef9f461dee0ad1c4753a481e30fb7b02d6356f342e573671f8044af5e", + "asset_id": "ce2d57a6bef7668a781bc149f5491aab7392b30a2f4368f013722f46a57abc70", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + }, + "amount": "499", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "025f121b76e25840b5fbe620ef331ac834abd964a35fff72bbae207bfe2bad9a43", + "script_key_is_local": false, + "asset_group": { + "raw_group_key": "", + "tweaked_group_key": "0349d60c6689bbbb2ffc9b30b45b96a3d6e5fd5fd01c867344c0054f6105048241", + "asset_witness": "" + }, + "chain_anchor": { + "anchor_tx": "020000000001011304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770100000000ffffffff02e803000000000000225120e5d4f8a3b6b3087984f36182654e2deb91e2e567cf35f068e6d4362ac7958cceef9a1600000000002251207a9d28abfb419fa691b22c3967b61d8d358ed65031f92740604875e29aa0ff2801407fc9e637deacd43c5434d35a9db8f6634d049f30f9aa2f8521944b4654bad147848d20f1b96e081fa23604e3ad610c5b9b16fd553ec751e608ee79bd622dcca800000000", + "anchor_block_hash": "0000000000000009390988cc23c5e128cdfc113cc68ec6df914a8374069f7304", + "anchor_outpoint": "2debb29de64ed7aafaf79c034f1ba22c41f484fafc814cab7b22a97bacfa6825:0", + "internal_key": "0261592c195dc3af641d2808184301edacd7596c7096358042c7873bee0ac110cf", + "merkle_root": "3fa4228e159176962d03aa19d09f160839076f242dc5943aebe70b6bc13ff4e1", + "tapscript_sibling": "", + "block_height": 2534338 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [ + "e0c383aaecabb44bee72683d825118b7ef7124a9c8be149c82b7c4c525340aceb4194a177bc1e13e0bee7df5425720f4b5f30335faed586bef129780146b7a2c" + ], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "0612f24121b3b09bca8dfd619a8412521cd5a0df3c3530e2f2e5aa7a4beebac8ba4ccd82f747699a0a1d1e4a99819fda33c8c9cccbc6b92e2e2ee6f7018ea3862b0574ac6910af8096a5531d803cad77a8a878972091f4a11404ecd009e75ebe40afd73ec375e791f7d7de16bee7fcb6e6e412a1fb03bd363f4a997af477ffe5caa538f8705031ec8da6da106429c44b289ef68e0cce784d0d91a47589b86ed27dbd5f81607a2e8dd37cb256c4179c5980ae45e8dff592a5dfea2ad06c9a8c4b412d", + "inclusion_proof": "00040000000002210261592c195dc3af641d2808184301edacd7596c7096358042c7873bee0ac110cf0374014900010002203eb8c5d0a5cf2a1c3ffbf1ad097e22260c783d2a2d6222a23647ff6791a6a04004220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "0004000000010221027b00a63bfb5c13093652e488eca57c924355d2f190f2a814982d193773e3d2760503040101" + ], + "split_root_proof": "", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": { + "genesis_base_reveal": { + "genesis_point": "77b550de10ad347daf314f4982a979db6d101573afe6fbf20c35935ce4bb0413:1", + "name": "unlimitedRoylloCoin1", + "meta_hash": "ef35cbdef9f461dee0ad1c4753a481e30fb7b02d6356f342e573671f8044af5e", + "asset_id": "ce2d57a6bef7668a781bc149f5491aab7392b30a2f4368f013722f46a57abc70", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + } + }, + "group_key_reveal": { + "raw_group_key": "036c1fb8f682b877b9caa27ddb7068a242f662332ea7eb99e3c32c12170c15a0bc", + "tapscript_root": "" + } + } +} diff --git a/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json new file mode 100644 index 000000000..5c74deeeb --- /dev/null +++ b/util/test/common-test/src/main/resources/tapd/assets/unlimitedRoylloCoin/secondEmission/decodeProof-proofFile1-proofAtDepth0-withoutMetaReveal-response.json @@ -0,0 +1,81 @@ +{ + "decoded_proof": { + "proof_at_depth": 0, + "number_of_proofs": 1, + "asset": { + "version": "ASSET_VERSION_V0", + "asset_genesis": { + "genesis_point": "89cd5498584f217ca77d50e740e56490a710ab7b6988b3cd73aac95b9e077b1f:1", + "name": "unlimitedRoylloCoin2", + "meta_hash": "36a5ee53396cf2d45b9f7bfb306ec706bca2e5738d9bbf4cf52e3cd2cf45a311", + "asset_id": "fdf6f8c41602ccdad237305a05e41868ba267947d152a1cacfaf3b5045a84a04", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + }, + "amount": "501", + "lock_time": 0, + "relative_lock_time": 0, + "script_version": 0, + "script_key": "02ea041c360a308ee44466ca4e2b07c5692c02a8d01f0720982dcd0642366546ff", + "script_key_is_local": false, + "asset_group": { + "raw_group_key": "", + "tweaked_group_key": "0349d60c6689bbbb2ffc9b30b45b96a3d6e5fd5fd01c867344c0054f6105048241", + "asset_witness": "" + }, + "chain_anchor": { + "anchor_tx": "020000000001011f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890100000000ffffffff02e8030000000000002251206f479cbd41e4ffce26c55a28268877fd40b0e64c283c817b875930bed23cea1e2b8216000000000022512078523cac7967c76daecc63e1fce58e7035fa400f8e5516299443dd4b2deebe210140864ccb6887b5dd92e0592b95aa5af1e4c0c82bbb20688a44c1a42a784aab5c5d2d22dbef014b51dfab133c4ea5d24826ddbd857ab8744cf7665492aa3ad45f0f00000000", + "anchor_block_hash": "0000000000000039e91d73fc6392f998a760ded016bb425a680ef925cc303b23", + "anchor_outpoint": "0516611bebe6a92675ee7360ad64edf0b3b2e967fe8c474b2d2242d5a349da3d:0", + "internal_key": "024b84c791ddceed288f4c832d047e67f8152ce1af352cc18930902d84bc6bf913", + "merkle_root": "54f74892adbbc7e3526903828c9437b4f7729c0b0e664a0acb9b1e3fac29aa05", + "tapscript_sibling": "", + "block_height": 2535184 + }, + "prev_witnesses": [ + { + "prev_id": { + "anchor_point": "0000000000000000000000000000000000000000000000000000000000000000:0", + "asset_id": "0000000000000000000000000000000000000000000000000000000000000000", + "script_key": "000000000000000000000000000000000000000000000000000000000000000000", + "amount": "0" + }, + "tx_witness": [ + "3c027fc40af5c14afedbbd9e08d61017ed36780f0b92d94ac97bb0f81fc8bf63a7c75c65bf37ee41be7a5287e1da049a8ccea15053ac2c11f0ad6a5000bc0659" + ], + "split_commitment": null + } + ], + "is_spent": false, + "lease_owner": "", + "lease_expiry": "0", + "is_burn": false + }, + "meta_reveal": null, + "tx_merkle_proof": "05c0f934598d194699c7c789782caabb2442ec4bdd0cba397c9bef4763aab4e3cb925852af91b28490c3f7678303f382a8cd71ede1e12b136779836f78a14e8ddcf5d067675f07d4c4692aa81d552f47e69faa56b63a01d27bc44cb08f8a2036feb5e4fe06516959842e30fa5d75c60a6f5caf8f82ae1d694837f2f587d352471f7b592c21cdb6cf968e27038ad439167cea8d4399a5adc4a6d90797ca27fe6a7819", + "inclusion_proof": "0004000000000221024b84c791ddceed288f4c832d047e67f8152ce1af352cc18930902d84bc6bf9130374014900010002203eb8c5d0a5cf2a1c3ffbf1ad097e22260c783d2a2d6222a23647ff6791a6a04004220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "exclusion_proofs": [ + "0004000000010221022300be5ca01e926c7bb7f8e59dc06111bf2d13627e8e28c3a581a632a8437e2e0503040101" + ], + "split_root_proof": "", + "num_additional_inputs": 0, + "challenge_witness": [], + "is_burn": false, + "genesis_reveal": { + "genesis_base_reveal": { + "genesis_point": "89cd5498584f217ca77d50e740e56490a710ab7b6988b3cd73aac95b9e077b1f:1", + "name": "unlimitedRoylloCoin2", + "meta_hash": "36a5ee53396cf2d45b9f7bfb306ec706bca2e5738d9bbf4cf52e3cd2cf45a311", + "asset_id": "fdf6f8c41602ccdad237305a05e41868ba267947d152a1cacfaf3b5045a84a04", + "asset_type": "NORMAL", + "output_index": 0, + "version": 0 + } + }, + "group_key_reveal": { + "raw_group_key": "", + "tapscript_root": "" + } + } +} From 74cb81a9e817576486b68dc61bd3c2d09e8e75ff Mon Sep 17 00:00:00 2001 From: straumat Date: Fri, 22 Dec 2023 12:18:42 +0100 Subject: [PATCH 24/57] Fixing integration tests --- .../integration/tapd/TapdUniverseRootsServiceTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdUniverseRootsServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdUniverseRootsServiceTest.java index cad1327eb..023dab4b0 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdUniverseRootsServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdUniverseRootsServiceTest.java @@ -26,13 +26,13 @@ public void getUniverseRootsTest() throws InterruptedException { String[] validServers = new String[]{ "testnet.universe.lightning.finance", "testnet.universe.lightning.finance/", - "52.34.1.134", - "52.34.1.134/", + "52.88.202.111", + "52.88.202.111/", // With https in front. "https://testnet.universe.lightning.finance", "https://testnet.universe.lightning.finance/", - "https://52.34.1.134", - "https://52.34.1.134/", + "https://52.88.202.111", + "https://52.88.202.111/", }; // Testing each server. From 067434c9e63735d1701bf7fa293e93e6f62c64a8 Mon Sep 17 00:00:00 2001 From: straumat Date: Fri, 22 Dec 2023 17:10:54 +0100 Subject: [PATCH 25/57] metaReveal parameter added to decode --- .../provider/tapd/DecodedProofResponse.java | 27 ++++++++++- .../core/provider/tapd/TapdService.java | 5 +- .../tapd/TapdServiceImplementation.java | 8 ++-- .../test/core/service/ProofServiceTest.java | 3 -- .../tapd/TapdDecodeServiceTest.java | 48 ++++++++++++++++++- .../batch/batch/request/AddProofBatch.java | 2 +- 6 files changed, 80 insertions(+), 13 deletions(-) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java index cf59e1b32..a1e228fe7 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java @@ -56,7 +56,11 @@ public static class DecodedProof { @JsonProperty("asset") Asset asset; - /** Transaction merkle proof. */ + /** The reveal meta-data associated with the proof, if available. */ + @JsonProperty("meta_reveal") + Asset.MetaReveal metaReveal; + + /** The merkle proof for AnchorTx used to prove its inclusion within BlockHeader. */ @JsonProperty("tx_merkle_proof") String txMerkleProof; @@ -185,6 +189,27 @@ public String getAssetStateId() { } } + @Getter + @Setter + @NoArgsConstructor + @ToString + @JsonIgnoreProperties(ignoreUnknown = true) + public static class MetaReveal { + + /** The raw data of the asset meta-data. Based on the type below, this may be structured data such as a text file or PDF. The size of the data is limited to 1MiB. */ + @JsonProperty("data") + private String data; + + /** The type of the meta-data. */ + @JsonProperty("type") + private String type; + + /** The hash of the meta. This is the hash of the TLV serialization of the meta itself. */ + @JsonProperty("meta_hash") + private String metaHash; + + } + @Getter @Setter @NoArgsConstructor diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/TapdService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/TapdService.java index 8f90580cc..96038b37a 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/TapdService.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/TapdService.java @@ -20,13 +20,14 @@ public interface TapdService { /** * Decode proof at a certain depth. - * If there are several proofs, is the latest proof is returned. + * If there are several proofs, the latest proof is returned. * * @param proof proof * @param proofAtDepth proof at depth + * @param metaReveal meta reveal * @return decoded proof */ - Mono decode(String proof, long proofAtDepth); + Mono decode(String proof, long proofAtDepth, boolean metaReveal); /** * Get universe roots. diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/TapdServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/TapdServiceImplementation.java index 72fb7877f..9171d5d12 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/TapdServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/TapdServiceImplementation.java @@ -76,12 +76,12 @@ public final SslContext getSslContext() { @Override public final Mono decode(final String proof) { // The index depth of the decoded proof, with 0 being the latest proof. - return decode(proof, 0); + return decode(proof, 0, false); } @Override - public final Mono decode(final String proof, final long proofAtDepth) { - logger.info("Calling decode for proof from tapd with proof {} at {} depth", proof, proofAtDepth); + public final Mono decode(final String proof, final long proofAtDepth, final boolean metaReveal) { + logger.info("Calling decode for proof from tapd at {} depth", proofAtDepth); HttpClient httpClient = HttpClient.create().secure(t -> t.sslContext(getSslContext())); // Consume a token from the token bucket. @@ -105,7 +105,7 @@ public final Mono decode(final String proof, final long pr .rawProof(proof) .proofAtDepth(proofAtDepth) .withPrevWitnesses(true) - .withMetaReveal(false) + .withMetaReveal(metaReveal) .build() )) .exchangeToFlux(response -> response.bodyToFlux(DecodedProofResponse.class)) diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/ProofServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/ProofServiceTest.java index 042b9117d..1308882ce 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/ProofServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/ProofServiceTest.java @@ -80,9 +80,6 @@ public void addProof() { @Test @DisplayName("getProofByAssetId()") public void getProofByAssetId() { - // Retrieved data from TAPD. - final String ROYLLO_COIN_RAW_PROOF = ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(0).getRawProof(); - // ============================================================================================================= // First case: asset id not found in database. AssertionError e = assertThrows(AssertionError.class, () -> proofService.getProofByAssetId(ROYLLO_COIN_ASSET_ID, 0, 1)); diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java index cbde6c75a..6a2c5f368 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java @@ -86,12 +86,12 @@ public void decodeTest() { public void proofAtDepthTest() { final String TRICKY_ROYLLO_COIN_3_RAW_PROOF = TRICKY_ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(2).getRawProof(); - final DecodedProofResponse response1 = tapdService.decode(TRICKY_ROYLLO_COIN_3_RAW_PROOF, 0).block(); + final DecodedProofResponse response1 = tapdService.decode(TRICKY_ROYLLO_COIN_3_RAW_PROOF, 0, false).block(); assertNotNull(response1); assertEquals(2, response1.getDecodedProof().getNumberOfProofs()); assertEquals(0, response1.getDecodedProof().getProofAtDepth()); - final DecodedProofResponse response2 = tapdService.decode(TRICKY_ROYLLO_COIN_3_RAW_PROOF, 1).block(); + final DecodedProofResponse response2 = tapdService.decode(TRICKY_ROYLLO_COIN_3_RAW_PROOF, 1, false).block(); assertNotNull(response2); assertEquals(2, response1.getDecodedProof().getNumberOfProofs()); assertEquals(1, response2.getDecodedProof().getProofAtDepth()); @@ -108,4 +108,48 @@ public void decodeErrorTest() { assertNotNull(response.getErrorMessage()); } + @Test + @DisplayName("decode() on tapd with meta reveal") + public void decodeMetaRevealTest() { + // Case tests on tricky coin. + + // Proof file 1. + // Issuance proof with meta reveal ==> We should be able to get the meta information. + final String issuanceProof1 = TRICKY_ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(0).getRawProof(); + DecodedProofResponse response = tapdService.decode(issuanceProof1, 0, true).block(); + assertNotNull(response); + assertNull(response.getErrorCode()); + assertNotNull(response.getDecodedProof().getMetaReveal()); + assertEquals("747269636b79526f796c6c6f436f696e20627920526f796c6c6f", response.getDecodedProof().getMetaReveal().getData()); + assertEquals("META_TYPE_OPAQUE", response.getDecodedProof().getMetaReveal().getType()); + assertEquals("13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", response.getDecodedProof().getMetaReveal().getMetaHash()); + + // If we do the same without asking for meta reveal, we should not get it. + response = tapdService.decode(issuanceProof1, 0, false).block(); + assertNotNull(response); + assertNull(response.getErrorCode()); + assertNull(response.getDecodedProof().getMetaReveal()); + + // Proof file 2. + // We get the proof file 2 (with two proofs) and we decode the last one, which is the issuance proof. + final String issuanceProof2 = TRICKY_ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(1).getRawProof(); + response = tapdService.decode(issuanceProof2, 1, true).block(); + assertNotNull(response); + assertNull(response.getErrorCode()); + assertNotNull(response.getDecodedProof().getMetaReveal()); + assertEquals("747269636b79526f796c6c6f436f696e20627920526f796c6c6f", response.getDecodedProof().getMetaReveal().getData()); + assertEquals("META_TYPE_OPAQUE", response.getDecodedProof().getMetaReveal().getType()); + assertEquals("13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", response.getDecodedProof().getMetaReveal().getMetaHash()); + + // If we get a transfer proof, we should not get the meta reveal and have a code error instead. + response = tapdService.decode(issuanceProof2, 0, true).block(); + assertNotNull(response); + assertNotNull(response.getErrorCode()); + + // But we should not have a problem if we set meta reveal to false. + response = tapdService.decode(issuanceProof2, 1, false).block(); + assertNotNull(response); + assertNull(response.getErrorCode()); + } + } diff --git a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java index b2f151993..68d530866 100644 --- a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java +++ b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java @@ -82,7 +82,7 @@ public void processRequests() { // Now, we decode all proofs, one by one, starting by the oldest (issuance proof). boolean proofAdded = false; for (long i = numberOfProofs; i > 0; i--) { - response = tapdService.decode(request.getProof(), i - 1).block(); + response = tapdService.decode(request.getProof(), i - 1, false).block(); // We check if we have a decoded proof response. if (response == null) { From aff66e81ec2328a8cfcbb001b07ca77b54070819 Mon Sep 17 00:00:00 2001 From: straumat Date: Sun, 24 Dec 2023 18:35:47 +0100 Subject: [PATCH 26/57] PROOF_TYPE field added on Proof and AddProofRequest --- .../explorer/core/domain/proof/Proof.java | 8 +++ .../core/domain/request/AddProofRequest.java | 10 +++- .../explorer/core/dto/proof/ProofDTO.java | 5 ++ .../core/dto/request/AddProofRequestDTO.java | 6 +++ .../proof/ProofServiceImplementation.java | 2 + .../request/RequestServiceImplementation.java | 2 + .../explorer/core/util/enums/ProofType.java | 3 ++ .../db/changelog/1.0.0/data/data-proof.xml | 1 + .../db/changelog/1.0.0/table/table-proof.xml | 2 + .../1.0.0/table/table-request_add_proof.xml | 2 + .../core/test/core/dto/ProofDTOTest.java | 39 ++++++++------- .../resources/db/test/test-data-proof.xml | 9 ++++ .../resources/db/test/test-data-request.xml | 3 ++ .../main/resources/db/dev/dev-data-proof.xml | 9 ++++ .../resources/db/dev/dev-data-request.xml | 3 ++ .../resources/db/test/api-test-data-proof.xml | 9 ++++ .../db/test/api-test-data-request.xml | 3 ++ .../batch/batch/request/AddProofBatch.java | 10 ++++ .../batch/universe/UniverseExplorerBatch.java | 1 + .../resources/db/dev/test-data-request.xml | 3 ++ .../main/resources/db/dev/dev-data-asset.xml | 50 +++++++++++++++++++ .../main/resources/db/dev/dev-data-proof.xml | 9 ++++ .../resources/db/dev/dev-data-request.xml | 3 ++ .../resources/db/test/web-test-data-proof.xml | 9 ++++ .../db/test/web-test-data-request.xml | 3 ++ 25 files changed, 185 insertions(+), 19 deletions(-) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/proof/Proof.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/proof/Proof.java index f826a4a19..26111bdd3 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/proof/Proof.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/proof/Proof.java @@ -2,6 +2,7 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; @@ -17,7 +18,9 @@ import org.royllo.explorer.core.domain.asset.Asset; import org.royllo.explorer.core.domain.user.User; import org.royllo.explorer.core.util.base.BaseDomain; +import org.royllo.explorer.core.util.enums.ProofType; +import static jakarta.persistence.EnumType.STRING; import static jakarta.persistence.FetchType.EAGER; import static jakarta.persistence.GenerationType.IDENTITY; @@ -58,4 +61,9 @@ public class Proof extends BaseDomain { @Column(name = "PROOF", updatable = false) private String proof; + /** Proof type. */ + @Enumerated(STRING) + @Column(name = "PROOF_TYPE", updatable = false) + private ProofType proofType; + } diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/request/AddProofRequest.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/request/AddProofRequest.java index a2a4c33b3..38f948c9c 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/request/AddProofRequest.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/request/AddProofRequest.java @@ -3,6 +3,7 @@ import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; @@ -12,7 +13,9 @@ import lombok.ToString; import lombok.experimental.SuperBuilder; import org.royllo.explorer.core.domain.asset.Asset; +import org.royllo.explorer.core.util.enums.ProofType; +import static jakarta.persistence.EnumType.STRING; import static jakarta.persistence.FetchType.EAGER; /** @@ -29,9 +32,14 @@ public class AddProofRequest extends Request { /** Proof that validates the asset information. */ - @Column(name = "proof", updatable = false) + @Column(name = "PROOF", updatable = false) private String proof; + /** Proof type. */ + @Enumerated(STRING) + @Column(name = "PROOF_TYPE", updatable = false) + private ProofType proofType; + /** The asset created/updated by this request. */ @ManyToOne(fetch = EAGER) @JoinColumn(name = "FK_ASSET") diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/proof/ProofDTO.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/proof/ProofDTO.java index ed03060e6..4b26bdb65 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/proof/ProofDTO.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/proof/ProofDTO.java @@ -8,6 +8,7 @@ import lombok.Value; import org.royllo.explorer.core.dto.asset.AssetDTO; import org.royllo.explorer.core.dto.user.UserDTO; +import org.royllo.explorer.core.util.enums.ProofType; import static lombok.AccessLevel.PRIVATE; @@ -46,6 +47,10 @@ public class ProofDTO { @NotBlank(message = "Proof is required") String proof; + /** Proof type. */ + @NotNull(message = "Proof type is required") + ProofType proofType; + /** * Returns an abstract of proof (for logs). * Three first characters, three dots, three last characters. diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/request/AddProofRequestDTO.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/request/AddProofRequestDTO.java index 531313bb1..5902a14da 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/request/AddProofRequestDTO.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/request/AddProofRequestDTO.java @@ -1,10 +1,12 @@ package org.royllo.explorer.core.dto.request; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.ToString; import lombok.experimental.SuperBuilder; import org.royllo.explorer.core.dto.asset.AssetDTO; +import org.royllo.explorer.core.util.enums.ProofType; /** * Request to add proof to royllo database. @@ -19,6 +21,10 @@ public class AddProofRequestDTO extends RequestDTO { @NotBlank(message = "Proof is required") String proof; + /** Proof type. */ + @NotNull(message = "Proof type is required") + ProofType proofType; + /** The asset created/updated by this request. */ AssetDTO asset; diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofServiceImplementation.java index 9e037ac7c..47222ecd8 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofServiceImplementation.java @@ -19,6 +19,7 @@ import static java.util.stream.Collectors.joining; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER; +import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_UNSPECIFIED; /** * {@link ProofService} implementation. @@ -59,6 +60,7 @@ public ProofDTO addProof(@NonNull final String proof, .creator(ANONYMOUS_USER) .asset(asset.get()) .proof(proof) + .proofType(PROOF_TYPE_UNSPECIFIED) .build()); final ProofDTO proofDTO = PROOF_MAPPER.mapToProofDTO(proofToCreate); logger.info("Proof created with id {} : {}", proofDTO.getId(), proofDTO); diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java index 22d64fe36..45b655665 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java @@ -20,6 +20,7 @@ import static java.util.stream.Collectors.joining; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER; +import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_UNSPECIFIED; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; import static org.royllo.explorer.core.util.enums.RequestStatus.openedStatus; @@ -96,6 +97,7 @@ public AddProofRequestDTO createAddProofRequest(final String proof) { .creator(ANONYMOUS_USER) .status(OPENED) .proof(proof) + .proofType(PROOF_TYPE_UNSPECIFIED) .build(); AddProofRequestDTO savedRequest = REQUEST_MAPPER.mapToAddAssetRequestDTO(requestRepository.save(request)); diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/enums/ProofType.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/enums/ProofType.java index c73230ee4..049708994 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/enums/ProofType.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/enums/ProofType.java @@ -5,6 +5,9 @@ */ public enum ProofType { + /** Proof type: PROOF_TYPE_UNSPECIFIED. */ + PROOF_TYPE_UNSPECIFIED, + /** Proof type: PROOF_TYPE_ISSUANCE. */ PROOF_TYPE_ISSUANCE, diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-proof.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-proof.xml index cb584df7d..d07927375 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-proof.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-proof.xml @@ -16,6 +16,7 @@ + diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-proof.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-proof.xml index a18cf7a79..eaa3722d2 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-proof.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-proof.xml @@ -30,6 +30,8 @@ + + diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/dto/ProofDTOTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/dto/ProofDTOTest.java index 1a650da4a..b0b47869d 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/dto/ProofDTOTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/dto/ProofDTOTest.java @@ -6,6 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_UNSPECIFIED; @DisplayName("ProofDTO tests") public class ProofDTOTest { @@ -15,72 +16,74 @@ public class ProofDTOTest { public void simpleProof() { ProofDTO proof = ProofDTO.builder() .proof("AABBBBBBBBCC") + .proofType(PROOF_TYPE_UNSPECIFIED) .build(); assertEquals("AABBBBBBBBCC", proof.getProof()); assertEquals("AAB...BCC", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofAbstract=AAB...BCC)", proof.toString()); + assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=AAB...BCC)", proof.toString()); } @Test @DisplayName("Null proof") public void nullProof() { ProofDTO proof = ProofDTO.builder() + .proofType(PROOF_TYPE_UNSPECIFIED) .build(); assertNull(proof.getProof()); assertNull(proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofAbstract=null)", proof.toString()); + assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=null)", proof.toString()); } @Test @DisplayName("Small proof") public void smallProof() { // Proof size = 0. - ProofDTO proof = ProofDTO.builder().proof("").build(); + ProofDTO proof = ProofDTO.builder().proof("").proofType(PROOF_TYPE_UNSPECIFIED).build(); assertEquals("", proof.getProof()); assertEquals("", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofAbstract=)", proof.toString()); + assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=)", proof.toString()); // Proof size = 1. - proof = ProofDTO.builder().proof("A").build(); + proof = ProofDTO.builder().proof("A").proofType(PROOF_TYPE_UNSPECIFIED).build(); assertEquals("A", proof.getProof()); assertEquals("A", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofAbstract=A)", proof.toString()); + assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=A)", proof.toString()); // Proof size = 2. - proof = ProofDTO.builder().proof("AB").build(); + proof = ProofDTO.builder().proof("AB").proofType(PROOF_TYPE_UNSPECIFIED).build(); assertEquals("AB", proof.getProof()); assertEquals("AB", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofAbstract=AB)", proof.toString()); + assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=AB)", proof.toString()); // Proof size = 3. - proof = ProofDTO.builder().proof("ABC").build(); + proof = ProofDTO.builder().proof("ABC").proofType(PROOF_TYPE_UNSPECIFIED).build(); assertEquals("ABC", proof.getProof()); assertEquals("ABC", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofAbstract=ABC)", proof.toString()); + assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=ABC)", proof.toString()); // Proof size = 4. - proof = ProofDTO.builder().proof("ABCD").build(); + proof = ProofDTO.builder().proof("ABCD").proofType(PROOF_TYPE_UNSPECIFIED).build(); assertEquals("ABCD", proof.getProof()); assertEquals("ABCD", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofAbstract=ABCD)", proof.toString()); + assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=ABCD)", proof.toString()); // Proof size = 5. - proof = ProofDTO.builder().proof("ABCDE").build(); + proof = ProofDTO.builder().proof("ABCDE").proofType(PROOF_TYPE_UNSPECIFIED).build(); assertEquals("ABCDE", proof.getProof()); assertEquals("ABCDE", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofAbstract=ABCDE)", proof.toString()); + assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=ABCDE)", proof.toString()); // Proof size = 6. - proof = ProofDTO.builder().proof("ABCDEF").build(); + proof = ProofDTO.builder().proof("ABCDEF").proofType(PROOF_TYPE_UNSPECIFIED).build(); assertEquals("ABCDEF", proof.getProof()); assertEquals("ABCDEF", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofAbstract=ABCDEF)", proof.toString()); + assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=ABCDEF)", proof.toString()); // Proof size = 7. - proof = ProofDTO.builder().proof("ABCDEFG").build(); + proof = ProofDTO.builder().proof("ABCDEFG").proofType(PROOF_TYPE_UNSPECIFIED).build(); assertEquals("ABCDEFG", proof.getProof()); assertEquals("ABC...EFG", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofAbstract=ABC...EFG)", proof.toString()); + assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=ABC...EFG)", proof.toString()); } } diff --git a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-proof.xml b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-proof.xml index e49a08407..6e55e61d3 100644 --- a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-proof.xml +++ b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-proof.xml @@ -13,6 +13,7 @@ + @@ -27,6 +28,7 @@ + @@ -37,6 +39,7 @@ + @@ -47,6 +50,7 @@ + @@ -61,6 +65,7 @@ + @@ -71,6 +76,7 @@ + @@ -81,6 +87,7 @@ + @@ -95,6 +102,7 @@ + @@ -105,6 +113,7 @@ + diff --git a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-request.xml b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-request.xml index b03bedf90..390bda0d0 100644 --- a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-request.xml +++ b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-request.xml @@ -15,6 +15,7 @@ + @@ -28,6 +29,7 @@ + @@ -54,6 +56,7 @@ + diff --git a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-proof.xml b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-proof.xml index e49a08407..6e55e61d3 100644 --- a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-proof.xml +++ b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-proof.xml @@ -13,6 +13,7 @@ + @@ -27,6 +28,7 @@ + @@ -37,6 +39,7 @@ + @@ -47,6 +50,7 @@ + @@ -61,6 +65,7 @@ + @@ -71,6 +76,7 @@ + @@ -81,6 +87,7 @@ + @@ -95,6 +102,7 @@ + @@ -105,6 +113,7 @@ + diff --git a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-request.xml b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-request.xml index b03bedf90..390bda0d0 100644 --- a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-request.xml +++ b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-request.xml @@ -15,6 +15,7 @@ + @@ -28,6 +29,7 @@ + @@ -54,6 +56,7 @@ + diff --git a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-proof.xml b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-proof.xml index e49a08407..6e55e61d3 100644 --- a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-proof.xml +++ b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-proof.xml @@ -13,6 +13,7 @@ + @@ -27,6 +28,7 @@ + @@ -37,6 +39,7 @@ + @@ -47,6 +50,7 @@ + @@ -61,6 +65,7 @@ + @@ -71,6 +76,7 @@ + @@ -81,6 +87,7 @@ + @@ -95,6 +102,7 @@ + @@ -105,6 +113,7 @@ + diff --git a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-request.xml b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-request.xml index b03bedf90..390bda0d0 100644 --- a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-request.xml +++ b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-request.xml @@ -15,6 +15,7 @@ + @@ -28,6 +29,7 @@ + @@ -54,6 +56,7 @@ + diff --git a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java index 68d530866..d4ff210c4 100644 --- a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java +++ b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java @@ -84,6 +84,16 @@ public void processRequests() { for (long i = numberOfProofs; i > 0; i--) { response = tapdService.decode(request.getProof(), i - 1, false).block(); + // We check if it's an issuance proof, if so, we will ask for meta reveal and replace the response. + // And we will specify it as issuance proof of the asset. + if (true) { + response = tapdService.decode(request.getProof(), i - 1, true).block(); + + // We treat the meta. + + + } + // We check if we have a decoded proof response. if (response == null) { logger.info("Decoded proof for request {} is null", request.getId()); diff --git a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/universe/UniverseExplorerBatch.java b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/universe/UniverseExplorerBatch.java index fde00c3bb..e233e9bf5 100644 --- a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/universe/UniverseExplorerBatch.java +++ b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/universe/UniverseExplorerBatch.java @@ -107,6 +107,7 @@ public void processUniverseServers() { final AddProofRequestDTO addProofRequest = requestService.createAddProofRequest(proof); logger.info("Request created {} for asset: {} ({})", addProofRequest.getId(), assetId, proofType); }); + } catch (Exception e) { logger.error("Error while retrieving leaves for asset id {} on {} ({})", assetId, diff --git a/backend/servers/explorer-batch/src/main/resources/db/dev/test-data-request.xml b/backend/servers/explorer-batch/src/main/resources/db/dev/test-data-request.xml index a2264caa5..0b19e74a6 100644 --- a/backend/servers/explorer-batch/src/main/resources/db/dev/test-data-request.xml +++ b/backend/servers/explorer-batch/src/main/resources/db/dev/test-data-request.xml @@ -15,6 +15,7 @@ + @@ -28,6 +29,7 @@ + @@ -54,6 +56,7 @@ + diff --git a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset.xml b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset.xml index 25410c34e..665450c23 100644 --- a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset.xml +++ b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset.xml @@ -1746,6 +1746,7 @@ + @@ -1757,6 +1758,7 @@ + @@ -1768,6 +1770,7 @@ + @@ -1779,6 +1782,7 @@ + @@ -1790,6 +1794,7 @@ + @@ -1801,6 +1806,7 @@ + @@ -1812,6 +1818,7 @@ + @@ -1823,6 +1830,7 @@ + @@ -1834,6 +1842,7 @@ + @@ -1845,6 +1854,7 @@ + @@ -1856,6 +1866,7 @@ + @@ -1867,6 +1878,7 @@ + @@ -1878,6 +1890,7 @@ + @@ -1889,6 +1902,7 @@ + @@ -1900,6 +1914,7 @@ + @@ -1911,6 +1926,7 @@ + @@ -1922,6 +1938,7 @@ + @@ -1933,6 +1950,7 @@ + @@ -1944,6 +1962,7 @@ + @@ -1955,6 +1974,7 @@ + @@ -1966,6 +1986,7 @@ + @@ -1977,6 +1998,7 @@ + @@ -1988,6 +2010,7 @@ + @@ -1999,6 +2022,7 @@ + @@ -2010,6 +2034,7 @@ + @@ -2021,6 +2046,7 @@ + @@ -2032,6 +2058,7 @@ + @@ -2043,6 +2070,7 @@ + @@ -2054,6 +2082,7 @@ + @@ -2065,6 +2094,7 @@ + @@ -2076,6 +2106,7 @@ + @@ -2087,6 +2118,7 @@ + @@ -2098,6 +2130,7 @@ + @@ -2109,6 +2142,7 @@ + @@ -2120,6 +2154,7 @@ + @@ -2131,6 +2166,7 @@ + @@ -2142,6 +2178,7 @@ + @@ -2153,6 +2190,7 @@ + @@ -2164,6 +2202,7 @@ + @@ -2175,6 +2214,7 @@ + @@ -2186,6 +2226,7 @@ + @@ -2197,6 +2238,7 @@ + @@ -2208,6 +2250,7 @@ + @@ -2219,6 +2262,7 @@ + @@ -2230,6 +2274,7 @@ + @@ -2241,6 +2286,7 @@ + @@ -2252,6 +2298,7 @@ + @@ -2263,6 +2310,7 @@ + @@ -2274,6 +2322,7 @@ + @@ -2285,6 +2334,7 @@ + diff --git a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-proof.xml b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-proof.xml index e49a08407..6e55e61d3 100644 --- a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-proof.xml +++ b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-proof.xml @@ -13,6 +13,7 @@ + @@ -27,6 +28,7 @@ + @@ -37,6 +39,7 @@ + @@ -47,6 +50,7 @@ + @@ -61,6 +65,7 @@ + @@ -71,6 +76,7 @@ + @@ -81,6 +87,7 @@ + @@ -95,6 +102,7 @@ + @@ -105,6 +113,7 @@ + diff --git a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-request.xml b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-request.xml index 74459e1d9..286c97cf8 100644 --- a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-request.xml +++ b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-request.xml @@ -15,6 +15,7 @@ + @@ -29,6 +30,7 @@ + @@ -56,6 +58,7 @@ + diff --git a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-proof.xml b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-proof.xml index e49a08407..6e55e61d3 100644 --- a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-proof.xml +++ b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-proof.xml @@ -13,6 +13,7 @@ + @@ -27,6 +28,7 @@ + @@ -37,6 +39,7 @@ + @@ -47,6 +50,7 @@ + @@ -61,6 +65,7 @@ + @@ -71,6 +76,7 @@ + @@ -81,6 +87,7 @@ + @@ -95,6 +102,7 @@ + @@ -105,6 +113,7 @@ + diff --git a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-request.xml b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-request.xml index 9d44ff021..239736e15 100644 --- a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-request.xml +++ b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-request.xml @@ -15,6 +15,7 @@ + @@ -29,6 +30,7 @@ + @@ -55,6 +57,7 @@ + From a7d06355e602a64a687421fbe0e40790247be423 Mon Sep 17 00:00:00 2001 From: straumat Date: Tue, 26 Dec 2023 22:33:02 +0100 Subject: [PATCH 27/57] Issuance field added on AssetState --- .../core/domain/asset/AssetState.java | 4 ++++ .../core/dto/asset/AssetStateDTO.java | 3 +++ .../provider/tapd/DecodedProofResponse.java | 5 ++++ .../core/service/proof/ProofService.java | 6 ++++- .../proof/ProofServiceImplementation.java | 5 ++-- .../core/service/request/RequestService.java | 10 ++++++++ .../request/RequestServiceImplementation.java | 9 +++++++- .../core/util/mapper/AssetStateMapper.java | 2 ++ .../changelog/1.0.0/data/data-asset_state.xml | 1 + .../1.0.0/table/table-asset_state.xml | 2 ++ .../test/core/service/ProofServiceTest.java | 8 ++++--- .../test/core/service/RequestServiceTest.java | 23 +++++++++++++++---- .../tapd/TapdDecodeServiceTest.java | 4 ++++ .../db/test/test-data-asset_state.xml | 10 ++++++++ .../resources/db/dev/dev-data-asset_state.xml | 8 +++++++ .../db/test/api-test-data-asset_state.xml | 10 ++++++++ .../batch/batch/request/AddProofBatch.java | 16 ++++++------- .../batch/universe/UniverseExplorerBatch.java | 2 +- .../resources/db/dev/dev-data-asset_state.xml | 10 ++++++++ .../db/test/web-test-data-asset_state.xml | 10 ++++++++ .../tapd/asset/DecodedProofValueResponse.java | 5 ++++ 21 files changed, 132 insertions(+), 21 deletions(-) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/AssetState.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/AssetState.java index f9cf636a5..f62d478a1 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/AssetState.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/AssetState.java @@ -144,4 +144,8 @@ public class AssetState extends BaseDomain { @Column(name = "CHALLENGE_WITNESS") private List challengeWitness = new ArrayList<>(); + /** Indicates if this asset state is an issuance or a transfer. */ + @Column(name = "ISSUANCE") + private boolean issuance; + } diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetStateDTO.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetStateDTO.java index 0dd9e6409..7ba626549 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetStateDTO.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetStateDTO.java @@ -112,4 +112,7 @@ public class AssetStateDTO { @NotBlank(message = "Asset state id is required") String assetStateId; + /** Indicates if this asset state is an issuance or a transfer. */ + boolean issuance; + } diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java index a1e228fe7..c9750bffc 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java @@ -60,6 +60,11 @@ public static class DecodedProof { @JsonProperty("meta_reveal") Asset.MetaReveal metaReveal; + /** Indicates whether this proof is an issuance. */ + public boolean isIssuance() { + return metaReveal != null; + } + /** The merkle proof for AnchorTx used to prove its inclusion within BlockHeader. */ @JsonProperty("tx_merkle_proof") String txMerkleProof; diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofService.java index 98fc53cad..825738d9a 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofService.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofService.java @@ -2,6 +2,7 @@ import org.royllo.explorer.core.dto.proof.ProofDTO; import org.royllo.explorer.core.provider.tapd.DecodedProofResponse; +import org.royllo.explorer.core.util.enums.ProofType; import org.springframework.data.domain.Page; import java.util.Optional; @@ -15,10 +16,13 @@ public interface ProofService { * Add a new proof to the database. * * @param proof proof + * @param proofType proof type * @param decodedProof decoded proof * @return the proof created */ - ProofDTO addProof(String proof, DecodedProofResponse decodedProof); + ProofDTO addProof(String proof, + ProofType proofType, + DecodedProofResponse decodedProof); /** * Get a proof by its proof id. diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofServiceImplementation.java index 47222ecd8..c02ed1831 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofServiceImplementation.java @@ -9,6 +9,7 @@ import org.royllo.explorer.core.repository.asset.AssetRepository; import org.royllo.explorer.core.repository.proof.ProofRepository; import org.royllo.explorer.core.util.base.BaseService; +import org.royllo.explorer.core.util.enums.ProofType; import org.royllo.explorer.core.util.exceptions.proof.ProofCreationException; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -19,7 +20,6 @@ import static java.util.stream.Collectors.joining; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER; -import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_UNSPECIFIED; /** * {@link ProofService} implementation. @@ -37,6 +37,7 @@ public class ProofServiceImplementation extends BaseService implements ProofServ @Override public ProofDTO addProof(@NonNull final String proof, + @NonNull final ProofType proofType, @NonNull final DecodedProofResponse decodedProof) { logger.info("Adding {} with {}", proof, decodedProof); @@ -60,7 +61,7 @@ public ProofDTO addProof(@NonNull final String proof, .creator(ANONYMOUS_USER) .asset(asset.get()) .proof(proof) - .proofType(PROOF_TYPE_UNSPECIFIED) + .proofType(proofType) .build()); final ProofDTO proofDTO = PROOF_MAPPER.mapToProofDTO(proofToCreate); logger.info("Proof created with id {} : {}", proofDTO.getId(), proofDTO); diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestService.java index bda4aacd5..918822c4a 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestService.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestService.java @@ -4,6 +4,7 @@ import org.royllo.explorer.core.dto.request.AddProofRequestDTO; import org.royllo.explorer.core.dto.request.AddUniverseServerRequestDTO; import org.royllo.explorer.core.dto.request.RequestDTO; +import org.royllo.explorer.core.util.enums.ProofType; import java.util.List; import java.util.Optional; @@ -44,6 +45,15 @@ public interface RequestService { */ AddProofRequestDTO createAddProofRequest(String proof); + /** + * Creates a request to add a proof. + * + * @param proof proof that validates the asset information + * @param proofType proof type + * @return id of the request created + */ + AddProofRequestDTO createAddProofRequest(String proof, ProofType proofType); + /** * Creates a request to add an asset meta data. * diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java index 45b655665..817bbd4dd 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java @@ -12,6 +12,7 @@ import org.royllo.explorer.core.dto.request.RequestDTO; import org.royllo.explorer.core.repository.request.RequestRepository; import org.royllo.explorer.core.util.base.BaseService; +import org.royllo.explorer.core.util.enums.ProofType; import org.springframework.stereotype.Service; import java.util.List; @@ -89,6 +90,12 @@ public Optional getRequestByRequestId(@NonNull final String requestI @Override public AddProofRequestDTO createAddProofRequest(final String proof) { + return createAddProofRequest(proof, PROOF_TYPE_UNSPECIFIED); + } + + @Override + public AddProofRequestDTO createAddProofRequest(final String proof, + final ProofType proofType) { logger.info("Adding proof request with proof {}", proof); // Creating and saving the request. @@ -97,7 +104,7 @@ public AddProofRequestDTO createAddProofRequest(final String proof) { .creator(ANONYMOUS_USER) .status(OPENED) .proof(proof) - .proofType(PROOF_TYPE_UNSPECIFIED) + .proofType(proofType) .build(); AddProofRequestDTO savedRequest = REQUEST_MAPPER.mapToAddAssetRequestDTO(requestRepository.save(request)); diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetStateMapper.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetStateMapper.java index 1fe16c244..94091daf8 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetStateMapper.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetStateMapper.java @@ -55,6 +55,8 @@ public interface AssetStateMapper { @Mapping(source = "exclusionProofs", target = "exclusionProofs") @Mapping(source = "splitRootProof", target = "splitRootProof") @Mapping(source = "challengeWitness", target = "challengeWitness") + + @Mapping(source = "issuance", target = "issuance") AssetStateDTO mapToAssetStateDTO(DecodedProofResponse.DecodedProof source); } diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-asset_state.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-asset_state.xml index 775d502cc..c3bb89912 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-asset_state.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-asset_state.xml @@ -46,6 +46,7 @@ value="00040000000102210238636cf0d229ba3c9c46e2d832db0f41a827de003ff5a16edc0611e1b71806f10503040101"/> + diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset_state.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset_state.xml index 26d638ffa..21a468fe1 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset_state.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset_state.xml @@ -73,6 +73,8 @@ remarks="An optional TaprootProof needed if this asset is the result of a split. SplitRootProof proves inclusion of the root asset of the split"/> + an error must occur. assertFalse(assetService.getAssetByAssetId(UNKNOWN_ROYLLO_COIN_ASSET_ID).isPresent()); - ProofCreationException e = assertThrows(ProofCreationException.class, () -> proofService.addProof(UNKNOWN_ROYLLO_COIN_RAW_PROOF, unknownRoylloCoinDecodedProof)); + ProofCreationException e = assertThrows(ProofCreationException.class, () -> proofService.addProof(UNKNOWN_ROYLLO_COIN_RAW_PROOF, PROOF_TYPE_UNSPECIFIED, unknownRoylloCoinDecodedProof)); assertEquals(e.getMessage(), "Asset " + UNKNOWN_ROYLLO_COIN_ASSET_ID + " is not registered in our database"); // We add the asset of our proof, and then, our proof --> No error and proof should be added. @@ -65,15 +66,16 @@ public void addProof() { verifyAsset(unknownRoylloCoin, UNKNOWN_ROYLLO_COIN_ASSET_ID); // Then, our proof that should be added without any problem. - final ProofDTO proofAdded = proofService.addProof(UNKNOWN_ROYLLO_COIN_RAW_PROOF, unknownRoylloCoinDecodedProof); + final ProofDTO proofAdded = proofService.addProof(UNKNOWN_ROYLLO_COIN_RAW_PROOF, PROOF_TYPE_UNSPECIFIED, unknownRoylloCoinDecodedProof); assertNotNull(proofAdded.getId()); assertEquals(UNKNOWN_ROYLLO_COIN_PROOF_ID, proofAdded.getProofId()); assertEquals(UNKNOWN_ROYLLO_COIN_RAW_PROOF, proofAdded.getProof()); assertEquals(UNKNOWN_ROYLLO_COIN_ASSET_ID, proofAdded.getAsset().getAssetId()); assertEquals(ANONYMOUS_ID, proofAdded.getCreator().getId()); + assertEquals(PROOF_TYPE_UNSPECIFIED, proofAdded.getProofType()); // We add again our proof as it's already in our database --> an error must occur. - e = assertThrows(ProofCreationException.class, () -> proofService.addProof(UNKNOWN_ROYLLO_COIN_RAW_PROOF, unknownRoylloCoinDecodedProof)); + e = assertThrows(ProofCreationException.class, () -> proofService.addProof(UNKNOWN_ROYLLO_COIN_RAW_PROOF, PROOF_TYPE_UNSPECIFIED, unknownRoylloCoinDecodedProof)); assertEquals(e.getMessage(), "This proof is already registered with proof id: " + UNKNOWN_ROYLLO_COIN_PROOF_ID); } diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java index af9d1e7f3..f88321b85 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java @@ -18,12 +18,16 @@ import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_ID; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER_ID; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER_USERNAME; +import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_ISSUANCE; +import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_TRANSFER; +import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_UNSPECIFIED; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; @SpringBootTest @@ -109,7 +113,7 @@ public void addRequests() { // Use getRequest(). Optional request1 = requestService.getRequest(request1Id); assertTrue(request1.isPresent()); - assertTrue(request1.get() instanceof AddProofRequestDTO); + assertInstanceOf(AddProofRequestDTO.class, request1.get()); // We cast and check of all the data is here. AddProofRequestDTO request1Casted = (AddProofRequestDTO) request1.get(); @@ -121,6 +125,7 @@ public void addRequests() { assertEquals(OPENED, request1Casted.getStatus()); assertNull(request1Casted.getErrorMessage()); assertEquals("proof1", request1Casted.getProof()); + assertEquals(PROOF_TYPE_UNSPECIFIED, request1Casted.getProofType()); // ============================================================================================================= // Request 2 (addAssetMetaData). @@ -131,7 +136,7 @@ public void addRequests() { // Use getRequest(). Optional request2 = requestService.getRequest(request2Id); assertTrue(request2.isPresent()); - assertTrue(request2.get() instanceof AddAssetMetaDataRequestDTO); + assertInstanceOf(AddAssetMetaDataRequestDTO.class, request2.get()); // We cast and check of all the data is here. AddAssetMetaDataRequestDTO request2Casted = (AddAssetMetaDataRequestDTO) request2.get(); @@ -153,7 +158,7 @@ public void addRequests() { // Use getRequest(). Optional request3 = requestService.getRequest(request3Id); assertTrue(request3.isPresent()); - assertTrue(request3.get() instanceof AddProofRequestDTO); + assertInstanceOf(AddProofRequestDTO.class, request3.get()); // We cast and check of all the data is here. AddProofRequestDTO request3Casted = (AddProofRequestDTO) request3.get(); @@ -165,6 +170,7 @@ public void addRequests() { assertEquals(OPENED, request3Casted.getStatus()); assertNull(request3Casted.getErrorMessage()); assertEquals("proof2", request3Casted.getProof()); + assertEquals(PROOF_TYPE_UNSPECIFIED, request3Casted.getProofType()); // ============================================================================================================= // Request 4 (AddUniverseServerRequest). @@ -175,7 +181,7 @@ public void addRequests() { // Use getRequest(). Optional request4 = requestService.getRequest(request4Id); assertTrue(request4.isPresent()); - assertTrue(request4.get() instanceof AddUniverseServerRequestDTO); + assertInstanceOf(AddUniverseServerRequestDTO.class, request4.get()); // We cast and check of all the data is here. AddUniverseServerRequestDTO request4Casted = (AddUniverseServerRequestDTO) request4.get(); @@ -187,6 +193,15 @@ public void addRequests() { assertEquals(OPENED, request4Casted.getStatus()); assertNull(request4Casted.getErrorMessage()); assertEquals("1.1.1.1:8080", request4Casted.getServerAddress()); + + // Testing createAddProofRequest(String proof, ProofType proofType). + AddProofRequestDTO request5DTO = requestService.createAddProofRequest("proof", PROOF_TYPE_ISSUANCE); + assertNotNull(request5DTO.getId()); + assertEquals(PROOF_TYPE_ISSUANCE, request5DTO.getProofType()); + + AddProofRequestDTO request6DTO = requestService.createAddProofRequest("proof", PROOF_TYPE_TRANSFER); + assertNotNull(request6DTO.getId()); + assertEquals(PROOF_TYPE_TRANSFER, request6DTO.getProofType()); } } diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java index 6a2c5f368..7e235574d 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java @@ -10,8 +10,10 @@ import org.springframework.boot.test.context.SpringBootTest; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.royllo.test.TapdData.TRICKY_ROYLLO_COIN_FROM_TEST; import static org.royllo.test.TapdData.UNLIMITED_ROYLLO_COIN_1_FROM_TEST; @@ -123,12 +125,14 @@ public void decodeMetaRevealTest() { assertEquals("747269636b79526f796c6c6f436f696e20627920526f796c6c6f", response.getDecodedProof().getMetaReveal().getData()); assertEquals("META_TYPE_OPAQUE", response.getDecodedProof().getMetaReveal().getType()); assertEquals("13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41", response.getDecodedProof().getMetaReveal().getMetaHash()); + assertTrue(response.getDecodedProof().isIssuance()); // If we do the same without asking for meta reveal, we should not get it. response = tapdService.decode(issuanceProof1, 0, false).block(); assertNotNull(response); assertNull(response.getErrorCode()); assertNull(response.getDecodedProof().getMetaReveal()); + assertFalse(response.getDecodedProof().isIssuance()); // Proof file 2. // We get the proof file 2 (with two proofs) and we decode the last one, which is the issuance proof. diff --git a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-asset_state.xml b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-asset_state.xml index a289af69d..3872ece4d 100644 --- a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-asset_state.xml +++ b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-asset_state.xml @@ -26,6 +26,7 @@ + @@ -53,6 +54,7 @@ + @@ -76,6 +78,7 @@ + @@ -99,6 +102,7 @@ + @@ -126,6 +130,7 @@ + @@ -149,6 +154,7 @@ + @@ -172,6 +178,7 @@ + @@ -195,6 +202,7 @@ + @@ -222,6 +230,7 @@ + @@ -245,6 +254,7 @@ + diff --git a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-asset_state.xml b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-asset_state.xml index d0faaee34..f32b55578 100644 --- a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-asset_state.xml +++ b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-asset_state.xml @@ -26,6 +26,7 @@ + @@ -53,6 +54,7 @@ + @@ -76,6 +78,7 @@ + @@ -99,6 +102,7 @@ + @@ -143,6 +147,7 @@ + @@ -166,6 +171,7 @@ + @@ -189,6 +195,7 @@ + @@ -233,6 +240,7 @@ + diff --git a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-asset_state.xml b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-asset_state.xml index a289af69d..3872ece4d 100644 --- a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-asset_state.xml +++ b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-asset_state.xml @@ -26,6 +26,7 @@ + @@ -53,6 +54,7 @@ + @@ -76,6 +78,7 @@ + @@ -99,6 +102,7 @@ + @@ -126,6 +130,7 @@ + @@ -149,6 +154,7 @@ + @@ -172,6 +178,7 @@ + @@ -195,6 +202,7 @@ + @@ -222,6 +230,7 @@ + @@ -245,6 +254,7 @@ + diff --git a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java index d4ff210c4..d9a5465d9 100644 --- a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java +++ b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java @@ -16,6 +16,8 @@ import java.util.Optional; +import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_ISSUANCE; + /** * Batch treating {@link AddProofRequestDTO}. */ @@ -82,16 +84,12 @@ public void processRequests() { // Now, we decode all proofs, one by one, starting by the oldest (issuance proof). boolean proofAdded = false; for (long i = numberOfProofs; i > 0; i--) { - response = tapdService.decode(request.getProof(), i - 1, false).block(); - // We check if it's an issuance proof, if so, we will ask for meta reveal and replace the response. - // And we will specify it as issuance proof of the asset. - if (true) { + // We check if it's an issuance proof, if so, we will ask for meta reveal. + if (PROOF_TYPE_ISSUANCE.equals(request.getProofType())) { response = tapdService.decode(request.getProof(), i - 1, true).block(); - - // We treat the meta. - - + } else { + response = tapdService.decode(request.getProof(), i - 1, false).block(); } // We check if we have a decoded proof response. @@ -122,7 +120,7 @@ public void processRequests() { // If not already added, we add the proof. if (!proofAdded) { - proofService.addProof(request.getProof(), response); + proofService.addProof(request.getProof(), request.getProofType(), response); request.setAsset(assetStateCreated.get().getAsset()); proofAdded = true; } diff --git a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/universe/UniverseExplorerBatch.java b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/universe/UniverseExplorerBatch.java index e233e9bf5..b8859a5e5 100644 --- a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/universe/UniverseExplorerBatch.java +++ b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/universe/UniverseExplorerBatch.java @@ -104,7 +104,7 @@ public void processUniverseServers() { .map(UniverseLeavesResponse.Leaf::getProof) .filter(proof -> proofRepository.findByProofId(sha256(proof)).isEmpty()) .forEach(proof -> { - final AddProofRequestDTO addProofRequest = requestService.createAddProofRequest(proof); + final AddProofRequestDTO addProofRequest = requestService.createAddProofRequest(proof, proofType); logger.info("Request created {} for asset: {} ({})", addProofRequest.getId(), assetId, proofType); }); diff --git a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset_state.xml b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset_state.xml index a289af69d..3872ece4d 100644 --- a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset_state.xml +++ b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset_state.xml @@ -26,6 +26,7 @@ + @@ -53,6 +54,7 @@ + @@ -76,6 +78,7 @@ + @@ -99,6 +102,7 @@ + @@ -126,6 +130,7 @@ + @@ -149,6 +154,7 @@ + @@ -172,6 +178,7 @@ + @@ -195,6 +202,7 @@ + @@ -222,6 +230,7 @@ + @@ -245,6 +254,7 @@ + diff --git a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-asset_state.xml b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-asset_state.xml index a289af69d..3872ece4d 100644 --- a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-asset_state.xml +++ b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-asset_state.xml @@ -26,6 +26,7 @@ + @@ -53,6 +54,7 @@ + @@ -76,6 +78,7 @@ + @@ -99,6 +102,7 @@ + @@ -126,6 +130,7 @@ + @@ -149,6 +154,7 @@ + @@ -172,6 +178,7 @@ + @@ -195,6 +202,7 @@ + @@ -222,6 +230,7 @@ + @@ -245,6 +254,7 @@ + diff --git a/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java b/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java index efc329c57..275c02c7f 100644 --- a/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java +++ b/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java @@ -60,6 +60,11 @@ public static class DecodedProof { @JsonProperty("meta_reveal") Asset.MetaReveal metaReveal; + /** Indicates whether this proof is an issuance. */ + boolean isIssuance() { + return metaReveal != null; + } + /** The merkle proof for AnchorTx used to prove its inclusion within BlockHeader. */ @JsonProperty("tx_merkle_proof") String txMerkleProof; From ae0ae8d305edd0478ba89f08ab81b3c67cd836d9 Mon Sep 17 00:00:00 2001 From: straumat Date: Wed, 27 Dec 2023 23:00:25 +0100 Subject: [PATCH 28/57] Added a test for tika --- .gitignore | 4 +- backend/explorer-core/autoconfigure/pom.xml | 5 ++ .../core/test/core/util/MetaDataTest.java | 68 +++++++++++++++++++ .../core/test/core/util/package-info.java | 4 ++ backend/servers/explorer-batch/pom.xml | 5 -- docs/design/meta-data/README.md | 56 +++++++++------ pom.xml | 2 +- 7 files changed, 116 insertions(+), 28 deletions(-) create mode 100644 backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/MetaDataTest.java create mode 100644 backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/package-info.java diff --git a/.gitignore b/.gitignore index 8a69525f1..517090680 100644 --- a/.gitignore +++ b/.gitignore @@ -117,5 +117,7 @@ output-* # Used to download royllo tade and run it. /util/test/common-test/tade/ +util/test/common-test/tade util/test/common-test/src/main/resources/tapd/admin-testnet.macaroon -util/test/common-test/src/main/resources/tapd/admin-mainnet.macaroon \ No newline at end of file +util/test/common-test/src/main/resources/tapd/admin-mainnet.macaroon +util/test/common-test/adamCoin-request.json diff --git a/backend/explorer-core/autoconfigure/pom.xml b/backend/explorer-core/autoconfigure/pom.xml index 51c80fc6a..3ffad6eab 100644 --- a/backend/explorer-core/autoconfigure/pom.xml +++ b/backend/explorer-core/autoconfigure/pom.xml @@ -99,6 +99,11 @@ mapstruct ${mapstruct.version} + + org.apache.tika + tika-core + ${tika-core.version} + diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/MetaDataTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/MetaDataTest.java new file mode 100644 index 000000000..e1bb20a31 --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/MetaDataTest.java @@ -0,0 +1,68 @@ +package org.royllo.explorer.core.test.core.util; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.apache.tika.Tika; +import org.apache.tika.mime.MimeTypeException; +import org.apache.tika.mime.MimeTypes; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** + * Meta data test class. + */ +@DisplayName("Meta data tests") +public class MetaDataTest { + + @Test + @DisplayName("Decoding meta data") + public void decodingMetaData() { + + // ============================================================================================================= + // Punk image on mainnet. + // 5630236058450d73ef22ca1e4bea24b5fc05f98688fa6502775f79275445222f + // https://explorer.royllo.org/asset/5630236058450d73ef22ca1e4bea24b5fc05f98688fa6502775f79275445222f + final String punkMeta = "89504e470d0a1a0a0000000d4948445200000018000000180806000000e0773df80000006e4944415478da63601805a360d880ff38304d0da78a25ff89c4941b5e682f8b81a9660136c3d12ca1cc029b0c75304636182646ae0528ae07d11ef9da182e078951c5025a04d1c059802e36b47c704451008e29cd07ff89f105552dc011f6d4f50135cb229c41448b229ba25403006cf5f5c3b61b973a0000000049454e44ae426082"; + + // Converting the meta and knowing what it is. + try { + + // Decoding (same as using xxd -r -p) + byte[] decodedBytes = Hex.decodeHex(punkMeta); + + // Detecting the type of file. + final String mimeType = new Tika().detect(decodedBytes); + + // Testing the mime type. + assertEquals("image/png", mimeType); + assertEquals(".png", MimeTypes.getDefaultMimeTypes().forName(mimeType).getExtension()); + + } catch (DecoderException | MimeTypeException e) { + throw new RuntimeException(e); + } + + // ============================================================================================================= + // Royllo coin on mainnet. + final String roylloCoinMeta = "726f796c6c6f436f696e206f6e206d61696e6e657420627920526f796c6c6f"; + + // Converting the meta and knowing what it is. + try { + + // Decoding (same as using xxd -r -p) + byte[] decodedBytes = Hex.decodeHex(roylloCoinMeta); + + // Detecting the type of file. + final String mimeType = new Tika().detect(decodedBytes); + + // Testing the mime type. + assertEquals("text/plain", mimeType); + assertEquals(".txt", MimeTypes.getDefaultMimeTypes().forName(mimeType).getExtension()); + + } catch (DecoderException | MimeTypeException e) { + throw new RuntimeException(e); + } + } + +} diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/package-info.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/package-info.java new file mode 100644 index 000000000..3ec68151d --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/package-info.java @@ -0,0 +1,4 @@ +/** + * This package contains the test classes for the core.util package. + */ +package org.royllo.explorer.core.test.core.util; \ No newline at end of file diff --git a/backend/servers/explorer-batch/pom.xml b/backend/servers/explorer-batch/pom.xml index edf9fbc95..61b320d18 100644 --- a/backend/servers/explorer-batch/pom.xml +++ b/backend/servers/explorer-batch/pom.xml @@ -47,11 +47,6 @@ ${lombok.version} provided - - org.apache.tika - tika-core - ${tika.version} - diff --git a/docs/design/meta-data/README.md b/docs/design/meta-data/README.md index ac5b30455..ce0ea1858 100644 --- a/docs/design/meta-data/README.md +++ b/docs/design/meta-data/README.md @@ -1,32 +1,46 @@ # Getting meta-data from the API -```bash -curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-mainnet.macaroon)" \ ---insecure https://universe.royllo.org:8089/v1/taproot-assets/assets/meta/asset-id/24a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d | \ -jq '.data' | tr -d '"' | xxd -r -p -``` +Let's take an asset: 5630236058450d73ef22ca1e4bea24b5fc05f98688fa6502775f79275445222f +We download the proof from explorer. + +The proof is named: `punk-proof` + +You then insert it in the request: `punk-request.json` + +We then call the decode method: + + ```bash + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 IdeaProjects/royllo/explorer/util/test/common-test/src/main/resources/tapd/admin-mainnet.macaroon)" \ + --data @punk-request.json \ + --insecure https://universe.royllo.org:8089/v1/taproot-assets/proofs/decode | jq + ``` + +We retrieve the meta field and we do `xxd -r -p` on it -Asset meta data can be added by adding a specific request. +## Getting meta data -A menu "Add meta data" is added to the "add data" button you can find on the homepage. -A form is displayed to add the meta data with three fields: +### Getting issuance proof -- asset id: the asset id of the asset you want to add meta data to. -- meta data file: a file containing the meta you want to add. +Getting issuance proof of AdamCoin (an asset): -When you click on the "Add meta data" button, a request is sent to the API to create the add meta data request. -If a meta data file is present, the file will be put in our storage system. +```bash +curl --insecure https://universe.tiramisuwallet.com:8089/v1/taproot-assets/universe/leaves/asset-id/3b7693c532a59186a56c25b39328bb1801b052ca960a7effd25724f3074eeda9?proof_type=PROOF_TYPE_ISSUANCE | jq .leaves[0].issuance_proof | tr -d '"' +``` -note : on an asset page, next to the meta data hash field : +Getting issuance proof of tiramisuwallet (an NFT): -- if meta data is known: a button "Get meta data" is displayed. When you click on it, a request is sent to the API to - get the meta data of the asset. -- If meta data is not known: a button "Add meta data" is displayed. When you click on it, the form is displayed (and - asset id is already filled). +```bash +curl --insecure https://universe.tiramisuwallet.com:8089/v1/taproot-assets/universe/leaves/asset-id/74b0bcd927fd5a8b296c5e859293639578c459611419988e5a2cab4fff18f7d3?proof_type=PROOF_TYPE_ISSUANCE | jq .leaves[0].issuance_proof | tr -d '"' +``` -A batch is in charge of getting all request to add meta data. -For each one, we search for the asset id in our database. If it's found, we calculate the hash of the meta data and -compare it to the one in the asset. -If it's the same, we add the file to our storage service and update the asset with the meta data file name. +### Decoding proof +Decoding AdamCoin proof: + +```bash + curl --header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 ./src/main/resources/tapd/admin-mainnet.macaroon)" \ + --data @adamCoin-request.json \ + --insecure https://universe.royllo.org:8089/v1/taproot-assets/proofs/decode +``` +We can decode the meta with: `xxd -r -p` \ No newline at end of file diff --git a/pom.xml b/pom.xml index 80ca815f0..c4ec18568 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 0.2.0 1.5.5.Final - 2.9.1 + 2.9.1 From 61096143d3fff8954971a70bff5977860e95c895 Mon Sep 17 00:00:00 2001 From: straumat Date: Thu, 28 Dec 2023 14:48:14 +0100 Subject: [PATCH 29/57] Fixing CI --- .../explorer/core/provider/tapd/DecodedProofResponse.java | 6 +++++- .../royllo/test/tapd/asset/DecodedProofValueResponse.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java index c9750bffc..98e08655d 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/tapd/DecodedProofResponse.java @@ -60,7 +60,11 @@ public static class DecodedProof { @JsonProperty("meta_reveal") Asset.MetaReveal metaReveal; - /** Indicates whether this proof is an issuance. */ + /** + * Indicates whether this proof is an issuance. + * + * @return true if issuance + */ public boolean isIssuance() { return metaReveal != null; } diff --git a/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java b/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java index 275c02c7f..befdfa6c4 100644 --- a/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java +++ b/util/test/common-test/src/main/java/org/royllo/test/tapd/asset/DecodedProofValueResponse.java @@ -60,7 +60,11 @@ public static class DecodedProof { @JsonProperty("meta_reveal") Asset.MetaReveal metaReveal; - /** Indicates whether this proof is an issuance. */ + /** + * Indicates whether this proof is an issuance. + * + * @return true if issuance + */ boolean isIssuance() { return metaReveal != null; } From 7838b48f70b5ee80f39a458e1ce7b027824937b1 Mon Sep 17 00:00:00 2001 From: straumat Date: Thu, 28 Dec 2023 23:38:02 +0100 Subject: [PATCH 30/57] Adding minio as a S3 mocked server --- backend/explorer-core/autoconfigure/pom.xml | 14 ++--- .../explorer/core/domain/asset/Asset.java | 10 +++- .../explorer/core/dto/asset/AssetDTO.java | 10 +++- .../core/service/asset/AssetService.java | 4 +- .../asset/AssetServiceImplementation.java | 3 +- .../db/changelog/1.0.0/table/table-asset.xml | 8 ++- .../explorer/core/test/core/util/S3Test.java | 41 +++++++++++++++ .../core/test/util/TestWithMockServers.java | 51 ++++++++++++++++++- backend/servers/explorer-batch/pom.xml | 5 ++ pom.xml | 5 +- 10 files changed, 135 insertions(+), 16 deletions(-) create mode 100644 backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/S3Test.java diff --git a/backend/explorer-core/autoconfigure/pom.xml b/backend/explorer-core/autoconfigure/pom.xml index 3ffad6eab..96c03ebcc 100644 --- a/backend/explorer-core/autoconfigure/pom.xml +++ b/backend/explorer-core/autoconfigure/pom.xml @@ -70,20 +70,20 @@ postgresql ${jdbc.driver.postgresql.version} + + - com.mysql - mysql-connector-j - ${jdbc.driver.mysql.version} + io.minio + minio + ${minio.version} - + com.bucket4j bucket4j-core 8.7.0 - - com.fasterxml.jackson.datatype jackson-datatype-joda @@ -123,7 +123,7 @@ org.testcontainers - mysql + minio test diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/Asset.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/Asset.java index f33d139a9..b9b664d07 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/Asset.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/Asset.java @@ -71,6 +71,14 @@ public class Asset extends BaseDomain { @Column(name = "META_DATA_HASH", updatable = false) private String metaDataHash; + /** Meta data file name. */ + @Column(name = "META_DATA_FILE_NAME") + private String metaDataFileName; + + /** Meta data file mime type. */ + @Column(name = "META_DATA_FILE_MIME_TYPE") + private String metaDataFileMimeType; + /** Asset genesis: The index of the output that carries the unique Taproot commitment in the genesis transaction. */ @Column(name = "OUTPUT_INDEX", updatable = false) private int outputIndex; @@ -84,7 +92,7 @@ public class Asset extends BaseDomain { @Column(name = "ASSET_TYPE", updatable = false) private AssetType type; - /** The total amount of the asset stored in this Taproot asset UTXO. */ + /** The total amount minted for this asset. */ @Column(name = "AMOUNT") private BigInteger amount; diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java index 6db1bcb00..6f28f89e9 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java @@ -49,6 +49,12 @@ public class AssetDTO { /** The hash of the metadata for this genesis asset. */ String metaDataHash; + /** Meta data file name. */ + String metaDataFileName; + + /** Meta data file mime type. */ + String metaDataFileMimeType; + /** The index of the output that carries the unique Taproot asset commitment in the genesis transaction. */ @NotNull(message = "Output index is required") Integer outputIndex; @@ -61,8 +67,8 @@ public class AssetDTO { @NotNull(message = "Asset type is required") AssetType type; - /** The total amount of the asset stored in this Taproot asset UTXO. */ - @NotNull(message = "Total amount is required") + /** The total amount minted for this asset. */ + @NotNull(message = "Amount is required") BigInteger amount; } diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java index 97aaeb632..b3bd1227e 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java @@ -35,10 +35,10 @@ public interface AssetService { * add metadata to an asset. * * @param assetId asset id - * @param filename filename + * @param metadata meta data * @return true if metadata added */ - boolean addMetaDataToAsset(String assetId, String filename); + boolean addMetaDataToAsset(String assetId, String metadata); /** * Get an asset. diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java index fe0aa5265..f0c02421f 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java @@ -139,8 +139,9 @@ public AssetDTO addAsset(@NonNull final AssetDTO newAsset) { } @Override - public boolean addMetaDataToAsset(final String assetId, final String filename) { + public boolean addMetaDataToAsset(final String assetId, final String metadata) { // We check that the asset exists. + assert assetRepository.findByAssetId(assetId).isPresent() : assetId + " not found"; // We get the content of the file. diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset.xml index 5e5de742f..4318de592 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset.xml @@ -32,8 +32,14 @@ + + + + + remarks="The total amount minted for this asset"/> postgresql test + + org.testcontainers + minio + test + org.royllo.test common-test diff --git a/pom.xml b/pom.xml index c4ec18568..ee3c18090 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,6 @@ 4.25.0 2.7.2 42.7.1 - 8.2.0 1.18.30 0.2.0 @@ -83,6 +82,10 @@ 2.9.1 + + + 8.5.7 + 8.7.0 From 4b24b2dd4a0c0c8ce6a147737db058d51b1ff597 Mon Sep 17 00:00:00 2001 From: straumat Date: Sun, 31 Dec 2023 19:01:03 +0100 Subject: [PATCH 31/57] LocalFileService implementation --- backend/explorer-core/autoconfigure/pom.xml | 15 ++++ .../ParametersConfiguration.java | 4 ++ .../explorer/core/domain/asset/Asset.java | 4 -- .../explorer/core/dto/asset/AssetDTO.java | 3 - .../core/provider/storage/FileService.java | 16 +++++ .../provider/storage/LocalFileService.java | 70 +++++++++++++++++++ .../core/provider/storage/package-info.java | 4 ++ .../parameters/RoylloExplorerParameters.java | 17 +++++ .../core/util/parameters/S3Parameters.java | 36 ++++++++++ .../src/main/resources/application.properties | 14 +++- .../db/changelog/1.0.0/table/table-asset.xml | 2 - .../repository/AssetStateRepositoryTest.java | 2 + .../repository/RequestRepositoryTest.java | 2 + .../UniverseServerRepositoryTest.java | 2 + .../core/repository/UserRepositoryTest.java | 2 + .../core/service/AssetGroupServiceTest.java | 2 + .../test/core/service/AssetServiceTest.java | 4 +- .../core/service/AssetStateServiceTest.java | 4 +- .../test/core/service/BitcoinServiceTest.java | 4 +- .../core/service/LocalFileServiceTest.java | 59 ++++++++++++++++ .../test/core/service/ProofServiceTest.java | 2 + .../test/core/service/RequestServiceTest.java | 4 +- .../core/service/StatisticServiceTest.java | 2 + .../service/UniverseServerServiceTest.java | 2 + .../test/core/service/UserServiceTest.java | 2 + .../explorer/core/test/core/util/S3Test.java | 14 +++- .../integration/database/PostgreSQLTest.java | 2 + .../MempoolTransactionServiceMainnetTest.java | 2 + .../MempoolTransactionServiceTestnetTest.java | 2 + .../tapd/TapdDecodeServiceTest.java | 2 + .../tapd/TapdUniverseLeavesServiceTest.java | 2 + .../tapd/TapdUniverseRootsServiceTest.java | 2 + .../core/test/util/TestWithMockServers.java | 4 +- .../src/test/resources/application.properties | 7 ++ .../src/main/resources/application.properties | 7 ++ .../test/graphql/AssetDataFetcherTest.java | 2 + .../graphql/AssetGroupDataFetcherTest.java | 2 + .../graphql/AssetStateDataFetcherTest.java | 2 + .../test/graphql/ProofDataFetcherTest.java | 2 + .../test/graphql/RequestDataFetcherTest.java | 3 +- .../api/test/graphql/UserDataFetcherTest.java | 2 + .../src/test/resources/application.properties | 7 ++ .../src/main/resources/application.properties | 7 ++ .../test/core/proof/InvalidProofTest.java | 3 +- .../core/proof/RoylloCoinIntegrationTest.java | 3 +- .../core/proof/RoylloNFTIntegrationTest.java | 3 +- .../proof/SetOfRoylloNFTIntegrationTest.java | 4 +- .../TrickyRoylloCoinIntegrationTest.java | 3 +- .../UnknownRoylloCoinIntegrationTest.java | 4 +- .../UnlimitedRoylloCoinIntegrationTest.java | 5 +- .../universe/AddUniverseServerBatchTest.java | 3 +- .../universe/UniverseExplorerBatchTest.java | 5 +- .../test/integration/PurgeBatchTest.java | 3 +- .../src/test/resources/application.properties | 7 ++ .../controller/util/SitemapController.java | 3 +- .../advice/ConfigurationControllerAdvice.java | 4 +- .../constants/ModelAttributeConstants.java | 3 + .../src/main/resources/application.properties | 1 + .../asset/AssetControllerTest.java | 4 +- .../asset/DisplayRoylloCoinTest.java | 2 + .../asset/DisplayRoylloNFTTest.java | 2 + .../asset/DisplaySetRoylloNFT1Test.java | 2 + .../asset/DisplaySetRoylloNFT2Test.java | 2 + .../asset/DisplaySetRoylloNFT3Test.java | 2 + .../asset/DisplayTrickyRoylloCoinTest.java | 2 + .../DisplayUnlimitedRoylloCoin1Test.java | 2 + .../DisplayUnlimitedRoylloCoin2Test.java | 2 + .../AddProofRequestRequestControllerTest.java | 2 + ...ddUniverseServerRequestControllerTest.java | 2 + .../request/RequestControllerTest.java | 2 + .../search/HomeControllerTest.java | 2 + .../search/SearchControllerTest.java | 3 +- .../util/SitemapControllerTest.java | 2 + .../src/test/resources/application.properties | 7 ++ pom.xml | 3 + 75 files changed, 387 insertions(+), 59 deletions(-) create mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/FileService.java create mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileService.java create mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/package-info.java create mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/parameters/S3Parameters.java create mode 100644 backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java diff --git a/backend/explorer-core/autoconfigure/pom.xml b/backend/explorer-core/autoconfigure/pom.xml index 96c03ebcc..b2dd1cdba 100644 --- a/backend/explorer-core/autoconfigure/pom.xml +++ b/backend/explorer-core/autoconfigure/pom.xml @@ -77,6 +77,16 @@ minio ${minio.version} + + com.google.jimfs + jimfs + ${jimfs.version} + + + io.undertow + undertow-core + ${undertow.version} + @@ -126,6 +136,11 @@ minio test + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + org.royllo.test common-test diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/configuration/ParametersConfiguration.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/configuration/ParametersConfiguration.java index bf589927c..b413d5283 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/configuration/ParametersConfiguration.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/configuration/ParametersConfiguration.java @@ -4,6 +4,7 @@ import org.royllo.explorer.core.util.parameters.MempoolParameters; import org.royllo.explorer.core.util.parameters.OutgoingRateLimitsParameters; import org.royllo.explorer.core.util.parameters.RoylloExplorerParameters; +import org.royllo.explorer.core.util.parameters.S3Parameters; import org.royllo.explorer.core.util.parameters.TAPDParameters; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; @@ -17,6 +18,9 @@ RoylloExplorerParameters.class, RoylloExplorerParameters.Api.class, RoylloExplorerParameters.Web.class, + RoylloExplorerParameters.Content.class, + // S3 configuration. + S3Parameters.class, // Mempool configuration. MempoolParameters.class, MempoolParameters.Api.class, diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/Asset.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/Asset.java index b9b664d07..4f761facf 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/Asset.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/Asset.java @@ -75,10 +75,6 @@ public class Asset extends BaseDomain { @Column(name = "META_DATA_FILE_NAME") private String metaDataFileName; - /** Meta data file mime type. */ - @Column(name = "META_DATA_FILE_MIME_TYPE") - private String metaDataFileMimeType; - /** Asset genesis: The index of the output that carries the unique Taproot commitment in the genesis transaction. */ @Column(name = "OUTPUT_INDEX", updatable = false) private int outputIndex; diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java index 6f28f89e9..d40e05dc8 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java @@ -52,9 +52,6 @@ public class AssetDTO { /** Meta data file name. */ String metaDataFileName; - /** Meta data file mime type. */ - String metaDataFileMimeType; - /** The index of the output that carries the unique Taproot asset commitment in the genesis transaction. */ @NotNull(message = "Output index is required") Integer outputIndex; diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/FileService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/FileService.java new file mode 100644 index 000000000..526921961 --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/FileService.java @@ -0,0 +1,16 @@ +package org.royllo.explorer.core.provider.storage; + +/** + * File service. + */ +public interface FileService { + + /** + * Store file. + * + * @param fileContent file content + * @param fileName file name + */ + void storeFile(byte[] fileContent, String fileName); + +} diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileService.java new file mode 100644 index 000000000..f1119141f --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileService.java @@ -0,0 +1,70 @@ +package org.royllo.explorer.core.provider.storage; + +import com.google.common.jimfs.Configuration; +import com.google.common.jimfs.Jimfs; +import io.undertow.Undertow; +import io.undertow.server.handlers.resource.PathResourceManager; +import io.undertow.server.handlers.resource.ResourceHandler; +import jakarta.annotation.PreDestroy; +import org.springframework.stereotype.Service; + +import java.nio.file.FileSystem; +import java.nio.file.Files; +import java.nio.file.Path; + +/** + * Local file service - Used for local development. + * It also includes a web server to serve content and simulate a s3 CDN. + */ +@Service +public class LocalFileService implements FileService { + + /** Web server port. */ + public static final int WEB_SERVER_PORT = 9093; + + /** Web server host. */ + public static final String WEB_SERVER_HOST = "localhost"; + + /** In-memory File system. */ + private final FileSystem fileSystem; + + /** Web server. */ + private final Undertow webServer; + + /** + * Constructor. + */ + public LocalFileService() { + // Starting an in-memory file system. + fileSystem = Jimfs.newFileSystem(Configuration.unix()); + + // Starting a web server to serve content. + PathResourceManager resourceManager = new PathResourceManager(fileSystem.getPath(".")); + webServer = Undertow.builder() + .addHttpListener(WEB_SERVER_PORT, WEB_SERVER_HOST) // Set port and host + .setHandler(new ResourceHandler(resourceManager)) // Set the handler to serve files + .build(); + webServer.start(); + } + + @PreDestroy + @SuppressWarnings("checkstyle:DesignForExtension") + public void onDestroy() throws Exception { + webServer.stop(); + fileSystem.close(); + } + + + @Override + @SuppressWarnings("checkstyle:DesignForExtension") + public void storeFile(final byte[] fileContent, + final String fileName) { + Path file = fileSystem.getPath(".").resolve(fileName); + try { + Files.write(file, fileContent); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + +} diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/package-info.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/package-info.java new file mode 100644 index 000000000..ac207d116 --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/package-info.java @@ -0,0 +1,4 @@ +/** + * Storage services. + */ +package org.royllo.explorer.core.provider.storage; \ No newline at end of file diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/parameters/RoylloExplorerParameters.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/parameters/RoylloExplorerParameters.java index a3d9d8aa1..89cf21e98 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/parameters/RoylloExplorerParameters.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/parameters/RoylloExplorerParameters.java @@ -51,4 +51,21 @@ public static class Web { } + /** content. */ + @Valid + private RoylloExplorerParameters.Content content = new Content(); + + /** Content parameters. */ + @Validated + @Getter + @Setter + @ToString + @ConfigurationProperties(prefix = "content") + public static class Content { + + /** Royllo explorer content base url. */ + private String baseUrl; + + } + } diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/parameters/S3Parameters.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/parameters/S3Parameters.java new file mode 100644 index 000000000..3d46bd1a3 --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/parameters/S3Parameters.java @@ -0,0 +1,36 @@ +package org.royllo.explorer.core.util.parameters; + +import jakarta.validation.constraints.NotEmpty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.validation.annotation.Validated; + +/** + * S3 parameters. + */ +@Validated +@Getter +@Setter +@ToString +@ConfigurationProperties(prefix = "s3") +public class S3Parameters { + + /** S3 access key. */ + @NotEmpty(message = "Access key is required") + private String accessKey; + + /** S3 secret key. */ + @NotEmpty(message = "Secret key is required") + private String secretKey; + + /** S3 bucket name. */ + @NotEmpty(message = "Bucket name is required") + private String bucketName; + + /** S3 endpoint. */ + @NotEmpty(message = "S3 endpoint is required") + private String endpointURL; + +} diff --git a/backend/explorer-core/autoconfigure/src/main/resources/application.properties b/backend/explorer-core/autoconfigure/src/main/resources/application.properties index 9089578f7..f5046039c 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/application.properties +++ b/backend/explorer-core/autoconfigure/src/main/resources/application.properties @@ -6,6 +6,7 @@ # Royllo explorer configuration. royllo.explorer.api.base-url=https://api.explorer.royllo.org royllo.explorer.web.base-url=https://explorer.royllo.org +royllo.explorer.content.base-url=https://content.royllo.org # # ====================================================================================================================== # Database access configuration. @@ -15,8 +16,11 @@ spring.datasource.username=sa spring.datasource.password= # # ====================================================================================================================== -# Cache configuration. -spring.cache.type=caffeine +# S3 service configuration. +s3.access-key=royllo-access-key +s3.secret-key=royllo-secret-key +s3.bucket-name=royllo-explorer-s3-asset-bucket +s3.endpoint-url=https://s3.amazonaws.com # # ====================================================================================================================== # Mempool configuration (testnet). @@ -40,4 +44,8 @@ rate.incoming.bandwidth.refillPeriod=100ns # # ====================================================================================================================== # Rate limit configuration (outgoing). -rate.outgoing.delayBetweenRequests=1s \ No newline at end of file +rate.outgoing.delayBetweenRequests=1s +# +# ====================================================================================================================== +# Cache configuration. +spring.cache.type=caffeine \ No newline at end of file diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset.xml index 4318de592..68a37f4c6 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset.xml @@ -37,8 +37,6 @@ remarks="The hash of the meta data for this genesis asset"/> - diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/AssetStateRepositoryTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/AssetStateRepositoryTest.java index 82c052554..00b038d32 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/AssetStateRepositoryTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/AssetStateRepositoryTest.java @@ -8,11 +8,13 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.test.annotation.DirtiesContext; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.royllo.test.TapdData.TRICKY_ROYLLO_COIN_ASSET_ID; @SpringBootTest +@DirtiesContext @DisplayName("AssetStateRepositoryTest tests") public class AssetStateRepositoryTest { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/RequestRepositoryTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/RequestRepositoryTest.java index b1e520d3b..5e71ab4b4 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/RequestRepositoryTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/RequestRepositoryTest.java @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.test.annotation.DirtiesContext; import javax.sql.DataSource; import java.util.Optional; @@ -25,6 +26,7 @@ import static org.royllo.explorer.core.util.enums.RequestStatus.SUCCESS; @SpringBootTest +@DirtiesContext @DisplayName("RequestRepository tests") public class RequestRepositoryTest extends TestWithMockServers { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/UniverseServerRepositoryTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/UniverseServerRepositoryTest.java index 9cbde9617..6212e26e9 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/UniverseServerRepositoryTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/UniverseServerRepositoryTest.java @@ -7,6 +7,7 @@ import org.royllo.explorer.core.test.util.TestWithMockServers; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import java.time.ZonedDateTime; import java.util.Optional; @@ -16,6 +17,7 @@ import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER; @SpringBootTest +@DirtiesContext @DisplayName("UniverseServerRepository tests") public class UniverseServerRepositoryTest extends TestWithMockServers { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/UserRepositoryTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/UserRepositoryTest.java index 8ad7355e9..adb2656f2 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/UserRepositoryTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/UserRepositoryTest.java @@ -6,6 +6,7 @@ import org.royllo.explorer.core.repository.user.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import java.util.Optional; @@ -17,6 +18,7 @@ import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER_USERNAME; @SpringBootTest +@DirtiesContext @DisplayName("UserRepository tests") public class UserRepositoryTest { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetGroupServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetGroupServiceTest.java index 11db70560..410d79503 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetGroupServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetGroupServiceTest.java @@ -7,6 +7,7 @@ import org.royllo.explorer.core.test.util.TestWithMockServers; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import java.util.Optional; @@ -18,6 +19,7 @@ import static org.royllo.test.TapdData.UNLIMITED_ROYLLO_COIN_1_FROM_TEST; @SpringBootTest +@DirtiesContext @DisplayName("AssetGroupService tests") public class AssetGroupServiceTest extends TestWithMockServers { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java index 0585ebc38..5e7e68f23 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java @@ -10,9 +10,9 @@ import org.royllo.explorer.core.service.bitcoin.BitcoinService; import org.royllo.explorer.core.test.util.TestWithMockServers; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.domain.Page; +import org.springframework.test.annotation.DirtiesContext; import java.math.BigInteger; import java.util.Optional; @@ -43,7 +43,7 @@ import static org.royllo.test.TapdData.TRICKY_ROYLLO_COIN_ASSET_ID_ALIAS; @SpringBootTest -@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY) +@DirtiesContext @DisplayName("AssetService tests") public class AssetServiceTest extends TestWithMockServers { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetStateServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetStateServiceTest.java index bde83791d..f7c87bdcb 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetStateServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetStateServiceTest.java @@ -13,9 +13,9 @@ import org.royllo.explorer.core.service.bitcoin.BitcoinService; import org.royllo.explorer.core.test.util.TestWithMockServers; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.domain.Page; +import org.springframework.test.annotation.DirtiesContext; import java.util.Optional; @@ -34,7 +34,7 @@ import static org.royllo.test.TapdData.TRICKY_ROYLLO_COIN_ASSET_ID; @SpringBootTest -@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY) +@DirtiesContext @DisplayName("AssetStateService tests") public class AssetStateServiceTest extends TestWithMockServers { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/BitcoinServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/BitcoinServiceTest.java index d2bd2c616..4a3b09029 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/BitcoinServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/BitcoinServiceTest.java @@ -6,8 +6,8 @@ import org.royllo.explorer.core.service.bitcoin.BitcoinService; import org.royllo.explorer.core.test.util.TestWithMockServers; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import java.util.Optional; @@ -18,7 +18,7 @@ import static org.royllo.test.MempoolData.UNKNOWN_ROYLLO_COIN_GENESIS_TXID; @SpringBootTest -@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY) +@DirtiesContext @DisplayName("BitcoinService tests") public class BitcoinServiceTest extends TestWithMockServers { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java new file mode 100644 index 000000000..606f47a8f --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java @@ -0,0 +1,59 @@ +package org.royllo.explorer.core.test.core.service; + +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.royllo.explorer.core.provider.storage.LocalFileService; +import org.royllo.explorer.core.test.util.TestWithMockServers; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; + +import java.io.IOException; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.provider.storage.LocalFileService.WEB_SERVER_HOST; +import static org.royllo.explorer.core.provider.storage.LocalFileService.WEB_SERVER_PORT; + +@SpringBootTest +@DirtiesContext +@DisplayName("LocalFileServiceTest tests") +public class LocalFileServiceTest extends TestWithMockServers { + + @Autowired + private LocalFileService localFileService; + + @Test + @DisplayName("Store and get file") + public void storeAndGetFile() { + // We store a file. + localFileService.storeFile("Hello World!".getBytes(), "hello.txt"); + + // We try retrieve hello.txt from the webserver. + var client = new OkHttpClient(); + Request request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/hello.txt") + .build(); + try (Response response = client.newCall(request).execute()) { + assertTrue(response.body().string().contains("Hello World!")); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + + // We try to retrieve another file that doesn't exists, so we should get a 404 error. + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/non_existing_file.txt") + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(404, response.code()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + + } + +} diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/ProofServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/ProofServiceTest.java index a2e94c7e5..fb2c5e77a 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/ProofServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/ProofServiceTest.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.domain.Page; +import org.springframework.test.annotation.DirtiesContext; import java.util.Optional; @@ -31,6 +32,7 @@ import static org.royllo.test.TapdData.UNKNOWN_ROYLLO_COIN_FROM_TEST; @SpringBootTest +@DirtiesContext @DisplayName("ProofService tests") public class ProofServiceTest extends TestWithMockServers { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java index f88321b85..2b318fe8b 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java @@ -11,8 +11,8 @@ import org.royllo.explorer.core.dto.request.RequestDTO; import org.royllo.explorer.core.service.request.RequestService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import java.util.List; import java.util.Optional; @@ -31,7 +31,7 @@ import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; @SpringBootTest -@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY) +@DirtiesContext @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @DisplayName("RequestService tests") public class RequestServiceTest { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/StatisticServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/StatisticServiceTest.java index 9ceaa11a5..33ea61818 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/StatisticServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/StatisticServiceTest.java @@ -10,10 +10,12 @@ import org.royllo.explorer.core.service.universe.UniverseServerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import static org.junit.jupiter.api.Assertions.assertEquals; @SpringBootTest +@DirtiesContext @DisplayName("StatisticService tests") public class StatisticServiceTest { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/UniverseServerServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/UniverseServerServiceTest.java index 304652ad6..203d4421c 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/UniverseServerServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/UniverseServerServiceTest.java @@ -7,6 +7,7 @@ import org.royllo.explorer.core.util.exceptions.universe.UniverseServerCreationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -15,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @SpringBootTest +@DirtiesContext @DisplayName("UniverseServerService tests") public class UniverseServerServiceTest { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/UserServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/UserServiceTest.java index ee1a78eaa..ec7655fa0 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/UserServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/UserServiceTest.java @@ -6,6 +6,7 @@ import org.royllo.explorer.core.service.user.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import java.util.Optional; @@ -24,6 +25,7 @@ import static org.royllo.explorer.core.util.enums.UserRole.ADMINISTRATOR; @SpringBootTest +@DirtiesContext @DisplayName("UserService tests") public class UserServiceTest { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/S3Test.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/S3Test.java index f0cd7f5e6..bf3e69081 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/S3Test.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/S3Test.java @@ -6,33 +6,41 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.royllo.explorer.core.test.util.TestWithMockServers; +import org.royllo.explorer.core.util.parameters.S3Parameters; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; /** - * S3Test. + * S3 test. */ @SpringBootTest +@DirtiesContext @DisplayName("S3 tests") public class S3Test extends TestWithMockServers { + @Autowired + private S3Parameters s3Parameters; + @Test @DisplayName("S3 connection test") public void connectionTest() { // Getting a connexion. MinioClient minioClient = MinioClient.builder() .endpoint(s3MockServer.getS3URL()) - .credentials("user", "password") + .credentials(s3Parameters.getAccessKey(), s3Parameters.getSecretKey()) .build(); // Testing operations. try { - minioClient.bucketExists(BucketExistsArgs.builder().bucket("test").build()); + assertTrue(minioClient.bucketExists(BucketExistsArgs.builder().bucket(s3Parameters.getBucketName()).build())); } catch (MinioException | InvalidKeyException | IOException | NoSuchAlgorithmException e) { fail("S3 connection test failed: " + e.getMessage()); } diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/database/PostgreSQLTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/database/PostgreSQLTest.java index f5d5d0269..e2f6fbadf 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/database/PostgreSQLTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/database/PostgreSQLTest.java @@ -5,6 +5,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import org.testcontainers.junit.jupiter.Testcontainers; import javax.sql.DataSource; @@ -17,6 +18,7 @@ "spring.datasource.url=jdbc:tc:postgresql:16:///explorer", "spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver" }) +@DirtiesContext @DisplayName("PostgreSQL test") public class PostgreSQLTest { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/mempool/MempoolTransactionServiceMainnetTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/mempool/MempoolTransactionServiceMainnetTest.java index f37dcde49..fac8918e1 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/mempool/MempoolTransactionServiceMainnetTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/mempool/MempoolTransactionServiceMainnetTest.java @@ -6,6 +6,7 @@ import org.royllo.explorer.core.provider.mempool.MempoolTransactionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import java.math.BigInteger; import java.util.Iterator; @@ -15,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; @SpringBootTest(properties = {"mempool.api.base-url=https://mempool.space/api"}) +@DirtiesContext @DisplayName("Mempool transaction service on mainnet") public class MempoolTransactionServiceMainnetTest { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/mempool/MempoolTransactionServiceTestnetTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/mempool/MempoolTransactionServiceTestnetTest.java index a58bd0113..eb40a8ca2 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/mempool/MempoolTransactionServiceTestnetTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/mempool/MempoolTransactionServiceTestnetTest.java @@ -6,6 +6,7 @@ import org.royllo.explorer.core.provider.mempool.MempoolTransactionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import java.math.BigInteger; @@ -14,6 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; @SpringBootTest(properties = {"mempool.api.base-url=https://mempool.space/testnet/api"}) +@DirtiesContext @DisplayName("Mempool transaction service on testnet") public class MempoolTransactionServiceTestnetTest { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java index 7e235574d..234ea8341 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdDecodeServiceTest.java @@ -8,6 +8,7 @@ import org.royllo.test.tapd.asset.DecodedProofValueResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -18,6 +19,7 @@ import static org.royllo.test.TapdData.UNLIMITED_ROYLLO_COIN_1_FROM_TEST; @SpringBootTest(properties = {"tapd.api.base-url=https://testnet.universe.royllo.org:8089"}) +@DirtiesContext @DisplayName("TAPD decode proof service test") public class TapdDecodeServiceTest { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdUniverseLeavesServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdUniverseLeavesServiceTest.java index 6dd5a4928..caa0b9d96 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdUniverseLeavesServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdUniverseLeavesServiceTest.java @@ -6,6 +6,7 @@ import org.royllo.explorer.core.provider.tapd.UniverseLeavesResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -14,6 +15,7 @@ import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_TRANSFER; @SpringBootTest +@DirtiesContext @DisplayName("Lightning TAPD universe leaves service test") public class TapdUniverseLeavesServiceTest { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdUniverseRootsServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdUniverseRootsServiceTest.java index 023dab4b0..2ca8b1d41 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdUniverseRootsServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/tapd/TapdUniverseRootsServiceTest.java @@ -6,6 +6,7 @@ import org.royllo.explorer.core.provider.tapd.UniverseRootsResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import java.util.concurrent.TimeUnit; @@ -13,6 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @SpringBootTest(properties = {"tapd.api.base-url=https://157.230.85.88:8089"}) +@DirtiesContext @DisplayName("Lightning TAPD Universe roots service test") public class TapdUniverseRootsServiceTest { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java index 26f63c87a..4e386605c 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java @@ -64,10 +64,10 @@ public class TestWithMockServers extends Base { public static final String S3_BUCKET_NAME = "royllo-explorer"; /** S3 user name. */ - public static final String S3_USER_NAME = "user"; + public static final String S3_USER_NAME = "royllo-access-key"; /** S3 password. */ - public static final String S3_PASSWORD = "password"; + public static final String S3_PASSWORD = "royllo-secret-key"; /** Mempool mock server. */ private ClientAndServer mempoolMockServer; diff --git a/backend/explorer-core/autoconfigure/src/test/resources/application.properties b/backend/explorer-core/autoconfigure/src/test/resources/application.properties index d9a9a82b9..a477ebb03 100644 --- a/backend/explorer-core/autoconfigure/src/test/resources/application.properties +++ b/backend/explorer-core/autoconfigure/src/test/resources/application.properties @@ -10,6 +10,13 @@ spring.datasource.username=sa spring.datasource.password= # # ====================================================================================================================== +# S3 service configuration. +s3.access-key=royllo-access-key +s3.secret-key=royllo-secret-key +s3.bucket-name=royllo-explorer +s3.endpoint-url=https://s3.amazonaws.com +# +# ====================================================================================================================== # Cache configuration. spring.cache.type=caffeine # diff --git a/backend/servers/explorer-api/src/main/resources/application.properties b/backend/servers/explorer-api/src/main/resources/application.properties index 5b52e49c1..bb824a0a7 100644 --- a/backend/servers/explorer-api/src/main/resources/application.properties +++ b/backend/servers/explorer-api/src/main/resources/application.properties @@ -10,6 +10,13 @@ spring.datasource.username=sa spring.datasource.password= # # ====================================================================================================================== +# S3 service configuration. +s3.access-key=royllo-access-key +s3.secret-key=royllo-secret-key +s3.bucket-name=royllo-explorer-s3-asset-bucket +s3.endpoint-url=https://s3.amazonaws.com +# +# ====================================================================================================================== # Cache configuration. spring.cache.type=caffeine # diff --git a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetDataFetcherTest.java b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetDataFetcherTest.java index b9e5da2cc..af4330ef3 100644 --- a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetDataFetcherTest.java +++ b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetDataFetcherTest.java @@ -16,6 +16,7 @@ import org.royllo.test.tapd.asset.DecodedProofValueResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import static graphql.Assert.assertNull; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,6 +41,7 @@ import static org.royllo.test.TapdData.UNLIMITED_ROYLLO_COIN_2_ASSET_ID_ALIAS; @SpringBootTest +@DirtiesContext @DisplayName("AssetDataFetcher tests") public class AssetDataFetcherTest { diff --git a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetGroupDataFetcherTest.java b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetGroupDataFetcherTest.java index 690c036da..e9162b4ee 100644 --- a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetGroupDataFetcherTest.java +++ b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetGroupDataFetcherTest.java @@ -12,6 +12,7 @@ import org.royllo.test.tapd.asset.DecodedProofValueResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -20,6 +21,7 @@ import static org.royllo.test.TapdData.UNLIMITED_ROYLLO_COIN_1_FROM_TEST; @SpringBootTest +@DirtiesContext @DisplayName("AssetGroupDataFetcher tests") public class AssetGroupDataFetcherTest { diff --git a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetStateDataFetcherTest.java b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetStateDataFetcherTest.java index d021e07cd..5286b4e2e 100644 --- a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetStateDataFetcherTest.java +++ b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetStateDataFetcherTest.java @@ -12,6 +12,7 @@ import org.royllo.explorer.api.graphql.generated.types.AssetStatePage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -22,6 +23,7 @@ import static org.royllo.test.TapdData.TRICKY_ROYLLO_COIN_FROM_TEST; @SpringBootTest +@DirtiesContext @DisplayName("AssetStateDataFetcher tests") public class AssetStateDataFetcherTest { diff --git a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/ProofDataFetcherTest.java b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/ProofDataFetcherTest.java index f38af81e9..8aa970cd3 100644 --- a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/ProofDataFetcherTest.java +++ b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/ProofDataFetcherTest.java @@ -13,6 +13,7 @@ import org.royllo.explorer.core.util.base.Base; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import java.util.Optional; @@ -23,6 +24,7 @@ import static org.royllo.test.TapdData.TRICKY_ROYLLO_COIN_FROM_TEST; @SpringBootTest +@DirtiesContext @DisplayName("ProofDataFetcher tests") public class ProofDataFetcherTest extends Base { diff --git a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/RequestDataFetcherTest.java b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/RequestDataFetcherTest.java index 19e5d2cef..2aabade93 100644 --- a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/RequestDataFetcherTest.java +++ b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/RequestDataFetcherTest.java @@ -31,11 +31,10 @@ import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER_ID; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER_USERNAME; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @SpringBootTest +@DirtiesContext @DisplayName("RequestDataFetcher tests") -@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) public class RequestDataFetcherTest { @Autowired diff --git a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/UserDataFetcherTest.java b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/UserDataFetcherTest.java index 2c2628579..1257aa099 100644 --- a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/UserDataFetcherTest.java +++ b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/UserDataFetcherTest.java @@ -13,11 +13,13 @@ import org.royllo.explorer.api.graphql.generated.types.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @SpringBootTest +@DirtiesContext @DisplayName("UserDataFetcher tests") public class UserDataFetcherTest { diff --git a/backend/servers/explorer-api/src/test/resources/application.properties b/backend/servers/explorer-api/src/test/resources/application.properties index 75138fb90..3f8473652 100644 --- a/backend/servers/explorer-api/src/test/resources/application.properties +++ b/backend/servers/explorer-api/src/test/resources/application.properties @@ -3,6 +3,13 @@ # Explorer configuration file. # # ====================================================================================================================== +# S3 service configuration. +s3.access-key=royllo-access-key +s3.secret-key=royllo-secret-key +s3.bucket-name=royllo-explorer +s3.endpoint-url=https://s3.amazonaws.com +# +# ====================================================================================================================== # Mempool configuration. mempool.api.base-url=https://mempool.space/api/ # diff --git a/backend/servers/explorer-batch/src/main/resources/application.properties b/backend/servers/explorer-batch/src/main/resources/application.properties index ac5a3dd7d..e1ee0aff9 100644 --- a/backend/servers/explorer-batch/src/main/resources/application.properties +++ b/backend/servers/explorer-batch/src/main/resources/application.properties @@ -10,6 +10,13 @@ spring.datasource.username=sa spring.datasource.password= # # ====================================================================================================================== +# S3 service configuration. +s3.access-key=royllo-access-key +s3.secret-key=royllo-secret-key +s3.bucket-name=royllo-explorer-s3-asset-bucket +s3.endpoint-url=https://s3.amazonaws.com +# +# ====================================================================================================================== # Cache configuration. spring.cache.type=caffeine # diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/InvalidProofTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/InvalidProofTest.java index f2bcb68ea..64e7efaaa 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/InvalidProofTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/InvalidProofTest.java @@ -20,11 +20,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.royllo.explorer.core.util.enums.RequestStatus.FAILURE; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @SpringBootTest +@DirtiesContext @DisplayName("Invalid proof test") -@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) @ActiveProfiles({"scheduler-disabled"}) public class InvalidProofTest extends TestWithMockServers { diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloCoinIntegrationTest.java index 250e4b282..7eadab89a 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloCoinIntegrationTest.java @@ -21,11 +21,10 @@ import static org.royllo.explorer.core.util.enums.RequestStatus.FAILURE; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; import static org.royllo.test.TapdData.ROYLLO_COIN_FROM_TEST; -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @SpringBootTest +@DirtiesContext @DisplayName("roylloCoin integration test") -@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) @ActiveProfiles({"scheduler-disabled"}) public class RoylloCoinIntegrationTest extends TestWithMockServers { diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java index 8a5c6f936..b876582af 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java @@ -37,11 +37,10 @@ import static org.royllo.test.MempoolData.ROYLLO_NFT_GENESIS_VOUT; import static org.royllo.test.TapdData.ROYLLO_NFT_ASSET_ID; import static org.royllo.test.TapdData.ROYLLO_NFT_FROM_TEST; -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @SpringBootTest +@DirtiesContext @DisplayName("roylloNFT integration test") -@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) @ActiveProfiles({"scheduler-disabled"}) public class RoylloNFTIntegrationTest extends TestWithMockServers { diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java index f9b2d01cd..b2f498fd9 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java @@ -38,18 +38,16 @@ import static org.royllo.test.MempoolData.SET_OF_ROYLLO_NFT_ANCHOR_3_VOUT; import static org.royllo.test.MempoolData.SET_OF_ROYLLO_NFT_GENESIS_TXID; import static org.royllo.test.MempoolData.SET_OF_ROYLLO_NFT_GENESIS_VOUT; -import static org.royllo.test.TapdData.ROYLLO_NFT_ASSET_ID; import static org.royllo.test.TapdData.SET_OF_ROYLLO_NFT_1_ASSET_ID; import static org.royllo.test.TapdData.SET_OF_ROYLLO_NFT_1_FROM_TEST; import static org.royllo.test.TapdData.SET_OF_ROYLLO_NFT_2_ASSET_ID; import static org.royllo.test.TapdData.SET_OF_ROYLLO_NFT_2_FROM_TEST; import static org.royllo.test.TapdData.SET_OF_ROYLLO_NFT_3_ASSET_ID; import static org.royllo.test.TapdData.SET_OF_ROYLLO_NFT_3_FROM_TEST; -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @SpringBootTest +@DirtiesContext @DisplayName("setOfRoylloNFT test") -@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) @ActiveProfiles({"scheduler-disabled"}) public class SetOfRoylloNFTIntegrationTest extends TestWithMockServers { diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java index b1d1dfec5..5fa8675f7 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java @@ -37,14 +37,13 @@ import static org.royllo.test.MempoolData.TRICKY_ROYLLO_COIN_ANCHOR_2_TXID; import static org.royllo.test.MempoolData.TRICKY_ROYLLO_COIN_ANCHOR_3_TXID; import static org.royllo.test.MempoolData.TRICKY_ROYLLO_COIN_GENESIS_TXID; -import static org.royllo.test.TapdData.SET_OF_ROYLLO_NFT_1_ASSET_ID; import static org.royllo.test.TapdData.TRICKY_ROYLLO_COIN_ASSET_ID; import static org.royllo.test.TapdData.TRICKY_ROYLLO_COIN_FROM_TEST; import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @SpringBootTest -@DisplayName("trickyRoylloCoin test") @DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) +@DisplayName("trickyRoylloCoin test") @ActiveProfiles({"scheduler-disabled"}) public class TrickyRoylloCoinIntegrationTest extends TestWithMockServers { diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java index cbeacdf2e..048f14cb2 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java @@ -34,14 +34,12 @@ import static org.royllo.test.MempoolData.UNKNOWN_ROYLLO_COIN_ANCHOR_1_VOUT; import static org.royllo.test.MempoolData.UNKNOWN_ROYLLO_COIN_GENESIS_TXID; import static org.royllo.test.MempoolData.UNKNOWN_ROYLLO_COIN_GENESIS_VOUT; -import static org.royllo.test.TapdData.TRICKY_ROYLLO_COIN_ASSET_ID; import static org.royllo.test.TapdData.UNKNOWN_ROYLLO_COIN_ASSET_ID; import static org.royllo.test.TapdData.UNKNOWN_ROYLLO_COIN_FROM_TEST; -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @SpringBootTest +@DirtiesContext @DisplayName("unknownRoylloCoin test") -@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) @ActiveProfiles({"scheduler-disabled"}) public class UnknownRoylloCoinIntegrationTest extends TestWithMockServers { diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java index 3e945bbf1..a55e0aa23 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java @@ -39,17 +39,14 @@ import static org.royllo.test.MempoolData.UNLIMITED_ROYLLO_COIN_2_ANCHOR_1_TXID; import static org.royllo.test.MempoolData.UNLIMITED_ROYLLO_COIN_2_GENESIS_TXID; import static org.royllo.test.MempoolData.UNLIMITED_ROYLLO_COIN_2_GENESIS_VOUT; -import static org.royllo.test.TapdData.SET_OF_ROYLLO_NFT_1_ASSET_ID; -import static org.royllo.test.TapdData.SET_OF_ROYLLO_NFT_2_ASSET_ID; import static org.royllo.test.TapdData.UNLIMITED_ROYLLO_COIN_1_ASSET_ID; import static org.royllo.test.TapdData.UNLIMITED_ROYLLO_COIN_1_FROM_TEST; import static org.royllo.test.TapdData.UNLIMITED_ROYLLO_COIN_2_ASSET_ID; import static org.royllo.test.TapdData.UNLIMITED_ROYLLO_COIN_2_FROM_TEST; -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @SpringBootTest +@DirtiesContext @DisplayName("unlimitedRoylloCoin test") -@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) @ActiveProfiles({"scheduler-disabled"}) public class UnlimitedRoylloCoinIntegrationTest extends TestWithMockServers { diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/universe/AddUniverseServerBatchTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/universe/AddUniverseServerBatchTest.java index 763c1761f..12dae89ef 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/universe/AddUniverseServerBatchTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/universe/AddUniverseServerBatchTest.java @@ -19,11 +19,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.royllo.explorer.core.util.enums.RequestStatus.FAILURE; import static org.royllo.explorer.core.util.enums.RequestStatus.SUCCESS; -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @SpringBootTest +@DirtiesContext @DisplayName("Add universe server batch test") -@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) @ActiveProfiles({"tapdProofServiceMock", "scheduler-disabled"}) public class AddUniverseServerBatchTest { diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/universe/UniverseExplorerBatchTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/universe/UniverseExplorerBatchTest.java index 89823eb77..fb9e48ca9 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/universe/UniverseExplorerBatchTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/universe/UniverseExplorerBatchTest.java @@ -8,7 +8,6 @@ import org.royllo.explorer.core.repository.request.RequestRepository; import org.royllo.explorer.core.repository.universe.UniverseServerRepository; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; @@ -22,12 +21,10 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @SpringBootTest +@DirtiesContext @DisplayName("Universe explorer batch test") -@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) -@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY) @ActiveProfiles({"tapdProofServiceMock", "scheduler-disabled"}) public class UniverseExplorerBatchTest { diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/integration/PurgeBatchTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/integration/PurgeBatchTest.java index 9ace32f2c..fa57b18d8 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/integration/PurgeBatchTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/integration/PurgeBatchTest.java @@ -19,10 +19,9 @@ import static org.royllo.explorer.core.util.enums.RequestStatus.FAILURE; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; import static org.royllo.explorer.core.util.enums.RequestStatus.SUCCESS; -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @DisplayName("Purge batch test") -@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) +@DirtiesContext @ActiveProfiles("scheduler-disabled") @Testcontainers @SpringBootTest(properties = {"spring.datasource.url=jdbc:tc:postgresql:16:///explorer", diff --git a/backend/servers/explorer-batch/src/test/resources/application.properties b/backend/servers/explorer-batch/src/test/resources/application.properties index 5303d5939..5ab476de0 100644 --- a/backend/servers/explorer-batch/src/test/resources/application.properties +++ b/backend/servers/explorer-batch/src/test/resources/application.properties @@ -4,6 +4,13 @@ # Explorer configuration file. # # ====================================================================================================================== +# S3 service configuration. +s3.access-key=royllo-access-key +s3.secret-key=royllo-secret-key +s3.bucket-name=royllo-explorer-s3-asset-bucket +s3.endpoint-url=https://s3.amazonaws.com +# +# ====================================================================================================================== # Mempool configuration - Using our mock server. mempool.api.base-url=http://localhost:9091/testnet/api # diff --git a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/controller/util/SitemapController.java b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/controller/util/SitemapController.java index 61ee23d17..4a960ce21 100644 --- a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/controller/util/SitemapController.java +++ b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/controller/util/SitemapController.java @@ -37,10 +37,11 @@ public class SitemapController { public String sitemap(final Model model) { // Get all asset ids and generate the corresponding urls. + final String baseUrl = roylloExplorerParameters.getWeb().getBaseUrl() + "/asset/"; List urls = assetRepository.findAll() .stream() .map(Asset::getAssetId) - .map(assetId -> roylloExplorerParameters.getWeb().getBaseUrl() + "/asset/" + assetId) + .map(assetId -> baseUrl + assetId) .toList(); model.addAttribute(SITEMAP_URLS_ATTRIBUTE, urls); diff --git a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/util/advice/ConfigurationControllerAdvice.java b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/util/advice/ConfigurationControllerAdvice.java index 580768f28..6e1829832 100644 --- a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/util/advice/ConfigurationControllerAdvice.java +++ b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/util/advice/ConfigurationControllerAdvice.java @@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.ModelAttribute; import static org.royllo.explorer.web.util.constants.ModelAttributeConstants.API_BASE_URL_ATTRIBUTE; +import static org.royllo.explorer.web.util.constants.ModelAttributeConstants.CONTENT_BASE_URL_ATTRIBUTE; import static org.royllo.explorer.web.util.constants.ModelAttributeConstants.WEB_BASE_URL_ATTRIBUTE; /** @@ -22,9 +23,10 @@ public class ConfigurationControllerAdvice { @ModelAttribute public final void handleRequest(final Model model) { - // Set the base url for web and API. + // Set the base url for web, API and assets. model.addAttribute(API_BASE_URL_ATTRIBUTE, roylloExplorerParameters.getApi().getBaseUrl()); model.addAttribute(WEB_BASE_URL_ATTRIBUTE, roylloExplorerParameters.getWeb().getBaseUrl()); + model.addAttribute(CONTENT_BASE_URL_ATTRIBUTE, roylloExplorerParameters.getContent().getBaseUrl()); } diff --git a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/util/constants/ModelAttributeConstants.java b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/util/constants/ModelAttributeConstants.java index 2104174b8..1c632030a 100644 --- a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/util/constants/ModelAttributeConstants.java +++ b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/util/constants/ModelAttributeConstants.java @@ -15,6 +15,9 @@ public class ModelAttributeConstants { /** Web base url. */ public static final String WEB_BASE_URL_ATTRIBUTE = "webBaseUrl"; + /** Content base url. */ + public static final String CONTENT_BASE_URL_ATTRIBUTE = "contentBaseUrl"; + /** Query attribute. */ public static final String QUERY_ATTRIBUTE = "query"; diff --git a/backend/servers/explorer-web/src/main/resources/application.properties b/backend/servers/explorer-web/src/main/resources/application.properties index 56a62b70e..48c205c28 100644 --- a/backend/servers/explorer-web/src/main/resources/application.properties +++ b/backend/servers/explorer-web/src/main/resources/application.properties @@ -6,6 +6,7 @@ # Royllo explorer configuration. royllo.explorer.api.base-url=https://api.explorer.royllo.org royllo.explorer.web.base-url=https://explorer.royllo.org +royllo.explorer.content.base-url=https://assets.royllo.org # # ====================================================================================================================== # Database access configuration. diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/AssetControllerTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/AssetControllerTest.java index 44b1a37eb..87939a7c1 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/AssetControllerTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/AssetControllerTest.java @@ -17,11 +17,11 @@ import org.royllo.explorer.core.service.bitcoin.BitcoinService; import org.royllo.explorer.web.test.util.BaseTest; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; import org.springframework.http.HttpHeaders; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import javax.xml.bind.DatatypeConverter; @@ -51,9 +51,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Asset controller tests") @AutoConfigureMockMvc -@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY) public class AssetControllerTest extends BaseTest { /** Asset state id field separator. */ diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloCoinTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloCoinTest.java index 18236351a..b0b80949f 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloCoinTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloCoinTest.java @@ -10,6 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; import org.springframework.http.HttpHeaders; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import static org.hamcrest.CoreMatchers.not; @@ -32,6 +33,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Display roylloCoin page tests") @AutoConfigureMockMvc public class DisplayRoylloCoinTest extends BaseTest { diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloNFTTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloNFTTest.java index a5dec232b..a7d654eb0 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloNFTTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloNFTTest.java @@ -10,6 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; import org.springframework.http.HttpHeaders; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import static org.hamcrest.CoreMatchers.not; @@ -30,6 +31,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Display roylloNFT page tests") @AutoConfigureMockMvc public class DisplayRoylloNFTTest extends BaseTest { diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplaySetRoylloNFT1Test.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplaySetRoylloNFT1Test.java index 562da30fd..5efafaeec 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplaySetRoylloNFT1Test.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplaySetRoylloNFT1Test.java @@ -10,6 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; import org.springframework.http.HttpHeaders; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import static org.hamcrest.CoreMatchers.not; @@ -36,6 +37,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Display setRoylloNFT1 page tests") @AutoConfigureMockMvc public class DisplaySetRoylloNFT1Test extends BaseTest { diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplaySetRoylloNFT2Test.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplaySetRoylloNFT2Test.java index d0714aa83..1a108e41c 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplaySetRoylloNFT2Test.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplaySetRoylloNFT2Test.java @@ -10,6 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; import org.springframework.http.HttpHeaders; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import static org.hamcrest.CoreMatchers.not; @@ -36,6 +37,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Display setRoylloNFT2 page tests") @AutoConfigureMockMvc public class DisplaySetRoylloNFT2Test extends BaseTest { diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplaySetRoylloNFT3Test.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplaySetRoylloNFT3Test.java index e6bca2668..784d66786 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplaySetRoylloNFT3Test.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplaySetRoylloNFT3Test.java @@ -10,6 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; import org.springframework.http.HttpHeaders; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import static org.hamcrest.CoreMatchers.not; @@ -36,6 +37,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Display setRoylloNFT3 page tests") @AutoConfigureMockMvc public class DisplaySetRoylloNFT3Test extends BaseTest { diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayTrickyRoylloCoinTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayTrickyRoylloCoinTest.java index 47306aacf..13f87e397 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayTrickyRoylloCoinTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayTrickyRoylloCoinTest.java @@ -10,6 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; import org.springframework.http.HttpHeaders; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import static org.hamcrest.CoreMatchers.not; @@ -32,6 +33,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Display trickyRoylloCoin page tests") @AutoConfigureMockMvc public class DisplayTrickyRoylloCoinTest extends BaseTest { diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayUnlimitedRoylloCoin1Test.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayUnlimitedRoylloCoin1Test.java index 79b8dc2c6..5fd6f7cd7 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayUnlimitedRoylloCoin1Test.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayUnlimitedRoylloCoin1Test.java @@ -10,6 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; import org.springframework.http.HttpHeaders; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import static org.hamcrest.CoreMatchers.not; @@ -33,6 +34,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Display unlimitedRoylloCoin1 page tests") @AutoConfigureMockMvc public class DisplayUnlimitedRoylloCoin1Test extends BaseTest { diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayUnlimitedRoylloCoin2Test.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayUnlimitedRoylloCoin2Test.java index 3291dd3a8..21fb4f23f 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayUnlimitedRoylloCoin2Test.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayUnlimitedRoylloCoin2Test.java @@ -10,6 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; import org.springframework.http.HttpHeaders; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import static org.hamcrest.CoreMatchers.not; @@ -33,6 +34,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Display unlimitedRoylloCoin2 page tests") @AutoConfigureMockMvc public class DisplayUnlimitedRoylloCoin2Test extends BaseTest { diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/request/AddProofRequestRequestControllerTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/request/AddProofRequestRequestControllerTest.java index 12019e999..5c6841428 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/request/AddProofRequestRequestControllerTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/request/AddProofRequestRequestControllerTest.java @@ -10,6 +10,7 @@ import org.springframework.context.MessageSource; import org.springframework.core.env.Environment; import org.springframework.http.MediaType; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import java.util.Objects; @@ -38,6 +39,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Add proof request controller tests") @AutoConfigureMockMvc public class AddProofRequestRequestControllerTest extends BaseTest { diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/request/AddUniverseServerRequestControllerTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/request/AddUniverseServerRequestControllerTest.java index 02400f9cd..764b9ddd6 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/request/AddUniverseServerRequestControllerTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/request/AddUniverseServerRequestControllerTest.java @@ -9,6 +9,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; import org.springframework.http.MediaType; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import java.util.Objects; @@ -37,6 +38,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Add universe server request controller tests") @AutoConfigureMockMvc public class AddUniverseServerRequestControllerTest extends BaseTest { diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/request/RequestControllerTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/request/RequestControllerTest.java index ba39a5fea..db4c41f27 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/request/RequestControllerTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/request/RequestControllerTest.java @@ -7,6 +7,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import static org.hamcrest.Matchers.containsString; @@ -19,6 +20,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Request controller tests") @AutoConfigureMockMvc public class RequestControllerTest extends BaseTest { diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/HomeControllerTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/HomeControllerTest.java index 3ec6ab58e..553a38801 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/HomeControllerTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/HomeControllerTest.java @@ -13,6 +13,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; import org.springframework.http.HttpHeaders; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import static org.hamcrest.Matchers.containsString; @@ -25,6 +26,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Home controller tests") @AutoConfigureMockMvc public class HomeControllerTest extends BaseTest { diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/SearchControllerTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/SearchControllerTest.java index a4f01dfcc..9de46f06f 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/SearchControllerTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/SearchControllerTest.java @@ -11,7 +11,6 @@ import org.royllo.explorer.core.service.bitcoin.BitcoinService; import org.royllo.explorer.web.test.util.BaseTest; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.MessageSource; @@ -37,9 +36,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; @SpringBootTest +@DirtiesContext @DisplayName("Search controller tests") @AutoConfigureMockMvc -@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY) public class SearchControllerTest extends BaseTest { @Autowired diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/util/SitemapControllerTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/util/SitemapControllerTest.java index beef3c906..6435d2c13 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/util/SitemapControllerTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/util/SitemapControllerTest.java @@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import static org.hamcrest.Matchers.containsString; @@ -21,6 +22,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @SpringBootTest +@DirtiesContext @DisplayName("Sitemap controller tests") @AutoConfigureMockMvc public class SitemapControllerTest { diff --git a/backend/servers/explorer-web/src/test/resources/application.properties b/backend/servers/explorer-web/src/test/resources/application.properties index d9ef1ce86..7f8681ac3 100644 --- a/backend/servers/explorer-web/src/test/resources/application.properties +++ b/backend/servers/explorer-web/src/test/resources/application.properties @@ -15,6 +15,13 @@ spring.datasource.username=sa spring.datasource.password= # # ====================================================================================================================== +# S3 service configuration. +s3.access-key=royllo-access-key +s3.secret-key=royllo-secret-key +s3.bucket-name=royllo-explorer-s3-asset-bucket +s3.endpoint-url=https://s3.amazonaws.com +# +# ====================================================================================================================== # Cache configuration. spring.cache.type=caffeine # diff --git a/pom.xml b/pom.xml index ee3c18090..22f155873 100644 --- a/pom.xml +++ b/pom.xml @@ -85,6 +85,8 @@ 8.5.7 + 1.3.0 + 2.3.10.Final @@ -101,6 +103,7 @@ 1.19.3 5.8.0 + 5.0.0-alpha.12 From ec609746e83d2c4627fca3a5d21912d3cc98eb7d Mon Sep 17 00:00:00 2001 From: straumat Date: Sun, 31 Dec 2023 19:08:11 +0100 Subject: [PATCH 32/57] LocalFileService implementation --- .../explorer/core/provider/storage/LocalFileService.java | 5 +---- .../explorer/core/test/core/service/RequestServiceTest.java | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileService.java index f1119141f..1ade938ac 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileService.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileService.java @@ -10,7 +10,6 @@ import java.nio.file.FileSystem; import java.nio.file.Files; -import java.nio.file.Path; /** * Local file service - Used for local development. @@ -54,14 +53,12 @@ public void onDestroy() throws Exception { fileSystem.close(); } - @Override @SuppressWarnings("checkstyle:DesignForExtension") public void storeFile(final byte[] fileContent, final String fileName) { - Path file = fileSystem.getPath(".").resolve(fileName); try { - Files.write(file, fileContent); + Files.write(fileSystem.getPath(".").resolve(fileName), fileContent); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java index 2b318fe8b..0a5b22fc3 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java @@ -29,9 +29,10 @@ import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_TRANSFER; import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_UNSPECIFIED; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; +import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @SpringBootTest -@DirtiesContext +@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @DisplayName("RequestService tests") public class RequestServiceTest { From 84aeec5585cbda02d3d57fde0b50ee85174262a5 Mon Sep 17 00:00:00 2001 From: straumat Date: Sun, 31 Dec 2023 19:20:18 +0100 Subject: [PATCH 33/57] LocalFileService implementation --- .../explorer/core/test/core/service/RequestServiceTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java index 0a5b22fc3..2f241909d 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java @@ -11,6 +11,7 @@ import org.royllo.explorer.core.dto.request.RequestDTO; import org.royllo.explorer.core.service.request.RequestService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; @@ -34,6 +35,7 @@ @SpringBootTest @DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) +@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY) @DisplayName("RequestService tests") public class RequestServiceTest { From c1dc4c8ff57604466c066a0c2a25d01b266c542d Mon Sep 17 00:00:00 2001 From: straumat Date: Sun, 31 Dec 2023 23:35:08 +0100 Subject: [PATCH 34/57] LocalFileService implementation --- backend/explorer-core/autoconfigure/pom.xml | 5 +++++ .../org/royllo/explorer/core/util/mapper/AssetMapper.java | 1 + .../core/test/core/service/LocalFileServiceTest.java | 4 +++- .../explorer/core/test/core/service/RequestServiceTest.java | 3 +-- .../royllo/explorer/core/test/util/TestWithMockServers.java | 3 +-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/backend/explorer-core/autoconfigure/pom.xml b/backend/explorer-core/autoconfigure/pom.xml index b2dd1cdba..48cdeb501 100644 --- a/backend/explorer-core/autoconfigure/pom.xml +++ b/backend/explorer-core/autoconfigure/pom.xml @@ -89,6 +89,11 @@ + + commons-codec + commons-codec + 1.16.0 + com.bucket4j bucket4j-core diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetMapper.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetMapper.java index b3ea81273..b219ff33b 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetMapper.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetMapper.java @@ -51,6 +51,7 @@ public interface AssetMapper { @Mapping(source = "asset.assetGenesis.version", target = "version") @Mapping(source = "asset.assetGenesis.assetType", target = "type") @Mapping(source = "asset.amount", target = "amount") + @Mapping(target = "metaDataFileName", ignore = true) AssetDTO mapToAssetDTO(DecodedProofResponse.DecodedProof source); default BitcoinTransactionOutputDTO mapToBitcoinTransactionOutputDTO(final String source) { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java index 606f47a8f..1f8b9605b 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java @@ -44,7 +44,7 @@ public void storeAndGetFile() { fail("Error while retrieving the file" + e.getMessage()); } - // We try to retrieve another file that doesn't exists, so we should get a 404 error. + // We try to retrieve another file that doesn't exist, so we should get a 404 error. request = new Request.Builder() .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/non_existing_file.txt") .build(); @@ -54,6 +54,8 @@ public void storeAndGetFile() { fail("Error while retrieving the file" + e.getMessage()); } + // We try to store again the same file. + localFileService.storeFile("Hello World!".getBytes(), "hello.txt"); } } diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java index 2f241909d..d466efd07 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java @@ -30,10 +30,9 @@ import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_TRANSFER; import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_UNSPECIFIED; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; @SpringBootTest -@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) +@DirtiesContext @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.ANY) @DisplayName("RequestService tests") diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java index 4e386605c..d65fa9cd1 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java @@ -42,13 +42,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockserver.integration.ClientAndServer.startClientAndServer; -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; /** * Utility classes for tests. */ @SuppressWarnings("SpellCheckingInspection") -@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) +@DirtiesContext public class TestWithMockServers extends Base { /** Mempool server port. */ From 12433ebb38adc3cbf14c18c33b3e7729d3a563ed Mon Sep 17 00:00:00 2001 From: straumat Date: Tue, 2 Jan 2024 14:58:43 +0100 Subject: [PATCH 35/57] Fix a bug on meta_reveal in tapd mock --- .../main/java/org/royllo/test/TapdData.java | 2 +- .../org/royllo/test/TapdMockServerTest.java | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/util/test/common-test/src/main/java/org/royllo/test/TapdData.java b/util/test/common-test/src/main/java/org/royllo/test/TapdData.java index 7808843e1..5a28156a7 100644 --- a/util/test/common-test/src/main/java/org/royllo/test/TapdData.java +++ b/util/test/common-test/src/main/java/org/royllo/test/TapdData.java @@ -252,7 +252,7 @@ public static void setMockServerRules(final ClientAndServer mockServer) { )) .respond(response().withStatusCode(200) .withContentType(APPLICATION_JSON) - .withBody(entry.getValue().getDecodedProofValuesWithoutMetaReveal().get(index).getJSONResponse())); + .withBody(entry.getValue().getDecodedProofValuesWithMetaReveal().get(index).getJSONResponse())); }); } } diff --git a/util/test/common-test/src/test/java/org/royllo/test/TapdMockServerTest.java b/util/test/common-test/src/test/java/org/royllo/test/TapdMockServerTest.java index f3ed9e3a3..d17e7d683 100644 --- a/util/test/common-test/src/test/java/org/royllo/test/TapdMockServerTest.java +++ b/util/test/common-test/src/test/java/org/royllo/test/TapdMockServerTest.java @@ -50,11 +50,11 @@ public void decodeResponse() { } // Testing with tricky royllo coin. - AssetValue testCoin = TapdData.findAssetValueByAssetId(TRICKY_ROYLLO_COIN_ASSET_ID); - assertNotNull(testCoin); + AssetValue trickyRoylloCoin = TapdData.findAssetValueByAssetId(TRICKY_ROYLLO_COIN_ASSET_ID); + assertNotNull(trickyRoylloCoin); request = new Request.Builder() .url("http://localhost:" + MOCK_SERVER_PORT + "/v1/taproot-assets/proofs/decode") - .post(RequestBody.create(testCoin.getDecodedProofValuesWithoutMetaReveal().get(2).getJSONRequest(), MediaType.parse("application/json; charset=utf-8"))) + .post(RequestBody.create(trickyRoylloCoin.getDecodedProofValuesWithoutMetaReveal().get(2).getJSONRequest(), MediaType.parse("application/json; charset=utf-8"))) .build(); try (Response response = client.newCall(request).execute()) { assertTrue(response.body().string().contains("\"script_key\" : \"023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff\"")); @@ -62,6 +62,19 @@ public void decodeResponse() { fail("Error while calling the mock server"); } + // Testing with tricky royllo coin and meta-reveal. + trickyRoylloCoin = TapdData.findAssetValueByAssetId(TRICKY_ROYLLO_COIN_ASSET_ID); + assertNotNull(trickyRoylloCoin); + request = new Request.Builder() + .url("http://localhost:" + MOCK_SERVER_PORT + "/v1/taproot-assets/proofs/decode") + .post(RequestBody.create(trickyRoylloCoin.getDecodedProofValuesWithMetaReveal().get(0).getJSONRequest(), MediaType.parse("application/json; charset=utf-8"))) + .build(); + try (Response response = client.newCall(request).execute()) { + assertTrue(response.body().string().contains("\"data\" : \"747269636b79526f796c6c6f436f696e20627920526f796c6c6f\"")); + } catch (IOException e) { + fail("Error while calling the mock server"); + } + tapdMockServer.stop(); } From cc85cf05e2cf883901e567ac4f96d4a7084a1ec9 Mon Sep 17 00:00:00 2001 From: straumat Date: Tue, 2 Jan 2024 16:46:10 +0100 Subject: [PATCH 36/57] Creating asset metadata file in batch --- .../{FileService.java => ContentService.java} | 6 +- ...va => LocalFileServiceImplementation.java} | 12 +++- .../core/service/asset/AssetService.java | 5 +- .../asset/AssetServiceImplementation.java | 37 ++++++++--- .../db/changelog/1.0.0/data/data-asset.xml | 2 + .../test/core/service/AssetServiceTest.java | 63 +++++++++++++++++++ .../core/service/LocalFileServiceTest.java | 26 +++++--- .../core/test/util/TestWithMockServers.java | 1 - .../batch/batch/request/AddProofBatch.java | 18 ++++-- .../core/proof/RoylloCoinIntegrationTest.java | 29 +++++++++ .../core/proof/RoylloNFTIntegrationTest.java | 24 +++++++ .../proof/SetOfRoylloNFTIntegrationTest.java | 48 ++++++++++++++ .../TrickyRoylloCoinIntegrationTest.java | 43 ++++++++++++- .../UnknownRoylloCoinIntegrationTest.java | 22 +++++++ .../UnlimitedRoylloCoinIntegrationTest.java | 32 ++++++++++ docs/design/meta-data/README.md | 1 + util/test/common-test/README-roylloCoin.md | 2 +- 17 files changed, 340 insertions(+), 31 deletions(-) rename backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/{FileService.java => ContentService.java} (74%) rename backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/{LocalFileService.java => LocalFileServiceImplementation.java} (80%) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/FileService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/ContentService.java similarity index 74% rename from backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/FileService.java rename to backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/ContentService.java index 526921961..e507aa223 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/FileService.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/ContentService.java @@ -1,12 +1,12 @@ package org.royllo.explorer.core.provider.storage; /** - * File service. + * Content service. */ -public interface FileService { +public interface ContentService { /** - * Store file. + * Store a file. * * @param fileContent file content * @param fileName file name diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java similarity index 80% rename from backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileService.java rename to backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java index 1ade938ac..147163f3b 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileService.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java @@ -16,7 +16,7 @@ * It also includes a web server to serve content and simulate a s3 CDN. */ @Service -public class LocalFileService implements FileService { +public class LocalFileServiceImplementation implements ContentService { /** Web server port. */ public static final int WEB_SERVER_PORT = 9093; @@ -33,10 +33,18 @@ public class LocalFileService implements FileService { /** * Constructor. */ - public LocalFileService() { + public LocalFileServiceImplementation() { // Starting an in-memory file system. fileSystem = Jimfs.newFileSystem(Configuration.unix()); + // For our tests, we create the asset data for RoylloCoin. + try { + Files.write(fileSystem.getPath(".").resolve("24a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d.txt"), + "roylloCoin on mainnet by Royllo".getBytes()); + } catch (Exception e) { + throw new RuntimeException(e); + } + // Starting a web server to serve content. PathResourceManager resourceManager = new PathResourceManager(fileSystem.getPath(".")); webServer = Undertow.builder() diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java index b3bd1227e..0bd9c88f4 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java @@ -32,13 +32,12 @@ public interface AssetService { AssetDTO addAsset(AssetDTO newAsset); /** - * add metadata to an asset. + * Update an asset. * * @param assetId asset id * @param metadata meta data - * @return true if metadata added */ - boolean addMetaDataToAsset(String assetId, String metadata); + void updateAsset(String assetId, String metadata); /** * Get an asset. diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java index f0c02421f..8a9fe8bfc 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java @@ -3,10 +3,16 @@ import io.micrometer.common.util.StringUtils; import lombok.NonNull; import lombok.RequiredArgsConstructor; +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.apache.tika.Tika; +import org.apache.tika.mime.MimeTypeException; +import org.apache.tika.mime.MimeTypes; import org.royllo.explorer.core.domain.asset.Asset; import org.royllo.explorer.core.dto.asset.AssetDTO; import org.royllo.explorer.core.dto.asset.AssetGroupDTO; import org.royllo.explorer.core.dto.bitcoin.BitcoinTransactionOutputDTO; +import org.royllo.explorer.core.provider.storage.ContentService; import org.royllo.explorer.core.repository.asset.AssetRepository; import org.royllo.explorer.core.service.bitcoin.BitcoinService; import org.royllo.explorer.core.util.base.BaseService; @@ -39,6 +45,9 @@ public class AssetServiceImplementation extends BaseService implements AssetServ /** Bitcoin service. */ private final BitcoinService bitcoinService; + /** File service. */ + private final ContentService fileService; + @Override public Page queryAssets(@NonNull final String query, final int page, @@ -139,19 +148,33 @@ public AssetDTO addAsset(@NonNull final AssetDTO newAsset) { } @Override - public boolean addMetaDataToAsset(final String assetId, final String metadata) { + public void updateAsset(final String assetId, final String metadata) { + final Optional assetToUpdate = assetRepository.findByAssetId(assetId); + // We check that the asset exists. - assert assetRepository.findByAssetId(assetId).isPresent() : assetId + " not found"; + assert assetToUpdate.isPresent() : assetId + " not found"; - // We get the content of the file. + // We save the data as a file. + try { + // Decoding (same as using xxd -r -p) + byte[] decodedBytes = Hex.decodeHex(metadata); - // We calculate the hash of the file and compare it with the metaDataHash of the asset in database. + // Detecting the file type. + final String mimeType = new Tika().detect(decodedBytes); + final String extension = MimeTypes.getDefaultMimeTypes().forName(mimeType).getExtension(); - // We use tika to extract the file type of filename. + // Saving the file. + final String fileName = assetId + extension; + fileService.storeFile(decodedBytes, fileName); - // We rename the file to assetId.fileType and set the filename on the asset object. + // Saving the name of the file. + assetToUpdate.get().setMetaDataFileName(fileName); + assetRepository.save(assetToUpdate.get()); + + } catch (DecoderException | MimeTypeException e) { + logger.error("Error decoding and saving metadata {}", e.getMessage()); + } - return true; } @Override diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-asset.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-asset.xml index 717760fcc..92cc80bd1 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-asset.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-asset.xml @@ -18,6 +18,8 @@ + diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java index 5e7e68f23..4345f12b8 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java @@ -1,5 +1,8 @@ package org.royllo.explorer.core.test.core.service; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.royllo.explorer.core.dto.asset.AssetDTO; @@ -14,6 +17,7 @@ import org.springframework.data.domain.Page; import org.springframework.test.annotation.DirtiesContext; +import java.io.IOException; import java.math.BigInteger; import java.util.Optional; import java.util.Set; @@ -26,6 +30,9 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_ID; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER_DTO; import static org.royllo.explorer.core.util.enums.AssetType.NORMAL; @@ -332,6 +339,62 @@ public void addAssetWithAssetGroup() { assertEquals("assetGroup2", asset4Created.getAssetGroup().getTweakedGroupKey()); } + @Test + @DisplayName("updateAsset()") + public void updateAsset() { + // We create an asset. + final AssetDTO asset1 = assetService.addAsset(AssetDTO.builder() + .creator(ANONYMOUS_USER_DTO) + .assetId("asset00000000000000000000000000000000000000000000000000000000001") + .genesisPoint(BitcoinTransactionOutputDTO.builder() + .txId(ROYLLO_COIN_GENESIS_TXID) + .vout(0) + .build()) + .metaDataHash("my meta data hash") + .name("testCoin") + .outputIndex(8) + .version(0) + .type(NORMAL) + .amount(ONE) + .build()); + + // The asset should not have a metadata file. + assertNotNull(asset1.getId()); + assertNotNull(asset1.getAssetId()); + assertNull(asset1.getMetaDataFileName()); + + // Now, we update the asset with the metadata. + final String imageMeta = "89504e470d0a1a0a0000000d4948445200000018000000180806000000e0773df80000006e4944415478da63601805a360d880ff38304d0da78a25ff89c4941b5e682f8b81a9660136c3d12ca1cc029b0c75304636182646ae0528ae07d11ef9da182e078951c5025a04d1c059802e36b47c704451008e29cd07ff89f105552dc011f6d4f50135cb229c41448b229ba25403006cf5f5c3b61b973a0000000049454e44ae426082"; + assetService.updateAsset(asset1.getAssetId(), imageMeta); + + // We test the data. + final Optional assetUpdated = assetService.getAssetByAssetId(asset1.getAssetId()); + assertTrue(assetUpdated.isPresent()); + assertEquals(asset1.getAssetId() + ".png", assetUpdated.get().getMetaDataFileName()); + + // The file should be available. + var client = new OkHttpClient(); + Request request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + assetUpdated.get().getMetaDataFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + + // We test that it gives a 404 error if you search for a non-existing file. + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/NON_EXISTING_FILE.png") + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(404, response.code()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + + } + @Test @DisplayName("getAsset()") public void getAsset() { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java index 1f8b9605b..ea7c5e5de 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java @@ -5,7 +5,7 @@ import okhttp3.Response; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.royllo.explorer.core.provider.storage.LocalFileService; +import org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation; import org.royllo.explorer.core.test.util.TestWithMockServers; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -16,22 +16,22 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import static org.royllo.explorer.core.provider.storage.LocalFileService.WEB_SERVER_HOST; -import static org.royllo.explorer.core.provider.storage.LocalFileService.WEB_SERVER_PORT; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; @SpringBootTest @DirtiesContext -@DisplayName("LocalFileServiceTest tests") +@DisplayName("LocalFileService tests") public class LocalFileServiceTest extends TestWithMockServers { @Autowired - private LocalFileService localFileService; + private LocalFileServiceImplementation localFileServiceImplementation; @Test @DisplayName("Store and get file") public void storeAndGetFile() { // We store a file. - localFileService.storeFile("Hello World!".getBytes(), "hello.txt"); + localFileServiceImplementation.storeFile("Hello World!".getBytes(), "hello.txt"); // We try retrieve hello.txt from the webserver. var client = new OkHttpClient(); @@ -55,7 +55,19 @@ public void storeAndGetFile() { } // We try to store again the same file. - localFileService.storeFile("Hello World!".getBytes(), "hello.txt"); + localFileServiceImplementation.storeFile("Hello World!".getBytes(), "hello.txt"); + + // We test that the 24a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d.txt file for Royllo coin + // exists and the content is correct. + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/24a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d.txt") + .build(); + try (Response response = client.newCall(request).execute()) { + assertTrue(response.body().string().contains("roylloCoin on mainnet by Royllo")); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + } } diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java index d65fa9cd1..909cea822 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java @@ -106,7 +106,6 @@ public void startServers() throws ServerException, InsufficientDataException, Er s3Client.makeBucket(MakeBucketArgs.builder().bucket(S3_BUCKET_NAME).build()); } - } @AfterEach diff --git a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java index d9a5465d9..05acfe50c 100644 --- a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java +++ b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java @@ -7,6 +7,7 @@ import org.royllo.explorer.core.provider.tapd.DecodedProofResponse; import org.royllo.explorer.core.provider.tapd.TapdService; import org.royllo.explorer.core.repository.request.RequestRepository; +import org.royllo.explorer.core.service.asset.AssetService; import org.royllo.explorer.core.service.asset.AssetStateService; import org.royllo.explorer.core.service.proof.ProofService; import org.royllo.explorer.core.service.request.RequestService; @@ -16,8 +17,6 @@ import java.util.Optional; -import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_ISSUANCE; - /** * Batch treating {@link AddProofRequestDTO}. */ @@ -41,6 +40,9 @@ public class AddProofBatch extends BaseBatch { /** Request service. */ private final RequestService requestService; + /** Asset service. */ + private final AssetService assetService; + /** Asset state service. */ private final AssetStateService assetStateService; @@ -86,9 +88,8 @@ public void processRequests() { for (long i = numberOfProofs; i > 0; i--) { // We check if it's an issuance proof, if so, we will ask for meta reveal. - if (PROOF_TYPE_ISSUANCE.equals(request.getProofType())) { - response = tapdService.decode(request.getProof(), i - 1, true).block(); - } else { + response = tapdService.decode(request.getProof(), i - 1, true).block(); + if (response == null || response.getErrorCode() != null) { response = tapdService.decode(request.getProof(), i - 1, false).block(); } @@ -118,6 +119,13 @@ public void processRequests() { logger.info("For request {}, asset state {} already exists", request.getId(), assetStateToCreate.getAssetStateId()); } + // We update the data and the file if we have meta-data. + if (response.getDecodedProof().getMetaReveal() != null) { + logger.info("Creating meta data file"); + assetService.updateAsset(response.getDecodedProof().getAsset().getAssetGenesis().getAssetId(), + response.getDecodedProof().getMetaReveal().getData()); + } + // If not already added, we add the proof. if (!proofAdded) { proofService.addProof(request.getProof(), request.getProofType(), response); diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloCoinIntegrationTest.java index 7eadab89a..dddb1ff41 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloCoinIntegrationTest.java @@ -1,10 +1,15 @@ package org.royllo.explorer.batch.test.core.proof; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.royllo.explorer.batch.batch.request.AddProofBatch; +import org.royllo.explorer.core.dto.asset.AssetDTO; import org.royllo.explorer.core.dto.request.AddProofRequestDTO; import org.royllo.explorer.core.dto.request.RequestDTO; +import org.royllo.explorer.core.service.asset.AssetService; import org.royllo.explorer.core.service.request.RequestService; import org.royllo.explorer.core.test.util.TestWithMockServers; import org.springframework.beans.factory.annotation.Autowired; @@ -12,14 +17,19 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; +import java.io.IOException; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.enums.RequestStatus.FAILURE; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; +import static org.royllo.test.TapdData.ROYLLO_COIN_ASSET_ID; import static org.royllo.test.TapdData.ROYLLO_COIN_FROM_TEST; @SpringBootTest @@ -34,6 +44,9 @@ public class RoylloCoinIntegrationTest extends TestWithMockServers { @Autowired AddProofBatch addProofBatch; + @Autowired + AssetService assetService; + @Test @DisplayName("Process proof") public void processProof() { @@ -53,6 +66,22 @@ public void processProof() { assertFalse(myRoylloCoinRequestTreated.get().isSuccessful()); assertEquals(FAILURE, myRoylloCoinRequestTreated.get().getStatus()); assertEquals("This proof is already registered with proof id: " + ROYLLO_COIN_PROOF_ID, myRoylloCoinRequestTreated.get().getErrorMessage()); + + // We should have the asset metadata in our database and files. + var client = new OkHttpClient(); + Optional asset = assetService.getAssetByAssetId(ROYLLO_COIN_ASSET_ID); + assertTrue(asset.isPresent()); + assertNotNull(asset.get().getMetaDataFileName()); + Request request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + asset.get().getMetaDataFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals("roylloCoin on mainnet by Royllo", response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + } } diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java index b876582af..9ca66629b 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java @@ -1,5 +1,8 @@ package org.royllo.explorer.batch.test.core.proof; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.royllo.explorer.batch.batch.request.AddProofBatch; @@ -22,12 +25,16 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; +import java.io.IOException; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; import static org.royllo.explorer.core.util.enums.RequestStatus.SUCCESS; import static org.royllo.explorer.core.util.mapper.AssetMapperDecorator.ALIAS_LENGTH; @@ -145,6 +152,23 @@ public void processProof() { ROYLLO_NFT_ANCHOR_1_TXID, ROYLLO_NFT_ANCHOR_1_VOUT, ROYLLO_NFT_FROM_TEST.getDecodedProofResponse(0).getAsset().getScriptKey()); + + // ============================================================================================================= + // We check meta-data file for our three assets + var client = new OkHttpClient(); + + // Asset 1. + assertNotNull(asset.get().getMetaDataFileName()); + Request request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + asset.get().getMetaDataFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals("roylloNFT by Royllo", response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + } } diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java index b2f498fd9..7b47d4e64 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java @@ -1,5 +1,8 @@ package org.royllo.explorer.batch.test.core.proof; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.royllo.explorer.batch.batch.request.AddProofBatch; @@ -21,12 +24,16 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; +import java.io.IOException; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; import static org.royllo.explorer.core.util.enums.RequestStatus.SUCCESS; import static org.royllo.explorer.core.util.mapper.AssetMapperDecorator.ALIAS_LENGTH; @@ -242,6 +249,47 @@ public void processProof() { SET_OF_ROYLLO_NFT_ANCHOR_3_TXID, SET_OF_ROYLLO_NFT_ANCHOR_3_VOUT, SET_OF_ROYLLO_NFT_3_FROM_TEST.getDecodedProofResponse(0).getAsset().getScriptKey()); + + // ============================================================================================================= + // We check meta-data file for our three assets + var client = new OkHttpClient(); + + // Asset 1. + assertNotNull(asset1.get().getMetaDataFileName()); + Request request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + asset1.get().getMetaDataFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals("setOfRoylloNFT by Royllo", response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + + // Asset 2. + assertNotNull(asset2.get().getMetaDataFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + asset2.get().getMetaDataFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals("setOfRoylloNFT2 by Royllo", response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + + // Asset 3. + assertNotNull(asset3.get().getMetaDataFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + asset3.get().getMetaDataFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals("setOfRoylloNFT3 by Royllo", response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + } } diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java index 5fa8675f7..cd7a82427 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java @@ -1,5 +1,8 @@ package org.royllo.explorer.batch.test.core.proof; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.royllo.explorer.batch.batch.request.AddProofBatch; @@ -21,12 +24,16 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; +import java.io.IOException; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; import static org.royllo.explorer.core.util.enums.RequestStatus.SUCCESS; import static org.royllo.test.MempoolData.SET_OF_ROYLLO_NFT_ANCHOR_1_VOUT; @@ -246,6 +253,21 @@ public void processProofs() { TRICKY_ROYLLO_COIN_3_ASSET_STATE_ID); verifyAssetState(assetStateService.getAssetStateByAssetStateId(TRICKY_ROYLLO_COIN_4_ASSET_STATE_ID).get(), TRICKY_ROYLLO_COIN_4_ASSET_STATE_ID); + + // ============================================================================================================= + // We check meta-data file for TRICKY_ROYLLO_COIN_ASSET_ID. + var client = new OkHttpClient(); + assertNotNull(asset.get().getMetaDataFileName()); + Request request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + asset.get().getMetaDataFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals("trickyRoylloCoin by Royllo", response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + } @Test @@ -279,7 +301,7 @@ public void processProofsStartingFromTheLastOne() { final long assetStateCountBefore = assetStateRepository.count(); // ============================================================================================================= - // We add the three proofs. + // We add the latest proof. AddProofRequestDTO addTrickyCoinProof3Request = requestService.createAddProofRequest(TRICKY_ROYLLO_COIN_3_RAW_PROOF); assertNotNull(addTrickyCoinProof3Request); assertEquals(OPENED, addTrickyCoinProof3Request.getStatus()); @@ -318,7 +340,9 @@ public void processProofsStartingFromTheLastOne() { assertEquals(assetStateCountBefore + 3, assetStateRepository.count()); // Verify asset. - verifyAsset(assetService.getAssetByAssetId(TRICKY_ROYLLO_COIN_ASSET_ID).get(), TRICKY_ROYLLO_COIN_ASSET_ID); + Optional asset = assetService.getAssetByAssetId(TRICKY_ROYLLO_COIN_ASSET_ID); + assertTrue(asset.isPresent()); + verifyAsset(asset.get(), TRICKY_ROYLLO_COIN_ASSET_ID); // Verify asset states. verifyAssetState(assetStateService.getAssetStateByAssetStateId(TRICKY_ROYLLO_COIN_1_ASSET_STATE_ID).get(), @@ -327,6 +351,21 @@ public void processProofsStartingFromTheLastOne() { TRICKY_ROYLLO_COIN_3_ASSET_STATE_ID); verifyAssetState(assetStateService.getAssetStateByAssetStateId(TRICKY_ROYLLO_COIN_4_ASSET_STATE_ID).get(), TRICKY_ROYLLO_COIN_4_ASSET_STATE_ID); + + // ============================================================================================================= + // We check meta-data file for TRICKY_ROYLLO_COIN_ASSET_ID. + var client = new OkHttpClient(); + assertNotNull(asset.get().getMetaDataFileName()); + Request request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + asset.get().getMetaDataFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals("trickyRoylloCoin by Royllo", response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + } } diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java index 048f14cb2..1ba50550e 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java @@ -1,5 +1,8 @@ package org.royllo.explorer.batch.test.core.proof; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.royllo.explorer.batch.batch.request.AddProofBatch; @@ -22,12 +25,16 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; +import java.io.IOException; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; import static org.royllo.explorer.core.util.enums.RequestStatus.SUCCESS; import static org.royllo.test.MempoolData.UNKNOWN_ROYLLO_COIN_ANCHOR_1_TXID; @@ -141,6 +148,21 @@ public void processProof() { UNKNOWN_ROYLLO_COIN_ANCHOR_1_TXID, UNKNOWN_ROYLLO_COIN_ANCHOR_1_VOUT, UNKNOWN_ROYLLO_COIN_FROM_TEST.getDecodedProofResponse(0).getAsset().getScriptKey()); + + // ============================================================================================================= + // We check meta-data file for UNKNOWN_ROYLLO_COIN_ASSET_ID. + var client = new OkHttpClient(); + assertNotNull(asset.get().getMetaDataFileName()); + Request request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + asset.get().getMetaDataFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals("unknownRoylloCoin by Royllo", response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + } } diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java index a55e0aa23..4be50c308 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java @@ -1,5 +1,8 @@ package org.royllo.explorer.batch.test.core.proof; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.royllo.explorer.batch.batch.request.AddProofBatch; @@ -22,12 +25,16 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; +import java.io.IOException; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; import static org.royllo.explorer.core.util.enums.RequestStatus.SUCCESS; import static org.royllo.explorer.core.util.mapper.AssetMapperDecorator.ALIAS_LENGTH; @@ -191,6 +198,31 @@ public void processProof() { assertEquals(ALIAS_LENGTH, asset2.get().getAssetIdAlias().length()); assertNotNull(asset2.get().getAssetGroup()); assertEquals(UNLIMITED_ROYLLO_COIN_TWEAKED_GROUP_KEY, asset2.get().getAssetGroup().getTweakedGroupKey()); + + // We check if we have the meta-data file for UNLIMITED_ROYLLO_COIN_1_ASSET_ID. + var client = new OkHttpClient(); + assertNotNull(asset1.get().getMetaDataFileName()); + Request request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + asset1.get().getMetaDataFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals("unlimitedRoylloCoin emission 1 by Royllo", response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + + // And then for UNLIMITED_ROYLLO_COIN_2_ASSET_ID. + assertNotNull(asset2.get().getMetaDataFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + asset2.get().getMetaDataFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals("unlimitedRoylloCoin emission 2 by Royllo", response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } } } diff --git a/docs/design/meta-data/README.md b/docs/design/meta-data/README.md index ce0ea1858..0275191f5 100644 --- a/docs/design/meta-data/README.md +++ b/docs/design/meta-data/README.md @@ -16,6 +16,7 @@ We then call the decode method: ``` We retrieve the meta field and we do `xxd -r -p` on it +726f796c6c6f436f696e206f6e206d61696e6e657420627920526f796c6c6f ## Getting meta data diff --git a/util/test/common-test/README-roylloCoin.md b/util/test/common-test/README-roylloCoin.md index 43334227a..f70fc5103 100644 --- a/util/test/common-test/README-roylloCoin.md +++ b/util/test/common-test/README-roylloCoin.md @@ -1,6 +1,6 @@ # roylloCoin -**This coin has been minted on the mainnet** +**This coin has been minted on the mainnet with the following meta: `roylloCoin on mainnet by Royllo`** ```json { From 5617570cdd3737168325e87444cb12b0a303181a Mon Sep 17 00:00:00 2001 From: straumat Date: Tue, 2 Jan 2024 18:17:37 +0100 Subject: [PATCH 37/57] S3 implementation with tests --- .../LocalFileServiceImplementation.java | 4 +- .../storage/S3ServiceImplementation.java | 68 +++++++++ .../explorer/core/test/core/util/S3Test.java | 49 ------- .../storage/S3ServiceImplementationTest.java | 133 ++++++++++++++++++ .../integration/storage/package-info.java | 4 + .../core/test/util/TestWithMockServers.java | 47 +------ 6 files changed, 209 insertions(+), 96 deletions(-) create mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/S3ServiceImplementation.java delete mode 100644 backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/S3Test.java create mode 100644 backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/storage/S3ServiceImplementationTest.java create mode 100644 backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/storage/package-info.java diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java index 147163f3b..303bb03a6 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java @@ -6,16 +6,18 @@ import io.undertow.server.handlers.resource.PathResourceManager; import io.undertow.server.handlers.resource.ResourceHandler; import jakarta.annotation.PreDestroy; +import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; import java.nio.file.FileSystem; import java.nio.file.Files; /** - * Local file service - Used for local development. + * Content service - Local file implementation - Used for local development. * It also includes a web server to serve content and simulate a s3 CDN. */ @Service +@Profile("!s3-storage") public class LocalFileServiceImplementation implements ContentService { /** Web server port. */ diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/S3ServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/S3ServiceImplementation.java new file mode 100644 index 000000000..f143a7599 --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/S3ServiceImplementation.java @@ -0,0 +1,68 @@ +package org.royllo.explorer.core.provider.storage; + +import io.minio.MinioClient; +import io.minio.PutObjectArgs; +import lombok.NonNull; +import org.apache.commons.io.IOUtils; +import org.apache.tika.Tika; +import org.royllo.explorer.core.util.base.BaseService; +import org.royllo.explorer.core.util.parameters.S3Parameters; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; + +import static java.nio.charset.StandardCharsets.UTF_8; + + +/** + * Content service - S3 implementation. + */ +@Service +@Profile("s3-storage") +@SuppressWarnings("checkstyle:DesignForExtension") +public class S3ServiceImplementation extends BaseService implements ContentService { + + /** Part size. */ + public static final int PART_SIZE = 10485760; + + /** S3 parameters. */ + private S3Parameters s3Parameters; + + /** + * Constructor. + * + * @param newS3Parameters S3 parameters. + */ + public S3ServiceImplementation(final S3Parameters newS3Parameters) { + this.s3Parameters = newS3Parameters; + } + + /** + * Update S3 parameters. + * + * @param newS3Parameters new S3 parameters. + */ + public void updateS3Parameters(final S3Parameters newS3Parameters) { + this.s3Parameters = newS3Parameters; + } + + @Override + public void storeFile(final byte[] fileContent, @NonNull final String fileName) { + // Creating a client. + MinioClient minioClient = MinioClient.builder() + .endpoint(s3Parameters.getEndpointURL()) + .credentials(s3Parameters.getAccessKey(), s3Parameters.getSecretKey()) + .build(); + + // Adding the file to the bucket. + try { + minioClient.putObject(PutObjectArgs.builder() + .bucket(s3Parameters.getBucketName()) + .object(fileName).stream(IOUtils.toInputStream(new String(fileContent), UTF_8), -1, PART_SIZE) + .contentType(new Tika().detect(fileContent)) + .build()); + } catch (Exception e) { + logger.error("Error while storing file {} in S3: {}", fileName, e.getMessage()); + } + } + +} diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/S3Test.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/S3Test.java deleted file mode 100644 index bf3e69081..000000000 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/util/S3Test.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.royllo.explorer.core.test.core.util; - -import io.minio.BucketExistsArgs; -import io.minio.MinioClient; -import io.minio.errors.MinioException; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.royllo.explorer.core.test.util.TestWithMockServers; -import org.royllo.explorer.core.util.parameters.S3Parameters; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.DirtiesContext; - -import java.io.IOException; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; - -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -/** - * S3 test. - */ -@SpringBootTest -@DirtiesContext -@DisplayName("S3 tests") -public class S3Test extends TestWithMockServers { - - @Autowired - private S3Parameters s3Parameters; - - @Test - @DisplayName("S3 connection test") - public void connectionTest() { - // Getting a connexion. - MinioClient minioClient = MinioClient.builder() - .endpoint(s3MockServer.getS3URL()) - .credentials(s3Parameters.getAccessKey(), s3Parameters.getSecretKey()) - .build(); - - // Testing operations. - try { - assertTrue(minioClient.bucketExists(BucketExistsArgs.builder().bucket(s3Parameters.getBucketName()).build())); - } catch (MinioException | InvalidKeyException | IOException | NoSuchAlgorithmException e) { - fail("S3 connection test failed: " + e.getMessage()); - } - } - -} diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/storage/S3ServiceImplementationTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/storage/S3ServiceImplementationTest.java new file mode 100644 index 000000000..84f4769df --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/storage/S3ServiceImplementationTest.java @@ -0,0 +1,133 @@ +package org.royllo.explorer.core.test.integration.storage; + +import io.minio.BucketExistsArgs; +import io.minio.MakeBucketArgs; +import io.minio.MinioClient; +import io.minio.StatObjectArgs; +import io.minio.errors.ErrorResponseException; +import io.minio.errors.InsufficientDataException; +import io.minio.errors.InternalException; +import io.minio.errors.InvalidResponseException; +import io.minio.errors.MinioException; +import io.minio.errors.ServerException; +import io.minio.errors.XmlParserException; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.royllo.explorer.core.provider.storage.ContentService; +import org.royllo.explorer.core.provider.storage.S3ServiceImplementation; +import org.royllo.explorer.core.test.util.TestWithMockServers; +import org.royllo.explorer.core.util.parameters.S3Parameters; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.ActiveProfiles; +import org.testcontainers.containers.MinIOContainer; + +import java.io.IOException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + +/** + * S3 test. + */ +@SpringBootTest +@DirtiesContext +@DisplayName("S3 tests") +@ActiveProfiles({"s3-storage"}) +public class S3ServiceImplementationTest extends TestWithMockServers { + + /** S3 minio image. */ + public static final String MINIO_RELEASE = "minio/minio:RELEASE.2023-09-04T19-57-37Z"; + + /** S3 bucket name. */ + public static final String S3_BUCKET_NAME = "royllo-explorer"; + + /** S3 user name. */ + public static final String S3_USER_NAME = "royllo-access-key"; + + /** S3 password. */ + public static final String S3_PASSWORD = "royllo-secret-key"; + + /** S3 mock server. */ + public static MinIOContainer s3MockServer; + + @Autowired + private ContentService contentService; + + @Test + @DisplayName("S3 implementation test") + public void s3ImplementationTest() { + // Getting a connexion to do some verification. + MinioClient minioClient = MinioClient.builder() + .endpoint(s3MockServer.getS3URL()) + .credentials(S3_USER_NAME, S3_PASSWORD) + .build(); + + // Checking that the bucket exists. + try { + assertTrue(minioClient.bucketExists(BucketExistsArgs.builder().bucket(S3_BUCKET_NAME).build())); + } catch (MinioException | InvalidKeyException | IOException | NoSuchAlgorithmException e) { + fail("S3 bucket not found: " + e.getMessage()); + } + + // Giving to the S3 service the new parameters. + S3Parameters parameters = new S3Parameters(); + parameters.setAccessKey(S3_USER_NAME); + parameters.setSecretKey(S3_PASSWORD); + parameters.setBucketName(S3_BUCKET_NAME); + parameters.setEndpointURL(s3MockServer.getS3URL()); + final S3ServiceImplementation s3ServiceImplementation = (S3ServiceImplementation) contentService; + s3ServiceImplementation.updateS3Parameters(parameters); + + // Checking that a file doesn't exist in minio. + try { + minioClient.statObject(StatObjectArgs.builder().bucket(S3_BUCKET_NAME).object("test.txt").build()); + fail("The file should not exist"); + } catch (MinioException | InvalidKeyException | IOException | NoSuchAlgorithmException e) { + // The file doesn't exist, so we should have an exception. + } + + // Adding the file. + contentService.storeFile("test".getBytes(), "test.txt"); + + // Checking that the file now exists. + try { + minioClient.statObject(StatObjectArgs.builder().bucket(S3_BUCKET_NAME).object("test.txt").build()); + } catch (MinioException | InvalidKeyException | IOException | NoSuchAlgorithmException e) { + fail("The file should now exist"); + } + + // Adding the file (again) - Checking there is no exception. + contentService.storeFile("test".getBytes(), "test.txt"); + } + + @BeforeAll + public static void startS3MockServer() throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { + // Starting S3 mock server; + s3MockServer = new MinIOContainer(MINIO_RELEASE).withUserName(S3_USER_NAME).withPassword(S3_PASSWORD); + s3MockServer.start(); + + // Creating the client. + MinioClient s3Client = MinioClient.builder() + .endpoint(s3MockServer.getS3URL()) + .credentials(S3_USER_NAME, S3_PASSWORD) + .build(); + + // Creating the bucket if it doesn't exist. + if (!s3Client.bucketExists(BucketExistsArgs.builder().bucket(S3_BUCKET_NAME).build())) { + s3Client.makeBucket(MakeBucketArgs.builder().bucket(S3_BUCKET_NAME).build()); + } + } + + @AfterAll + public static void stopS3MockServer() { + // Stopping S3 mock server. + s3MockServer.stop(); + } + +} diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/storage/package-info.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/storage/package-info.java new file mode 100644 index 000000000..6e9a3c29b --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/storage/package-info.java @@ -0,0 +1,4 @@ +/** + * Storage tests. + */ +package org.royllo.explorer.core.test.integration.storage; \ No newline at end of file diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java index 909cea822..52a71503e 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/util/TestWithMockServers.java @@ -1,14 +1,5 @@ package org.royllo.explorer.core.test.util; -import io.minio.BucketExistsArgs; -import io.minio.MakeBucketArgs; -import io.minio.MinioClient; -import io.minio.errors.ErrorResponseException; -import io.minio.errors.InsufficientDataException; -import io.minio.errors.InternalException; -import io.minio.errors.InvalidResponseException; -import io.minio.errors.ServerException; -import io.minio.errors.XmlParserException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.mockserver.integration.ClientAndServer; @@ -24,11 +15,8 @@ import org.royllo.test.tapd.asset.AssetValue; import org.royllo.test.tapd.asset.DecodedProofValueResponse; import org.springframework.test.annotation.DirtiesContext; -import org.testcontainers.containers.MinIOContainer; import javax.xml.bind.DatatypeConverter; -import java.io.IOException; -import java.security.InvalidKeyException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.time.Instant; @@ -56,29 +44,14 @@ public class TestWithMockServers extends Base { /** Tapd server port. */ public static final int TAPD_MOCK_SERVER_PORT = 9092; - /** S3 minio image. */ - public static final String MINIO_RELEASE = "minio/minio:RELEASE.2023-09-04T19-57-37Z"; - - /** S3 bucket name. */ - public static final String S3_BUCKET_NAME = "royllo-explorer"; - - /** S3 user name. */ - public static final String S3_USER_NAME = "royllo-access-key"; - - /** S3 password. */ - public static final String S3_PASSWORD = "royllo-secret-key"; - /** Mempool mock server. */ private ClientAndServer mempoolMockServer; /** Tapd mock server. */ private ClientAndServer tapdMockServer; - /** S3 mock server. */ - public MinIOContainer s3MockServer; - @BeforeEach - public void startServers() throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { + public void startServers() { // ============================================================================================================= // Mempool mock server. @@ -89,30 +62,12 @@ public void startServers() throws ServerException, InsufficientDataException, Er // Tapd mock server. tapdMockServer = startClientAndServer(TAPD_MOCK_SERVER_PORT); TapdData.setMockServerRules(tapdMockServer); - - // ============================================================================================================= - // S3 mock server; - s3MockServer = new MinIOContainer(MINIO_RELEASE).withUserName(S3_USER_NAME).withPassword(S3_PASSWORD); - s3MockServer.start(); - - // Creating the client. - MinioClient s3Client = MinioClient.builder() - .endpoint(s3MockServer.getS3URL()) - .credentials(S3_USER_NAME, S3_PASSWORD) - .build(); - - // Creating the bucket if it doesn't exist. - if (!s3Client.bucketExists(BucketExistsArgs.builder().bucket(S3_BUCKET_NAME).build())) { - s3Client.makeBucket(MakeBucketArgs.builder().bucket(S3_BUCKET_NAME).build()); - } - } @AfterEach public void stopServers() { mempoolMockServer.stop(); tapdMockServer.stop(); - //s3MockServer.stop(); } /** From 2c2a25a84adbb3efbc98b8358eb5400199354357 Mon Sep 17 00:00:00 2001 From: straumat Date: Tue, 2 Jan 2024 19:33:46 +0100 Subject: [PATCH 38/57] Label change --- .../src/main/resources/i18n/statistic.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/servers/explorer-web/src/main/resources/i18n/statistic.properties b/backend/servers/explorer-web/src/main/resources/i18n/statistic.properties index 9d48f2b57..ec998fc44 100644 --- a/backend/servers/explorer-web/src/main/resources/i18n/statistic.properties +++ b/backend/servers/explorer-web/src/main/resources/i18n/statistic.properties @@ -2,6 +2,6 @@ # Statistics # # Global statistics. -statistics.global.universeCount=Universe count -statistics.global.assetCount=Asset count -statistics.global.assetStateCount=Asset state count \ No newline at end of file +statistics.global.universeCount=Universe +statistics.global.assetCount=Asset +statistics.global.assetStateCount=Asset state \ No newline at end of file From 35846bb6f02deb76e9d72ace4686001d7b21390b Mon Sep 17 00:00:00 2001 From: straumat Date: Tue, 2 Jan 2024 22:11:59 +0100 Subject: [PATCH 39/57] Improving logs --- .../batch/batch/request/AddProofBatch.java | 2 + .../src/main/resources/application.properties | 7 +++ docker-compose.yml | 50 +++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java index 05acfe50c..bba74d9c2 100644 --- a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java +++ b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java @@ -124,6 +124,8 @@ public void processRequests() { logger.info("Creating meta data file"); assetService.updateAsset(response.getDecodedProof().getAsset().getAssetGenesis().getAssetId(), response.getDecodedProof().getMetaReveal().getData()); + } else { + logger.info("No meta data file to create"); } // If not already added, we add the proof. diff --git a/backend/servers/explorer-web/src/main/resources/application.properties b/backend/servers/explorer-web/src/main/resources/application.properties index 48c205c28..4be47743c 100644 --- a/backend/servers/explorer-web/src/main/resources/application.properties +++ b/backend/servers/explorer-web/src/main/resources/application.properties @@ -16,6 +16,13 @@ spring.datasource.username=sa spring.datasource.password= # # ====================================================================================================================== +# S3 service configuration. +s3.access-key=royllo-access-key +s3.secret-key=royllo-secret-key +s3.bucket-name=royllo-explorer-s3-asset-bucket +s3.endpoint-url=https://s3.amazonaws.com +# +# ====================================================================================================================== # Cache configuration. spring.cache.type=caffeine # diff --git a/docker-compose.yml b/docker-compose.yml index 40618d970..0878e1c1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,7 @@ networks: # You can list them with the command: 'docker volume ls' volumes: royllo-explorer-database-volume: + royllo-explorer-storage-volume: # ====================================================================================================================== # Services (Docker images). @@ -35,6 +36,40 @@ services: - POSTGRES_PASSWORD=Q5QnE5S%Y]qt7 # ==================================================================================================================== + # Storage service used to store content ( https://hub.docker.com/r/minio/minio ). + royllo-explorer-storage-server: + image: minio/minio:RELEASE.2024-01-01T16-36-33Z.fips + restart: always + networks: + - royllo-explorer-network + ports: + - "9000:9000" + - "9001:9001" + volumes: + - royllo-explorer-storage-volume:/data + environment: + - TZ=Europe/Paris + - MINIO_ROOT_USER=royllo_explorer_username + - MINIO_ROOT_PASSWORD=t?T:X4$(L!D-7gYaQb^#hZ + command: server --console-address ":9001" /data + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ] + interval: 30s + timeout: 20s + retries: 3 + + createRoylloBucket: + image: minio/mc:RELEASE.2023-12-29T20-15-29Z.fips + depends_on: + - royllo-explorer-storage-server + entrypoint: > + /bin/sh -c " + /usr/bin/mc alias set myminio http://minio:9000 royllo_explorer_username t?T:X4$(L!D-7gYaQb^#hZ; + /usr/bin/mc mb myminio/royllo-explorer; + /usr/bin/mc anonymous set public myminio/royllo-explorer; + exit 0; + " + # ==================================================================================================================== # Royllo explorer batch server ( https://hub.docker.com/r/royllo/explorer-batch ). royllo-explorer-batch-server: image: royllo/explorer-batch:latest @@ -52,6 +87,11 @@ services: - TAPD_API_BASE-URL=https://testnet.universe.royllo.org:8089 - TAPD_API_MACAROON=0201047461706402A301030A1004650A26E6928A4C60E007BDA107389E1201301A180A09616464726573736573120472656164120577726974651A150A06617373657473120472656164120577726974651A150A066461656D6F6E120472656164120577726974651A130A046D696E74120472656164120577726974651A150A0670726F6F6673120472656164120577726974651A170A08756E6976657273651204726561641205777269746500000620A28CB923A36B8B86E03C47E5275CA31104A6065401227FFD068BC545DFAB383F - SPRING_LIQUIBASE_ENABLED=true + - SPRING_PROFILES_ACTIVE=s3-storage + - S3_ACCESS_KEY=royllo_explorer_username + - S3_SECRET_KEY=t?T:X4$(L!D-7gYaQb^#hZ + - S3_BUCKET_NAME=royllo-explorer + - S3_ENDPOINTURL=https://royllo-explorer-storage-server:9000 # ==================================================================================================================== # Royllo explorer API server ( https://hub.docker.com/r/royllo/explorer-api ). @@ -70,6 +110,11 @@ services: - SPRING_DATASOURCE_USERNAME=royllo_explorer_username - SPRING_DATASOURCE_PASSWORD=Q5QnE5S%Y]qt7 - SPRING_LIQUIBASE_ENABLED=false + - SPRING_PROFILES_ACTIVE=s3-storage + - S3_ACCESS_KEY=royllo_explorer_username + - S3_SECRET_KEY=t?T:X4$(L!D-7gYaQb^#hZ + - S3_BUCKET_NAME=royllo-explorer + - S3_ENDPOINTURL=https://royllo-explorer-storage-server:9000 # ==================================================================================================================== # Royllo explorer web server ( https://hub.docker.com/r/royllo/explorer-web ). @@ -88,3 +133,8 @@ services: - SPRING_DATASOURCE_USERNAME=royllo_explorer_username - SPRING_DATASOURCE_PASSWORD=Q5QnE5S%Y]qt7 - SPRING_LIQUIBASE_ENABLED=false + - SPRING_PROFILES_ACTIVE=s3-storage + - S3_ACCESS_KEY=royllo_explorer_username + - S3_SECRET_KEY=t?T:X4$(L!D-7gYaQb^#hZ + - S3_BUCKET_NAME=royllo-explorer + - S3_ENDPOINTURL=https://royllo-explorer-storage-server:9000 From 5fd4c14ce74be12156a0005718dd5fe66ff1ea48 Mon Sep 17 00:00:00 2001 From: straumat Date: Tue, 2 Jan 2024 22:55:40 +0100 Subject: [PATCH 40/57] Docker-compose with minio --- docker-compose.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0878e1c1b..6438c601e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,8 +49,8 @@ services: - royllo-explorer-storage-volume:/data environment: - TZ=Europe/Paris - - MINIO_ROOT_USER=royllo_explorer_username - - MINIO_ROOT_PASSWORD=t?T:X4$(L!D-7gYaQb^#hZ + - MINIO_ROOT_USER=royllo + - MINIO_ROOT_PASSWORD=tTX4LD7gYaQbhZ command: server --console-address ":9001" /data healthcheck: test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ] @@ -60,11 +60,14 @@ services: createRoylloBucket: image: minio/mc:RELEASE.2023-12-29T20-15-29Z.fips + networks: + - royllo-explorer-network depends_on: - royllo-explorer-storage-server entrypoint: > /bin/sh -c " - /usr/bin/mc alias set myminio http://minio:9000 royllo_explorer_username t?T:X4$(L!D-7gYaQb^#hZ; + sleep 10; + /usr/bin/mc alias set myminio http://royllo-explorer-storage-server:9000 royllo tTX4LD7gYaQbhZ; /usr/bin/mc mb myminio/royllo-explorer; /usr/bin/mc anonymous set public myminio/royllo-explorer; exit 0; @@ -88,10 +91,10 @@ services: - TAPD_API_MACAROON=0201047461706402A301030A1004650A26E6928A4C60E007BDA107389E1201301A180A09616464726573736573120472656164120577726974651A150A06617373657473120472656164120577726974651A150A066461656D6F6E120472656164120577726974651A130A046D696E74120472656164120577726974651A150A0670726F6F6673120472656164120577726974651A170A08756E6976657273651204726561641205777269746500000620A28CB923A36B8B86E03C47E5275CA31104A6065401227FFD068BC545DFAB383F - SPRING_LIQUIBASE_ENABLED=true - SPRING_PROFILES_ACTIVE=s3-storage - - S3_ACCESS_KEY=royllo_explorer_username - - S3_SECRET_KEY=t?T:X4$(L!D-7gYaQb^#hZ + - S3_ACCESS_KEY=royllo + - S3_SECRET_KEY=tTX4LD7gYaQbhZ - S3_BUCKET_NAME=royllo-explorer - - S3_ENDPOINTURL=https://royllo-explorer-storage-server:9000 + - S3_ENDPOINTURL=http://royllo-explorer-storage-server:9000 # ==================================================================================================================== # Royllo explorer API server ( https://hub.docker.com/r/royllo/explorer-api ). @@ -111,10 +114,10 @@ services: - SPRING_DATASOURCE_PASSWORD=Q5QnE5S%Y]qt7 - SPRING_LIQUIBASE_ENABLED=false - SPRING_PROFILES_ACTIVE=s3-storage - - S3_ACCESS_KEY=royllo_explorer_username - - S3_SECRET_KEY=t?T:X4$(L!D-7gYaQb^#hZ + - S3_ACCESS_KEY=royllo + - S3_SECRET_KEY=tTX4LD7gYaQbhZ - S3_BUCKET_NAME=royllo-explorer - - S3_ENDPOINTURL=https://royllo-explorer-storage-server:9000 + - S3_ENDPOINTURL=http://royllo-explorer-storage-server:9000 # ==================================================================================================================== # Royllo explorer web server ( https://hub.docker.com/r/royllo/explorer-web ). @@ -134,7 +137,7 @@ services: - SPRING_DATASOURCE_PASSWORD=Q5QnE5S%Y]qt7 - SPRING_LIQUIBASE_ENABLED=false - SPRING_PROFILES_ACTIVE=s3-storage - - S3_ACCESS_KEY=royllo_explorer_username - - S3_SECRET_KEY=t?T:X4$(L!D-7gYaQb^#hZ + - S3_ACCESS_KEY=royllo + - S3_SECRET_KEY=tTX4LD7gYaQbhZ - S3_BUCKET_NAME=royllo-explorer - - S3_ENDPOINTURL=https://royllo-explorer-storage-server:9000 + - S3_ENDPOINTURL=http://royllo-explorer-storage-server:9000 From 76247379f1aeae286d3b8f90b539481f02c46668 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 07:54:45 +0000 Subject: [PATCH 41/57] Bump daisyui from 4.4.20 to 4.5.0 in /backend/servers/explorer-web Bumps [daisyui](https://github.com/saadeghi/daisyui) from 4.4.20 to 4.5.0. - [Release notes](https://github.com/saadeghi/daisyui/releases) - [Changelog](https://github.com/saadeghi/daisyui/blob/master/CHANGELOG.md) - [Commits](https://github.com/saadeghi/daisyui/compare/v4.4.20...v4.5.0) --- updated-dependencies: - dependency-name: daisyui dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../servers/explorer-web/package-lock.json | 14 +- backend/servers/explorer-web/package.json | 2 +- backend/servers/explorer-web/yarn.lock | 197 ++++++++---------- 3 files changed, 100 insertions(+), 113 deletions(-) diff --git a/backend/servers/explorer-web/package-lock.json b/backend/servers/explorer-web/package-lock.json index 9f2a25a89..66958c871 100644 --- a/backend/servers/explorer-web/package-lock.json +++ b/backend/servers/explorer-web/package-lock.json @@ -13,7 +13,7 @@ "autoprefixer": "^10.4.16", "browser-sync": "^2.29.3", "cssnano": "^6.0.2", - "daisyui": "^4.4.20", + "daisyui": "^4.5.0", "mkdirp": "^3.0.1", "ncp": "^2.0.0", "npm-run-all": "^4.1.5", @@ -1069,9 +1069,9 @@ } }, "node_modules/daisyui": { - "version": "4.4.20", - "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.4.20.tgz", - "integrity": "sha512-AR2fuFVVLHVTdbkV+XWAqjtymEoxXksrsEMkdzPQo2wANtWjSXuODUzePNade64gJ0Y2CdQtiQkaZI7fWcp13g==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.5.0.tgz", + "integrity": "sha512-RWQCPQ0vBUaxGy768O7Ku8SRQgwdoto1lDzuKeVOcMtYghuSbUY7NoPoMK+k8JH4s1J02OvpNAgtB9MeKpZIwg==", "dev": true, "dependencies": { "css-selector-tokenizer": "^0.8", @@ -5667,9 +5667,9 @@ "dev": true }, "daisyui": { - "version": "4.4.20", - "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.4.20.tgz", - "integrity": "sha512-AR2fuFVVLHVTdbkV+XWAqjtymEoxXksrsEMkdzPQo2wANtWjSXuODUzePNade64gJ0Y2CdQtiQkaZI7fWcp13g==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.5.0.tgz", + "integrity": "sha512-RWQCPQ0vBUaxGy768O7Ku8SRQgwdoto1lDzuKeVOcMtYghuSbUY7NoPoMK+k8JH4s1J02OvpNAgtB9MeKpZIwg==", "dev": true, "requires": { "css-selector-tokenizer": "^0.8", diff --git a/backend/servers/explorer-web/package.json b/backend/servers/explorer-web/package.json index 8776cb783..666470999 100644 --- a/backend/servers/explorer-web/package.json +++ b/backend/servers/explorer-web/package.json @@ -20,7 +20,7 @@ "autoprefixer": "^10.4.16", "browser-sync": "^2.29.3", "cssnano": "^6.0.2", - "daisyui": "^4.4.20", + "daisyui": "^4.5.0", "mkdirp": "^3.0.1", "ncp": "^2.0.0", "npm-run-all": "^4.1.5", diff --git a/backend/servers/explorer-web/yarn.lock b/backend/servers/explorer-web/yarn.lock index 5fa5b09cf..5a1628455 100644 --- a/backend/servers/explorer-web/yarn.lock +++ b/backend/servers/explorer-web/yarn.lock @@ -36,7 +36,7 @@ resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@1.4.14": +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.14" resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== @@ -57,7 +57,7 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== @@ -139,14 +139,7 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -ansi-styles@^4.0.0: - version "4.3.0" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -ansi-styles@^4.1.0: +ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== @@ -217,7 +210,7 @@ balanced-match@^1.0.0: resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64id@~2.0.0, base64id@2.0.0: +base64id@2.0.0, base64id@~2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz" integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== @@ -309,7 +302,7 @@ browser-sync@^2.29.3: ua-parser-js "^1.0.33" yargs "^17.3.1" -browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.4, "browserslist@>= 4.21.0": +browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.4: version "4.21.10" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz" integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ== @@ -357,6 +350,14 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001538: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001539.tgz" integrity sha512-hfS5tE8bnNiNvEOEkm8HElUHroYwlqMMENEzELymy77+tJ6m+gA2krtHl5hxJaj71OlpC2cHZbdSMX1/YEqEkA== +chalk@4.1.2: + version "4.1.2" + resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chalk@^2.4.1: version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" @@ -366,14 +367,6 @@ chalk@^2.4.1: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@4.1.2: - version "4.1.2" - resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chokidar@^3.3.0, chokidar@^3.3.1, chokidar@^3.5.1, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" @@ -421,16 +414,16 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - color-name@1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + colord@^2.9.1: version "2.9.3" resolved "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz" @@ -614,31 +607,17 @@ culori@^3: resolved "https://registry.npmjs.org/culori/-/culori-3.2.0.tgz" integrity sha512-HIEbTSP7vs1mPq/2P9In6QyFE0Tkpevh0k9a+FkjhD+cwsYm9WRSbn4uMdW9O0yXlNYC3ppxL3gWWPOcvEl57w== -daisyui@^4.4.20: - version "4.4.20" - resolved "https://registry.npmjs.org/daisyui/-/daisyui-4.4.20.tgz" - integrity sha512-AR2fuFVVLHVTdbkV+XWAqjtymEoxXksrsEMkdzPQo2wANtWjSXuODUzePNade64gJ0Y2CdQtiQkaZI7fWcp13g== +daisyui@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.5.0.tgz#8fe5198fba6788adeac78786d2d10296241278a7" + integrity sha512-RWQCPQ0vBUaxGy768O7Ku8SRQgwdoto1lDzuKeVOcMtYghuSbUY7NoPoMK+k8JH4s1J02OvpNAgtB9MeKpZIwg== dependencies: css-selector-tokenizer "^0.8" culori "^3" picocolors "^1" postcss-js "^4" -debug@^2.2.0: - version "2.6.9" - resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@~4.3.1, debug@~4.3.2: - version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@2.6.9: +debug@2.6.9, debug@^2.2.0: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -652,6 +631,13 @@ debug@4.3.2: dependencies: ms "2.1.2" +debug@~4.3.1, debug@~4.3.2: + version "4.3.4" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz" @@ -660,16 +646,16 @@ define-properties@^1.1.3, define-properties@^1.1.4: has-property-descriptors "^1.0.0" object-keys "^1.1.1" -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" - integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== - depd@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== + dependency-graph@^0.11.0: version "0.11.0" resolved "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz" @@ -875,7 +861,7 @@ escape-string-regexp@^1.0.5: resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== -etag@^1.8.1, etag@~1.8.1, etag@1.8.1: +etag@1.8.1, etag@^1.8.1, etag@~1.8.1: version "1.8.1" resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== @@ -945,20 +931,11 @@ fraction.js@^4.3.6: resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz" integrity sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg== -fresh@^0.5.2, fresh@0.5.2: +fresh@0.5.2, fresh@^0.5.2: version "0.5.2" resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== -fs-extra@^11.0.0: - version "11.1.0" - resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz" - integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-extra@3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz" @@ -968,11 +945,25 @@ fs-extra@3.0.1: jsonfile "^3.0.0" universalify "^0.1.0" +fs-extra@^11.0.0: + version "11.1.0" + resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz" + integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== +fsevents@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" @@ -1128,16 +1119,6 @@ hosted-git-info@^2.1.4: resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz" - integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - http-errors@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz" @@ -1149,6 +1130,16 @@ http-errors@2.0.0: statuses "2.0.1" toidentifier "1.0.1" +http-errors@~1.6.2: + version "1.6.3" + resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz" + integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + http-proxy@^1.18.1: version "1.18.1" resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz" @@ -1355,7 +1346,7 @@ isexe@^2.0.0: resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -jiti@^1.19.1, jiti@>=1.21.0: +jiti@^1.19.1: version "1.21.0" resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz" integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== @@ -2007,14 +1998,6 @@ postcss-reporter@^7.0.0: picocolors "^1.0.0" thenby "^1.3.4" -postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5: - version "6.0.11" - resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz" - integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - postcss-selector-parser@6.0.10: version "6.0.10" resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz" @@ -2023,6 +2006,14 @@ postcss-selector-parser@6.0.10: cssesc "^3.0.0" util-deprecate "^1.0.2" +postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5: + version "6.0.11" + resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz" + integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + postcss-svgo@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.1.tgz" @@ -2043,7 +2034,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0: resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.0.0, postcss@^8.0.9, postcss@^8.1.0, postcss@^8.2.14, postcss@^8.2.2, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.31, postcss@^8.4.32, postcss@>=8.0.9: +postcss@^8.4.23, postcss@^8.4.32: version "8.4.32" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz" integrity sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw== @@ -2167,12 +2158,7 @@ safe-regex-test@^1.0.0: resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -semver@^5.5.0: - version "5.7.1" - resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -"semver@2 || 3 || 4 || 5": +"semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -2345,6 +2331,11 @@ spdx-license-ids@^3.0.0: resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz" integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + "statuses@>= 1.4.0 < 2", statuses@~1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz" @@ -2355,11 +2346,6 @@ statuses@~1.3.1: resolved "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz" integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg== -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== - stream-throttle@^0.1.3: version "0.1.3" resolved "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz" @@ -2468,6 +2454,7 @@ svgo@^3.0.5: css-what "^6.1.0" csso "5.0.5" picocolors "^1.0.0" + tailwindcss@^3.3.7: version "3.3.7" resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.7.tgz#9e3c0cb7c6867b4cda4557a447bd2bb6fe20c6fa" @@ -2576,7 +2563,7 @@ universalify@^2.0.0: resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -unpipe@~1.0.0, unpipe@1.0.0: +unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== @@ -2693,19 +2680,6 @@ yargs-parser@^21.1.1: resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^17.0.0, yargs@^17.3.1: - version "17.6.2" - resolved "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz" - integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - yargs@17.1.1: version "17.1.1" resolved "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz" @@ -2718,3 +2692,16 @@ yargs@17.1.1: string-width "^4.2.0" y18n "^5.0.5" yargs-parser "^20.2.2" + +yargs@^17.0.0, yargs@^17.3.1: + version "17.6.2" + resolved "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz" + integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" From 224fc827e1b684127b0f4a5f30887eac791d0d24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:35:56 +0000 Subject: [PATCH 42/57] Bump com.puppycrawl.tools:checkstyle from 10.12.6 to 10.12.7 Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.12.6 to 10.12.7. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.12.6...checkstyle-10.12.7) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- util/test/common-test/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5f0c9d5e2..457713cd5 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ 3.3.1 1.50 - 10.12.6 + 10.12.7 3.12.0 3.3.0 diff --git a/util/test/common-test/pom.xml b/util/test/common-test/pom.xml index be7b0543d..402c0375e 100644 --- a/util/test/common-test/pom.xml +++ b/util/test/common-test/pom.xml @@ -101,7 +101,7 @@ com.puppycrawl.tools checkstyle - 10.12.6 + 10.12.7 From 9f7a6c5a68e54b42a72922ca5f4da53e40053ed7 Mon Sep 17 00:00:00 2001 From: straumat Date: Wed, 3 Jan 2024 10:08:41 +0100 Subject: [PATCH 43/57] Updating librairies --- .github/workflows/on-push.yml | 2 +- .../servers/explorer-web/package-lock.json | 285 +++++------------- backend/servers/explorer-web/package.json | 4 +- backend/servers/explorer-web/yarn.lock | 129 +++----- pom.xml | 6 +- util/test/common-test/pom.xml | 10 +- 6 files changed, 121 insertions(+), 315 deletions(-) diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml index 86f30aab8..a70e63044 100644 --- a/.github/workflows/on-push.yml +++ b/.github/workflows/on-push.yml @@ -93,7 +93,7 @@ jobs: - name: Retrieving request status id: requestByRequestId run: | - sleep 60 + sleep 90 status=$(curl -H "Content-Type: application/json" \ -d '{ "query": "{ requestByRequestId(requestId: \"${{ steps.addProofRequest.outputs.requestId }}\") { status }}" }' \ http://localhost:9090/graphql | jq -r '.data.requestByRequestId.status') diff --git a/backend/servers/explorer-web/package-lock.json b/backend/servers/explorer-web/package-lock.json index 9f2a25a89..37495e140 100644 --- a/backend/servers/explorer-web/package-lock.json +++ b/backend/servers/explorer-web/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@tailwindcss/typography": "^0.5.10", "autoprefixer": "^10.4.16", - "browser-sync": "^2.29.3", + "browser-sync": "^3.0.2", "cssnano": "^6.0.2", "daisyui": "^4.4.20", "mkdirp": "^3.0.1", @@ -20,7 +20,7 @@ "onchange": "^7.1.0", "postcss": "^8.4.32", "postcss-cli": "^11.0.0", - "tailwindcss": "^3.3.7" + "tailwindcss": "^3.4.0" } }, "node_modules/@alloc/quick-lru": { @@ -319,15 +319,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dev": true, - "dependencies": { - "follow-redirects": "^1.14.0" - } - }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -383,13 +374,13 @@ } }, "node_modules/browser-sync": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.29.3.tgz", - "integrity": "sha512-NiM38O6XU84+MN+gzspVmXV2fTOoe+jBqIBx3IBdhZrdeURr6ZgznJr/p+hQ+KzkKEiGH/GcC4SQFSL0jV49bg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-3.0.2.tgz", + "integrity": "sha512-PC9c7aWJFVR4IFySrJxOqLwB9ENn3/TaXCXtAa0SzLwocLN3qMjN+IatbjvtCX92BjNXsY6YWg9Eb7F3Wy255g==", "dev": true, "dependencies": { - "browser-sync-client": "^2.29.3", - "browser-sync-ui": "^2.29.3", + "browser-sync-client": "^3.0.2", + "browser-sync-ui": "^3.0.2", "bs-recipes": "1.3.4", "chalk": "4.1.2", "chokidar": "^3.5.1", @@ -403,7 +394,6 @@ "fs-extra": "3.0.1", "http-proxy": "^1.18.1", "immutable": "^3", - "localtunnel": "^2.0.1", "micromatch": "^4.0.2", "opn": "5.3.0", "portscanner": "2.2.0", @@ -426,9 +416,9 @@ } }, "node_modules/browser-sync-client": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.29.3.tgz", - "integrity": "sha512-4tK5JKCl7v/3aLbmCBMzpufiYLsB1+UI+7tUXCCp5qF0AllHy/jAqYu6k7hUF3hYtlClKpxExWaR+rH+ny07wQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-3.0.2.tgz", + "integrity": "sha512-tBWdfn9L0wd2Pjuz/NWHtNEKthVb1Y67vg8/qyGNtCqetNz5lkDkFnrsx5UhPNPYUO8vci50IWC/BhYaQskDiQ==", "dev": true, "dependencies": { "etag": "1.8.1", @@ -440,9 +430,9 @@ } }, "node_modules/browser-sync-ui": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.29.3.tgz", - "integrity": "sha512-kBYOIQjU/D/3kYtUIJtj82e797Egk1FB2broqItkr3i4eF1qiHbFCG6srksu9gWhfmuM/TNG76jMfzAdxEPakg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-3.0.2.tgz", + "integrity": "sha512-V3FwWAI+abVbFLTyJjXJlCMBwjc3GXf/BPGfwO2fMFACWbIGW9/4SrBOFYEOOtqzCjQE0Di+U3VIb7eES4omNA==", "dev": true, "dependencies": { "async-each-series": "0.1.1", @@ -1364,18 +1354,27 @@ } }, "node_modules/engine.io-client": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz", - "integrity": "sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==", + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz", + "integrity": "sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==", "dev": true, "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1", - "engine.io-parser": "~5.0.3", + "engine.io-parser": "~5.2.1", "ws": "~8.11.0", "xmlhttprequest-ssl": "~2.0.0" } }, + "node_modules/engine.io-client/node_modules/engine.io-parser": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz", + "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==", + "dev": true, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/engine.io-parser": { "version": "5.0.6", "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz", @@ -2345,79 +2344,6 @@ "node": ">=4" } }, - "node_modules/localtunnel": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz", - "integrity": "sha512-n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug==", - "dev": true, - "dependencies": { - "axios": "0.21.4", - "debug": "4.3.2", - "openurl": "1.1.1", - "yargs": "17.1.1" - }, - "bin": { - "lt": "bin/lt.js" - }, - "engines": { - "node": ">=8.3.0" - } - }, - "node_modules/localtunnel/node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "node_modules/localtunnel/node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/localtunnel/node_modules/yargs": { - "version": "17.1.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz", - "integrity": "sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==", - "dev": true, - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/localtunnel/node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, - "engines": { - "node": ">=10" - } - }, "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -2852,12 +2778,6 @@ "node": ">= 8" } }, - "node_modules/openurl": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz", - "integrity": "sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA==", - "dev": true - }, "node_modules/opn": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", @@ -4154,24 +4074,24 @@ } }, "node_modules/socket.io-client": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.6.1.tgz", - "integrity": "sha512-5UswCV6hpaRsNg5kkEHVcbBIXEYoVbMQaHJBXJCyEQ+CiFPV1NIOY0XOFWG4XR4GZcB8Kn6AsRs/9cy9TbqVMQ==", + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.2.tgz", + "integrity": "sha512-vtA0uD4ibrYD793SOIAwlo8cj6haOeMHrGvwPxJsxH7CeIksqJ+3Zc06RvWTIFgiSqx4A3sOnTXpfAEE2Zyz6w==", "dev": true, "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.2", - "engine.io-client": "~6.4.0", - "socket.io-parser": "~4.2.1" + "engine.io-client": "~6.5.2", + "socket.io-parser": "~4.2.4" }, "engines": { "node": ">=10.0.0" } }, "node_modules/socket.io-parser": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.3.tgz", - "integrity": "sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz", + "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", "dev": true, "dependencies": { "@socket.io/component-emitter": "~3.1.0", @@ -4459,9 +4379,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.7.tgz", - "integrity": "sha512-pjgQxDZPvyS/nG3ZYkyCvsbONJl7GdOejfm24iMt2ElYQQw8Jc4p0m8RdMp7mznPD0kUhfzwV3zAwa80qI0zmQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.0.tgz", + "integrity": "sha512-VigzymniH77knD1dryXbyxR+ePHihHociZbXnLZHUyzf2MMs2ZVqlUrZ3FvpXP8pno9JzmILt1sZPD19M3IxtA==", "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", @@ -5104,15 +5024,6 @@ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", "dev": true }, - "axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dev": true, - "requires": { - "follow-redirects": "^1.14.0" - } - }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -5159,13 +5070,13 @@ } }, "browser-sync": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.29.3.tgz", - "integrity": "sha512-NiM38O6XU84+MN+gzspVmXV2fTOoe+jBqIBx3IBdhZrdeURr6ZgznJr/p+hQ+KzkKEiGH/GcC4SQFSL0jV49bg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-3.0.2.tgz", + "integrity": "sha512-PC9c7aWJFVR4IFySrJxOqLwB9ENn3/TaXCXtAa0SzLwocLN3qMjN+IatbjvtCX92BjNXsY6YWg9Eb7F3Wy255g==", "dev": true, "requires": { - "browser-sync-client": "^2.29.3", - "browser-sync-ui": "^2.29.3", + "browser-sync-client": "^3.0.2", + "browser-sync-ui": "^3.0.2", "bs-recipes": "1.3.4", "chalk": "4.1.2", "chokidar": "^3.5.1", @@ -5179,7 +5090,6 @@ "fs-extra": "3.0.1", "http-proxy": "^1.18.1", "immutable": "^3", - "localtunnel": "^2.0.1", "micromatch": "^4.0.2", "opn": "5.3.0", "portscanner": "2.2.0", @@ -5247,9 +5157,9 @@ } }, "browser-sync-client": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.29.3.tgz", - "integrity": "sha512-4tK5JKCl7v/3aLbmCBMzpufiYLsB1+UI+7tUXCCp5qF0AllHy/jAqYu6k7hUF3hYtlClKpxExWaR+rH+ny07wQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-3.0.2.tgz", + "integrity": "sha512-tBWdfn9L0wd2Pjuz/NWHtNEKthVb1Y67vg8/qyGNtCqetNz5lkDkFnrsx5UhPNPYUO8vci50IWC/BhYaQskDiQ==", "dev": true, "requires": { "etag": "1.8.1", @@ -5258,9 +5168,9 @@ } }, "browser-sync-ui": { - "version": "2.29.3", - "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.29.3.tgz", - "integrity": "sha512-kBYOIQjU/D/3kYtUIJtj82e797Egk1FB2broqItkr3i4eF1qiHbFCG6srksu9gWhfmuM/TNG76jMfzAdxEPakg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-3.0.2.tgz", + "integrity": "sha512-V3FwWAI+abVbFLTyJjXJlCMBwjc3GXf/BPGfwO2fMFACWbIGW9/4SrBOFYEOOtqzCjQE0Di+U3VIb7eES4omNA==", "dev": true, "requires": { "async-each-series": "0.1.1", @@ -5880,16 +5790,24 @@ } }, "engine.io-client": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz", - "integrity": "sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==", + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz", + "integrity": "sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==", "dev": true, "requires": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1", - "engine.io-parser": "~5.0.3", + "engine.io-parser": "~5.2.1", "ws": "~8.11.0", "xmlhttprequest-ssl": "~2.0.0" + }, + "dependencies": { + "engine.io-parser": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz", + "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==", + "dev": true + } } }, "engine.io-parser": { @@ -6599,61 +6517,6 @@ } } }, - "localtunnel": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz", - "integrity": "sha512-n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug==", - "dev": true, - "requires": { - "axios": "0.21.4", - "debug": "4.3.2", - "openurl": "1.1.1", - "yargs": "17.1.1" - }, - "dependencies": { - "cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "yargs": { - "version": "17.1.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz", - "integrity": "sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==", - "dev": true, - "requires": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - } - }, - "yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true - } - } - }, "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -6979,12 +6842,6 @@ } } }, - "openurl": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz", - "integrity": "sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA==", - "dev": true - }, "opn": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", @@ -7851,21 +7708,21 @@ } }, "socket.io-client": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.6.1.tgz", - "integrity": "sha512-5UswCV6hpaRsNg5kkEHVcbBIXEYoVbMQaHJBXJCyEQ+CiFPV1NIOY0XOFWG4XR4GZcB8Kn6AsRs/9cy9TbqVMQ==", + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.2.tgz", + "integrity": "sha512-vtA0uD4ibrYD793SOIAwlo8cj6haOeMHrGvwPxJsxH7CeIksqJ+3Zc06RvWTIFgiSqx4A3sOnTXpfAEE2Zyz6w==", "dev": true, "requires": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.2", - "engine.io-client": "~6.4.0", - "socket.io-parser": "~4.2.1" + "engine.io-client": "~6.5.2", + "socket.io-parser": "~4.2.4" } }, "socket.io-parser": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.3.tgz", - "integrity": "sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz", + "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", "dev": true, "requires": { "@socket.io/component-emitter": "~3.1.0", @@ -8079,9 +7936,9 @@ } }, "tailwindcss": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.7.tgz", - "integrity": "sha512-pjgQxDZPvyS/nG3ZYkyCvsbONJl7GdOejfm24iMt2ElYQQw8Jc4p0m8RdMp7mznPD0kUhfzwV3zAwa80qI0zmQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.0.tgz", + "integrity": "sha512-VigzymniH77knD1dryXbyxR+ePHihHociZbXnLZHUyzf2MMs2ZVqlUrZ3FvpXP8pno9JzmILt1sZPD19M3IxtA==", "requires": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", diff --git a/backend/servers/explorer-web/package.json b/backend/servers/explorer-web/package.json index 8776cb783..f146f0e29 100644 --- a/backend/servers/explorer-web/package.json +++ b/backend/servers/explorer-web/package.json @@ -18,7 +18,7 @@ "devDependencies": { "@tailwindcss/typography": "^0.5.10", "autoprefixer": "^10.4.16", - "browser-sync": "^2.29.3", + "browser-sync": "^3.0.2", "cssnano": "^6.0.2", "daisyui": "^4.4.20", "mkdirp": "^3.0.1", @@ -27,7 +27,7 @@ "onchange": "^7.1.0", "postcss": "^8.4.32", "postcss-cli": "^11.0.0", - "tailwindcss": "^3.3.7" + "tailwindcss": "^3.4.0" }, "dependencies": { "@tailwindcss/forms": "^0.5.7" diff --git a/backend/servers/explorer-web/yarn.lock b/backend/servers/explorer-web/yarn.lock index 5fa5b09cf..bc17417a4 100644 --- a/backend/servers/explorer-web/yarn.lock +++ b/backend/servers/explorer-web/yarn.lock @@ -205,13 +205,6 @@ available-typed-arrays@^1.0.5: resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -axios@0.21.4: - version "0.21.4" - resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== - dependencies: - follow-redirects "^1.14.0" - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" @@ -252,19 +245,19 @@ braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -browser-sync-client@^2.29.3: - version "2.29.3" - resolved "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.29.3.tgz" - integrity sha512-4tK5JKCl7v/3aLbmCBMzpufiYLsB1+UI+7tUXCCp5qF0AllHy/jAqYu6k7hUF3hYtlClKpxExWaR+rH+ny07wQ== +browser-sync-client@^3.0.2: + version "3.0.2" + resolved "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-3.0.2.tgz" + integrity sha512-tBWdfn9L0wd2Pjuz/NWHtNEKthVb1Y67vg8/qyGNtCqetNz5lkDkFnrsx5UhPNPYUO8vci50IWC/BhYaQskDiQ== dependencies: etag "1.8.1" fresh "0.5.2" mitt "^1.1.3" -browser-sync-ui@^2.29.3: - version "2.29.3" - resolved "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.29.3.tgz" - integrity sha512-kBYOIQjU/D/3kYtUIJtj82e797Egk1FB2broqItkr3i4eF1qiHbFCG6srksu9gWhfmuM/TNG76jMfzAdxEPakg== +browser-sync-ui@^3.0.2: + version "3.0.2" + resolved "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-3.0.2.tgz" + integrity sha512-V3FwWAI+abVbFLTyJjXJlCMBwjc3GXf/BPGfwO2fMFACWbIGW9/4SrBOFYEOOtqzCjQE0Di+U3VIb7eES4omNA== dependencies: async-each-series "0.1.1" chalk "4.1.2" @@ -274,13 +267,13 @@ browser-sync-ui@^2.29.3: socket.io-client "^4.4.1" stream-throttle "^0.1.3" -browser-sync@^2.29.3: - version "2.29.3" - resolved "https://registry.npmjs.org/browser-sync/-/browser-sync-2.29.3.tgz" - integrity sha512-NiM38O6XU84+MN+gzspVmXV2fTOoe+jBqIBx3IBdhZrdeURr6ZgznJr/p+hQ+KzkKEiGH/GcC4SQFSL0jV49bg== +browser-sync@^3.0.2: + version "3.0.2" + resolved "https://registry.npmjs.org/browser-sync/-/browser-sync-3.0.2.tgz" + integrity sha512-PC9c7aWJFVR4IFySrJxOqLwB9ENn3/TaXCXtAa0SzLwocLN3qMjN+IatbjvtCX92BjNXsY6YWg9Eb7F3Wy255g== dependencies: - browser-sync-client "^2.29.3" - browser-sync-ui "^2.29.3" + browser-sync-client "^3.0.2" + browser-sync-ui "^3.0.2" bs-recipes "1.3.4" chalk "4.1.2" chokidar "^3.5.1" @@ -294,7 +287,6 @@ browser-sync@^2.29.3: fs-extra "3.0.1" http-proxy "^1.18.1" immutable "^3" - localtunnel "^2.0.1" micromatch "^4.0.2" opn "5.3.0" portscanner "2.2.0" @@ -389,15 +381,6 @@ chokidar@^3.3.0, chokidar@^3.3.1, chokidar@^3.5.1, chokidar@^3.5.3: optionalDependencies: fsevents "~2.3.2" -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - cliui@^8.0.1: version "8.0.1" resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz" @@ -645,13 +628,6 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4.3.2: - version "4.3.2" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz" @@ -759,14 +735,14 @@ encodeurl@~1.0.1, encodeurl@~1.0.2: resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -engine.io-client@~6.4.0: - version "6.4.0" - resolved "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz" - integrity sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g== +engine.io-client@~6.5.2: + version "6.5.3" + resolved "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz" + integrity sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q== dependencies: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" - engine.io-parser "~5.0.3" + engine.io-parser "~5.2.1" ws "~8.11.0" xmlhttprequest-ssl "~2.0.0" @@ -775,6 +751,11 @@ engine.io-parser@~5.0.3: resolved "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz" integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw== +engine.io-parser@~5.2.1: + version "5.2.1" + resolved "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz" + integrity sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ== + engine.io@~6.4.1: version "6.4.2" resolved "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz" @@ -928,7 +909,7 @@ finalhandler@1.1.0: statuses "~1.3.1" unpipe "~1.0.0" -follow-redirects@^1.0.0, follow-redirects@^1.14.0: +follow-redirects@^1.0.0: version "1.15.2" resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== @@ -1411,16 +1392,6 @@ load-json-file@^4.0.0: pify "^3.0.0" strip-bom "^3.0.0" -localtunnel@^2.0.1: - version "2.0.2" - resolved "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz" - integrity sha512-n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug== - dependencies: - axios "0.21.4" - debug "4.3.2" - openurl "1.1.1" - yargs "17.1.1" - lodash.castarray@^4.4.0: version "4.4.0" resolved "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz" @@ -1666,11 +1637,6 @@ onchange@^7.1.0: ignore "^5.1.4" tree-kill "^1.2.2" -openurl@1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz" - integrity sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA== - opn@5.3.0: version "5.3.0" resolved "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz" @@ -2285,19 +2251,19 @@ socket.io-adapter@~2.5.2: ws "~8.11.0" socket.io-client@^4.4.1: - version "4.6.1" - resolved "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.6.1.tgz" - integrity sha512-5UswCV6hpaRsNg5kkEHVcbBIXEYoVbMQaHJBXJCyEQ+CiFPV1NIOY0XOFWG4XR4GZcB8Kn6AsRs/9cy9TbqVMQ== + version "4.7.2" + resolved "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.2.tgz" + integrity sha512-vtA0uD4ibrYD793SOIAwlo8cj6haOeMHrGvwPxJsxH7CeIksqJ+3Zc06RvWTIFgiSqx4A3sOnTXpfAEE2Zyz6w== dependencies: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.2" - engine.io-client "~6.4.0" - socket.io-parser "~4.2.1" + engine.io-client "~6.5.2" + socket.io-parser "~4.2.4" -socket.io-parser@~4.2.1: - version "4.2.3" - resolved "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.3.tgz" - integrity sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ== +socket.io-parser@~4.2.1, socket.io-parser@~4.2.4: + version "4.2.4" + resolved "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz" + integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew== dependencies: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" @@ -2468,10 +2434,11 @@ svgo@^3.0.5: css-what "^6.1.0" csso "5.0.5" picocolors "^1.0.0" -tailwindcss@^3.3.7: - version "3.3.7" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.7.tgz#9e3c0cb7c6867b4cda4557a447bd2bb6fe20c6fa" - integrity sha512-pjgQxDZPvyS/nG3ZYkyCvsbONJl7GdOejfm24iMt2ElYQQw8Jc4p0m8RdMp7mznPD0kUhfzwV3zAwa80qI0zmQ== + +tailwindcss@^3.4.0, "tailwindcss@>=3.0.0 || >= 3.0.0-alpha.1", "tailwindcss@>=3.0.0 || insiders": + version "3.4.0" + resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.0.tgz" + integrity sha512-VigzymniH77knD1dryXbyxR+ePHihHociZbXnLZHUyzf2MMs2ZVqlUrZ3FvpXP8pno9JzmILt1sZPD19M3IxtA== dependencies: "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" @@ -2683,11 +2650,6 @@ yaml@^2.1.1, yaml@^2.3.4: resolved "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz" integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA== -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" @@ -2705,16 +2667,3 @@ yargs@^17.0.0, yargs@^17.3.1: string-width "^4.2.3" y18n "^5.0.5" yargs-parser "^21.1.1" - -yargs@17.1.1: - version "17.1.1" - resolved "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz" - integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" diff --git a/pom.xml b/pom.xml index 5f0c9d5e2..92b61247f 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ 3.3.0 3.2.0 0.50 - 1.9.9 + 1.9.10 3.13.3 @@ -110,7 +110,7 @@ 3.3.1 1.50 10.12.6 - 3.12.0 + 3.12.1 3.3.0 3.3.1 @@ -152,7 +152,7 @@ com.amashchenko.maven.plugin gitflow-maven-plugin - 1.20.0 + 1.21.0 production diff --git a/util/test/common-test/pom.xml b/util/test/common-test/pom.xml index be7b0543d..29960e4f5 100644 --- a/util/test/common-test/pom.xml +++ b/util/test/common-test/pom.xml @@ -32,7 +32,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.16.0 + 2.16.1 org.projectlombok @@ -56,7 +56,7 @@ com.fasterxml.jackson.core jackson-databind - 2.16.0 + 2.16.1 compile @@ -78,13 +78,13 @@ org.slf4j slf4j-api - 2.0.9 + 2.0.10 org.slf4j slf4j-simple - 2.0.9 + 2.0.10 @@ -149,7 +149,7 @@ com.amashchenko.maven.plugin gitflow-maven-plugin - 1.20.0 + 1.21.0 production From 647d6d211b4ebab62c055378c1aaf8534a3bd633 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:13:23 +0000 Subject: [PATCH 44/57] Bump org.apache.maven.plugins:maven-surefire-plugin from 3.1.2 to 3.2.3 Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.1.2 to 3.2.3. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.1.2...surefire-3.2.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- util/test/common-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/test/common-test/pom.xml b/util/test/common-test/pom.xml index 0ec3396d0..d3862ed11 100644 --- a/util/test/common-test/pom.xml +++ b/util/test/common-test/pom.xml @@ -143,7 +143,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.3 From 73e09305c54e494087c8647e15173dee97ea1703 Mon Sep 17 00:00:00 2001 From: straumat Date: Wed, 3 Jan 2024 10:26:42 +0100 Subject: [PATCH 45/57] Add metaDataFileName to API --- .../explorer-api/src/main/resources/schema/asset.graphqls | 2 ++ .../explorer/api/test/graphql/AssetDataFetcherTest.java | 1 + .../explorer/batch/batch/request/AddProofBatch.java | 2 +- backend/servers/explorer-web/yarn.lock | 8 ++++---- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/backend/servers/explorer-api/src/main/resources/schema/asset.graphqls b/backend/servers/explorer-api/src/main/resources/schema/asset.graphqls index 2dfffd93d..e9157d657 100644 --- a/backend/servers/explorer-api/src/main/resources/schema/asset.graphqls +++ b/backend/servers/explorer-api/src/main/resources/schema/asset.graphqls @@ -10,6 +10,8 @@ type Asset { genesisPoint: BitcoinTransactionOutput! "The hash of the metadata for this genesis asset" metaDataHash: String! + "Meta data file name" + metaDataFileName: String "The name of the asset" name: String! "The index of the output that carries the unique Taproot commitment in the genesis transaction" diff --git a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetDataFetcherTest.java b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetDataFetcherTest.java index af4330ef3..de6b39983 100644 --- a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetDataFetcherTest.java +++ b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/AssetDataFetcherTest.java @@ -261,6 +261,7 @@ public void assetByAssetId() { .assetIdAlias() .genesisPoint().txId().vout().parent() .metaDataHash() + .metaDataFileName() .name() .outputIndex() .version() diff --git a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java index bba74d9c2..ce4954b63 100644 --- a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java +++ b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java @@ -120,7 +120,7 @@ public void processRequests() { } // We update the data and the file if we have meta-data. - if (response.getDecodedProof().getMetaReveal() != null) { + if (assetStateCreated.get().getAsset().getMetaDataFileName() == null && response.getDecodedProof().getMetaReveal() != null) { logger.info("Creating meta data file"); assetService.updateAsset(response.getDecodedProof().getAsset().getAssetGenesis().getAssetId(), response.getDecodedProof().getMetaReveal().getData()); diff --git a/backend/servers/explorer-web/yarn.lock b/backend/servers/explorer-web/yarn.lock index bc17417a4..0f860fa20 100644 --- a/backend/servers/explorer-web/yarn.lock +++ b/backend/servers/explorer-web/yarn.lock @@ -597,10 +597,10 @@ culori@^3: resolved "https://registry.npmjs.org/culori/-/culori-3.2.0.tgz" integrity sha512-HIEbTSP7vs1mPq/2P9In6QyFE0Tkpevh0k9a+FkjhD+cwsYm9WRSbn4uMdW9O0yXlNYC3ppxL3gWWPOcvEl57w== -daisyui@^4.4.20: - version "4.4.20" - resolved "https://registry.npmjs.org/daisyui/-/daisyui-4.4.20.tgz" - integrity sha512-AR2fuFVVLHVTdbkV+XWAqjtymEoxXksrsEMkdzPQo2wANtWjSXuODUzePNade64gJ0Y2CdQtiQkaZI7fWcp13g== +daisyui@^4.5.0: + version "4.5.0" + resolved "https://registry.npmjs.org/daisyui/-/daisyui-4.5.0.tgz" + integrity sha512-RWQCPQ0vBUaxGy768O7Ku8SRQgwdoto1lDzuKeVOcMtYghuSbUY7NoPoMK+k8JH4s1J02OvpNAgtB9MeKpZIwg== dependencies: css-selector-tokenizer "^0.8" culori "^3" From 48e89211733388d6f5ad13f9e1dbf25d9c4cd989 Mon Sep 17 00:00:00 2001 From: straumat Date: Wed, 3 Jan 2024 10:54:14 +0100 Subject: [PATCH 46/57] Added getMetaDataFileType to assetDTO --- .../explorer/core/dto/asset/AssetDTO.java | 13 +++++ .../LocalFileServiceImplementation.java | 15 ++--- .../explorer/core/util/enums/FileType.java | 55 +++++++++++++++++++ .../test/core/service/AssetServiceTest.java | 6 ++ .../core/service/LocalFileServiceTest.java | 16 +++++- .../resources/db/test/test-data-asset.xml | 2 + .../main/resources/db/dev/dev-data-asset.xml | 2 + .../resources/db/test/api-test-data-asset.xml | 2 + .../main/resources/db/dev/dev-data-asset.xml | 2 + .../resources/db/test/web-test-data-asset.xml | 2 + 10 files changed, 106 insertions(+), 9 deletions(-) create mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/enums/FileType.java diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java index d40e05dc8..d2d447211 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java @@ -8,6 +8,7 @@ import org.royllo.explorer.core.dto.bitcoin.BitcoinTransactionOutputDTO; import org.royllo.explorer.core.dto.user.UserDTO; import org.royllo.explorer.core.util.enums.AssetType; +import org.royllo.explorer.core.util.enums.FileType; import java.math.BigInteger; @@ -68,4 +69,16 @@ public class AssetDTO { @NotNull(message = "Amount is required") BigInteger amount; + /** + * Returns the type of the metadata file. + * + * @return file type + */ + public FileType getMetaDataFileType() { + if (metaDataFileName == null || metaDataFileName.isEmpty()) { + return FileType.UNKNOWN; + } + return FileType.getTypeByExtension(metaDataFileName.substring(metaDataFileName.lastIndexOf(".") + 1)); + } + } diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java index 303bb03a6..d1b141294 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java @@ -6,6 +6,8 @@ import io.undertow.server.handlers.resource.PathResourceManager; import io.undertow.server.handlers.resource.ResourceHandler; import jakarta.annotation.PreDestroy; +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; @@ -35,17 +37,16 @@ public class LocalFileServiceImplementation implements ContentService { /** * Constructor. */ - public LocalFileServiceImplementation() { + public LocalFileServiceImplementation() throws DecoderException { // Starting an in-memory file system. fileSystem = Jimfs.newFileSystem(Configuration.unix()); // For our tests, we create the asset data for RoylloCoin. - try { - Files.write(fileSystem.getPath(".").resolve("24a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d.txt"), - "roylloCoin on mainnet by Royllo".getBytes()); - } catch (Exception e) { - throw new RuntimeException(e); - } + storeFile("roylloCoin on mainnet by Royllo".getBytes(), "24a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d.txt"); + + // For roylloNFT, we will store an image instead of the text we set. + final String image = "89504e470d0a1a0a0000000d4948445200000018000000180806000000e0773df80000006e4944415478da63601805a360d880ff38304d0da78a25ff89c4941b5e682f8b81a9660136c3d12ca1cc029b0c75304636182646ae0528ae07d11ef9da182e078951c5025a04d1c059802e36b47c704451008e29cd07ff89f105552dc011f6d4f50135cb229c41448b229ba25403006cf5f5c3b61b973a0000000049454e44ae426082"; + storeFile(Hex.decodeHex(image), "89c9d3ff7cb9dbc4615f854f7127e94db10edd430f8bcf82d7309d0c8b750051.png"); // Starting a web server to serve content. PathResourceManager resourceManager = new PathResourceManager(fileSystem.getPath(".")); diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/enums/FileType.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/enums/FileType.java new file mode 100644 index 000000000..9c41612ae --- /dev/null +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/enums/FileType.java @@ -0,0 +1,55 @@ +package org.royllo.explorer.core.util.enums; + +/** + * File type. + */ +public enum FileType { + + /** Image file. */ + IMAGE("png", "jpg", "jpeg", "gif", "bmp"), + + /** Text file. */ + TEXT("txt"), + + /** Video file. */ + VIDEO("mp4", "avi", "mkv", "mov", "wmv"), + + /** Audio file. */ + AUDIO("mp3", "wav", "ogg", "flac", "aac", "wma"), + + /** PDF file. */ + PDF("pdf"), + + /** Unknown file. */ + UNKNOWN(""); + + /** Extensions. */ + private final String[] extensions; + + /** + * Constructor. + * + * @param newExtensions extensions + */ + FileType(final String... newExtensions) { + this.extensions = newExtensions; + } + + /** + * Returns the type for the given extension. + * + * @param extension extension, for example : "png" + * @return type + */ + public static FileType getTypeByExtension(final String extension) { + for (FileType fileType : FileType.values()) { + for (String ext : fileType.extensions) { + if (ext.equalsIgnoreCase(extension)) { + return fileType; + } + } + } + return UNKNOWN; + } + +} diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java index 4345f12b8..a4dccfd55 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/AssetServiceTest.java @@ -36,6 +36,9 @@ import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_ID; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER_DTO; import static org.royllo.explorer.core.util.enums.AssetType.NORMAL; +import static org.royllo.explorer.core.util.enums.FileType.IMAGE; +import static org.royllo.explorer.core.util.enums.FileType.TEXT; +import static org.royllo.explorer.core.util.enums.FileType.UNKNOWN; import static org.royllo.explorer.core.util.mapper.AssetMapperDecorator.ALIAS_LENGTH; import static org.royllo.test.MempoolData.ROYLLO_COIN_GENESIS_TXID; import static org.royllo.test.TapdData.ROYLLO_COIN_ASSET_ID; @@ -436,6 +439,7 @@ public void getAssetByAssetId() { assertNotNull(asset.get().getCreator()); assertEquals(ANONYMOUS_ID, asset.get().getCreator().getId()); verifyAsset(asset.get(), ROYLLO_COIN_ASSET_ID); + assertEquals(TEXT, asset.get().getMetaDataFileType()); // getAsset() on an asset that has no asset group asset = assetService.getAsset(1); @@ -447,6 +451,7 @@ public void getAssetByAssetId() { assertTrue(asset.isPresent()); assertNotNull(asset.get().getAssetId()); assertEquals(ROYLLO_NFT_ASSET_ID_ALIAS, asset.get().getAssetIdAlias()); + assertEquals(IMAGE, asset.get().getMetaDataFileType()); // Testing with an asset id alias asset = assetService.getAssetByAssetId(SET_OF_ROYLLO_NFT_2_ASSET_ID_ALIAS); @@ -454,6 +459,7 @@ public void getAssetByAssetId() { assertNotNull(asset.get().getAssetId()); assertEquals(SET_OF_ROYLLO_NFT_2_ASSET_ID, asset.get().getAssetId()); assertEquals(SET_OF_ROYLLO_NFT_2_ASSET_ID_ALIAS, asset.get().getAssetIdAlias()); + assertEquals(UNKNOWN, asset.get().getMetaDataFileType()); } @Test diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java index ea7c5e5de..e025ebb9d 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/LocalFileServiceTest.java @@ -18,6 +18,8 @@ import static org.junit.jupiter.api.Assertions.fail; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; +import static org.royllo.test.TapdData.ROYLLO_COIN_ASSET_ID; +import static org.royllo.test.TapdData.ROYLLO_NFT_ASSET_ID; @SpringBootTest @DirtiesContext @@ -60,7 +62,7 @@ public void storeAndGetFile() { // We test that the 24a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d.txt file for Royllo coin // exists and the content is correct. request = new Request.Builder() - .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/24a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d.txt") + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + ROYLLO_COIN_ASSET_ID + ".txt") .build(); try (Response response = client.newCall(request).execute()) { assertTrue(response.body().string().contains("roylloCoin on mainnet by Royllo")); @@ -68,6 +70,16 @@ public void storeAndGetFile() { fail("Error while retrieving the file" + e.getMessage()); } - } + // For Royllo NFT, we will store an image instead of the text we set. + // We check if we retrieve the image correctly. + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + ROYLLO_NFT_ASSET_ID + ".png") + .build(); + try (Response response = client.newCall(request).execute()) { + assertTrue(response.body().string().contains("PNG")); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + } } diff --git a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-asset.xml b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-asset.xml index 94518737d..86e5d81d4 100644 --- a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-asset.xml +++ b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-asset.xml @@ -14,6 +14,8 @@ + diff --git a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-asset.xml b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-asset.xml index 94518737d..86e5d81d4 100644 --- a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-asset.xml +++ b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-asset.xml @@ -14,6 +14,8 @@ + diff --git a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-asset.xml b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-asset.xml index 94518737d..86e5d81d4 100644 --- a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-asset.xml +++ b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-asset.xml @@ -14,6 +14,8 @@ + diff --git a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset.xml b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset.xml index 665450c23..e7aa6b03b 100644 --- a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset.xml +++ b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset.xml @@ -13,6 +13,8 @@ + diff --git a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-asset.xml b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-asset.xml index 94518737d..86e5d81d4 100644 --- a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-asset.xml +++ b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-asset.xml @@ -14,6 +14,8 @@ + From ac59122a105f1fa9dad0dc96eb312ae31c27e4fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:07:20 +0000 Subject: [PATCH 47/57] Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.12.0 to 3.12.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.12.0...maven-compiler-plugin-3.12.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- util/test/common-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/test/common-test/pom.xml b/util/test/common-test/pom.xml index d3862ed11..bedea6f93 100644 --- a/util/test/common-test/pom.xml +++ b/util/test/common-test/pom.xml @@ -125,7 +125,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.0 + 3.12.1 -Xlint:unchecked 17 From 9e01af064971451517fba452f962b71c771d33ad Mon Sep 17 00:00:00 2001 From: straumat Date: Wed, 3 Jan 2024 16:42:02 +0100 Subject: [PATCH 48/57] Display asset meta file on web pages --- .../core/service/request/RequestService.java | 1 + .../request/RequestServiceImplementation.java | 7 ++++- .../main/resources/application-dev.properties | 1 + .../src/main/resources/i18n/asset.properties | 2 ++ .../main/resources/i18n/statistic.properties | 6 ++--- .../resources/templates/asset/genesis.html | 27 +++++++++++++++++++ .../src/main/resources/templates/search.html | 22 ++++++++++++--- .../asset/DisplayRoylloCoinTest.java | 2 ++ .../asset/DisplayRoylloNFTTest.java | 2 ++ .../search/SearchControllerTest.java | 23 ++++++++++++++++ 10 files changed, 86 insertions(+), 7 deletions(-) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestService.java index 918822c4a..b3a651e37 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestService.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestService.java @@ -16,6 +16,7 @@ public interface RequestService { /** * Returns the list of opened requests. + * (will return a max of 100 requests) * * @return opened requests */ diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java index 817bbd4dd..00c8d58e7 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java @@ -13,6 +13,7 @@ import org.royllo.explorer.core.repository.request.RequestRepository; import org.royllo.explorer.core.util.base.BaseService; import org.royllo.explorer.core.util.enums.ProofType; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import java.util.List; @@ -33,6 +34,9 @@ @SuppressWarnings({"checkstyle:DesignForExtension", "unused"}) public class RequestServiceImplementation extends BaseService implements RequestService { + /** Maximum number of opened requests results. */ + public static final int MAXIMUM_OPENED_REQUESTS_RESULTS = 100; + /** Request repository. */ private final RequestRepository requestRepository; @@ -41,7 +45,8 @@ public List getOpenedRequests() { logger.info("Getting opened requests"); // Getting results. - final List results = requestRepository.findByStatusInOrderById(openedStatus()) + final List results = requestRepository.findByStatusInOrderById(openedStatus(), + Pageable.ofSize(MAXIMUM_OPENED_REQUESTS_RESULTS)) .stream() .map(REQUEST_MAPPER::mapToRequestDTO) .toList(); diff --git a/backend/servers/explorer-web/src/main/resources/application-dev.properties b/backend/servers/explorer-web/src/main/resources/application-dev.properties index 048a58c35..f525824c9 100644 --- a/backend/servers/explorer-web/src/main/resources/application-dev.properties +++ b/backend/servers/explorer-web/src/main/resources/application-dev.properties @@ -2,6 +2,7 @@ # URL for dev royllo.explorer.api.base-url=http://localhost:9090/api royllo.explorer.web.base-url=http://localhost:3000 +royllo.explorer.content.base-url=http://localhost:9093 # ====================================================================================================================== # Using Liquibase to import test data spring.liquibase.enabled=true diff --git a/backend/servers/explorer-web/src/main/resources/i18n/asset.properties b/backend/servers/explorer-web/src/main/resources/i18n/asset.properties index 44c164e5a..a2038e21a 100644 --- a/backend/servers/explorer-web/src/main/resources/i18n/asset.properties +++ b/backend/servers/explorer-web/src/main/resources/i18n/asset.properties @@ -28,6 +28,8 @@ asset.data.assetType=Asset type asset.data.assetType.normal=Normal asset.data.assetType.collectible=Collectible asset.data.amount=Amount +asset.data.metaDataImage=Meta data image +asset.data.metaDataFile=Meta data file asset.data.metaDataHash=Meta data hash asset.data.version=Version asset.data.genesisPoint=Genesis point diff --git a/backend/servers/explorer-web/src/main/resources/i18n/statistic.properties b/backend/servers/explorer-web/src/main/resources/i18n/statistic.properties index ec998fc44..226657c80 100644 --- a/backend/servers/explorer-web/src/main/resources/i18n/statistic.properties +++ b/backend/servers/explorer-web/src/main/resources/i18n/statistic.properties @@ -2,6 +2,6 @@ # Statistics # # Global statistics. -statistics.global.universeCount=Universe -statistics.global.assetCount=Asset -statistics.global.assetStateCount=Asset state \ No newline at end of file +statistics.global.universeCount=Universes +statistics.global.assetCount=Assets +statistics.global.assetStateCount=Asset states \ No newline at end of file diff --git a/backend/servers/explorer-web/src/main/resources/templates/asset/genesis.html b/backend/servers/explorer-web/src/main/resources/templates/asset/genesis.html index 3cadf8e00..85c81bcaf 100644 --- a/backend/servers/explorer-web/src/main/resources/templates/asset/genesis.html +++ b/backend/servers/explorer-web/src/main/resources/templates/asset/genesis.html @@ -55,6 +55,33 @@ + + + + +
+
+ +
+ + + + + + +
+
+ +
+ + + + diff --git a/backend/servers/explorer-web/src/main/resources/templates/search.html b/backend/servers/explorer-web/src/main/resources/templates/search.html index d6577c4e5..080056a02 100644 --- a/backend/servers/explorer-web/src/main/resources/templates/search.html +++ b/backend/servers/explorer-web/src/main/resources/templates/search.html @@ -34,18 +34,32 @@
- + + +
diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloCoinTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloCoinTest.java index b0b80949f..aeea5f276 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloCoinTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloCoinTest.java @@ -85,6 +85,8 @@ void assetPageGenesis(final HttpHeaders headers) throws Exception { .andExpect(content().string(containsString(">" + assetIdAlias + "<"))) .andExpect(content().string(containsString(">" + getMessage(messages, "asset.data.assetType.normal") + "<"))) .andExpect(content().string(containsString(">" + assetFromTest.getAsset().getAmount() + "<"))) + .andExpect(content().string(not(containsString("src=" + "\"" + "null/" + assetFromTest.getAsset().getAssetGenesis().getAssetId() + ".txt")))) + .andExpect(content().string(containsString("href=" + "\"" + "null/" + assetFromTest.getAsset().getAssetGenesis().getAssetId() + ".txt"))) .andExpect(content().string(containsString(">" + assetFromTest.getAsset().getAssetGenesis().getMetaDataHash() + "<"))) .andExpect(content().string(containsString(">" + assetFromTest.getAsset().getAssetGenesis().getVersion() + "<"))) .andExpect(content().string(containsString(">" + assetFromTest.getAsset().getAssetGenesis().getGenesisPoint() + "<"))) diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloNFTTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloNFTTest.java index a7d654eb0..0e1ce9e7a 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloNFTTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/DisplayRoylloNFTTest.java @@ -85,6 +85,8 @@ void assetPageGenesis(final HttpHeaders headers) throws Exception { .andExpect(content().string(containsString(">" + assetIdAlias + "<"))) .andExpect(content().string(containsString(">" + getMessage(messages, "asset.data.assetType.collectible") + "<"))) .andExpect(content().string(not(containsString(">" + assetFromTest.getAsset().getAmount() + "<")))) + .andExpect(content().string(containsString("src=" + "\"" + "null/" + assetFromTest.getAsset().getAssetGenesis().getAssetId() + ".png"))) + .andExpect(content().string(containsString("href=" + "\"" + "null/" + assetFromTest.getAsset().getAssetGenesis().getAssetId() + ".png"))) .andExpect(content().string(containsString(">" + assetFromTest.getAsset().getAssetGenesis().getMetaDataHash() + "<"))) .andExpect(content().string(containsString(">" + assetFromTest.getAsset().getAssetGenesis().getVersion() + "<"))) .andExpect(content().string(containsString(">" + assetFromTest.getAsset().getAssetGenesis().getGenesisPoint() + "<"))) diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/SearchControllerTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/SearchControllerTest.java index 9de46f06f..827ca709d 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/SearchControllerTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/search/SearchControllerTest.java @@ -221,6 +221,29 @@ void searchPageWithInvalidPageNumber(final HttpHeaders headers) throws Exception } + + @DirtiesContext + @ParameterizedTest + @MethodSource("headers") + @DisplayName("Search page with images on results") + void searchPageWithImageInResults(final HttpHeaders headers) throws Exception { + + // We check in the result. + mockMvc.perform(get("/search") + .headers(headers) + .param(QUERY_ATTRIBUTE, "roylloNFT") + .param(PAGE_ATTRIBUTE, "1")) + .andExpect(status().isOk()) + .andExpect(view().name(containsString(SEARCH_PAGE))) + // Check image link + .andExpect(content().string(containsString("/89c9d3ff7cb9dbc4615f854f7127e94db10edd430f8bcf82d7309d0c8b750051.png"))) + // Checking error message. + .andExpect(content().string(not(containsString(getMessage(messages, "search.error.invalidPage"))))) + .andExpect(content().string(not(containsString(getMessage(messages, "search.error.noQuery"))))) + .andExpect(content().string(not(containsString(getMessage(messages, "search.error.noResult"))))); + + } + /** * Create fake assets. */ From 1f26afb8e832a24c88a5966599ac3ef81a99005d Mon Sep 17 00:00:00 2001 From: straumat Date: Wed, 3 Jan 2024 17:37:48 +0100 Subject: [PATCH 49/57] Add a cache for assets --- .../web/configuration/WebConfiguration.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/configuration/WebConfiguration.java b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/configuration/WebConfiguration.java index 430a67c9b..e96975613 100644 --- a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/configuration/WebConfiguration.java +++ b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/configuration/WebConfiguration.java @@ -2,15 +2,20 @@ import lombok.RequiredArgsConstructor; import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect; +import org.jetbrains.annotations.NotNull; import org.royllo.explorer.core.util.parameters.IncomingRateLimitsParameters; import org.royllo.explorer.web.util.interceptor.RateLimitInterceptor; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.support.ReloadableResourceBundleMessageSource; +import org.springframework.http.CacheControl; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import static java.util.concurrent.TimeUnit.DAYS; + /** * Web configuration. */ @@ -18,6 +23,7 @@ @RequiredArgsConstructor public class WebConfiguration implements WebMvcConfigurer { + /** Assets search results default page size. */ public static final int ASSET_SEARCH_DEFAULT_PAGE_SIZE = 10; @@ -30,6 +36,9 @@ public class WebConfiguration implements WebMvcConfigurer { /** Asset's proofs default page size. */ public static final int ASSET_PROOFS_DEFAULT_PAGE_SIZE = 10; + /** Default cache duration. */ + public static final CacheControl DEFAULT_CACHE_DURATION = CacheControl.maxAge(1, DAYS); + /** Incoming rate limits parameters. */ private final IncomingRateLimitsParameters incomingRateLimitsParameters; @@ -68,4 +77,30 @@ public MessageSource messageSource() { return messageSource; } + @Override + @SuppressWarnings("checkstyle:DesignForExtension") + public void addResourceHandlers(@NotNull final ResourceHandlerRegistry registry) { + // Cache Images + registry.addResourceHandler("/images/favicon/**") + .addResourceLocations("classpath:/static/images/favicon/") + .setCacheControl(DEFAULT_CACHE_DURATION); + + registry.addResourceHandler("/images/logo/**") + .addResourceLocations("classpath:/static/images/logo/") + .setCacheControl(DEFAULT_CACHE_DURATION); + + registry.addResourceHandler("/images/open_graph/**") + .addResourceLocations("classpath:/static/images/open_graph/") + .setCacheControl(DEFAULT_CACHE_DURATION); + + // Cache SVG + registry.addResourceHandler("/svg/footer/**") + .addResourceLocations("classpath:/static/svg/footer/") + .setCacheControl(DEFAULT_CACHE_DURATION); + + registry.addResourceHandler("/svg/type_*.svg") + .addResourceLocations("classpath:/static/svg/") + .setCacheControl(DEFAULT_CACHE_DURATION); + } + } From 00bd0091fe5948c9a8fd43b12f03e11f15804b79 Mon Sep 17 00:00:00 2001 From: straumat Date: Wed, 3 Jan 2024 18:20:38 +0100 Subject: [PATCH 50/57] Remove AddAssetMetaDataRequest - closes #433 --- .../request/AddAssetMetaDataRequest.java | 40 ----------------- .../request/AddAssetMetaDataRequestDTO.java | 35 --------------- .../core/service/request/RequestService.java | 11 ----- .../request/RequestServiceImplementation.java | 20 --------- .../core/util/mapper/RequestMapper.java | 14 +----- ...onstraints-request_add_asset_meta_data.xml | 22 ---------- .../table-request_add_asset_meta_data.xml | 32 -------------- .../db/changelog/db.changelog-master.yaml | 4 -- .../repository/RequestRepositoryTest.java | 22 +++++----- .../test/core/service/RequestServiceTest.java | 15 +++---- .../resources/db/test/test-data-request.xml | 8 ++-- backend/servers/explorer-api/pom.xml | 1 - .../AddAssetMetaDataRequestInputs.java | 23 ---------- .../graphql/request/RequestDataFetcher.java | 15 ------- .../resources/db/dev/dev-data-request.xml | 8 ++-- .../main/resources/schema/mutation.graphqls | 11 ----- .../schema/request-addAssetMetaData.graphqls | 13 ------ .../test/graphql/RequestDataFetcherTest.java | 38 +--------------- .../db/test/api-test-data-request.xml | 8 ++-- .../batch/request/AddAssetMetaDataBatch.java | 43 ------------------- .../resources/db/dev/test-data-request.xml | 10 ++--- .../resources/db/dev/dev-data-request.xml | 10 ++--- .../db/test/web-test-data-request.xml | 10 ++--- 23 files changed, 47 insertions(+), 366 deletions(-) delete mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/request/AddAssetMetaDataRequest.java delete mode 100644 backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/request/AddAssetMetaDataRequestDTO.java delete mode 100644 backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table-constraints/table-constraints-request_add_asset_meta_data.xml delete mode 100644 backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-request_add_asset_meta_data.xml delete mode 100644 backend/servers/explorer-api/src/main/java/org/royllo/explorer/api/graphql/request/AddAssetMetaDataRequestInputs.java delete mode 100644 backend/servers/explorer-api/src/main/resources/schema/request-addAssetMetaData.graphqls delete mode 100644 backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddAssetMetaDataBatch.java diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/request/AddAssetMetaDataRequest.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/request/AddAssetMetaDataRequest.java deleted file mode 100644 index 2a35df386..000000000 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/request/AddAssetMetaDataRequest.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.royllo.explorer.core.domain.request; - -import jakarta.persistence.Column; -import jakarta.persistence.DiscriminatorValue; -import jakarta.persistence.Entity; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.SuperBuilder; -import org.royllo.explorer.core.domain.asset.Asset; - -import static jakarta.persistence.FetchType.EAGER; - -/** - * Request to add asset meta data to an asset already in royllo database. - */ -@Getter -@Setter -@ToString -@SuperBuilder -@RequiredArgsConstructor -@Entity -@Table(name = "REQUEST_ADD_ASSET_META_DATA") -@DiscriminatorValue("ADD_ASSET_META_DATA") -public class AddAssetMetaDataRequest extends Request { - - /** Taproot asset id set by the user. */ - @Column(name = "ASSET_ID", updatable = false) - private String assetId; - - /** The asset created/updated by this request. */ - @ManyToOne(fetch = EAGER) - @JoinColumn(name = "FK_ASSET") - private Asset asset; - -} diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/request/AddAssetMetaDataRequestDTO.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/request/AddAssetMetaDataRequestDTO.java deleted file mode 100644 index 44766c2de..000000000 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/request/AddAssetMetaDataRequestDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.royllo.explorer.core.dto.request; - -import jakarta.validation.constraints.NotBlank; -import lombok.Getter; -import lombok.ToString; -import lombok.experimental.SuperBuilder; -import org.royllo.explorer.core.dto.asset.AssetDTO; - -/** - * Request to add asset meta data to an asset already in royllo database. - */ -@Getter -@SuperBuilder -@ToString(callSuper = true) -@SuppressWarnings("checkstyle:VisibilityModifier") -public class AddAssetMetaDataRequestDTO extends RequestDTO { - - /** Taproot asset id set by the user. */ - @NotBlank(message = "Asset id is required") - String assetId; - - /** The asset created/updated by this request. */ - AssetDTO asset; - - /** - * Set the asset created/updated by this request (Cannot be used to update the asset). - * - * @param newAsset new asset - */ - public void setAsset(final AssetDTO newAsset) { - assert asset == null : "You can't update the target asset, it's already set"; - asset = newAsset; - } - -} diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestService.java index b3a651e37..3b7cf67e4 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestService.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestService.java @@ -1,6 +1,5 @@ package org.royllo.explorer.core.service.request; -import org.royllo.explorer.core.dto.request.AddAssetMetaDataRequestDTO; import org.royllo.explorer.core.dto.request.AddProofRequestDTO; import org.royllo.explorer.core.dto.request.AddUniverseServerRequestDTO; import org.royllo.explorer.core.dto.request.RequestDTO; @@ -55,16 +54,6 @@ public interface RequestService { */ AddProofRequestDTO createAddProofRequest(String proof, ProofType proofType); - /** - * Creates a request to add an asset meta data. - * - * @param assetId asset id - * @param metaData Metadata corresponding to the meta hash stored in the genesis information - * @return id of the request created - */ - AddAssetMetaDataRequestDTO createAddAssetMetaDataRequest(String assetId, - String metaData); - /** * Creates a request to add a royllo universe server to royllo database. * diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java index 00c8d58e7..b6113b499 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/request/RequestServiceImplementation.java @@ -2,11 +2,9 @@ import lombok.NonNull; import lombok.RequiredArgsConstructor; -import org.royllo.explorer.core.domain.request.AddAssetMetaDataRequest; import org.royllo.explorer.core.domain.request.AddProofRequest; import org.royllo.explorer.core.domain.request.AddUniverseServerRequest; import org.royllo.explorer.core.domain.request.Request; -import org.royllo.explorer.core.dto.request.AddAssetMetaDataRequestDTO; import org.royllo.explorer.core.dto.request.AddProofRequestDTO; import org.royllo.explorer.core.dto.request.AddUniverseServerRequestDTO; import org.royllo.explorer.core.dto.request.RequestDTO; @@ -117,24 +115,6 @@ public AddProofRequestDTO createAddProofRequest(final String proof, return savedRequest; } - @Override - public AddAssetMetaDataRequestDTO createAddAssetMetaDataRequest(@NonNull final String assetId, - final String metaData) { - logger.info("Adding metadata request for Taproot asset id {}", assetId); - - // Creating and saving the request. - AddAssetMetaDataRequest request = AddAssetMetaDataRequest.builder() - .requestId(UUID.randomUUID().toString()) - .creator(ANONYMOUS_USER) - .status(OPENED) - .assetId(assetId) - .build(); - - AddAssetMetaDataRequestDTO savedRequest = REQUEST_MAPPER.mapToAddAssetMetaRequestDTO(requestRepository.save(request)); - logger.info("Request {} saved", savedRequest); - return savedRequest; - } - @Override public AddUniverseServerRequestDTO createAddUniverseServerRequest(@NonNull final String serverAddress) { logger.info("Adding universe server {}", serverAddress); diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/RequestMapper.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/RequestMapper.java index 77bf76991..31cb5e0ad 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/RequestMapper.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/RequestMapper.java @@ -2,11 +2,9 @@ import org.mapstruct.Mapper; import org.mapstruct.Mapping; -import org.royllo.explorer.core.domain.request.AddAssetMetaDataRequest; import org.royllo.explorer.core.domain.request.AddProofRequest; import org.royllo.explorer.core.domain.request.AddUniverseServerRequest; import org.royllo.explorer.core.domain.request.Request; -import org.royllo.explorer.core.dto.request.AddAssetMetaDataRequestDTO; import org.royllo.explorer.core.dto.request.AddProofRequestDTO; import org.royllo.explorer.core.dto.request.AddUniverseServerRequestDTO; import org.royllo.explorer.core.dto.request.RequestDTO; @@ -24,12 +22,10 @@ public interface RequestMapper { // ================================================================================================================= // Generic mapper. default RequestDTO mapToRequestDTO(Request source) { + // TODO Change this with the new Java release if (source instanceof AddProofRequest) { return mapToAddAssetRequestDTO((AddProofRequest) source); } - if (source instanceof AddAssetMetaDataRequest) { - return mapToAddAssetMetaRequestDTO((AddAssetMetaDataRequest) source); - } if (source instanceof AddUniverseServerRequest) { return mapToAddUniverseServerRequestDTO((AddUniverseServerRequest) source); } @@ -44,14 +40,6 @@ default RequestDTO mapToRequestDTO(Request source) { AddProofRequestDTO mapToAddAssetRequestDTO(AddProofRequest source); - // ================================================================================================================= - // Add asset meta mapper. - @Mapping(target = "createdOn", ignore = true) - @Mapping(target = "updatedOn", ignore = true) - AddAssetMetaDataRequest mapToAddAssetMetaRequest(AddAssetMetaDataRequestDTO source); - - AddAssetMetaDataRequestDTO mapToAddAssetMetaRequestDTO(AddAssetMetaDataRequest source); - // ================================================================================================================= // Add universe server mapper. @Mapping(target = "createdOn", ignore = true) diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table-constraints/table-constraints-request_add_asset_meta_data.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table-constraints/table-constraints-request_add_asset_meta_data.xml deleted file mode 100644 index 65b049f5c..000000000 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table-constraints/table-constraints-request_add_asset_meta_data.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-request_add_asset_meta_data.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-request_add_asset_meta_data.xml deleted file mode 100644 index 9f8a456c6..000000000 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-request_add_asset_meta_data.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/db.changelog-master.yaml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/db.changelog-master.yaml index 09dc4b620..2cbb16b38 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/db.changelog-master.yaml @@ -26,8 +26,6 @@ databaseChangeLog: file: /db/changelog/1.0.0/table/table-request.xml - include: file: /db/changelog/1.0.0/table/table-request_add_proof.xml - - include: - file: /db/changelog/1.0.0/table/table-request_add_asset_meta_data.xml - include: file: /db/changelog/1.0.0/table/table-request_add_universe_server.xml - include: @@ -53,8 +51,6 @@ databaseChangeLog: file: /db/changelog/1.0.0/table-constraints/table-constraints-request.xml - include: file: /db/changelog/1.0.0/table-constraints/table-constraints-request_add_proof.xml - - include: - file: /db/changelog/1.0.0/table-constraints/table-constraints-request_add_asset_meta_data.xml - include: file: /db/changelog/1.0.0/table-constraints/table-constraints-request_add_universe_server.xml - include: diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/RequestRepositoryTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/RequestRepositoryTest.java index 5e71ab4b4..f2fc61b30 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/RequestRepositoryTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/repository/RequestRepositoryTest.java @@ -2,8 +2,8 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.royllo.explorer.core.domain.request.AddAssetMetaDataRequest; import org.royllo.explorer.core.domain.request.AddProofRequest; +import org.royllo.explorer.core.domain.request.AddUniverseServerRequest; import org.royllo.explorer.core.domain.request.Request; import org.royllo.explorer.core.repository.request.RequestRepository; import org.royllo.explorer.core.test.util.TestWithMockServers; @@ -68,29 +68,29 @@ public void requestsInheritance() { assertEquals(request1ID, addAssetRequest1IDFromJDBC); // ============================================================================================================= - // Creating request 2 (ADD_ASSET_META_DATA type). - AddAssetMetaDataRequest request2 = new AddAssetMetaDataRequest(); + // Creating request 2 (ADD_UNIVERSE_SERVER type). + AddUniverseServerRequest request2 = new AddUniverseServerRequest(); request2.setRequestId(UUID.randomUUID().toString()); request2.setCreator(ANONYMOUS_USER); request2.setStatus(SUCCESS); - request2.setAssetId("TaprootAssetId1"); + request2.setServerAddress("serverAddress1"); long request2ID = requestRepository.save(request2).getId(); // See what's in database with JPA. Optional request2FromJPA = requestRepository.findById(request2ID); assertTrue(request2FromJPA.isPresent()); - AddAssetMetaDataRequest addAssetMeatRequest2FromJPA = (AddAssetMetaDataRequest) request2FromJPA.get(); - assertEquals(request2ID, addAssetMeatRequest2FromJPA.getId()); - assertEquals(ANONYMOUS_USER_USERNAME, addAssetMeatRequest2FromJPA.getCreator().getUsername()); - assertEquals(SUCCESS, addAssetMeatRequest2FromJPA.getStatus()); - assertNull(addAssetMeatRequest2FromJPA.getErrorMessage()); - assertEquals("TaprootAssetId1", addAssetMeatRequest2FromJPA.getAssetId()); + AddUniverseServerRequest addUniverseServerRequest2FromJPA = (AddUniverseServerRequest) request2FromJPA.get(); + assertEquals(request2ID, addUniverseServerRequest2FromJPA.getId()); + assertEquals(ANONYMOUS_USER_USERNAME, addUniverseServerRequest2FromJPA.getCreator().getUsername()); + assertEquals(SUCCESS, addUniverseServerRequest2FromJPA.getStatus()); + assertNull(addUniverseServerRequest2FromJPA.getErrorMessage()); + assertEquals("serverAddress1", addUniverseServerRequest2FromJPA.getServerAddress()); // See what's in database with JDBC. jdbcTemplate = new JdbcTemplate(dataSource); Long request2IDFromJDBC = jdbcTemplate.queryForObject("SELECT MAX(ID) FROM REQUEST", Long.class); assertEquals(request2ID, request2IDFromJDBC); - Long addAssetRequest2IDFromJDBC = jdbcTemplate.queryForObject("SELECT MAX(ID) FROM REQUEST_ADD_ASSET_META_DATA", Long.class); + Long addAssetRequest2IDFromJDBC = jdbcTemplate.queryForObject("SELECT MAX(ID) FROM REQUEST_ADD_UNIVERSE_SERVER", Long.class); assertEquals(request2ID, addAssetRequest2IDFromJDBC); // ============================================================================================================= diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java index d466efd07..3666b5687 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/RequestServiceTest.java @@ -5,7 +5,6 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import org.royllo.explorer.core.dto.request.AddAssetMetaDataRequestDTO; import org.royllo.explorer.core.dto.request.AddProofRequestDTO; import org.royllo.explorer.core.dto.request.AddUniverseServerRequestDTO; import org.royllo.explorer.core.dto.request.RequestDTO; @@ -59,14 +58,14 @@ public void getOpenedRequests() { assertEquals("P1", request1.getProof()); // Request 2. - AddAssetMetaDataRequestDTO request2 = (AddAssetMetaDataRequestDTO) openedRequests.get(1); + AddUniverseServerRequestDTO request2 = (AddUniverseServerRequestDTO) openedRequests.get(1); assertEquals(3, request2.getId()); assertEquals(ANONYMOUS_ID, request2.getCreator().getId()); assertEquals(ANONYMOUS_USER_ID, request2.getCreator().getUserId()); assertEquals(ANONYMOUS_USER_USERNAME, request2.getCreator().getUsername()); assertEquals(OPENED, request2.getStatus()); assertNull(request2.getErrorMessage()); - assertEquals("AI2", request2.getAssetId()); + assertEquals("SERVER_3", request2.getServerAddress()); // Request 3. AddProofRequestDTO request3 = (AddProofRequestDTO) openedRequests.get(2); @@ -96,7 +95,7 @@ public void getRequestByRequestId() { assertTrue(requestService.getRequestByRequestId(request1DTO.getRequestId()).isPresent()); // We create a new "add medata data" request, and we should find it. - RequestDTO request2DTO = requestService.createAddAssetMetaDataRequest("TaprootAssetId1", "meta1"); + RequestDTO request2DTO = requestService.createAddUniverseServerRequest("server4"); assertNotNull(request2DTO); assertNotNull(request2DTO.getRequestId()); assertTrue(requestService.getRequestByRequestId(request2DTO.getRequestId()).isPresent()); @@ -131,17 +130,17 @@ public void addRequests() { // ============================================================================================================= // Request 2 (addAssetMetaData). - RequestDTO request2DTO = requestService.createAddAssetMetaDataRequest("TaprootAssetId1", "meta1"); + RequestDTO request2DTO = requestService.createAddUniverseServerRequest("universe1"); assertNotNull(request2DTO); long request2Id = request2DTO.getId(); // Use getRequest(). Optional request2 = requestService.getRequest(request2Id); assertTrue(request2.isPresent()); - assertInstanceOf(AddAssetMetaDataRequestDTO.class, request2.get()); + assertInstanceOf(AddUniverseServerRequestDTO.class, request2.get()); // We cast and check of all the data is here. - AddAssetMetaDataRequestDTO request2Casted = (AddAssetMetaDataRequestDTO) request2.get(); + AddUniverseServerRequestDTO request2Casted = (AddUniverseServerRequestDTO) request2.get(); assertEquals(request2Id, request2Casted.getId()); assertNotNull(request2Casted.getRequestId()); assertEquals(ANONYMOUS_ID, request2Casted.getCreator().getId()); @@ -149,7 +148,7 @@ public void addRequests() { assertEquals(ANONYMOUS_USER_USERNAME, request2Casted.getCreator().getUsername()); assertEquals(OPENED, request2Casted.getStatus()); assertNull(request2Casted.getErrorMessage()); - assertEquals("TaprootAssetId1", request2Casted.getAssetId()); + assertEquals("universe1", request2Casted.getServerAddress()); // ============================================================================================================= // Request 3 (addAssetDTO). diff --git a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-request.xml b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-request.xml index 390bda0d0..af5b4edc5 100644 --- a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-request.xml +++ b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-request.xml @@ -32,17 +32,17 @@ - + - + - + - + diff --git a/backend/servers/explorer-api/pom.xml b/backend/servers/explorer-api/pom.xml index 72ce793b8..7c09daf1e 100644 --- a/backend/servers/explorer-api/pom.xml +++ b/backend/servers/explorer-api/pom.xml @@ -205,7 +205,6 @@ src/main/resources/schema/proof.graphqls src/main/resources/schema/request.graphqls src/main/resources/schema/request-addProof.graphqls - src/main/resources/schema/request-addAssetMetaData.graphqls src/main/resources/schema/request-addUniverseServer.graphqls src/main/resources/schema/query.graphqls diff --git a/backend/servers/explorer-api/src/main/java/org/royllo/explorer/api/graphql/request/AddAssetMetaDataRequestInputs.java b/backend/servers/explorer-api/src/main/java/org/royllo/explorer/api/graphql/request/AddAssetMetaDataRequestInputs.java deleted file mode 100644 index 994c21355..000000000 --- a/backend/servers/explorer-api/src/main/java/org/royllo/explorer/api/graphql/request/AddAssetMetaDataRequestInputs.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.royllo.explorer.api.graphql.request; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -/** - * createAddAssetMetaDataRequest inputs. - */ -@Getter -@Setter -@ToString -@NoArgsConstructor -public class AddAssetMetaDataRequestInputs { - - /** Taproot asset id. */ - private String assetId; - - /** Metadata corresponding to the meta hash stored in the genesis information. */ - private String metaData; - -} diff --git a/backend/servers/explorer-api/src/main/java/org/royllo/explorer/api/graphql/request/RequestDataFetcher.java b/backend/servers/explorer-api/src/main/java/org/royllo/explorer/api/graphql/request/RequestDataFetcher.java index 206a5405c..a4332ebf8 100644 --- a/backend/servers/explorer-api/src/main/java/org/royllo/explorer/api/graphql/request/RequestDataFetcher.java +++ b/backend/servers/explorer-api/src/main/java/org/royllo/explorer/api/graphql/request/RequestDataFetcher.java @@ -9,7 +9,6 @@ import com.netflix.graphql.dgs.exceptions.DgsEntityNotFoundException; import lombok.RequiredArgsConstructor; import org.royllo.explorer.api.util.base.BaseDataFetcher; -import org.royllo.explorer.core.dto.request.AddAssetMetaDataRequestDTO; import org.royllo.explorer.core.dto.request.AddProofRequestDTO; import org.royllo.explorer.core.dto.request.AddUniverseServerRequestDTO; import org.royllo.explorer.core.dto.request.RequestDTO; @@ -35,8 +34,6 @@ public class RequestDataFetcher extends BaseDataFetcher { public String resolveRequest(final RequestDTO requestDTO) { if (requestDTO instanceof AddProofRequestDTO) { return "AddProofRequest"; - } else if (requestDTO instanceof AddAssetMetaDataRequestDTO) { - return "AddAssetMetaDataRequest"; } else if (requestDTO instanceof AddUniverseServerRequestDTO) { return "AddUniverseServerRequest"; } else { @@ -66,18 +63,6 @@ public final AddProofRequestDTO createAddProofRequest(final @InputArgument AddPr return requestService.createAddProofRequest(input.getProof()); } - /** - * Creates a request to add an asset meta data. - * - * @param input add asset meta data request inputs - * @return request created - */ - @DgsMutation - public final AddAssetMetaDataRequestDTO createAddAssetMetaDataRequest(final @InputArgument AddAssetMetaDataRequestInputs input) { - // TODO Manage file upload. - return requestService.createAddAssetMetaDataRequest(input.getAssetId(), input.getMetaData()); - } - /** * Creates a request to add a universe server. * diff --git a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-request.xml b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-request.xml index 390bda0d0..af5b4edc5 100644 --- a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-request.xml +++ b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-request.xml @@ -32,17 +32,17 @@ - + - + - + - + diff --git a/backend/servers/explorer-api/src/main/resources/schema/mutation.graphqls b/backend/servers/explorer-api/src/main/resources/schema/mutation.graphqls index 67d1a4f3f..2beceb944 100644 --- a/backend/servers/explorer-api/src/main/resources/schema/mutation.graphqls +++ b/backend/servers/explorer-api/src/main/resources/schema/mutation.graphqls @@ -5,9 +5,6 @@ type Mutation { "Creates a request to add a proof" createAddProofRequest(input: AddProofRequestInputs!): AddProofRequest - "Creates a request to add an asset meta data" - createAddAssetMetaDataRequest(input: AddAssetMetaDataRequestInputs!): AddAssetMetaDataRequest - "Creates a request to add a universe server" createAddUniverseServerRequest(input: AddUniverseServerRequestInputs!): AddUniverseServerRequest @@ -19,14 +16,6 @@ input AddProofRequestInputs { proof: String! } -"Add asset request meta data inputs" -input AddAssetMetaDataRequestInputs { - "Taproot asset id" - assetId: String! - "Metadata corresponding to the meta hash stored in the genesis information" - metaData: String! -} - "Add universe server request inputs" input AddUniverseServerRequestInputs { "The universe server address (consists of both an IP address and a port number)" diff --git a/backend/servers/explorer-api/src/main/resources/schema/request-addAssetMetaData.graphqls b/backend/servers/explorer-api/src/main/resources/schema/request-addAssetMetaData.graphqls deleted file mode 100644 index f826a6b14..000000000 --- a/backend/servers/explorer-api/src/main/resources/schema/request-addAssetMetaData.graphqls +++ /dev/null @@ -1,13 +0,0 @@ -"A request to add asset meta data to an asset already in Royllo database" -type AddAssetMetaDataRequest implements Request { - "Request ID in database" - requestId: ID! - "Request creator" - creator: User! - "Request status" - status: RequestStatus! - "Error message - Not empty if status is equals to ERROR" - errorMessage: String - "Taproot asset id" - assetId: String! -} diff --git a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/RequestDataFetcherTest.java b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/RequestDataFetcherTest.java index 2aabade93..f601a1dd2 100644 --- a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/RequestDataFetcherTest.java +++ b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/RequestDataFetcherTest.java @@ -6,16 +6,12 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.royllo.explorer.api.graphql.generated.DgsConstants; -import org.royllo.explorer.api.graphql.generated.client.CreateAddAssetMetaDataRequestGraphQLQuery; -import org.royllo.explorer.api.graphql.generated.client.CreateAddAssetMetaDataRequestProjectionRoot; import org.royllo.explorer.api.graphql.generated.client.CreateAddProofRequestGraphQLQuery; import org.royllo.explorer.api.graphql.generated.client.CreateAddProofRequestProjectionRoot; import org.royllo.explorer.api.graphql.generated.client.CreateAddUniverseServerRequestGraphQLQuery; import org.royllo.explorer.api.graphql.generated.client.CreateAddUniverseServerRequestProjectionRoot; import org.royllo.explorer.api.graphql.generated.client.RequestByRequestIdGraphQLQuery; import org.royllo.explorer.api.graphql.generated.client.RequestByRequestIdProjectionRoot; -import org.royllo.explorer.api.graphql.generated.types.AddAssetMetaDataRequest; -import org.royllo.explorer.api.graphql.generated.types.AddAssetMetaDataRequestInputs; import org.royllo.explorer.api.graphql.generated.types.AddProofRequest; import org.royllo.explorer.api.graphql.generated.types.AddProofRequestInputs; import org.royllo.explorer.api.graphql.generated.types.AddUniverseServerRequest; @@ -53,7 +49,7 @@ public void requestByRequestId() { .status().getParent() .errorMessage() .onAddProofRequest().proof().parent() - .onAddAssetMetaDataRequest().assetId() + .onAddUniverseServerRequest().serverAddress() ).serialize(), "data." + DgsConstants.QUERY.RequestByRequestId, new TypeRef<>() { @@ -99,38 +95,6 @@ public void createAddProofRequest() { assertEquals("6", requestCreated.getProof()); } - @Test - @DisplayName("createAddAssetMetaDataRequest()") - public void createAddAssetMetaDataRequest() { - // Creating a new request to add meta data. - AddAssetMetaDataRequest requestCreated = dgsQueryExecutor.executeAndExtractJsonPathAsObject( - new GraphQLQueryRequest( - CreateAddAssetMetaDataRequestGraphQLQuery.newRequest() - .input(AddAssetMetaDataRequestInputs.newBuilder() - .assetId("AssetID1") - .metaData("MetaData01") - .build()) - .build(), - new CreateAddAssetMetaDataRequestProjectionRoot<>() - .requestId() - .creator().userId().username().parent() - .status().getParent() - .errorMessage() - .assetId() - ).serialize(), - "data." + DgsConstants.MUTATION.CreateAddAssetMetaDataRequest, - new TypeRef<>() { - }); - - // Testing results. - assertNotNull(requestCreated.getRequestId()); - assertEquals(ANONYMOUS_USER_ID, requestCreated.getCreator().getUserId()); - assertEquals(ANONYMOUS_USER_USERNAME, requestCreated.getCreator().getUsername()); - assertEquals(OPENED.toString(), requestCreated.getStatus().toString()); - assertNull(requestCreated.getErrorMessage()); - assertEquals("AssetID1", requestCreated.getAssetId()); - } - @Test @DisplayName("createAddUniverseServerRequest()") public void createAddUniverseServerRequest() { diff --git a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-request.xml b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-request.xml index 390bda0d0..af5b4edc5 100644 --- a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-request.xml +++ b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-request.xml @@ -32,17 +32,17 @@ - + - + - + - + diff --git a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddAssetMetaDataBatch.java b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddAssetMetaDataBatch.java deleted file mode 100644 index 6f1997077..000000000 --- a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddAssetMetaDataBatch.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.royllo.explorer.batch.batch.request; - -import lombok.RequiredArgsConstructor; -import org.royllo.explorer.batch.util.base.BaseBatch; -import org.royllo.explorer.core.dto.request.AddAssetMetaDataRequestDTO; -import org.royllo.explorer.core.service.request.RequestService; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -/** - * Batch treating {@link AddAssetMetaDataBatch}. - */ -@Component -@RequiredArgsConstructor -@SuppressWarnings("checkstyle:DesignForExtension") -public class AddAssetMetaDataBatch extends BaseBatch { - - /** Start delay in milliseconds (1 000 ms = 1 second). */ - private static final int START_DELAY_IN_MILLISECONDS = 1_000; - - /** Delay between two calls to process requests (1 000 ms = 1 second). */ - private static final int DELAY_BETWEEN_TWO_PROCESS_IN_MILLISECONDS = 1_000; - - /** Request service. */ - private final RequestService requestService; - - /** - * Recurrent calls to process requests. - */ - @Scheduled(initialDelay = START_DELAY_IN_MILLISECONDS, fixedDelay = DELAY_BETWEEN_TWO_PROCESS_IN_MILLISECONDS) - public void processRequests() { - if (enabled.get()) { - requestService.getOpenedRequests() - .stream() - .filter(request -> request instanceof AddAssetMetaDataRequestDTO) - .map(requestDTO -> (AddAssetMetaDataRequestDTO) requestDTO) - .forEach(request -> { - logger.info("Processing request {}: {}", request.getId(), request); - }); - } - } - -} diff --git a/backend/servers/explorer-batch/src/main/resources/db/dev/test-data-request.xml b/backend/servers/explorer-batch/src/main/resources/db/dev/test-data-request.xml index 0b19e74a6..36cc08354 100644 --- a/backend/servers/explorer-batch/src/main/resources/db/dev/test-data-request.xml +++ b/backend/servers/explorer-batch/src/main/resources/db/dev/test-data-request.xml @@ -32,17 +32,17 @@ - + - - + + - + - + diff --git a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-request.xml b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-request.xml index 286c97cf8..45cd46ac9 100644 --- a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-request.xml +++ b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-request.xml @@ -33,17 +33,17 @@ - + - + - + - + - + diff --git a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-request.xml b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-request.xml index 239736e15..cad10218e 100644 --- a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-request.xml +++ b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-request.xml @@ -33,17 +33,17 @@ - + - - + + - + - + From 1fe968632e7f4edf7376e12824a7303383cf2e72 Mon Sep 17 00:00:00 2001 From: straumat Date: Wed, 3 Jan 2024 23:29:27 +0100 Subject: [PATCH 51/57] Remove raw proof field from database - closes #440 --- .../explorer/core/domain/proof/Proof.java | 4 - .../explorer/core/dto/proof/ProofDTO.java | 31 ++---- .../LocalFileServiceImplementation.java | 48 +++++++++ .../asset/AssetServiceImplementation.java | 6 +- .../proof/ProofServiceImplementation.java | 40 +++++++- .../db/changelog/1.0.0/data/data-proof.xml | 2 - .../db/changelog/1.0.0/table/table-proof.xml | 2 - .../core/test/core/dto/ProofDTOTest.java | 89 ----------------- .../test/core/service/ProofServiceTest.java | 36 ++++++- .../resources/db/test/test-data-proof.xml | 18 ---- .../main/resources/db/dev/dev-data-proof.xml | 18 ---- .../src/main/resources/schema/proof.graphqls | 4 +- .../test/graphql/ProofDataFetcherTest.java | 12 +-- .../resources/db/test/api-test-data-proof.xml | 18 ---- .../core/proof/RoylloCoinIntegrationTest.java | 11 +++ .../core/proof/RoylloNFTIntegrationTest.java | 15 +++ .../proof/SetOfRoylloNFTIntegrationTest.java | 42 ++++++++ .../TrickyRoylloCoinIntegrationTest.java | 57 +++++++++++ .../UnknownRoylloCoinIntegrationTest.java | 16 +++ .../UnlimitedRoylloCoinIntegrationTest.java | 31 ++++++ .../web/controller/asset/AssetController.java | 4 +- .../main/resources/db/dev/dev-data-asset.xml | 99 ------------------- .../main/resources/db/dev/dev-data-proof.xml | 18 ---- .../resources/templates/asset/proofs.html | 3 +- .../asset/AssetControllerTest.java | 8 +- .../resources/db/test/web-test-data-proof.xml | 18 ---- 26 files changed, 315 insertions(+), 335 deletions(-) delete mode 100644 backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/dto/ProofDTOTest.java diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/proof/Proof.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/proof/Proof.java index 26111bdd3..b08462378 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/proof/Proof.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/proof/Proof.java @@ -57,10 +57,6 @@ public class Proof extends BaseDomain { @Column(name = "PROOF_ID", updatable = false) private String proofId; - /** Proof. */ - @Column(name = "PROOF", updatable = false) - private String proof; - /** Proof type. */ @Enumerated(STRING) @Column(name = "PROOF_TYPE", updatable = false) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/proof/ProofDTO.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/proof/ProofDTO.java index 4b26bdb65..63bd51287 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/proof/ProofDTO.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/proof/ProofDTO.java @@ -4,7 +4,6 @@ import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.ToString; import lombok.Value; import org.royllo.explorer.core.dto.asset.AssetDTO; import org.royllo.explorer.core.dto.user.UserDTO; @@ -21,11 +20,8 @@ @SuppressWarnings("checkstyle:VisibilityModifier") public class ProofDTO { - /** Proof minimum size - Under this size, the proof is displayed without preview. */ - private static final int PROOF_MINIMUM_SIZE = 6; - - /** Proof preview size - The size of the preview on both ends. */ - private static final int PROOF_PREVIEW_SIZE = 3; + /** Proof file name extension. */ + public static final String PROOF_FILE_NAME_EXTENSION = ".proof"; /** Unique identifier. */ Long id; @@ -42,32 +38,17 @@ public class ProofDTO { @NotBlank(message = "Proof file ID is required") String proofId; - /** Proof. */ - @ToString.Exclude - @NotBlank(message = "Proof is required") - String proof; - /** Proof type. */ @NotNull(message = "Proof type is required") ProofType proofType; /** - * Returns an abstract of proof (for logs). - * Three first characters, three dots, three last characters. + * Returns the proof file name. * - * @return proof abstract + * @return the proof file name */ - @ToString.Include(name = "proofAbstract") - public String getProofAbstract() { - // If proof is null, return null. - if (proof == null) { - return null; - } - // If proof is too small for substring, return proof. - if (proof.length() <= PROOF_MINIMUM_SIZE) { - return proof; - } - return proof.substring(0, PROOF_PREVIEW_SIZE) + "..." + proof.substring(proof.length() - PROOF_PREVIEW_SIZE); + public String getProofFileName() { + return proofId + PROOF_FILE_NAME_EXTENSION; } } diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java index d1b141294..f4b8abf97 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/LocalFileServiceImplementation.java @@ -11,8 +11,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import javax.xml.bind.DatatypeConverter; +import java.nio.charset.StandardCharsets; import java.nio.file.FileSystem; import java.nio.file.Files; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +import static org.royllo.explorer.core.dto.proof.ProofDTO.PROOF_FILE_NAME_EXTENSION; /** * Content service - Local file implementation - Used for local development. @@ -41,13 +47,39 @@ public LocalFileServiceImplementation() throws DecoderException { // Starting an in-memory file system. fileSystem = Jimfs.newFileSystem(Configuration.unix()); + // ============================================================================================================= // For our tests, we create the asset data for RoylloCoin. storeFile("roylloCoin on mainnet by Royllo".getBytes(), "24a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d.txt"); + // ============================================================================================================= // For roylloNFT, we will store an image instead of the text we set. final String image = "89504e470d0a1a0a0000000d4948445200000018000000180806000000e0773df80000006e4944415478da63601805a360d880ff38304d0da78a25ff89c4941b5e682f8b81a9660136c3d12ca1cc029b0c75304636182646ae0528ae07d11ef9da182e078951c5025a04d1c059802e36b47c704451008e29cd07ff89f105552dc011f6d4f50135cb229c41448b229ba25403006cf5f5c3b61b973a0000000049454e44ae426082"; storeFile(Hex.decodeHex(image), "89c9d3ff7cb9dbc4615f854f7127e94db10edd430f8bcf82d7309d0c8b750051.png"); + // ============================================================================================================= + // Storing proofs for all assets. + final String roylloCoinProof = "544150460000000001fd054e544150500004000000000224cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd20000000404500060da25a5c4ac850d9b2bb53264a39577ad4b37b5b6e356adb502000000000000000000a82669d71121cb48e9687c782551e0063c0552f8e9bf499d5b6100b8df1575284d365265125a041746cca20f06f702000000000101cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd20400000000ffffffff02e8030000000000002251200e7b1c167645f8fea7d7d52d9fd2655822d53e9f56e7ce5261635955d18906f1542e040000000000225120350e820feb4e9ae48a0f6281f7aebc64434132302cd204f71bb0d53f5e8fdf600248304502210094efb25003c9ced0c59a50c486f34351f23fcf72d5994b788e21be14e0d7e91f02203b1101052c06ca423891bcef245857e0073137a4d9eb62fcc0cde6c28a5becfc012103a23aa11f7f890650feaf48f09006d9c3e800f37b5b48c47dcfef27e7554cd5900000000008fd01830c6a7ccb693cd1d079239846914c0f6321988a3ab9efe6265191669bcb74c487f005e70b97110aa74310d5758156a887b8a1cfe6034ed8d2b4afba0ef89d3d0c1bb18c04cfe7fbc25a72fc5f9298c19f8e2d0ee5a127c5244f66a6edbc29df1c3764deda4f5dbcf2aad84cece706a48d1ead1aff3c3a54cf651c5803c710e697208b453cf2d5d65fb39948b24709616e6ce502ba78c72dc48f732608ec17af1109980f804c959933be7c02b6b1491a40a9182cf1b5f9b7bb3a8b5eeffad7dcc72bbc3c649ec93c31c5b0acff3a4275edf9e95046a9911276ec256ff3410bdfc513aeab02ad7ab1d0bda062fb9ff3828a367139363265ac7b96076018dcddc4c64f2ae2be52f40637b6c75d7d1b8d62316aabd2948da02e5e61988615faa014c78b1defa9f97f3897ae8d0f27a0ef87f87af2f153f15f27ba3dd35a65dc4743b7570bf824800d0451c3d7b7f0619176a6b13655380a272c06925ecf77508e70e578c6fb76a872f68b0832f60b124b9aedcee1596bc5692b1cf02c7fcd60dfd0bca5cf0b0af50001000254cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd2000000040a726f796c6c6f436f696ee08c74d75554e2c9d6d8452a3584d191f8727963b05e497bba84ada8ae82920800000000000401000605fe000186a00b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e020000102102fe0898805795bd2b698c8819ea3bfcbf1c7aa2330d0f7228723899b825848ee60c9f00040000000002210215305a361d0919c3be1a756ec45514feff098ddeb5b2731c4bf8068e19a69de903740149000100022024a27ab522c9c33e64f4462f2acee01571e014ccbbac075786d1deae033a128d04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e00040000000102210238636cf0d229ba3c9c46e2d832db0f41a827de003ff5a16edc0611e1b71806f105030401011124000100021f726f796c6c6f436f696e206f6e206d61696e6e657420627920526f796c6c6f1604000c75e21754cb9f6b6266ba56d7bf85fbf3963c59caadb80045c1202c2a267c65dea2e92dd2000000040a726f796c6c6f436f696ee08c74d75554e2c9d6d8452a3584d191f8727963b05e497bba84ada8ae82920800000000004ef51f2a52c89668c2bb425dbe7c89d7f6dc9f1869635a80a2e13bf4d3d085e9"; + storeFile(roylloCoinProof.getBytes(), sha256(roylloCoinProof) + PROOF_FILE_NAME_EXTENSION); + + final String setOfRoylloNFT1 = "544150460000000001fd055a544150500004000000000224900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010450008004326ab5c17f2ded3596b047247d63f70a33f70446c9096dc4982000000000000000ef61438cd2c2405693b046c63c514df4a47f5db553b5e20cc48c86d1b41c4d6c6a3032655f293b194efac01206cd02000000000101900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d0100000000ffffffff02e803000000000000225120d6484a40e7a0c5bcb5a958bd6251554feee22c1c94b0c058d7891105b34f309b0ba7100000000000225120c746196e62f7e88c99a96fab48967d38c58dcd415ccc87a51b5bd96fcf34de840140ae44a092025c5c182a52f0b542489395196b147b6b908f220205a562b86de46a2fd83770100e8aa5f775496c518ec3be8846fcc727cc3467adc8eb149cc767790000000008e207e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e0afd015c0001000258900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010e7365744f66526f796c6c6f4e46545d24eb6c3942d4919bdf6aa059ccd193afcbace8cfaf3cf9138ad43cafadc38e00000000010401010601010bad01ab0165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003420140b21995d3080a44a6402faddc4c8976e50c72230a811754f9f2656072cc1d95bfb15fa1e937ad6381ecfb3bcd821ffef583aeb90b08b8e47d5dc51e2c932a7b510e0200001021022dd926192ebdfd038b85ae326efd0ee3919c435da9e1d43186f994706cf245081121039511fd8c1f51acfbd85d9d742268d1ca03ce3b69d0436e71130192c085394c990cef000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b03c4019900010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a04720002e9c90ee43476c7623bd5392f7197c8ac6a7f1eabb535264e515e82dbdc16d1b800000000000000017e079338ba0a60e64b794492e39e4a10ce06083578677aa95b6c6c9a373cc6dc0000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e000400000001022102f202542e41672bec22302c29d8e002c953c9c9abb1c4f8cdeefd1e075753e3060503040101111d00010002187365744f66526f796c6c6f4e465420627920526f796c6c6f16040026abaf1758900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010e7365744f66526f796c6c6f4e46545d24eb6c3942d4919bdf6aa059ccd193afcbace8cfaf3cf9138ad43cafadc38e0000000001192102575af07788bda54cc640cfb9b05ad0a621c171e8c581e12e4cbdf3d2d7b8da8241765d6ecc379d1595d8af0fff01fab52a0675e56d4e8dfa4cf197884739d20a"; + storeFile(setOfRoylloNFT1.getBytes(), sha256(setOfRoylloNFT1) + PROOF_FILE_NAME_EXTENSION); + final String setOfRoylloNFT2 = "544150460000000001fd053a544150500004000000000224900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010450008004326ab5c17f2ded3596b047247d63f70a33f70446c9096dc4982000000000000000ef61438cd2c2405693b046c63c514df4a47f5db553b5e20cc48c86d1b41c4d6c6a3032655f293b194efac01206cd02000000000101900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d0100000000ffffffff02e803000000000000225120d6484a40e7a0c5bcb5a958bd6251554feee22c1c94b0c058d7891105b34f309b0ba7100000000000225120c746196e62f7e88c99a96fab48967d38c58dcd415ccc87a51b5bd96fcf34de840140ae44a092025c5c182a52f0b542489395196b147b6b908f220205a562b86de46a2fd83770100e8aa5f775496c518ec3be8846fcc727cc3467adc8eb149cc767790000000008e207e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e0afd015d0001000259900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010f7365744f66526f796c6c6f4e465432512dfac35a94760baf3dbd6682e3cd0d5cf4f3f8cc5b881931f73ed3a820c2a400000000010401010601010bad01ab01650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034201409a8b780e6e9fc9cb85424fdbdb0c86563ab4229007a572109baf7e4ef78419ed7fdeb8801a6e8811e70a64ab09376fbcb5e04cda5cc8a286b3bd679859bc02670e02000010210217c46686156f732035981526ea4f7e4cf5055fbdb6eeaa0254ea2b111b69328e1121039511fd8c1f51acfbd85d9d742268d1ca03ce3b69d0436e71130192c085394c990cef000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b03c4019900010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a04720002b3cd0b6af8976c1d9979ac0b63f85965e1cca16e9686b2406dfb063daf54140c00000000000000017e079338ba0a60e64b794492e39e4a10ce06083578677aa95b6c6c9a373cc6dc0000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e000400000001022102f202542e41672bec22302c29d8e002c953c9c9abb1c4f8cdeefd1e075753e3060503040101111e00010002197365744f66526f796c6c6f4e46543220627920526f796c6c6f16040026abaf1759900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010f7365744f66526f796c6c6f4e465432512dfac35a94760baf3dbd6682e3cd0d5cf4f3f8cc5b881931f73ed3a820c2a40000000001cd5aec6f7e1b80b906b4dcc157252585e1237fbc39e4635514fbbfe7992c10da"; + storeFile(setOfRoylloNFT2.getBytes(), sha256(setOfRoylloNFT2) + PROOF_FILE_NAME_EXTENSION); + final String setOfRoylloNFT3 = "544150460000000001fd0512544150500004000000000224900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010450008004326ab5c17f2ded3596b047247d63f70a33f70446c9096dc4982000000000000000ef61438cd2c2405693b046c63c514df4a47f5db553b5e20cc48c86d1b41c4d6c6a3032655f293b194efac01206cd02000000000101900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d0100000000ffffffff02e803000000000000225120d6484a40e7a0c5bcb5a958bd6251554feee22c1c94b0c058d7891105b34f309b0ba7100000000000225120c746196e62f7e88c99a96fab48967d38c58dcd415ccc87a51b5bd96fcf34de840140ae44a092025c5c182a52f0b542489395196b147b6b908f220205a562b86de46a2fd83770100e8aa5f775496c518ec3be8846fcc727cc3467adc8eb149cc767790000000008e207e17618af6be825a96957491f4b6499cf97fdc5b88a4762e87661426d41bb62081d6bf0ab625ac447d9c83a1fed040b2876c076da593609509112a69372a5ed0082dad8dcaa7ce94e0a4ea0f520807995d5202c0f2415ea8756db7c4ca9cb3768ee2c9043dcf1ba953d3adb1f6901d29ce77ba52a5f3e5072fd114053cb477a872a280c347835730f15997e1ecfe5e76d7b43390f8fe665065353b9bce131a26a4847319d092430d0f6878224be35e03af5bbc81d337a305e2c8590dea0b7cccbec17ab742568cc65f574f89c49119e0881650fee43d1472232c5486688b0d9073e0afd015d0001000259900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010f7365744f66526f796c6c6f4e46543357321df398180b331e6a8207abe9412a19e5b5c307348340fac9d450b5310cec00000000010401010601010bad01ab0165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003420140687db6a3598f2a507e8cda8ce94769de9446641c923fc69418796675cdb4a75ba1e8956812d2f81c33a7e4ef5f5c43e855683d9a7239fc281cb6d10a3058e4710e020000102102c8c3e030404c7f117a62aeebca5926a1693f917121465938cc5f215a8a3dc7e11121039511fd8c1f51acfbd85d9d742268d1ca03ce3b69d0436e71130192c085394c990cc7000400000000022102cb0cb321ba20816b7450ae6eb309839770f3dc41529664124f8983ca11a6932b039c017100010002202d3e0b53fa0b0ca74339398b9d3efca5d338fc6fc3727c4a24b4ec3191215e3a044a00012225bf1097c66530e2c0b7d13acee653ff40ca5ab078d2feb12a14a1dd825fd10000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e000400000001022102f202542e41672bec22302c29d8e002c953c9c9abb1c4f8cdeefd1e075753e3060503040101111e00010002197365744f66526f796c6c6f4e46543320627920526f796c6c6f16040026abaf1759900b77ad5955e1640645a7c66f1a794acb3a0f69ed4c04b4bf65baf25a9fb76d000000010f7365744f66526f796c6c6f4e46543357321df398180b331e6a8207abe9412a19e5b5c307348340fac9d450b5310cec0000000001b805a6524902d9682bcbcfb45d1473eb35d85fd1f016e80b3227eaa33b3eb678"; + storeFile(setOfRoylloNFT3.getBytes(), sha256(setOfRoylloNFT3) + PROOF_FILE_NAME_EXTENSION); + + final String trickyRoylloCoinProof1 = "544150460000000001fd04d154415050000400000000022476dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e3772700000001045000003635f365e8a493496b66b914c5725753fad8439edf0a567a90220a00000000000000eaf04296428e6aaec3fffbc67a0598e067a050839e6efb23ff9330c077da7426463432655f293b19663892b606f60200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c0000000008fd0102087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a20af9000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2af80b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0200001021023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff0c9f000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101111f000100021a747269636b79526f796c6c6f436f696e20627920526f796c6c6f16040026abb0175a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000008b27a67fc41942150b23743e9b88aeedfb8da174f90f9e21667eb455ac099dfa"; + storeFile(trickyRoylloCoinProof1.getBytes(), sha256(trickyRoylloCoinProof1) + PROOF_FILE_NAME_EXTENSION); + final String trickyRoylloCoinProof2 = "544150460000000002fd04d154415050000400000000022476dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e3772700000001045000003635f365e8a493496b66b914c5725753fad8439edf0a567a90220a00000000000000eaf04296428e6aaec3fffbc67a0598e067a050839e6efb23ff9330c077da7426463432655f293b19663892b606f60200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c0000000008fd0102087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a20af9000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2af80b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0200001021023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff0c9f000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101111f000100021a747269636b79526f796c6c6f436f696e20627920526f796c6c6f16040026abb0175a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000008b27a67fc41942150b23743e9b88aeedfb8da174f90f9e21667eb455ac099dfafd07a7544150500004000000000224adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630000000004500000ff3f5dba5695789b34b2a4177c1918ff0aa9d20eef1bdfe78e302100000000000000ad2ec309a6f38f5bd7432d3ec39375dfcce23987a05de649086d09e43ee4ca1bd03732655f293b19e08c9a3e06fd016302000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c0000000008c20608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e0afd02b4000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000601320bfd022401fd02200165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005fd01b54a000133bb0d9d198714f699adcaaeba0da20feb35bb9c6cc7f954466ac980f39b2f650000000000002ac6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdffd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2ac60bad01ab0165adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff03420140098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a0d280ec4c71b4a0c96a3939c488fe60a268a8777e3016b1f41306ecf572a0540bdd70000000000002af80e0200001021022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb0e0200001021026e6f1ce5a4cf58f63f1c6d2421aaf3d011e3811bab92122cffd67dada97ab6100c9f000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a0001ad91c6726cfc6a35637fc28d8c6c5153ca6667faca459054a03195cf87cb014a0000000000002ac6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e1840205030401010f9f000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16040026abb20730ebfb00979ea9778521856c717b764370eaf504d79dc3aea33e1caa970d25"; + storeFile(trickyRoylloCoinProof2.getBytes(), sha256(trickyRoylloCoinProof2) + PROOF_FILE_NAME_EXTENSION); + final String trickyRoylloCoinProof3 = "544150460000000003fd04d154415050000400000000022476dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e3772700000001045000003635f365e8a493496b66b914c5725753fad8439edf0a567a90220a00000000000000eaf04296428e6aaec3fffbc67a0598e067a050839e6efb23ff9330c077da7426463432655f293b19663892b606f60200000000010176dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270100000000ffffffff02e8030000000000002251204251129e0033628da2e8e297ea72bd6675143a881841a655f92b93462d8f3898ebbf16000000000022512075a5d9344ea3b0fb74a7c42b14e066249a9ff3abfb515e6288abe5502f2585740247304402206bf51adf6f12b6f50e344d51bffaa5b5e94e6cf0834523920352354a84c4836a0220177509e5a4c424852779d8ebf44441e4ec3f80ea365ec185c37d5e453106ab94012103219e2594f427e338690c3f51409706439d8ab83fde02d18d0c28ec55c285801c0000000008fd0102087952442c0461122a7532be0147f2a7fe87dcb387b133d2a32ce95638ea1ed345859091c4ae7a576de03631f91e8efd9595d2b54a3d8f21013374e1a857feb25a4eb246b5ba1a90c4937053b66e48b2908118daa11f8c53584723e612b7d409e56c09b4657be394ecd13208ee6bd102930fdc1655864bceab592900527297ec9c56012066ab30eefec6ad51d148bdbbb6d5a23813750904986d7b59fcc26ff1ebb2054959f173eccab36e4e91e8794956ca29758f4dfdc4756f3989a1f1976e8736076bb032659a09852f845ee476260daa53b9d71b246b4606f75c4af4118ed9f6dc4ca0876a83cb9fe99f16ba9a7f2f6c37c4736106cad9f78ae06fb56ccd45a20af9000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2af80b690167016500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0200001021023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff0c9f000400000000022103995581f54bd5751c79fa0f394f97fc05b88180bacc67805ff11065e6c6c60c40037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221029fa69a708d80239eb132267e3d7f90b4312fdada68c3ebcb402eabf6628ef0a50503040101111f000100021a747269636b79526f796c6c6f436f696e20627920526f796c6c6f16040026abb0175a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000008b27a67fc41942150b23743e9b88aeedfb8da174f90f9e21667eb455ac099dfafd05b9544150500004000000000224adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630000000004500000ff3f5dba5695789b34b2a4177c1918ff0aa9d20eef1bdfe78e302100000000000000ad2ec309a6f38f5bd7432d3ec39375dfcce23987a05de649086d09e43ee4ca1bd03732655f293b19e08c9a3e06fd016302000000000102adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d630100000000ffffffffadb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000000000000003e803000000000000225120eb93573ac51bf6b65aa4458b0bc48659844f2fd267108c740d130bfe9ac41807e803000000000000225120e8e257c55806d5091802e9c92c8264153a1778c3d7814c12854f14079cc6c98a11b416000000000022512051df07dfb09c998ea6f0cc7945a689fe542fc1a9e317a03ab2dfe06b5b453b8b014096ae7d9091209d38139dd1f3243e091bc7d94ae3be3a0a3a952db82e67090cc7605ca344d4e6bf564a98a75e3ee4ba3b42f0d3f7c5db92cade10092281c87ec90140466ae8ba099587195807ec28a3fe682c39355438892027575b0261bbdcc486ddd9af10749be0617563be9ab16e31be8519aa565e0eb77a9b2cc1596034e2ee1c0000000008c20608c03588c3edf8639df01c70cbd3793dfe478af2f1f88de37cef016ca1f60b32ae4690a36a3c5e86121b1db67c5d6e560ec617f092fd329c32a96cfdc1a988182f466628113babb675f06190883f3ee8bfb2ed82efe90be0bd1413fa1c7b2507dad2b9a035ded2db5e0db7855ad26fcbf2dfeaa691df17cd1835ec6de8cf7795a63b81caa53ac29ad16e7088bbf8857d9a2ff40548b9de836c5bbe85ce22b3668293682aed4a1ed48936e1b92a79f7c1e459e699ebeb790831fe7e8108a48ada2e0afd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2ac60bad01ab0165adb03787405b61fb3ea37a6f97d7867751e5dc68e21837aa30f2ff35390c2d6300000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e023a8d9bc352eb3f5f69b798a941f06244b3633a8fd2cf82406132504ff08e23ff03420140098e4ab4d1370e834542ac40fe2ef80d48f9b5bc4c484375342928e1fb07cdc8f5e49a077ddcee12dd92f2b3c57a06dad10c33f19512db42662d3d8b9016fd5a0d280ec4c71b4a0c96a3939c488fe60a268a8777e3016b1f41306ecf572a0540bdd70000000000002af80e0200001021022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb0c9f000400000000022102ca2940ca5e20318ee913dfb1bd22c9e61065bead2137909b849dc1625b9854b8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000001022102db2decc6a7e06ab173ffce3fabd24de90d607a7d8a8a7ed2f95c51f7afca5aad039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a00019b28bc20e99078e38640e026115c0e6b214bba541ad194dffa5737983cddae1a0000000000000032ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbf022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e0004000000020221028cca992c798b0e2f92ff69366196625005376721aeee5fb9ce6c766d90e18402050304010116040026abb28f40a7bea7a33a37cd2194c330007dcbc532537b9ce5c77e357afae1ab30f799fd07c7544150500004000000000224d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000045000400020ed570e7c46d5584f76068799496d9317a4398e486a785ab4110000000000000087cfc858c94d3005d6c8880fafd773aed06e2fe748a081a2fc32d9e2f20ef5a3384032655f293b19668bd3c706fd016302000000000102d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf20200000000ffffffffd3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000000000000003e803000000000000225120acb9b163799c60c08c279c18a652ffe4bbbea9301831c3acca52b796a5fb7cc5e8030000000000002251203f475770dfc8d7e92e93632c251a5c01b6e90670e8522b81cb7b448bf86efffa03aa1600000000002251209706916002ac9ba36bab02ce2ed586da3ee2bfd271c54743143c9663ccfda56d01409867a537b52ee5c4bc798315397d89bf65380e4ed88a04ec9315f67bc08ed6bb275a51117feecf87da27a8b2761630c92fd81c6e4512ecfe9536819be6b3c5d00140a6df68be0be4f5c58b40e0463254e11e6848761ad77d538f53212ad78b5ab80640344e46de7bcd6d8350bf52769851a5b0abff9e8c08414075ea885ad86644ac0000000008e207ed5bc2ffc43424ee07fed779bdbbb19b8a264d6b3c7e4be7e48e1fc63196abe8e749d4950360f70c69103d539ae7a27a80ca78c226fd540b4fc84d687b71eb786b8fc0cc51efe9a546188902577e1f5d105dbe483b03077fd6ac643ef2dfd0a152a98a2916ce8948567b361ed53da743e455e575cef6380c1909aeeb597c377c476ce23a33c62d040495d94028ba3c503aa8d56ed27a3e323c2503277d03fddf89361e8d266148f7784cdadbcd47b21d8221418ec9b4b5f5ffad95a9e41159ca7be8c3138e935252798546897d2515404231693240af2dc052479c1403f9ef11640afd02b4000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b41000000000004010006017d0bfd022401fd02200165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005fd01b54a0001c6360d41bd3cb4ddefc119acc1db551dd2a324c0364c3a6f42c8183e0ffe6cf50000000000002a49ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdffd0167000100025a76dfd989aeba79f86c08003815ef131e2e4186827bb1f431526d1f4506e377270000000110747269636b79526f796c6c6f436f696e13a16f12767ad6fbafcfd69fd12fc19747ac35749b1b6806c74dd4a07d2e4b4100000000000401000603fd2a490bad01ab0165d3e09cd4a81a19f2857c4afcf033bf1d2f4cb8b1ae5bad3b68a7825823f1acf200000000e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e022dcc33d4e29c5d322277b9404ced5c67790fe1e31e234fecb3d06239caf3eddb034201408bd6b5306b3c03794c974922b7b6a4a5b9deeefd35a02d3ade39de88882e507cc9b62c8de4c4a6758efa9b756428e0d7666657794d1a8bd82cdbd6d02117139a0d2851efabb48146e9c53975cb2f0f71fdcc7c17b0a14d1787de7ad8dc8ac4d3c7a20000000000002ac60e02000010210223e1cfbdb232a9d98d3ddc2bf36d907c3c1bf3f40ad10eca0ebdb7eafe07db840e020000102102629f225f4ef29972e703b1086796dbe47e881ae913904a1c2eec15df35361fb60c9f0004000000010221034d6fd392fe86bdfc93973406f15050b36281f569be8335afa4b3586b36a0aaf8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c7000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8039c01710001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e044a000179bef732bcc42581ed21a0673d739a0096c5b29c13e4170d59185ba1bf5a20650000000000002a49ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e000400000002022102fabb9caf70565dd69dabab7e38cd8932843de0a2e620d8c8964d375387e764bc05030401010f9f000400000000022102bfca44f6bdfd7d54ce75e775049026015f7745ddef61610d4a6488c42f06f0a8037401490001000220e16029acc4d2cf0505857265442344efb5547f2047a3fc1c4822683f7c57820e04220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16040026abb7d3a36b396d7e73af998dd2ef8e0501379740114177ff1f93b08f17a9a8e4c767"; + storeFile(trickyRoylloCoinProof3.getBytes(), sha256(trickyRoylloCoinProof3) + PROOF_FILE_NAME_EXTENSION); + + final String unlimitedRoylloCoin1 = "544150460000000001fd05085441505000040000000002241304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770000000104500000002033b4e14d09dca9b6a47b283628a13a56fc625d00749b89dd1b0000000000000027a7b906a22308e5c62586eaf63a0755465193da34f88f38fcd16136a40837245c4c32655f293b199a10705906cd020000000001011304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770100000000ffffffff02e803000000000000225120e5d4f8a3b6b3087984f36182654e2deb91e2e567cf35f068e6d4362ac7958cceef9a1600000000002251207a9d28abfb419fa691b22c3967b61d8d358ed65031f92740604875e29aa0ff2801407fc9e637deacd43c5434d35a9db8f6634d049f30f9aa2f8521944b4654bad147848d20f1b96e081fa23604e3ad610c5b9b16fd553ec751e608ee79bd622dcca80000000008c20612f24121b3b09bca8dfd619a8412521cd5a0df3c3530e2f2e5aa7a4beebac8ba4ccd82f747699a0a1d1e4a99819fda33c8c9cccbc6b92e2e2ee6f7018ea3862b0574ac6910af8096a5531d803cad77a8a878972091f4a11404ecd009e75ebe40afd73ec375e791f7d7de16bee7fcb6e6e412a1fb03bd363f4a997af477ffe5caa538f8705031ec8da6da106429c44b289ef68e0cce784d0d91a47589b86ed27dbd5f81607a2e8dd37cb256c4179c5980ae45e8dff592a5dfea2ad06c9a8c4b412d0afd0164000100025e1304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770000000114756e6c696d69746564526f796c6c6f436f696e31ef35cbdef9f461dee0ad1c4753a481e30fb7b02d6356f342e573671f8044af5e00000000000401000603fd01f30bad01ab0165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003420140e0c383aaecabb44bee72683d825118b7ef7124a9c8be149c82b7c4c525340aceb4194a177bc1e13e0bee7df5425720f4b5f30335faed586bef129780146b7a2c0e0200001021025f121b76e25840b5fbe620ef331ac834abd964a35fff72bbae207bfe2bad9a4311210349d60c6689bbbb2ffc9b30b45b96a3d6e5fd5fd01c867344c0054f61050482410c9f00040000000002210261592c195dc3af641d2808184301edacd7596c7096358042c7873bee0ac110cf0374014900010002203eb8c5d0a5cf2a1c3ffbf1ad097e22260c783d2a2d6222a23647ff6791a6a04004220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221027b00a63bfb5c13093652e488eca57c924355d2f190f2a814982d193773e3d2760503040101112d0001000228756e6c696d69746564526f796c6c6f436f696e20656d697373696f6e203120627920526f796c6c6f16040026abc2175e1304bbe45c93350cf2fbe6af7315106ddb79a982494f31af7d34ad10de50b5770000000114756e6c696d69746564526f796c6c6f436f696e31ef35cbdef9f461dee0ad1c4753a481e30fb7b02d6356f342e573671f8044af5e00000000001921036c1fb8f682b877b9caa27ddb7068a242f662332ea7eb99e3c32c12170c15a0bc7bffc046fd524f88aede26e5729447892286061bf1c950a6299d0a79061bd8df"; + storeFile(unlimitedRoylloCoin1.getBytes(), sha256(unlimitedRoylloCoin1) + PROOF_FILE_NAME_EXTENSION); + final String unlimitedRoylloCoin2 = "544150460000000001fd04c55441505000040000000002241f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890000000104500000202034a4f2a5fecc95d461212ad94ecb66d0c9ee7ac5fdb43d003100000000000000cf4a3cba30f469954f2fa882aeb881ae88294608a980abddd1595d48f9daf729a77539655f293b19402f697e06cd020000000001011f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890100000000ffffffff02e8030000000000002251206f479cbd41e4ffce26c55a28268877fd40b0e64c283c817b875930bed23cea1e2b8216000000000022512078523cac7967c76daecc63e1fce58e7035fa400f8e5516299443dd4b2deebe210140864ccb6887b5dd92e0592b95aa5af1e4c0c82bbb20688a44c1a42a784aab5c5d2d22dbef014b51dfab133c4ea5d24826ddbd857ab8744cf7665492aa3ad45f0f0000000008a205c0f934598d194699c7c789782caabb2442ec4bdd0cba397c9bef4763aab4e3cb925852af91b28490c3f7678303f382a8cd71ede1e12b136779836f78a14e8ddcf5d067675f07d4c4692aa81d552f47e69faa56b63a01d27bc44cb08f8a2036feb5e4fe06516959842e30fa5d75c60a6f5caf8f82ae1d694837f2f587d352471f7b592c21cdb6cf968e27038ad439167cea8d4399a5adc4a6d90797ca27fe6a78190afd0164000100025e1f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890000000114756e6c696d69746564526f796c6c6f436f696e3236a5ee53396cf2d45b9f7bfb306ec706bca2e5738d9bbf4cf52e3cd2cf45a31100000000000401000603fd01f50bad01ab01650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034201403c027fc40af5c14afedbbd9e08d61017ed36780f0b92d94ac97bb0f81fc8bf63a7c75c65bf37ee41be7a5287e1da049a8ccea15053ac2c11f0ad6a5000bc06590e020000102102ea041c360a308ee44466ca4e2b07c5692c02a8d01f0720982dcd0642366546ff11210349d60c6689bbbb2ffc9b30b45b96a3d6e5fd5fd01c867344c0054f61050482410c9f0004000000000221024b84c791ddceed288f4c832d047e67f8152ce1af352cc18930902d84bc6bf9130374014900010002203eb8c5d0a5cf2a1c3ffbf1ad097e22260c783d2a2d6222a23647ff6791a6a04004220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010002220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0d30012e0004000000010221022300be5ca01e926c7bb7f8e59dc06111bf2d13627e8e28c3a581a632a8437e2e0503040101112d0001000228756e6c696d69746564526f796c6c6f436f696e20656d697373696f6e203220627920526f796c6c6f16040026af10175e1f7b079e5bc9aa73cdb388697bab10a79064e540e7507da77c214f589854cd890000000114756e6c696d69746564526f796c6c6f436f696e3236a5ee53396cf2d45b9f7bfb306ec706bca2e5738d9bbf4cf52e3cd2cf45a3110000000000e8d13eb083538735c4bb6a9354741d6187206bdfa196ff9f0534523182753408"; + storeFile(unlimitedRoylloCoin2.getBytes(), sha256(unlimitedRoylloCoin2) + PROOF_FILE_NAME_EXTENSION); + // Starting a web server to serve content. PathResourceManager resourceManager = new PathResourceManager(fileSystem.getPath(".")); webServer = Undertow.builder() @@ -75,4 +107,20 @@ public void storeFile(final byte[] fileContent, } } + /** + * Returns the sha256 value calculated with the parameter. + * + * @param value value + * @return sha256 of value + */ + protected static String sha256(final String value) { + try { + MessageDigest md = MessageDigest.getInstance("SHA-256"); + byte[] digest = md.digest(value.getBytes(StandardCharsets.UTF_8)); + return DatatypeConverter.printHexBinary(digest).toLowerCase(); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("SHA-256 is not available: " + e.getMessage()); + } + } + } diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java index 8a9fe8bfc..9595440d7 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java @@ -45,8 +45,8 @@ public class AssetServiceImplementation extends BaseService implements AssetServ /** Bitcoin service. */ private final BitcoinService bitcoinService; - /** File service. */ - private final ContentService fileService; + /** Content service. */ + private final ContentService contentService; @Override public Page queryAssets(@NonNull final String query, @@ -165,7 +165,7 @@ public void updateAsset(final String assetId, final String metadata) { // Saving the file. final String fileName = assetId + extension; - fileService.storeFile(decodedBytes, fileName); + contentService.storeFile(decodedBytes, fileName); // Saving the name of the file. assetToUpdate.get().setMetaDataFileName(fileName); diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofServiceImplementation.java index c02ed1831..074fb4848 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/proof/ProofServiceImplementation.java @@ -5,6 +5,7 @@ import org.royllo.explorer.core.domain.asset.Asset; import org.royllo.explorer.core.domain.proof.Proof; import org.royllo.explorer.core.dto.proof.ProofDTO; +import org.royllo.explorer.core.provider.storage.ContentService; import org.royllo.explorer.core.provider.tapd.DecodedProofResponse; import org.royllo.explorer.core.repository.asset.AssetRepository; import org.royllo.explorer.core.repository.proof.ProofRepository; @@ -19,6 +20,7 @@ import java.util.Optional; import static java.util.stream.Collectors.joining; +import static org.royllo.explorer.core.dto.proof.ProofDTO.PROOF_FILE_NAME_EXTENSION; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER; /** @@ -29,21 +31,30 @@ @SuppressWarnings({"checkstyle:DesignForExtension", "unused"}) public class ProofServiceImplementation extends BaseService implements ProofService { + /** Proof minimum size - Under this size, the proof is displayed without preview. */ + private static final int PROOF_MINIMUM_SIZE = 6; + + /** Proof preview size - The size of the preview on both ends. */ + private static final int PROOF_PREVIEW_SIZE = 3; + /** Asset repository. */ private final AssetRepository assetRepository; /** Proof repository. */ private final ProofRepository proofRepository; + /** Content service. */ + private final ContentService contentService; + @Override public ProofDTO addProof(@NonNull final String proof, @NonNull final ProofType proofType, @NonNull final DecodedProofResponse decodedProof) { - logger.info("Adding {} with {}", proof, decodedProof); + logger.info("Adding {} with {}", getProofAbstract(proof), decodedProof); // We check that the proof is not in our database. proofRepository.findByProofId(sha256(proof)).ifPresent(existingProof -> { - logger.info("Proof {} is already registered", proof); + logger.info("Proof {} is already registered", getProofAbstract(proof)); throw new ProofCreationException("This proof is already registered with proof id: " + existingProof.getProofId()); }); @@ -55,16 +66,17 @@ public ProofDTO addProof(@NonNull final String proof, logger.info("Asset {} is not registered in our database", assetId); throw new ProofCreationException("Asset " + assetId + " is not registered in our database"); } else { - // Asset exists, we create the proof. + // Asset exists, we create the proof (in content service and database). + contentService.storeFile(proof.getBytes(), sha256(proof) + PROOF_FILE_NAME_EXTENSION); + final Proof proofToCreate = proofRepository.save(Proof.builder() .proofId(sha256(proof)) .creator(ANONYMOUS_USER) .asset(asset.get()) - .proof(proof) .proofType(proofType) .build()); final ProofDTO proofDTO = PROOF_MAPPER.mapToProofDTO(proofToCreate); - logger.info("Proof created with id {} : {}", proofDTO.getId(), proofDTO); + logger.info("Proof '{}' with id {}", getProofAbstract(proof), proofDTO.getId()); return proofDTO; } } @@ -114,4 +126,22 @@ public Page getProofByAssetId(@NonNull final String assetId, return results; } + /** + * Returns an abstract of proof (for logs). + * + * @param proof proof + * @return proof abstract + */ + private String getProofAbstract(final String proof) { + // If proof is null, return null. + if (proof == null) { + return null; + } + // If proof is too small for substring, return proof. + if (proof.length() <= PROOF_MINIMUM_SIZE) { + return proof; + } + return proof.substring(0, PROOF_PREVIEW_SIZE) + "..." + proof.substring(proof.length() - PROOF_PREVIEW_SIZE); + } + } diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-proof.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-proof.xml index d07927375..d1fe68265 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-proof.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/data/data-proof.xml @@ -14,8 +14,6 @@ - diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-proof.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-proof.xml index eaa3722d2..649c5ab4b 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-proof.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-proof.xml @@ -28,8 +28,6 @@ remarks="Calculated value: sha256(proof)"> - diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/dto/ProofDTOTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/dto/ProofDTOTest.java deleted file mode 100644 index b0b47869d..000000000 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/dto/ProofDTOTest.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.royllo.explorer.core.test.core.dto; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.royllo.explorer.core.dto.proof.ProofDTO; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_UNSPECIFIED; - -@DisplayName("ProofDTO tests") -public class ProofDTOTest { - - @Test - @DisplayName("Simple proof") - public void simpleProof() { - ProofDTO proof = ProofDTO.builder() - .proof("AABBBBBBBBCC") - .proofType(PROOF_TYPE_UNSPECIFIED) - .build(); - assertEquals("AABBBBBBBBCC", proof.getProof()); - assertEquals("AAB...BCC", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=AAB...BCC)", proof.toString()); - } - - @Test - @DisplayName("Null proof") - public void nullProof() { - ProofDTO proof = ProofDTO.builder() - .proofType(PROOF_TYPE_UNSPECIFIED) - .build(); - assertNull(proof.getProof()); - assertNull(proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=null)", proof.toString()); - } - - @Test - @DisplayName("Small proof") - public void smallProof() { - // Proof size = 0. - ProofDTO proof = ProofDTO.builder().proof("").proofType(PROOF_TYPE_UNSPECIFIED).build(); - assertEquals("", proof.getProof()); - assertEquals("", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=)", proof.toString()); - - // Proof size = 1. - proof = ProofDTO.builder().proof("A").proofType(PROOF_TYPE_UNSPECIFIED).build(); - assertEquals("A", proof.getProof()); - assertEquals("A", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=A)", proof.toString()); - - // Proof size = 2. - proof = ProofDTO.builder().proof("AB").proofType(PROOF_TYPE_UNSPECIFIED).build(); - assertEquals("AB", proof.getProof()); - assertEquals("AB", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=AB)", proof.toString()); - - // Proof size = 3. - proof = ProofDTO.builder().proof("ABC").proofType(PROOF_TYPE_UNSPECIFIED).build(); - assertEquals("ABC", proof.getProof()); - assertEquals("ABC", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=ABC)", proof.toString()); - - // Proof size = 4. - proof = ProofDTO.builder().proof("ABCD").proofType(PROOF_TYPE_UNSPECIFIED).build(); - assertEquals("ABCD", proof.getProof()); - assertEquals("ABCD", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=ABCD)", proof.toString()); - - // Proof size = 5. - proof = ProofDTO.builder().proof("ABCDE").proofType(PROOF_TYPE_UNSPECIFIED).build(); - assertEquals("ABCDE", proof.getProof()); - assertEquals("ABCDE", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=ABCDE)", proof.toString()); - - // Proof size = 6. - proof = ProofDTO.builder().proof("ABCDEF").proofType(PROOF_TYPE_UNSPECIFIED).build(); - assertEquals("ABCDEF", proof.getProof()); - assertEquals("ABCDEF", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=ABCDEF)", proof.toString()); - - // Proof size = 7. - proof = ProofDTO.builder().proof("ABCDEFG").proofType(PROOF_TYPE_UNSPECIFIED).build(); - assertEquals("ABCDEFG", proof.getProof()); - assertEquals("ABC...EFG", proof.getProofAbstract()); - assertEquals("ProofDTO(id=null, creator=null, asset=null, proofId=null, proofType=PROOF_TYPE_UNSPECIFIED, proofAbstract=ABC...EFG)", proof.toString()); - } - -} diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/ProofServiceTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/ProofServiceTest.java index fb2c5e77a..575e378eb 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/ProofServiceTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/core/service/ProofServiceTest.java @@ -1,5 +1,8 @@ package org.royllo.explorer.core.test.core.service; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.royllo.explorer.core.dto.asset.AssetDTO; @@ -15,6 +18,7 @@ import org.springframework.data.domain.Page; import org.springframework.test.annotation.DirtiesContext; +import java.io.IOException; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -22,6 +26,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; +import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_ID; import static org.royllo.explorer.core.util.enums.ProofType.PROOF_TYPE_UNSPECIFIED; import static org.royllo.test.TapdData.ROYLLO_COIN_ASSET_ID; @@ -71,7 +78,7 @@ public void addProof() { final ProofDTO proofAdded = proofService.addProof(UNKNOWN_ROYLLO_COIN_RAW_PROOF, PROOF_TYPE_UNSPECIFIED, unknownRoylloCoinDecodedProof); assertNotNull(proofAdded.getId()); assertEquals(UNKNOWN_ROYLLO_COIN_PROOF_ID, proofAdded.getProofId()); - assertEquals(UNKNOWN_ROYLLO_COIN_RAW_PROOF, proofAdded.getProof()); + assertEquals(UNKNOWN_ROYLLO_COIN_RAW_PROOF, getProofFromContentService(proofAdded.getProofFileName())); assertEquals(UNKNOWN_ROYLLO_COIN_ASSET_ID, proofAdded.getAsset().getAssetId()); assertEquals(ANONYMOUS_ID, proofAdded.getCreator().getId()); assertEquals(PROOF_TYPE_UNSPECIFIED, proofAdded.getProofType()); @@ -105,7 +112,7 @@ public void getProofByAssetId() { assertEquals(ANONYMOUS_ID, proof1.get().getCreator().getId()); assertEquals(TRICKY_ROYLLO_COIN_ASSET_ID, proof1.get().getAsset().getAssetId()); assertEquals(sha256(TRICKY_ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(0).getRawProof()), proof1.get().getProofId()); - assertEquals(TRICKY_ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(0).getRawProof(), proof1.get().getProof()); + assertEquals(TRICKY_ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(0).getRawProof(), getProofFromContentService(proof1.get().getProofFileName())); // Proof 2. Optional proof2 = trickyRoylloCoinProofs.getContent().stream().filter(proofDTO -> proofDTO.getId() == 7).findFirst(); @@ -113,7 +120,7 @@ public void getProofByAssetId() { assertEquals(ANONYMOUS_ID, proof2.get().getCreator().getId()); assertEquals(TRICKY_ROYLLO_COIN_ASSET_ID, proof2.get().getAsset().getAssetId()); assertEquals(sha256(TRICKY_ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(2).getRawProof()), proof2.get().getProofId()); - assertEquals(TRICKY_ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(2).getRawProof(), proof2.get().getProof()); + assertEquals(TRICKY_ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(2).getRawProof(), getProofFromContentService(proof2.get().getProofFileName())); // Proof 3. Optional proof3 = trickyRoylloCoinProofs.getContent().stream().filter(proofDTO -> proofDTO.getId() == 8).findFirst(); @@ -121,7 +128,7 @@ public void getProofByAssetId() { assertEquals(ANONYMOUS_ID, proof3.get().getCreator().getId()); assertEquals(TRICKY_ROYLLO_COIN_ASSET_ID, proof3.get().getAsset().getAssetId()); assertEquals(sha256(TRICKY_ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(4).getRawProof()), proof3.get().getProofId()); - assertEquals(TRICKY_ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(4).getRawProof(), proof3.get().getProof()); + assertEquals(TRICKY_ROYLLO_COIN_FROM_TEST.getDecodedProofRequest(4).getRawProof(), getProofFromContentService(proof3.get().getProofFileName())); } @Test @@ -136,11 +143,30 @@ public void getProofByProofId() { // Checking proof. assertTrue(roylloCoinProof.isPresent()); assertEquals(ROYLLO_COIN_PROOF_ID, roylloCoinProof.get().getProofId()); - assertEquals(ROYLLO_COIN_RAW_PROOF, roylloCoinProof.get().getProof()); + assertEquals(ROYLLO_COIN_RAW_PROOF, getProofFromContentService(roylloCoinProof.get().getProofFileName())); // Checking asset. assertEquals(1, roylloCoinProof.get().getAsset().getId()); verifyAsset(roylloCoinProof.get().getAsset(), ROYLLO_COIN_ASSET_ID); } + /** + * Returns the proof content from the content service. + * + * @param filename filename of the proof + * @return proof + */ + private String getProofFromContentService(final String filename) { + var client = new OkHttpClient(); + Request request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + filename) + .build(); + try (Response response = client.newCall(request).execute()) { + return response.body().string(); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + return ""; + } + } diff --git a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-proof.xml b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-proof.xml index 6e55e61d3..d49c09f72 100644 --- a/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-proof.xml +++ b/backend/explorer-core/autoconfigure/src/test/resources/db/test/test-data-proof.xml @@ -11,8 +11,6 @@ - @@ -26,8 +24,6 @@ - @@ -37,8 +33,6 @@ - @@ -48,8 +42,6 @@ - @@ -63,8 +55,6 @@ - @@ -74,8 +64,6 @@ - @@ -85,8 +73,6 @@ - @@ -100,8 +86,6 @@ - @@ -111,8 +95,6 @@ - diff --git a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-proof.xml b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-proof.xml index 6e55e61d3..d49c09f72 100644 --- a/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-proof.xml +++ b/backend/servers/explorer-api/src/main/resources/db/dev/dev-data-proof.xml @@ -11,8 +11,6 @@ - @@ -26,8 +24,6 @@ - @@ -37,8 +33,6 @@ - @@ -48,8 +42,6 @@ - @@ -63,8 +55,6 @@ - @@ -74,8 +64,6 @@ - @@ -85,8 +73,6 @@ - @@ -100,8 +86,6 @@ - @@ -111,8 +95,6 @@ - diff --git a/backend/servers/explorer-api/src/main/resources/schema/proof.graphqls b/backend/servers/explorer-api/src/main/resources/schema/proof.graphqls index 6d6ead375..25ec3d2ba 100644 --- a/backend/servers/explorer-api/src/main/resources/schema/proof.graphqls +++ b/backend/servers/explorer-api/src/main/resources/schema/proof.graphqls @@ -6,8 +6,8 @@ type Proof { creator: User! "Target asset" asset: Asset! - "Proof" - proof: String! + "Proof file name" + proofFileName: String! } "Proof page - Container used to return proof results" diff --git a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/ProofDataFetcherTest.java b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/ProofDataFetcherTest.java index 8aa970cd3..8dfa765aa 100644 --- a/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/ProofDataFetcherTest.java +++ b/backend/servers/explorer-api/src/test/java/org/royllo/explorer/api/test/graphql/ProofDataFetcherTest.java @@ -19,6 +19,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.royllo.explorer.core.dto.proof.ProofDTO.PROOF_FILE_NAME_EXTENSION; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER_ID; import static org.royllo.test.TapdData.TRICKY_ROYLLO_COIN_ASSET_ID; import static org.royllo.test.TapdData.TRICKY_ROYLLO_COIN_FROM_TEST; @@ -55,7 +56,7 @@ public void proofsByAssetId() { .creator().userId().username().parent() .asset().assetId().parent() .proofId() - .proof() + .proofFileName() .parent() .totalElements() .totalPages() @@ -77,7 +78,7 @@ public void proofsByAssetId() { assertEquals(ANONYMOUS_USER_ID, proof1.get().getCreator().getUserId()); assertEquals(TRICKY_ROYLLO_COIN_ASSET_ID, proof1.get().getAsset().getAssetId()); assertEquals(TRICKY_ROYLLO_COIN_1_PROOF_ID, proof1.get().getProofId()); - assertEquals(TRICKY_ROYLLO_COIN_1_RAW_PROOF, proof1.get().getProof()); + assertEquals(sha256(TRICKY_ROYLLO_COIN_1_RAW_PROOF) + PROOF_FILE_NAME_EXTENSION, proof1.get().getProofFileName()); // Testing proof 2. final Optional proof2 = proofPage.getContent().stream() @@ -87,7 +88,7 @@ public void proofsByAssetId() { assertEquals(ANONYMOUS_USER_ID, proof2.get().getCreator().getUserId()); assertEquals(TRICKY_ROYLLO_COIN_ASSET_ID, proof2.get().getAsset().getAssetId()); assertEquals(TRICKY_ROYLLO_COIN_2_PROOF_ID, proof2.get().getProofId()); - assertEquals(TRICKY_ROYLLO_COIN_2_RAW_PROOF, proof2.get().getProof()); + assertEquals(sha256(TRICKY_ROYLLO_COIN_2_RAW_PROOF) + PROOF_FILE_NAME_EXTENSION, proof2.get().getProofFileName()); // Testing proof 3. @@ -98,8 +99,7 @@ public void proofsByAssetId() { assertEquals(ANONYMOUS_USER_ID, proof3.get().getCreator().getUserId()); assertEquals(TRICKY_ROYLLO_COIN_ASSET_ID, proof3.get().getAsset().getAssetId()); assertEquals(TRICKY_ROYLLO_COIN_3_PROOF_ID, proof3.get().getProofId()); - assertEquals(TRICKY_ROYLLO_COIN_3_RAW_PROOF, proof3.get().getProof()); - + assertEquals(sha256(TRICKY_ROYLLO_COIN_3_RAW_PROOF) + PROOF_FILE_NAME_EXTENSION, proof3.get().getProofFileName()); // Checking page management results. proofPage = dgsQueryExecutor.executeAndExtractJsonPathAsObject( @@ -109,7 +109,7 @@ public void proofsByAssetId() { .creator().userId().username().parent() .asset().assetId().parent() .proofId() - .proof() + .proofFileName() .parent() .totalElements() .totalPages() diff --git a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-proof.xml b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-proof.xml index 6e55e61d3..d49c09f72 100644 --- a/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-proof.xml +++ b/backend/servers/explorer-api/src/test/resources/db/test/api-test-data-proof.xml @@ -11,8 +11,6 @@ - @@ -26,8 +24,6 @@ - @@ -37,8 +33,6 @@ - @@ -48,8 +42,6 @@ - @@ -63,8 +55,6 @@ - @@ -74,8 +64,6 @@ - @@ -85,8 +73,6 @@ - @@ -100,8 +86,6 @@ - @@ -111,8 +95,6 @@ - diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloCoinIntegrationTest.java index dddb1ff41..30252ec7e 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloCoinIntegrationTest.java @@ -25,6 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.dto.proof.ProofDTO.PROOF_FILE_NAME_EXTENSION; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.enums.RequestStatus.FAILURE; @@ -82,6 +83,16 @@ public void processProof() { fail("Error while retrieving the file" + e.getMessage()); } + // We should have the proof file on our content service. + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + sha256(ROYLLO_COIN_RAW_PROOF) + PROOF_FILE_NAME_EXTENSION) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals(ROYLLO_COIN_RAW_PROOF, response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } } } diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java index 9ca66629b..bd723be98 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test; import org.royllo.explorer.batch.batch.request.AddProofBatch; import org.royllo.explorer.core.dto.asset.AssetDTO; +import org.royllo.explorer.core.dto.proof.ProofDTO; import org.royllo.explorer.core.dto.request.AddProofRequestDTO; import org.royllo.explorer.core.dto.request.RequestDTO; import org.royllo.explorer.core.repository.asset.AssetGroupRepository; @@ -33,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.dto.proof.ProofDTO.PROOF_FILE_NAME_EXTENSION; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; @@ -169,6 +171,19 @@ public void processProof() { fail("Error while retrieving the file" + e.getMessage()); } + // We should have the proof file on our content service. + final Optional proofCreated = proofService.getProofByProofId(ROYLLO_NFT_PROOF_ID); + assertTrue(proofCreated.isPresent()); + assertEquals(ROYLLO_NFT_PROOF_ID + PROOF_FILE_NAME_EXTENSION, proofCreated.get().getProofFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + proofCreated.get().getProofFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals(ROYLLO_NFT_RAW_PROOF, response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } } } diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java index 7b47d4e64..c080b7072 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test; import org.royllo.explorer.batch.batch.request.AddProofBatch; import org.royllo.explorer.core.dto.asset.AssetDTO; +import org.royllo.explorer.core.dto.proof.ProofDTO; import org.royllo.explorer.core.dto.request.AddProofRequestDTO; import org.royllo.explorer.core.dto.request.RequestDTO; import org.royllo.explorer.core.repository.asset.AssetGroupRepository; @@ -32,6 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.dto.proof.ProofDTO.PROOF_FILE_NAME_EXTENSION; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; @@ -290,6 +292,46 @@ public void processProof() { fail("Error while retrieving the file" + e.getMessage()); } + // ============================================================================================================= + // We should have the proof file on our content service. + final Optional proof1Created = proofService.getProofByProofId(SET_OF_ROYLLO_NFT_1_PROOF_ID); + assertTrue(proof1Created.isPresent()); + assertEquals(SET_OF_ROYLLO_NFT_1_PROOF_ID + PROOF_FILE_NAME_EXTENSION, proof1Created.get().getProofFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + proof1Created.get().getProofFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals(SET_OF_ROYLLO_NFT_1_RAW_PROOF, response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + + final Optional proof2Created = proofService.getProofByProofId(SET_OF_ROYLLO_NFT_2_PROOF_ID); + assertTrue(proof2Created.isPresent()); + assertEquals(SET_OF_ROYLLO_NFT_2_PROOF_ID + PROOF_FILE_NAME_EXTENSION, proof2Created.get().getProofFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + proof2Created.get().getProofFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals(SET_OF_ROYLLO_NFT_2_RAW_PROOF, response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + + final Optional proof3Created = proofService.getProofByProofId(SET_OF_ROYLLO_NFT_3_PROOF_ID); + assertTrue(proof3Created.isPresent()); + assertEquals(SET_OF_ROYLLO_NFT_3_PROOF_ID + PROOF_FILE_NAME_EXTENSION, proof3Created.get().getProofFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + proof3Created.get().getProofFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals(SET_OF_ROYLLO_NFT_3_RAW_PROOF, response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } } } diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java index cd7a82427..2d1fb9091 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test; import org.royllo.explorer.batch.batch.request.AddProofBatch; import org.royllo.explorer.core.dto.asset.AssetDTO; +import org.royllo.explorer.core.dto.proof.ProofDTO; import org.royllo.explorer.core.dto.request.AddProofRequestDTO; import org.royllo.explorer.core.dto.request.RequestDTO; import org.royllo.explorer.core.repository.asset.AssetGroupRepository; @@ -32,6 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.dto.proof.ProofDTO.PROOF_FILE_NAME_EXTENSION; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; @@ -268,6 +270,46 @@ public void processProofs() { fail("Error while retrieving the file" + e.getMessage()); } + // ============================================================================================================= + // We should have the proof file on our content service. + final Optional proof1Created = proofService.getProofByProofId(TRICKY_ROYLLO_COIN_1_PROOF_ID); + assertTrue(proof1Created.isPresent()); + assertEquals(TRICKY_ROYLLO_COIN_1_PROOF_ID + PROOF_FILE_NAME_EXTENSION, proof1Created.get().getProofFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + proof1Created.get().getProofFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals(TRICKY_ROYLLO_COIN_1_RAW_PROOF, response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + + final Optional proof2Created = proofService.getProofByProofId(TRICKY_ROYLLO_COIN_2_PROOF_ID); + assertTrue(proof2Created.isPresent()); + assertEquals(TRICKY_ROYLLO_COIN_2_PROOF_ID + PROOF_FILE_NAME_EXTENSION, proof2Created.get().getProofFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + proof2Created.get().getProofFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals(TRICKY_ROYLLO_COIN_2_RAW_PROOF, response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + + final Optional proof3Created = proofService.getProofByProofId(TRICKY_ROYLLO_COIN_3_PROOF_ID); + assertTrue(proof3Created.isPresent()); + assertEquals(TRICKY_ROYLLO_COIN_3_PROOF_ID + PROOF_FILE_NAME_EXTENSION, proof3Created.get().getProofFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + proof3Created.get().getProofFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals(TRICKY_ROYLLO_COIN_3_RAW_PROOF, response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } } @Test @@ -366,6 +408,21 @@ public void processProofsStartingFromTheLastOne() { fail("Error while retrieving the file" + e.getMessage()); } + // ============================================================================================================= + // We should have the proof file on our content service. + + final Optional proof3Created = proofService.getProofByProofId(TRICKY_ROYLLO_COIN_3_PROOF_ID); + assertTrue(proof3Created.isPresent()); + assertEquals(TRICKY_ROYLLO_COIN_3_PROOF_ID + PROOF_FILE_NAME_EXTENSION, proof3Created.get().getProofFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + proof3Created.get().getProofFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals(TRICKY_ROYLLO_COIN_3_RAW_PROOF, response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } } } diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java index 1ba50550e..5e70ac127 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test; import org.royllo.explorer.batch.batch.request.AddProofBatch; import org.royllo.explorer.core.dto.asset.AssetDTO; +import org.royllo.explorer.core.dto.proof.ProofDTO; import org.royllo.explorer.core.dto.request.AddProofRequestDTO; import org.royllo.explorer.core.dto.request.RequestDTO; import org.royllo.explorer.core.repository.asset.AssetGroupRepository; @@ -33,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.dto.proof.ProofDTO.PROOF_FILE_NAME_EXTENSION; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; @@ -163,6 +165,20 @@ public void processProof() { fail("Error while retrieving the file" + e.getMessage()); } + // ============================================================================================================= + // We should have the proof file on our content service. + final Optional proof1Created = proofService.getProofByProofId(UNKNOWN_ROYLLO_COIN_PROOF_ID); + assertTrue(proof1Created.isPresent()); + assertEquals(UNKNOWN_ROYLLO_COIN_PROOF_ID + PROOF_FILE_NAME_EXTENSION, proof1Created.get().getProofFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + proof1Created.get().getProofFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals(UNKNOWN_ROYLLO_COIN_RAW_PROOF, response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } } } diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java index 4be50c308..1317edee2 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java @@ -8,6 +8,7 @@ import org.royllo.explorer.batch.batch.request.AddProofBatch; import org.royllo.explorer.core.dto.asset.AssetDTO; import org.royllo.explorer.core.dto.asset.AssetStateDTO; +import org.royllo.explorer.core.dto.proof.ProofDTO; import org.royllo.explorer.core.dto.request.AddProofRequestDTO; import org.royllo.explorer.core.dto.request.RequestDTO; import org.royllo.explorer.core.repository.asset.AssetGroupRepository; @@ -33,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.dto.proof.ProofDTO.PROOF_FILE_NAME_EXTENSION; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_HOST; import static org.royllo.explorer.core.provider.storage.LocalFileServiceImplementation.WEB_SERVER_PORT; import static org.royllo.explorer.core.util.enums.RequestStatus.OPENED; @@ -223,6 +225,35 @@ public void processProof() { } catch (IOException e) { fail("Error while retrieving the file" + e.getMessage()); } + + // ============================================================================================================= + // We should have the proof file on our content service. + final Optional proof1Created = proofService.getProofByProofId(UNLIMITED_ROYLLO_COIN_1_PROOF_ID); + assertTrue(proof1Created.isPresent()); + assertEquals(UNLIMITED_ROYLLO_COIN_1_PROOF_ID + PROOF_FILE_NAME_EXTENSION, proof1Created.get().getProofFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + proof1Created.get().getProofFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals(UNLIMITED_ROYLLO_COIN_1_RAW_PROOF, response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + + final Optional proof2Created = proofService.getProofByProofId(UNLIMITED_ROYLLO_COIN_2_PROOF_ID); + assertTrue(proof2Created.isPresent()); + assertEquals(UNLIMITED_ROYLLO_COIN_2_PROOF_ID + PROOF_FILE_NAME_EXTENSION, proof2Created.get().getProofFileName()); + request = new Request.Builder() + .url("http://" + WEB_SERVER_HOST + ":" + WEB_SERVER_PORT + "/" + proof2Created.get().getProofFileName()) + .build(); + try (Response response = client.newCall(request).execute()) { + assertEquals(200, response.code()); + assertEquals(UNLIMITED_ROYLLO_COIN_2_RAW_PROOF, response.body().string()); + } catch (IOException e) { + fail("Error while retrieving the file" + e.getMessage()); + } + } } diff --git a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/controller/asset/AssetController.java b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/controller/asset/AssetController.java index b6891bf45..422bc29b1 100644 --- a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/controller/asset/AssetController.java +++ b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/controller/asset/AssetController.java @@ -183,7 +183,9 @@ public String assetProofs(final Model model, @PathVariable(value = PROOF_ID_ATTRIBUTE) final String proofId) { final Optional proofFile = proofService.getProofByProofId(proofId); if (proofFile.isPresent()) { - return proofFile.get().getProof().getBytes(); + // TODO Useless + return null; + //return proofFile.get().getProof().getBytes(); } else { throw new ResponseStatusException(NOT_FOUND, "Proof not found on asset id:" + assetId + " and proof id:" + proofId); } diff --git a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset.xml b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset.xml index e7aa6b03b..727b1b248 100644 --- a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset.xml +++ b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-asset.xml @@ -1747,595 +1747,496 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-proof.xml b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-proof.xml index 6e55e61d3..d49c09f72 100644 --- a/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-proof.xml +++ b/backend/servers/explorer-web/src/main/resources/db/dev/dev-data-proof.xml @@ -11,8 +11,6 @@ - @@ -26,8 +24,6 @@ - @@ -37,8 +33,6 @@ - @@ -48,8 +42,6 @@ - @@ -63,8 +55,6 @@ - @@ -74,8 +64,6 @@ - @@ -85,8 +73,6 @@ - @@ -100,8 +86,6 @@ - @@ -111,8 +95,6 @@ - diff --git a/backend/servers/explorer-web/src/main/resources/templates/asset/proofs.html b/backend/servers/explorer-web/src/main/resources/templates/asset/proofs.html index edf16f0b2..b08ab0c37 100644 --- a/backend/servers/explorer-web/src/main/resources/templates/asset/proofs.html +++ b/backend/servers/explorer-web/src/main/resources/templates/asset/proofs.html @@ -21,7 +21,8 @@ - diff --git a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/AssetControllerTest.java b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/AssetControllerTest.java index 87939a7c1..127703ae8 100644 --- a/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/AssetControllerTest.java +++ b/backend/servers/explorer-web/src/test/java/org/royllo/explorer/web/test/controllers/asset/AssetControllerTest.java @@ -10,6 +10,7 @@ import org.royllo.explorer.core.dto.asset.AssetGroupDTO; import org.royllo.explorer.core.dto.asset.AssetStateDTO; import org.royllo.explorer.core.dto.bitcoin.BitcoinTransactionOutputDTO; +import org.royllo.explorer.core.provider.storage.ContentService; import org.royllo.explorer.core.repository.proof.ProofRepository; import org.royllo.explorer.core.service.asset.AssetGroupService; import org.royllo.explorer.core.service.asset.AssetService; @@ -35,6 +36,7 @@ import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import static org.royllo.explorer.core.dto.proof.ProofDTO.PROOF_FILE_NAME_EXTENSION; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER; import static org.royllo.explorer.core.util.constants.AnonymousUserConstants.ANONYMOUS_USER_DTO; import static org.royllo.explorer.core.util.enums.AssetType.NORMAL; @@ -80,6 +82,9 @@ public class AssetControllerTest extends BaseTest { @Autowired MessageSource messages; + @Autowired + ContentService contentService; + @Test @DisplayName("Asset page without parameter") void assetPageWithoutParameter() throws Exception { @@ -304,12 +309,13 @@ private void createFakeAssets() { final String proof = "TEST_ANCHOR_BLOCK_HASH_" + String.format("%02d", i); final Optional proofFound = proofRepository.findByProofId(sha256(proof)); if (proofFound.isEmpty()) { + contentService.storeFile(proof.getBytes(), sha256(proof) + PROOF_FILE_NAME_EXTENSION); + // Proof doesn't exist, we create the proof. proofRepository.save(Proof.builder() .proofId(sha256(proof)) .creator(ANONYMOUS_USER) .asset(ASSET_MAPPER.mapToAsset(assetForAssetTest.get())) - .proof(proof) .build()); } } diff --git a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-proof.xml b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-proof.xml index 6e55e61d3..d49c09f72 100644 --- a/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-proof.xml +++ b/backend/servers/explorer-web/src/test/resources/db/test/web-test-data-proof.xml @@ -11,8 +11,6 @@ - @@ -26,8 +24,6 @@ - @@ -37,8 +33,6 @@ - @@ -48,8 +42,6 @@ - @@ -63,8 +55,6 @@ - @@ -74,8 +64,6 @@ - @@ -85,8 +73,6 @@ - @@ -100,8 +86,6 @@ - @@ -111,8 +95,6 @@ - From 170e6862ad613abfbb8f824553742edaacdfbc51 Mon Sep 17 00:00:00 2001 From: straumat Date: Thu, 4 Jan 2024 10:10:28 +0100 Subject: [PATCH 52/57] Updated presentation --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6a664f66f..df8bdacb2 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,10 @@ Google" for Taproot Assets, providing you with a web interface and an API to sea The Key features for users include: -- Search for Taproot assets and proofs using our user-friendly web interface. +- Search for Taproot assets information using our user-friendly web interface. - Add your proofs to our database to let the world discover and learn about your assets. - Add your universe server to let us discover new assets automatically. -- Build new applications, services, and tools effortlessly using our GraphQL API +- Build new applications, services, and tools effortlessly using our GraphQL API. A live version is available here: [https://explorer.royllo.org/](https://explorer.royllo.org/) @@ -23,17 +23,20 @@ A live version is available here: [https://explorer.royllo.org/](https://explore ```mermaid graph LR + S3Storage(S3 storage) --- BatchServer(Batch server); BatchServer(Batch server) --- database[(Database)]; database[(Database)] --- APIServers(API servers); database[(Database)] --- WebServers(Web servers); + contentServer(Content server) --- S3Storage(S3 storage); ``` -Royllo has four components: +Royllo has several servers: -- A Postgresql Database Server ([Release 15](https://hub.docker.com/_/postgres)). -- A Batch server ([royllo/explorer-batch](https://hub.docker.com/r/royllo/explorer-batch)). -- An API server ([royllo/explorer-api](https://hub.docker.com/r/royllo/explorer-api)). -- A Web server ([royllo/explorer-web](https://hub.docker.com/r/royllo/explorer-web)). +- Database Server ([Postgresql](https://hub.docker.com/_/postgres)). +- S3 storage Server (For example [Minio](https://hub.docker.com/r/minio/minio)). +- Batch server ([royllo/explorer-batch](https://hub.docker.com/r/royllo/explorer-batch)). +- API server ([royllo/explorer-api](https://hub.docker.com/r/royllo/explorer-api)). +- Web server ([royllo/explorer-web](https://hub.docker.com/r/royllo/explorer-web)). Royllo also needs to access to three external services: [Lnd, Tapd](https://github.com/royllo/lnd-taro-with-docker) & [Mempool](https://mempool.space/). From c215c8f85f902e6c9599bc91956012e5e7d94f24 Mon Sep 17 00:00:00 2001 From: straumat Date: Thu, 4 Jan 2024 11:44:03 +0100 Subject: [PATCH 53/57] Update amount minted and issuance date with issuance proof - closes #352 --- .../explorer/core/domain/asset/Asset.java | 5 ++ .../explorer/core/dto/asset/AssetDTO.java | 8 ++- .../core/service/asset/AssetService.java | 15 ++++-- .../asset/AssetServiceImplementation.java | 53 +++++++++++++------ .../core/util/mapper/AssetMapper.java | 1 + .../validator/ServerAddressValidator.java | 3 +- .../db/changelog/1.0.0/data/data-asset.xml | 7 ++- .../db/changelog/1.0.0/table/table-asset.xml | 2 + .../test/core/service/AssetServiceTest.java | 32 +++++++++-- .../batch/batch/request/AddProofBatch.java | 7 ++- .../core/proof/RoylloNFTIntegrationTest.java | 2 + .../proof/SetOfRoylloNFTIntegrationTest.java | 7 +++ .../TrickyRoylloCoinIntegrationTest.java | 2 + .../UnknownRoylloCoinIntegrationTest.java | 2 + .../UnlimitedRoylloCoinIntegrationTest.java | 4 ++ 15 files changed, 118 insertions(+), 32 deletions(-) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/Asset.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/Asset.java index 4f761facf..535db2e27 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/Asset.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/domain/asset/Asset.java @@ -18,6 +18,7 @@ import org.royllo.explorer.core.util.enums.AssetType; import java.math.BigInteger; +import java.time.ZonedDateTime; import static jakarta.persistence.EnumType.STRING; import static jakarta.persistence.FetchType.EAGER; @@ -92,4 +93,8 @@ public class Asset extends BaseDomain { @Column(name = "AMOUNT") private BigInteger amount; + /** The date and time when the asset was created. */ + @Column(name = "ISSUANCE_DATE") + private ZonedDateTime issuanceDate; + } diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java index d2d447211..d08ae8ac9 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/dto/asset/AssetDTO.java @@ -5,12 +5,14 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Value; +import org.apache.commons.lang3.StringUtils; import org.royllo.explorer.core.dto.bitcoin.BitcoinTransactionOutputDTO; import org.royllo.explorer.core.dto.user.UserDTO; import org.royllo.explorer.core.util.enums.AssetType; import org.royllo.explorer.core.util.enums.FileType; import java.math.BigInteger; +import java.time.ZonedDateTime; import static lombok.AccessLevel.PRIVATE; @@ -66,16 +68,18 @@ public class AssetDTO { AssetType type; /** The total amount minted for this asset. */ - @NotNull(message = "Amount is required") BigInteger amount; + /** The date and time when the asset was created. */ + ZonedDateTime issuanceDate; + /** * Returns the type of the metadata file. * * @return file type */ public FileType getMetaDataFileType() { - if (metaDataFileName == null || metaDataFileName.isEmpty()) { + if (StringUtils.isBlank(metaDataFileName) || metaDataFileName.lastIndexOf(".") == -1) { return FileType.UNKNOWN; } return FileType.getTypeByExtension(metaDataFileName.substring(metaDataFileName.lastIndexOf(".") + 1)); diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java index 0bd9c88f4..bf887c63d 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetService.java @@ -3,6 +3,8 @@ import org.royllo.explorer.core.dto.asset.AssetDTO; import org.springframework.data.domain.Page; +import java.math.BigInteger; +import java.time.ZonedDateTime; import java.util.Optional; /** @@ -33,11 +35,18 @@ public interface AssetService { /** * Update an asset. + * Some data can only be retrieved from issuance proof. + * This method is used to update the asset when we encounter the asset issuance proof. * - * @param assetId asset id - * @param metadata meta data + * @param assetId asset id + * @param metadata meta data + * @param amount amount minted + * @param issuanceDate asset issuance date */ - void updateAsset(String assetId, String metadata); + void updateAsset(String assetId, + String metadata, + BigInteger amount, + ZonedDateTime issuanceDate); /** * Get an asset. diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java index 9595440d7..05167ad53 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/service/asset/AssetServiceImplementation.java @@ -21,6 +21,8 @@ import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; +import java.math.BigInteger; +import java.time.ZonedDateTime; import java.util.Objects; import java.util.Optional; @@ -148,33 +150,52 @@ public AssetDTO addAsset(@NonNull final AssetDTO newAsset) { } @Override - public void updateAsset(final String assetId, final String metadata) { + public void updateAsset(final String assetId, + final String metadata, + final BigInteger amount, + final ZonedDateTime issuanceDate) { final Optional assetToUpdate = assetRepository.findByAssetId(assetId); // We check that the asset exists. assert assetToUpdate.isPresent() : assetId + " not found"; - // We save the data as a file. - try { - // Decoding (same as using xxd -r -p) - byte[] decodedBytes = Hex.decodeHex(metadata); + // ============================================================================================================= + // If we have the metadata. + if (metadata != null) { + + try { + // Decoding (same as using xxd -r -p) + byte[] decodedBytes = Hex.decodeHex(metadata); - // Detecting the file type. - final String mimeType = new Tika().detect(decodedBytes); - final String extension = MimeTypes.getDefaultMimeTypes().forName(mimeType).getExtension(); + // Detecting the file type. + final String mimeType = new Tika().detect(decodedBytes); + final String extension = MimeTypes.getDefaultMimeTypes().forName(mimeType).getExtension(); - // Saving the file. - final String fileName = assetId + extension; - contentService.storeFile(decodedBytes, fileName); + // Saving the file. + final String fileName = assetId + extension; + contentService.storeFile(decodedBytes, fileName); + + // Setting the name of the file. + assetToUpdate.get().setMetaDataFileName(fileName); + } catch (DecoderException | MimeTypeException e) { + logger.error("Error decoding and saving metadata {}", e.getMessage()); + } + } - // Saving the name of the file. - assetToUpdate.get().setMetaDataFileName(fileName); - assetRepository.save(assetToUpdate.get()); + // ============================================================================================================= + // If we have the new amount. + if (amount != null) { + assetToUpdate.get().setAmount(amount); + } - } catch (DecoderException | MimeTypeException e) { - logger.error("Error decoding and saving metadata {}", e.getMessage()); + // ============================================================================================================= + // If we have the issuance date. + if (issuanceDate != null) { + assetToUpdate.get().setIssuanceDate(issuanceDate); } + // We save the asset with the new information. + assetRepository.save(assetToUpdate.get()); } @Override diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetMapper.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetMapper.java index b219ff33b..b98df3169 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetMapper.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/mapper/AssetMapper.java @@ -52,6 +52,7 @@ public interface AssetMapper { @Mapping(source = "asset.assetGenesis.assetType", target = "type") @Mapping(source = "asset.amount", target = "amount") @Mapping(target = "metaDataFileName", ignore = true) + @Mapping(target = "issuanceDate", ignore = true) AssetDTO mapToAssetDTO(DecodedProofResponse.DecodedProof source); default BitcoinTransactionOutputDTO mapToBitcoinTransactionOutputDTO(final String source) { diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/validator/ServerAddressValidator.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/validator/ServerAddressValidator.java index a55783127..f0e932e6d 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/validator/ServerAddressValidator.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/util/validator/ServerAddressValidator.java @@ -2,6 +2,7 @@ import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; +import org.apache.commons.lang3.StringUtils; import java.util.regex.Pattern; @@ -20,7 +21,7 @@ public class ServerAddressValidator implements ConstraintValidator @@ -13,7 +13,7 @@ - + @@ -24,9 +24,8 @@ - - + diff --git a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset.xml b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset.xml index 68a37f4c6..baa8f48d6 100644 --- a/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset.xml +++ b/backend/explorer-core/autoconfigure/src/main/resources/db/changelog/1.0.0/table/table-asset.xml @@ -50,6 +50,8 @@ remarks="The type of the asset: normal or a collectible"/> + assetUpdated = assetService.getAssetByAssetId(asset1.getAssetId()); + Optional assetUpdated = assetService.getAssetByAssetId(asset1.getAssetId()); assertTrue(assetUpdated.isPresent()); assertEquals(asset1.getAssetId() + ".png", assetUpdated.get().getMetaDataFileName()); + assertEquals(0, new BigInteger("100").compareTo(assetUpdated.get().getAmount())); + assertTrue(testDate.isEqual(assetUpdated.get().getIssuanceDate())); // The file should be available. var client = new OkHttpClient(); @@ -396,6 +411,15 @@ public void updateAsset() { fail("Error while retrieving the file" + e.getMessage()); } + // We update with nothing, nothing should change. + assetService.updateAsset(asset1.getAssetId(), null, null, null); + + // We test the data. + assetUpdated = assetService.getAssetByAssetId(asset1.getAssetId()); + assertTrue(assetUpdated.isPresent()); + assertEquals(asset1.getAssetId() + ".png", assetUpdated.get().getMetaDataFileName()); + assertEquals(0, new BigInteger("100").compareTo(assetUpdated.get().getAmount())); + assertTrue(testDate.isEqual(assetUpdated.get().getIssuanceDate())); } @Test diff --git a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java index ce4954b63..213313f77 100644 --- a/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java +++ b/backend/servers/explorer-batch/src/main/java/org/royllo/explorer/batch/batch/request/AddProofBatch.java @@ -15,6 +15,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import java.time.ZoneId; import java.util.Optional; /** @@ -119,11 +120,13 @@ public void processRequests() { logger.info("For request {}, asset state {} already exists", request.getId(), assetStateToCreate.getAssetStateId()); } - // We update the data and the file if we have meta-data. + // We update the data and the file if we have the issuance proof if (assetStateCreated.get().getAsset().getMetaDataFileName() == null && response.getDecodedProof().getMetaReveal() != null) { logger.info("Creating meta data file"); assetService.updateAsset(response.getDecodedProof().getAsset().getAssetGenesis().getAssetId(), - response.getDecodedProof().getMetaReveal().getData()); + response.getDecodedProof().getMetaReveal().getData(), + response.getDecodedProof().getAsset().getAmount(), + assetStateCreated.get().getAnchorOutpoint().getBlockTime().atZone(ZoneId.of("Europe/Paris"))); } else { logger.info("No meta data file to create"); } diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java index bd723be98..6c1c11060 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/RoylloNFTIntegrationTest.java @@ -144,6 +144,8 @@ public void processProof() { assertTrue(asset.isPresent()); assertNotNull(asset.get().getAssetIdAlias()); assertEquals(ALIAS_LENGTH, asset.get().getAssetIdAlias().length()); + assertNotNull(asset.get().getAmount()); + assertNotNull(asset.get().getIssuanceDate()); verifyTransaction(bitcoinService.getBitcoinTransactionOutput(ROYLLO_NFT_GENESIS_TXID, ROYLLO_NFT_GENESIS_VOUT).get(), ROYLLO_NFT_GENESIS_TXID); verifyTransaction(bitcoinService.getBitcoinTransactionOutput(ROYLLO_NFT_ANCHOR_1_TXID, ROYLLO_NFT_ANCHOR_1_VOUT).get(), diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java index c080b7072..daca52a12 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/SetOfRoylloNFTIntegrationTest.java @@ -252,6 +252,13 @@ public void processProof() { SET_OF_ROYLLO_NFT_ANCHOR_3_VOUT, SET_OF_ROYLLO_NFT_3_FROM_TEST.getDecodedProofResponse(0).getAsset().getScriptKey()); + assertNotNull(asset1.get().getIssuanceDate()); + assertNotNull(asset1.get().getAmount()); + assertNotNull(asset2.get().getIssuanceDate()); + assertNotNull(asset2.get().getAmount()); + assertNotNull(asset3.get().getIssuanceDate()); + assertNotNull(asset3.get().getAmount()); + // ============================================================================================================= // We check meta-data file for our three assets var client = new OkHttpClient(); diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java index 2d1fb9091..08ea62583 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/TrickyRoylloCoinIntegrationTest.java @@ -245,6 +245,8 @@ public void processProofs() { // Verify asset. verifyAsset(assetService.getAssetByAssetId(TRICKY_ROYLLO_COIN_ASSET_ID).get(), TRICKY_ROYLLO_COIN_ASSET_ID); + assertNotNull(asset.get().getAmount()); + assertNotNull(asset.get().getIssuanceDate()); // Verify asset states. verifyAssetState(assetStateService.getAssetStateByAssetStateId(TRICKY_ROYLLO_COIN_1_ASSET_STATE_ID).get(), diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java index 5e70ac127..f6c5bf4c1 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnknownRoylloCoinIntegrationTest.java @@ -145,6 +145,8 @@ public void processProof() { verifyTransaction(bitcoinService.getBitcoinTransactionOutput(UNKNOWN_ROYLLO_COIN_ANCHOR_1_TXID, UNKNOWN_ROYLLO_COIN_ANCHOR_1_VOUT).get(), UNKNOWN_ROYLLO_COIN_ANCHOR_1_TXID); verifyAsset(assetService.getAssetByAssetId(UNKNOWN_ROYLLO_COIN_ASSET_ID).get(), UNKNOWN_ROYLLO_COIN_ASSET_ID); + assertNotNull(asset.get().getAmount()); + assertNotNull(asset.get().getIssuanceDate()); verifyAssetState(assetStateService.getAssetStateByAssetStateId(UNKNOWN_ROYLLO_COIN_STATE_ID).get(), UNKNOWN_ROYLLO_COIN_ASSET_ID, UNKNOWN_ROYLLO_COIN_ANCHOR_1_TXID, diff --git a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java index 1317edee2..8d56f82c1 100644 --- a/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java +++ b/backend/servers/explorer-batch/src/test/java/org/royllo/explorer/batch/test/core/proof/UnlimitedRoylloCoinIntegrationTest.java @@ -193,6 +193,8 @@ public void processProof() { assertEquals(ALIAS_LENGTH, asset1.get().getAssetIdAlias().length()); assertNotNull(asset1.get().getAssetGroup()); assertEquals(UNLIMITED_ROYLLO_COIN_TWEAKED_GROUP_KEY, asset1.get().getAssetGroup().getTweakedGroupKey()); + assertNotNull(asset1.get().getAmount()); + assertNotNull(asset1.get().getIssuanceDate()); final Optional asset2 = assetService.getAssetByAssetId(UNLIMITED_ROYLLO_COIN_2_ASSET_ID); assertTrue(asset2.isPresent()); @@ -200,6 +202,8 @@ public void processProof() { assertEquals(ALIAS_LENGTH, asset2.get().getAssetIdAlias().length()); assertNotNull(asset2.get().getAssetGroup()); assertEquals(UNLIMITED_ROYLLO_COIN_TWEAKED_GROUP_KEY, asset2.get().getAssetGroup().getTweakedGroupKey()); + assertNotNull(asset2.get().getAmount()); + assertNotNull(asset2.get().getIssuanceDate()); // We check if we have the meta-data file for UNLIMITED_ROYLLO_COIN_1_ASSET_ID. var client = new OkHttpClient(); From 5a1054eaf9ab0155a02229d5d7c7e74890478294 Mon Sep 17 00:00:00 2001 From: straumat Date: Thu, 4 Jan 2024 18:36:25 +0100 Subject: [PATCH 54/57] Fixing an encoding issue for S3 --- .../storage/S3ServiceImplementation.java | 5 ++-- .../storage/S3ServiceImplementationTest.java | 23 ++++++++++++++++--- docker-compose.yml | 8 ++++--- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/S3ServiceImplementation.java b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/S3ServiceImplementation.java index f143a7599..21482ca1f 100644 --- a/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/S3ServiceImplementation.java +++ b/backend/explorer-core/autoconfigure/src/main/java/org/royllo/explorer/core/provider/storage/S3ServiceImplementation.java @@ -3,14 +3,13 @@ import io.minio.MinioClient; import io.minio.PutObjectArgs; import lombok.NonNull; -import org.apache.commons.io.IOUtils; import org.apache.tika.Tika; import org.royllo.explorer.core.util.base.BaseService; import org.royllo.explorer.core.util.parameters.S3Parameters; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import static java.nio.charset.StandardCharsets.UTF_8; +import java.io.ByteArrayInputStream; /** @@ -57,7 +56,7 @@ public void storeFile(final byte[] fileContent, @NonNull final String fileName) try { minioClient.putObject(PutObjectArgs.builder() .bucket(s3Parameters.getBucketName()) - .object(fileName).stream(IOUtils.toInputStream(new String(fileContent), UTF_8), -1, PART_SIZE) + .object(fileName).stream(new ByteArrayInputStream(fileContent), fileContent.length, -1) .contentType(new Tika().detect(fileContent)) .build()); } catch (Exception e) { diff --git a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/storage/S3ServiceImplementationTest.java b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/storage/S3ServiceImplementationTest.java index 84f4769df..2607ebb3c 100644 --- a/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/storage/S3ServiceImplementationTest.java +++ b/backend/explorer-core/autoconfigure/src/test/java/org/royllo/explorer/core/test/integration/storage/S3ServiceImplementationTest.java @@ -1,6 +1,7 @@ package org.royllo.explorer.core.test.integration.storage; import io.minio.BucketExistsArgs; +import io.minio.GetObjectArgs; import io.minio.MakeBucketArgs; import io.minio.MinioClient; import io.minio.StatObjectArgs; @@ -11,6 +12,7 @@ import io.minio.errors.MinioException; import io.minio.errors.ServerException; import io.minio.errors.XmlParserException; +import org.apache.commons.codec.DecoderException; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; @@ -26,9 +28,12 @@ import org.testcontainers.containers.MinIOContainer; import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -61,7 +66,7 @@ public class S3ServiceImplementationTest extends TestWithMockServers { @Test @DisplayName("S3 implementation test") - public void s3ImplementationTest() { + public void s3ImplementationTest() throws DecoderException { // Getting a connexion to do some verification. MinioClient minioClient = MinioClient.builder() .endpoint(s3MockServer.getS3URL()) @@ -84,6 +89,7 @@ public void s3ImplementationTest() { final S3ServiceImplementation s3ServiceImplementation = (S3ServiceImplementation) contentService; s3ServiceImplementation.updateS3Parameters(parameters); + // ============================================================================================================= // Checking that a file doesn't exist in minio. try { minioClient.statObject(StatObjectArgs.builder().bucket(S3_BUCKET_NAME).object("test.txt").build()); @@ -95,15 +101,26 @@ public void s3ImplementationTest() { // Adding the file. contentService.storeFile("test".getBytes(), "test.txt"); + // Adding the file (again) - Checking there is no exception. + contentService.storeFile("test".getBytes(), "test.txt"); + // Checking that the file now exists. try { + // File exists ? minioClient.statObject(StatObjectArgs.builder().bucket(S3_BUCKET_NAME).object("test.txt").build()); + + // Retrieving the file. + InputStream stream = minioClient.getObject( + GetObjectArgs.builder() + .bucket(S3_BUCKET_NAME) + .object("test.txt") + .build()); + String content = new String(stream.readAllBytes(), StandardCharsets.UTF_8); + assertEquals("test", content); } catch (MinioException | InvalidKeyException | IOException | NoSuchAlgorithmException e) { fail("The file should now exist"); } - // Adding the file (again) - Checking there is no exception. - contentService.storeFile("test".getBytes(), "test.txt"); } @BeforeAll diff --git a/docker-compose.yml b/docker-compose.yml index 6438c601e..96fffb008 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -82,6 +82,7 @@ services: - royllo-explorer-network environment: - TZ=Europe/Paris + - ROYLLO_EXPLORER_CONTENT_BASE_URL=http://localhost:9000/royllo-explorer - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver - SPRING_DATASOURCE_URL=jdbc:postgresql://royllo-explorer-database-server/royllo_explorer_database - SPRING_DATASOURCE_USERNAME=royllo_explorer_username @@ -95,9 +96,8 @@ services: - S3_SECRET_KEY=tTX4LD7gYaQbhZ - S3_BUCKET_NAME=royllo-explorer - S3_ENDPOINTURL=http://royllo-explorer-storage-server:9000 - - # ==================================================================================================================== - # Royllo explorer API server ( https://hub.docker.com/r/royllo/explorer-api ). + - # ==================================================================================================================== + # Royllo explorer API server ( https://hub.docker.com/r/royllo/explorer-api ). royllo-explorer-api-server: image: royllo/explorer-api:latest depends_on: @@ -108,6 +108,7 @@ services: - "9090:8080" environment: - TZ=Europe/Paris + - ROYLLO_EXPLORER_CONTENT_BASE_URL=http://localhost:9000/royllo-explorer - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver - SPRING_DATASOURCE_URL=jdbc:postgresql://royllo-explorer-database-server/royllo_explorer_database - SPRING_DATASOURCE_USERNAME=royllo_explorer_username @@ -131,6 +132,7 @@ services: - "8080:8080" environment: - TZ=Europe/Paris + - ROYLLO_EXPLORER_CONTENT_BASE_URL=http://localhost:9000/royllo-explorer - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver - SPRING_DATASOURCE_URL=jdbc:postgresql://royllo-explorer-database-server/royllo_explorer_database - SPRING_DATASOURCE_USERNAME=royllo_explorer_username From 268c4627f65998db6a6e5d2f589e36c28c229e82 Mon Sep 17 00:00:00 2001 From: straumat Date: Thu, 4 Jan 2024 19:49:46 +0100 Subject: [PATCH 55/57] CI fix --- docker-compose.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 96fffb008..49481767e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -96,8 +96,9 @@ services: - S3_SECRET_KEY=tTX4LD7gYaQbhZ - S3_BUCKET_NAME=royllo-explorer - S3_ENDPOINTURL=http://royllo-explorer-storage-server:9000 - - # ==================================================================================================================== - # Royllo explorer API server ( https://hub.docker.com/r/royllo/explorer-api ). + + # ==================================================================================================================== + # Royllo explorer API server ( https://hub.docker.com/r/royllo/explorer-api ). royllo-explorer-api-server: image: royllo/explorer-api:latest depends_on: From 9df98dafab8031893ebc8528298bc24d484c3fa6 Mon Sep 17 00:00:00 2001 From: straumat Date: Thu, 4 Jan 2024 23:09:45 +0100 Subject: [PATCH 56/57] Scheduler configuration added to update statistics --- .../configuration/SchedulerConfiguration.java | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/configuration/SchedulerConfiguration.java diff --git a/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/configuration/SchedulerConfiguration.java b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/configuration/SchedulerConfiguration.java new file mode 100644 index 000000000..38d139be9 --- /dev/null +++ b/backend/servers/explorer-web/src/main/java/org/royllo/explorer/web/configuration/SchedulerConfiguration.java @@ -0,0 +1,45 @@ +package org.royllo.explorer.web.configuration; + +import lombok.RequiredArgsConstructor; +import org.royllo.explorer.core.util.base.BaseConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.scheduling.TaskScheduler; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; + +/** + * Scheduler configuration. + */ +@Profile("!scheduler-disabled") +@Configuration +@EnableScheduling +@RequiredArgsConstructor +public class SchedulerConfiguration extends BaseConfiguration { + + /** Termination delay in milliseconds (10 000 ms = 10 seconds). */ + private static final int TERMINATION_DELAY_IN_MILLISECONDS = 10_000; + + /** + * Configure the task scheduler. + * + * @return task scheduler + */ + @Bean + public TaskScheduler taskScheduler() { + ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); + scheduler.setWaitForTasksToCompleteOnShutdown(true); + scheduler.setAwaitTerminationMillis(TERMINATION_DELAY_IN_MILLISECONDS); + scheduler.setThreadNamePrefix("royllo-process-"); + scheduler.setErrorHandler(throwable -> { + try { + logger.error("Error while processing requests: {}", throwable.getMessage()); + } catch (Exception exception) { + logger.error("Error while processing requests: {}", exception.getMessage()); + } + }); + return scheduler; + } + +} From 11c065531b903c980b1b98fd0790eaae4466c3e7 Mon Sep 17 00:00:00 2001 From: straumat Date: Thu, 4 Jan 2024 23:39:11 +0100 Subject: [PATCH 57/57] Update versions for release --- backend/explorer-core/autoconfigure/pom.xml | 2 +- backend/explorer-core/starter/pom.xml | 2 +- backend/servers/explorer-api/pom.xml | 2 +- backend/servers/explorer-batch/pom.xml | 2 +- backend/servers/explorer-web/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/explorer-core/autoconfigure/pom.xml b/backend/explorer-core/autoconfigure/pom.xml index 48cdeb501..855caf211 100644 --- a/backend/explorer-core/autoconfigure/pom.xml +++ b/backend/explorer-core/autoconfigure/pom.xml @@ -308,7 +308,7 @@ org.royllo.explorer explorer - 0.0.23-SNAPSHOT + 0.1.0 ../../../pom.xml diff --git a/backend/explorer-core/starter/pom.xml b/backend/explorer-core/starter/pom.xml index 222dde4ec..60d92d86f 100644 --- a/backend/explorer-core/starter/pom.xml +++ b/backend/explorer-core/starter/pom.xml @@ -114,7 +114,7 @@ org.royllo.explorer explorer - 0.0.23-SNAPSHOT + 0.1.0 ../../../pom.xml diff --git a/backend/servers/explorer-api/pom.xml b/backend/servers/explorer-api/pom.xml index 7c09daf1e..0f83851b5 100644 --- a/backend/servers/explorer-api/pom.xml +++ b/backend/servers/explorer-api/pom.xml @@ -310,7 +310,7 @@ org.royllo.explorer explorer - 0.0.23-SNAPSHOT + 0.1.0 ../../../pom.xml diff --git a/backend/servers/explorer-batch/pom.xml b/backend/servers/explorer-batch/pom.xml index 66049a060..b27497b2c 100644 --- a/backend/servers/explorer-batch/pom.xml +++ b/backend/servers/explorer-batch/pom.xml @@ -237,7 +237,7 @@ org.royllo.explorer explorer - 0.0.23-SNAPSHOT + 0.1.0 ../../../pom.xml diff --git a/backend/servers/explorer-web/pom.xml b/backend/servers/explorer-web/pom.xml index 4b43d544a..15b5fbb41 100644 --- a/backend/servers/explorer-web/pom.xml +++ b/backend/servers/explorer-web/pom.xml @@ -291,7 +291,7 @@ org.royllo.explorer explorer - 0.0.23-SNAPSHOT + 0.1.0 ../../../pom.xml diff --git a/pom.xml b/pom.xml index 92b61247f..74e0ea7a5 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.royllo.explorer explorer - 0.0.23-SNAPSHOT + 0.1.0 Royllo - A Taproot asset explorer Royllo explorer allows you to search for Taproot assets created on the Bitcoin blockchain pom