Show all metadata and mark the locked ones with lock icon #1010
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,10 +22,7 @@ import com.radixdlt.sargon.extensions.init | |
| import com.radixdlt.sargon.extensions.string | ||
| import com.radixdlt.sargon.extensions.toDecimal192 | ||
| import rdx.works.core.domain.resources.Divisibility | ||
| import rdx.works.core.domain.resources.Resource | ||
| import rdx.works.core.domain.resources.metadata.poolAddress | ||
| import rdx.works.core.domain.resources.metadata.validatorAddress | ||
| import java.time.Instant | ||
|
|
@@ -50,17 +47,14 @@ data class ResourceEntity( | |
| val synced: Instant | ||
| ) { | ||
|
|
||
| val isDetailsAvailable: Boolean | ||
| get() = when (type) { | ||
| ResourceEntityType.FUNGIBLE -> supply != null && divisibility != null && behaviours != null | ||
| ResourceEntityType.NON_FUNGIBLE -> supply != null && behaviours != null | ||
| } | ||
|
|
||
| @Suppress("CyclomaticComplexMethod") | ||
| fun toResource(amount: Decimal192?): Resource { | ||
| return when (type) { | ||
| ResourceEntityType.FUNGIBLE -> { | ||
| Resource.FungibleResource( | ||
|
|
@@ -69,7 +63,7 @@ data class ResourceEntity( | |
| assetBehaviours = behaviours?.behaviours?.toSet(), | ||
| currentSupply = supply, | ||
| divisibility = divisibility, | ||
| metadata = metadata?.metadata.orEmpty() | ||
| ) | ||
| } | ||
|
|
||
|
|
@@ -80,7 +74,7 @@ data class ResourceEntity( | |
| assetBehaviours = behaviours?.behaviours?.toSet(), | ||
| items = emptyList(), | ||
| currentSupply = supply?.string?.toIntOrNull(), | ||
| metadata = metadata?.metadata.orEmpty() | ||
| ) | ||
| } | ||
| } | ||
|
|
@@ -97,9 +91,8 @@ data class ResourceEntity( | |
| validatorAddress = metadata.validatorAddress(), | ||
| poolAddress = metadata.poolAddress(), | ||
| metadata = metadata | ||
| .takeIf { it.isNotEmpty() } | ||
| ?.let { MetadataColumn(it, MetadataColumn.ImplicitMetadataState.Unknown) }, | ||
| synced = synced | ||
| ) | ||
|
|
||
|
|
@@ -112,9 +105,8 @@ data class ResourceEntity( | |
| validatorAddress = metadata.validatorAddress(), | ||
| poolAddress = metadata.poolAddress(), | ||
| metadata = metadata | ||
| .takeIf { it.isNotEmpty() } | ||
| ?.let { MetadataColumn(it, MetadataColumn.ImplicitMetadataState.Unknown) }, | ||
| synced = synced | ||
| ) | ||
| } | ||
|
|
@@ -126,7 +118,8 @@ data class ResourceEntity( | |
| details: StateEntityDetailsResponseItemDetails? = null | ||
| ): ResourceEntity = from( | ||
| address = ResourceAddress.init(resourceAddress), | ||
| explicitMetadata = explicitMetadata, | ||
| implicitMetadata = null, | ||
| details = details, | ||
| type = ResourceEntityType.FUNGIBLE, | ||
| synced = synced | ||
|
|
@@ -139,7 +132,8 @@ data class ResourceEntity( | |
| details: StateEntityDetailsResponseItemDetails? = null | ||
| ): ResourceEntity = from( | ||
| address = ResourceAddress.init(resourceAddress), | ||
| explicitMetadata = explicitMetadata, | ||
| implicitMetadata = null, | ||
| details = details, | ||
| type = ResourceEntityType.NON_FUNGIBLE, | ||
| synced = synced | ||
|
|
@@ -156,33 +150,44 @@ data class ResourceEntity( | |
| } | ||
| return from( | ||
| address = ResourceAddress.init(address), | ||
| explicitMetadata = explicitMetadata, | ||
| implicitMetadata = metadata, | ||
| details = details, | ||
| type = type, | ||
| synced = synced | ||
| ) | ||
| } | ||
|
|
||
| @Suppress("LongParameterList") | ||
| private fun from( | ||
| address: ResourceAddress, | ||
| explicitMetadata: EntityMetadataCollection?, | ||
| implicitMetadata: EntityMetadataCollection?, | ||
| details: StateEntityDetailsResponseItemDetails?, | ||
| type: ResourceEntityType, | ||
| synced: Instant | ||
| ): ResourceEntity { | ||
| val metadataColumn = if (implicitMetadata != null) { | ||
|
There was a problem hiding this comment. what is the difference between explicit/implicit metadata? There was a problem hiding this comment. Explicit metadata are the ones we request when we communicate with GW and GW ensures that we will receive them. Also known as standard metadata. For example a resource may have defined 150 metadata. If you do a simple entity details request, on the first response we will only receive the first page of them (100) and we need to paginate them in order to get the other 50. Although we need to somehow make sure that some metadata will be received since are crucial to rendering the UI without the need of pagination, like name, symbol, description, icon_url.... So for these requests you will see that we put When the user navigates to asset details, we can also display the rest of the metadata (besides the explicit ones). Decided to call them implicit. If we know that there is a page to be paginated, this is the time we do it. |
||
| MetadataColumn.from( | ||
| explicitMetadata = explicitMetadata, | ||
| implicitMetadata = implicitMetadata | ||
| ) | ||
| } else { | ||
| MetadataColumn( | ||
| metadata = explicitMetadata?.toMetadata().orEmpty(), | ||
| implicitState = MetadataColumn.ImplicitMetadataState.Unknown | ||
| ) | ||
| }.takeIf { it.metadata.isNotEmpty() } | ||
|
|
||
| return ResourceEntity( | ||
| address = address, | ||
| type = type, | ||
| divisibility = details?.divisibility(), | ||
| behaviours = details?.let { BehavioursColumn(it.extractBehaviours()) }, | ||
| supply = details?.totalSupply(), | ||
| validatorAddress = metadataColumn?.metadata?.validatorAddress(), | ||
| poolAddress = metadataColumn?.metadata?.poolAddress(), | ||
| metadata = metadataColumn, | ||
| synced = synced | ||
| ) | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe we should use same
jsonas we use for gateway models serialization?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No it is different, this is how the column is serialized into a json string. Room stores metadata in a custom type called
MetadataColumnwhich uses this serialisation logic inside. Also theMetadatatype we have defined is a domain model and not a GW one.