Merge pull request #4 from swisschain/LM-1778-asset-blockchain-networ…

…k-name-f-master Lm 1778 add blockchain network name to asset
swisschain · Feb 21, 2022 · a9aba76 · a9aba76
2 parents 2520320 + 1032542
commit a9aba76
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 2 deletions.
diff --git a/Lykke.Service.Assets.sln.DotSettings b/Lykke.Service.Assets.sln.DotSettings
@@ -1,2 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Blockchain/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/client/Lykke.Service.Assets.Client/AssetsService.Generated.cs b/client/Lykke.Service.Assets.Client/AssetsService.Generated.cs
@@ -21612,7 +21612,7 @@ public Asset()
         /// 'Bitcoin', 'Ethereum'</param>
         /// <param name="blockchainIntegrationType">Possible values include:
         /// 'None', 'Bil', 'Sirius'</param>
-        public Asset(int accuracy, string assetAddress, bool bankCardsDepositEnabled, bool otherDepositOptionsEnabled, Blockchain blockchain, string blockChainAssetId, bool blockchainDepositEnabled, string blockChainId, bool blockchainWithdrawal, string blockchainIntegrationLayerId, string blockchainIntegrationLayerAssetId, bool buyScreen, string categoryId, bool crosschainWithdrawal, int defaultOrder, string definitionUrl, int displayAccuracy, string displayId, double dustLimit, string forwardBaseAsset, int forwardFrozenDays, string forwardMemoUrl, bool forwardWithdrawal, bool hideDeposit, bool hideIfZero, bool hideWithdraw, string iconUrl, string id, string idIssuer, bool isBase, bool isDisabled, bool isTradable, bool issueAllowed, bool kycNeeded, double lowVolumeAmount, int multiplierPower, string name, bool notLykkeAsset, IList<string> partnerIds, bool sellScreen, bool swiftDepositEnabled, bool swiftWithdrawal, string symbol, AssetType? type, bool isTrusted, bool privateWalletsEnabled, double cashinMinimalAmount, double cashoutMinimalAmount, string lykkeEntityId, long siriusAssetId, string siriusBlockchainId, BlockchainIntegrationType blockchainIntegrationType)
+        public Asset(int accuracy, string assetAddress, bool bankCardsDepositEnabled, bool otherDepositOptionsEnabled, Blockchain blockchain, string blockChainAssetId, bool blockchainDepositEnabled, string blockChainId, bool blockchainWithdrawal, string blockchainIntegrationLayerId, string blockchainIntegrationLayerAssetId, bool buyScreen, string categoryId, bool crosschainWithdrawal, int defaultOrder, string definitionUrl, int displayAccuracy, string displayId, double dustLimit, string forwardBaseAsset, int forwardFrozenDays, string forwardMemoUrl, bool forwardWithdrawal, bool hideDeposit, bool hideIfZero, bool hideWithdraw, string iconUrl, string id, string idIssuer, bool isBase, bool isDisabled, bool isTradable, bool issueAllowed, bool kycNeeded, double lowVolumeAmount, int multiplierPower, string name, bool notLykkeAsset, IList<string> partnerIds, bool sellScreen, bool swiftDepositEnabled, bool swiftWithdrawal, string symbol, AssetType? type, bool isTrusted, bool privateWalletsEnabled, double cashinMinimalAmount, double cashoutMinimalAmount, string lykkeEntityId, long siriusAssetId, string siriusBlockchainId, BlockchainIntegrationType blockchainIntegrationType, string blockchainNetworkName)
         {
             Accuracy = accuracy;
             AssetAddress = assetAddress;
@@ -21666,6 +21666,7 @@ public Asset(int accuracy, string assetAddress, bool bankCardsDepositEnabled, bo
             SiriusAssetId = siriusAssetId;
             SiriusBlockchainId = siriusBlockchainId;
             BlockchainIntegrationType = blockchainIntegrationType;
+            BlockchainNetworkName = blockchainNetworkName;
             CustomInit();
         }
 
@@ -21936,6 +21937,11 @@ public Asset(int accuracy, string assetAddress, bool bankCardsDepositEnabled, bo
         /// </summary>
         [JsonProperty(PropertyName = "BlockchainIntegrationType")]
         public BlockchainIntegrationType BlockchainIntegrationType { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "BlockchainNetworkName")]
+        public string BlockchainNetworkName { get; set; }
     }
 }
 // <auto-generated>

