nmshd · Dannyps · May 8, 2024 · Mar 21, 2024 · Mar 21, 2024 · Mar 21, 2024
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -115,6 +115,7 @@ jobs:
         with:
           repository: nmshd/runtime
           path: runtime
+          ref: feature/backbone-specific-addresses
       - name: Run Consumer API
         run: docker compose -f ./backbone/.ci/docker-compose.test.yml -f ./backbone/.ci/docker-compose.test.sqlserver.yml up -d
       - name: Install runtime dependencies
@@ -152,6 +153,7 @@ jobs:
         with:
           repository: nmshd/runtime
           path: runtime
+          ref: feature/backbone-specific-addresses
       - name: Run Consumer API
         run: docker compose -f ./backbone/.ci/docker-compose.test.yml -f ./backbone/.ci/docker-compose.test.postgres.yml up -d
       - name: Install runtime dependencies

diff --git a/AdminApi/src/AdminApi/appsettings.json b/AdminApi/src/AdminApi/appsettings.json
@@ -23,6 +23,7 @@
         "Devices": {
             "Application": {
                 "AddressPrefix": "id1",
+                "InstanceUrl": "prod.enmeshed.eu",
                 "Pagination": {
                     "DefaultPageSize": 50,
                     "MaxPageSize": 200

diff --git a/Backbone.sln.DotSettings b/Backbone.sln.DotSettings
@@ -1,4 +1,4 @@
-<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">
+<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:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/IntelliSenseCompletingCharacters/CSharpCompletingCharacters/UpgradedFromVSSettings/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToPrimaryConstructor/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -32,6 +32,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=appsettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Datawallet/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Datawallets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=dids/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Dtos/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ecdsa/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=enrichers/@EntryIndexedValue">True</s:Boolean>

diff --git a/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/IdentityAddress.cs b/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/IdentityAddress.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Security.Cryptography;
 using System.Text;
+using System.Text.RegularExpressions;
 using Backbone.BuildingBlocks.Domain;
 using SimpleBase;
 
@@ -11,7 +12,7 @@
 [TypeConverter(typeof(IdentityAddressTypeConverter))]
 public class IdentityAddress : IFormattable, IEquatable<IdentityAddress>, IComparable<IdentityAddress>
 {
-    public const int MAX_LENGTH = 36;
+    public const int MAX_LENGTH = 100;
 
     private IdentityAddress(string stringValue)
     {
@@ -47,29 +48,39 @@
 
         var lengthIsValid = stringValue.Length <= MAX_LENGTH;
 
-        var realm = stringValue[..3];
+        const string pattern = @"^did\:web\:(.+?)\:dids\:(.{3})(.+)$";
+        var matches = Regex.Matches(stringValue, pattern, RegexOptions.IgnoreCase);
 
-        var concatenation = Base58.Bitcoin.Decode(stringValue.AsSpan(3)).ToArray();
-        var hashedPublicKey = concatenation[..20];
-        var givenChecksum = concatenation[20..];
+        try
+        {
+            var realm = matches.First().Groups[2].Value;
+            var concatenation = Base58.Bitcoin.Decode(matches.First().Groups[3].Value).ToArray();
 
-        var realmBytes = Encoding.UTF8.GetBytes(realm);
-        var correctChecksum = CalculateChecksum(realmBytes, hashedPublicKey);
+            var hashedPublicKey = concatenation[..20];
+            var givenChecksum = concatenation[20..];
+
+            var realmBytes = Encoding.UTF8.GetBytes(realm);
+            var correctChecksum = CalculateChecksum(realmBytes, hashedPublicKey);
 
-        var checksumIsValid = givenChecksum.SequenceEqual(correctChecksum);
+            var checksumIsValid = givenChecksum.SequenceEqual(correctChecksum);
 
-        return lengthIsValid && checksumIsValid;
+            return lengthIsValid && checksumIsValid;
+        }
+        catch (IndexOutOfRangeException _)
+        {
+            return false;
+        }
     }
 
-    public static IdentityAddress Create(byte[] publicKey, string realm)
+    public static IdentityAddress Create(byte[] publicKey, string realm, string instanceUrl)
     {
         var hashedPublicKey = SHA256.Create().ComputeHash(SHA512.Create().ComputeHash(publicKey))[..20];
         var realmBytes = Encoding.UTF8.GetBytes(realm);
         var checksum = CalculateChecksum(realmBytes, hashedPublicKey);
         var concatenation = hashedPublicKey.Concat(checksum).ToArray();
         var address = realm + Base58.Bitcoin.Encode(concatenation);
 
-        return new IdentityAddress(address);
+        return new IdentityAddress($"did:web:{instanceUrl}:dids:{address}");
     }
 
     private static byte[] CalculateChecksum(byte[] realmBytes, byte[] hashedPublicKey)

diff --git a/BuildingBlocks/src/UnitTestTools/Data/TestDataGenerator.cs b/BuildingBlocks/src/UnitTestTools/Data/TestDataGenerator.cs
@@ -14,7 +14,7 @@ public static string GenerateString(int resultLength, char[]? chars = null)
 
     public static IdentityAddress CreateRandomIdentityAddress()
     {
-        return IdentityAddress.Create(CreateRandomBytes(), "id1");
+        return IdentityAddress.Create(CreateRandomBytes(), "id1", "url");
     }
 
     public static DeviceId CreateRandomDeviceId()

diff --git a/BuildingBlocks/test/DevelopmentKit.Identity.Tests/IdentityAddressTests.cs b/BuildingBlocks/test/DevelopmentKit.Identity.Tests/IdentityAddressTests.cs
@@ -7,20 +7,20 @@ namespace Backbone.DevelopmentKit.Identity.Tests;
 public class IdentityAddressTests
 {
     [Theory]
-    [InlineData("fj0o9eOiPRswTZL6j9lE9TRvpDDnPRMF0gJeahz/W2c=", "id1QF24Gk2DfqCywRS7NpeH5iu7D4xvu6qv1")]
-    [InlineData("jRxGfZtQ8a90TmKCGk+dhuX1CBjgoXuldhNPwrjpWsw=", "id1HwY1TuyVBp3CmY3h18yTt1CKyu5qwB9wj")]
-    [InlineData("PEODpwvi7KxIVa4qeUXia9apMFvPMktdDHiDitlfbjE=", "id1LMp4k1XwxZ3WFXdAn9y12tv1ofe5so4kM")]
-    [InlineData("mJGmNbxiVZAPToRuk9O3NvdfsWl6V+7wzIc+/57bU08=", "id1McegXycvRoiJppS2LG25phn3jNveckFUL")]
-    [InlineData("l68K/zdNp1VLoswcHAqN6QUFwCMU6Yvzf7XiW2m1hRY=", "id193k6K5cJr94WJEWYb6Kei8zp5CGPyrQLS")]
-    [InlineData("Gl8XTo8qFuUM+ksXixwp4g/jf3H/hU1F8ETuYaHCM5I=", "id1BLrHAgDpimtLcGJGssMSm7bJHsvVe7CN")]
-    [InlineData("rIS4kAzHXT7GgCA6Qm1ANlwM3x12QMSkeprHb6tjPyc=", "id1NjGvLfWPrQ34PXWRBNiTfXv9DFiDQHExx")]
-    [InlineData("hg/cbeBvfNrMiJ0dW1AtWC4IQwG4gkuhzG2+z6bAoRU=", "id1Gda4aTXiBX9Pyc8UnmLaG44cX46umjnea")]
-    [InlineData("kId+qWen/lKeTdyxcIQhkzvvvTU8wIJECfWUWbmRQRY=", "id17RDEphijMPFGLbhqLWWgJfatBANMruC8f")]
-    [InlineData("NcqlzTEpSlKX9gmNBv41EjPRHpaNYwt0bxqh1bgyJzA=", "id19meHs4Di7JYNXoRPx9bFD6FUcpHFo3mBi")]
-    [InlineData("49fWA+kzWNdCFdo92imTiQ4vUUJsPPLNlcB9udC4ooE=", "id1c711BBi4yqV9wrLBVKxRSNFayfAm3Eib")]
+    [InlineData("fj0o9eOiPRswTZL6j9lE9TRvpDDnPRMF0gJeahz/W2c=", "did:web:prod.enmeshed.eu:dids:id1QF24Gk2DfqCywRS7NpeH5iu7D4xvu6qv1")]
+    [InlineData("jRxGfZtQ8a90TmKCGk+dhuX1CBjgoXuldhNPwrjpWsw=", "did:web:prod.enmeshed.eu:dids:id1HwY1TuyVBp3CmY3h18yTt1CKyu5qwB9wj")]
+    [InlineData("PEODpwvi7KxIVa4qeUXia9apMFvPMktdDHiDitlfbjE=", "did:web:prod.enmeshed.eu:dids:id1LMp4k1XwxZ3WFXdAn9y12tv1ofe5so4kM")]
+    [InlineData("mJGmNbxiVZAPToRuk9O3NvdfsWl6V+7wzIc+/57bU08=", "did:web:prod.enmeshed.eu:dids:id1McegXycvRoiJppS2LG25phn3jNveckFUL")]
+    [InlineData("l68K/zdNp1VLoswcHAqN6QUFwCMU6Yvzf7XiW2m1hRY=", "did:web:prod.enmeshed.eu:dids:id193k6K5cJr94WJEWYb6Kei8zp5CGPyrQLS")]
+    [InlineData("Gl8XTo8qFuUM+ksXixwp4g/jf3H/hU1F8ETuYaHCM5I=", "did:web:prod.enmeshed.eu:dids:id1BLrHAgDpimtLcGJGssMSm7bJHsvVe7CN")]
+    [InlineData("rIS4kAzHXT7GgCA6Qm1ANlwM3x12QMSkeprHb6tjPyc=", "did:web:prod.enmeshed.eu:dids:id1NjGvLfWPrQ34PXWRBNiTfXv9DFiDQHExx")]
+    [InlineData("hg/cbeBvfNrMiJ0dW1AtWC4IQwG4gkuhzG2+z6bAoRU=", "did:web:prod.enmeshed.eu:dids:id1Gda4aTXiBX9Pyc8UnmLaG44cX46umjnea")]
+    [InlineData("kId+qWen/lKeTdyxcIQhkzvvvTU8wIJECfWUWbmRQRY=", "did:web:prod.enmeshed.eu:dids:id17RDEphijMPFGLbhqLWWgJfatBANMruC8f")]
+    [InlineData("NcqlzTEpSlKX9gmNBv41EjPRHpaNYwt0bxqh1bgyJzA=", "did:web:prod.enmeshed.eu:dids:id19meHs4Di7JYNXoRPx9bFD6FUcpHFo3mBi")]
+    [InlineData("49fWA+kzWNdCFdo92imTiQ4vUUJsPPLNlcB9udC4ooE=", "did:web:prod.enmeshed.eu:dids:id1c711BBi4yqV9wrLBVKxRSNFayfAm3Eib")]
     public void AddressIsCreatedCorrectly2(string publicKey, string expectedAddress)
     {
-        var address = IdentityAddress.Create(Convert.FromBase64String(publicKey), "id1");
+        var address = IdentityAddress.Create(Convert.FromBase64String(publicKey), "id1", "prod.enmeshed.eu");
 
         address.StringValue.Should().Be(expectedAddress);
     }
@@ -29,7 +29,7 @@ public void AddressIsCreatedCorrectly2(string publicKey, string expectedAddress)
     public void AddressIsCreatedCorrectly()
     {
         var testData = TestData.Valid();
-        var address = IdentityAddress.Create(testData.PublicKey, testData.Realm);
+        var address = IdentityAddress.Create(testData.PublicKey, testData.Realm, testData.InstanceUrl);
 
         address.Should().Be(testData.Address);
     }
@@ -38,7 +38,7 @@ public void AddressIsCreatedCorrectly()
     public void EfConverterWorksCorrectly()
     {
         var testData = TestData.Valid();
-        var address = IdentityAddress.Create(testData.PublicKey, testData.Realm);
+        var address = IdentityAddress.Create(testData.PublicKey, testData.Realm, testData.InstanceUrl);
 
         address.Should().Be(testData.Address);
     }
@@ -83,6 +83,7 @@ public void AddressesWithInvalidMainPartAreDeclined()
 internal class TestData
 {
     public required string Realm { get; set; }
+    public required string InstanceUrl { get; set; }
     public required byte[] PublicKey { get; set; }
 
     public required string Address { get; set; }
@@ -94,47 +95,51 @@ public static TestData Valid()
     {
         return new TestData
         {
-            Address = "id18uSgVGTSNqECvt1DJM3bZg6U8p6RSjott",
+            Address = "did:web:prod.enmeshed.eu:dids:id18uSgVGTSNqECvt1DJM3bZg6U8p6RSjott",
             PublicKey = Convert.FromBase64String("tB9KFp/YqHrom3m5qUuZsd6l30DkaNjN14SxRw7YZuI="),
             Realm = "id1",
             Checksum = "jott",
-            MainPart = "8uSgVGTSNqECvt1DJM3bZg6U8p6RS"
+            MainPart = "8uSgVGTSNqECvt1DJM3bZg6U8p6RS",
+            InstanceUrl = "prod.enmeshed.eu"
         };
     }
 
     public static TestData WithInvalidRealm()
     {
         return new TestData
         {
-            Address = "id08uSgVGTSNqECvt1DJM3bZg6U8p6RSjott",
+            Address = "did:web:prod.enmeshed.eu:dids:id08uSgVGTSNqECvt1DJM3bZg6U8p6RSjott",
             PublicKey = Convert.FromBase64String("tB9KFp/YqHrom3m5qUuZsd6l30DkaNjN14SxRw7YZuI="),
             Realm = "id0",
             Checksum = "jott",
-            MainPart = "8uSgVGTSNqECvt1DJM3bZg6U8p6RS"
+            MainPart = "8uSgVGTSNqECvt1DJM3bZg6U8p6RS",
+            InstanceUrl = "prod.enmeshed.eu"
         };
     }
 
     public static TestData WithInvalidMainPart()
     {
         return new TestData
         {
-            Address = "id07uSgVGTSNqECvt1DJM3bZg6U8p6RSjott",
+            Address = "did:web:prod.enmeshed.eu:dids:id07uSgVGTSNqECvt1DJM3bZg6U8p6RSjott",
             PublicKey = Convert.FromBase64String("tB9KFp/YqHrom3m5qUuZsd6l30DkaNjN14SxRw7YZuI="),
             Realm = "id0",
             Checksum = "jott",
-            MainPart = "7uSgVGTSNqECvt1DJM3bZg6U8p6RS"
+            MainPart = "7uSgVGTSNqECvt1DJM3bZg6U8p6RS",
+            InstanceUrl = "prod.enmeshed.eu"
         };
     }
 
     public static TestData WithInvalidChecksum()
     {
         return new TestData
         {
-            Address = "id08uSgVGTSNqECvt1DJM3bZg6U8p6RSiott",
+            Address = "did:web:prod.enmeshed.eu:dids:id08uSgVGTSNqECvt1DJM3bZg6U8p6RSiott",
             PublicKey = Convert.FromBase64String("tB9KFp/YqHrom3m5qUuZsd6l30DkaNjN14SxRw7YZuI="),
             Realm = "id0",
             Checksum = "iott",
-            MainPart = "8uSgVGTSNqECvt1DJM3bZg6U8p6RS"
+            MainPart = "8uSgVGTSNqECvt1DJM3bZg6U8p6RS",
+            InstanceUrl = "prod.enmeshed.eu"
         };
     }
 }
diff --git a/ConsumerApi/appsettings.json b/ConsumerApi/appsettings.json
@@ -29,6 +29,7 @@
         "Devices": {
             "Application": {
                 "AddressPrefix": "id1",
+                "InstanceUrl": "prod.enmeshed.eu",
                 "Pagination": {
                     "DefaultPageSize": 50,
                     "MaxPageSize": 200

diff --git a/...Infrastructure.Database.Postgres/Migrations/20240321084302_IdentityAddress100.Designer.cs b/...Infrastructure.Database.Postgres/Migrations/20240321084302_IdentityAddress100.Designer.cs
diff --git a/...allenges.Infrastructure.Database.Postgres/Migrations/20240321084302_IdentityAddress100.cs b/...allenges.Infrastructure.Database.Postgres/Migrations/20240321084302_IdentityAddress100.cs
@@ -0,0 +1,48 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Backbone.Modules.Challenges.Infrastructure.Database.Postgres.Migrations
+{
+    /// <inheritdoc />
+    public partial class IdentityAddress100 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "CreatedBy",
+                table: "Challenges",
+                type: "character(100)",
+                unicode: false,
+                fixedLength: true,
+                maxLength: 100,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character(36)",
+                oldUnicode: false,
+                oldFixedLength: true,
+                oldMaxLength: 36,
+                oldNullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "CreatedBy",
+                table: "Challenges",
+                type: "character(36)",
+                unicode: false,
+                fixedLength: true,
+                maxLength: 36,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character(100)",
+                oldUnicode: false,
+                oldFixedLength: true,
+                oldMaxLength: 100,
+                oldNullable: true);
+        }
+    }
+}
diff --git a/...hallenges.Infrastructure.Database.Postgres/Migrations/ChallengesDbContextModelSnapshot.cs b/...hallenges.Infrastructure.Database.Postgres/Migrations/ChallengesDbContextModelSnapshot.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using Backbone.Modules.Challenges.Infrastructure.Persistence.Database;
 using Microsoft.EntityFrameworkCore;
@@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.2")
+                .HasAnnotation("ProductVersion", "8.0.3")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -31,9 +31,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsFixedLength();
 
                     b.Property<string>("CreatedBy")
-                        .HasMaxLength(36)
+                        .HasMaxLength(100)
                         .IsUnicode(false)
-                        .HasColumnType("character(36)")
+                        .HasColumnType("character(100)")
                         .IsFixedLength();
 
                     b.Property<string>("CreatedByDevice")