diff --git a/src/Lykke.Service.Assets.Core.Domain/Domain/IAsset.cs b/src/Lykke.Service.Assets.Core.Domain/Domain/IAsset.cs
@@ -117,7 +117,11 @@ public interface IAsset
         string LykkeEntityId { get; }
 
         long SiriusAssetId { get; }
+
         string SiriusBlockchainId { get; }
+
         BlockchainIntegrationType BlockchainIntegrationType { get; }
+
+        string BlockchainNetworkName { get; }
     }
 }
diff --git a/src/Lykke.Service.Assets.NoSql/Models/AssetNoSql.cs b/src/Lykke.Service.Assets.NoSql/Models/AssetNoSql.cs
@@ -42,6 +42,7 @@ public static AssetModel Create(IAsset source)
                     BlockchainIntegrationLayerAssetId = source.BlockchainIntegrationLayerAssetId,
                     BlockchainIntegrationLayerId = source.BlockchainIntegrationLayerId,
                     BlockchainIntegrationType = source.BlockchainIntegrationType,
+                    BlockchainNetworkName = source.BlockchainNetworkName,
                     BlockchainWithdrawal = source.BlockchainWithdrawal,
                     BuyScreen = source.BuyScreen,
                     CashinMinimalAmount = source.CashinMinimalAmount,
@@ -144,6 +145,7 @@ public static AssetModel Create(IAsset source)
             public long SiriusAssetId { get; set; }
             public string SiriusBlockchainId { get; set; }
             public BlockchainIntegrationType BlockchainIntegrationType { get; set; }
+            public string BlockchainNetworkName { get; set; }
         }
     }
 }
diff --git a/src/Lykke.Service.Assets.Repositories/DTOs/AssetDto.cs b/src/Lykke.Service.Assets.Repositories/DTOs/AssetDto.cs
@@ -159,5 +159,7 @@ public class AssetDto : IAsset
         public string SiriusBlockchainId { get; set; }
         [ProtoMember(52)]
         public BlockchainIntegrationType BlockchainIntegrationType { get; set; }
+        [ProtoMember(53)]
+        public string BlockchainNetworkName { get; set; }
     }
 }
diff --git a/src/Lykke.Service.Assets.Repositories/Entities/AssetEntity.cs b/src/Lykke.Service.Assets.Repositories/Entities/AssetEntity.cs
@@ -103,7 +103,11 @@ public class AssetEntity : TableEntity
         public string LykkeEntityId { get; set; }
 
         public long SiriusAssetId { get; set; }
+
         public string SiriusBlockchainId { get; set; }
+
         public string BlockchainIntegrationType { get; set; }
+
+        public string BlockchainNetworkName { get; set; }
     }
 }
diff --git a/src/Lykke.Service.Assets.Services/Domain/Asset.cs b/src/Lykke.Service.Assets.Services/Domain/Asset.cs
@@ -103,7 +103,11 @@ public class Asset : IAsset
         public string LykkeEntityId { get; set; }
 
         public long SiriusAssetId { get; set; }
+
         public string SiriusBlockchainId { get; set; }
+
         public BlockchainIntegrationType BlockchainIntegrationType { get; set; }
+
+        public string BlockchainNetworkName { get; set; }
     }
 }
diff --git a/src/Lykke.Service.Assets/Responses/v2/Asset.cs b/src/Lykke.Service.Assets/Responses/v2/Asset.cs
@@ -103,7 +103,11 @@ public class Asset : IAsset
         public string LykkeEntityId { get; set; }
 
         public long SiriusAssetId { get; set; }
+
         public string SiriusBlockchainId { get; set; }
+
         public BlockchainIntegrationType BlockchainIntegrationType { get; set; }
+
+        public string BlockchainNetworkName { get; set; }
     }
 }