From 7139ec9eb01292b660a4dc2d58cff167bb4e9754 Mon Sep 17 00:00:00 2001 From: Filip Date: Tue, 21 Nov 2023 23:41:42 +0100 Subject: [PATCH 1/3] Use copper-multibase --- pom.xml | 6 ------ pom_jre8.xml | 6 ------ pom_parent.xml | 12 ++++++++++-- src/main/java/com/apicatalog/did/key/DidKey.java | 4 ++-- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 5614bab..2f2eb20 100644 --- a/pom.xml +++ b/pom.xml @@ -26,14 +26,8 @@ 17 17 src/main/java17 - 1.1.1 - - com.github.multiformats - java-multibase - ${multiformats.version} - com.apicatalog titanium-json-ld diff --git a/pom_jre8.xml b/pom_jre8.xml index 1f4f428..471b8ed 100644 --- a/pom_jre8.xml +++ b/pom_jre8.xml @@ -22,14 +22,8 @@ 1.8 1.8 src/main/java8 - v1.1.0 - - com.github.multiformats - java-multibase - ${multiformats.version} - com.apicatalog titanium-json-ld-jre8 diff --git a/pom_parent.xml b/pom_parent.xml index c0f7636..93cbd18 100644 --- a/pom_parent.xml +++ b/pom_parent.xml @@ -48,7 +48,8 @@ 2.0.1 1.3.3 - 0.0.5 + 0.0.6 + 0.0.1 5.10.1 @@ -64,10 +65,17 @@ com.apicatalog copper-multicodec - ${copper.version} + ${copper.multicodec.version} provided + + com.apicatalog + copper-multibase + ${copper.multibase.version} + provided + + org.junit.jupiter diff --git a/src/main/java/com/apicatalog/did/key/DidKey.java b/src/main/java/com/apicatalog/did/key/DidKey.java index aaee11f..937203e 100644 --- a/src/main/java/com/apicatalog/did/key/DidKey.java +++ b/src/main/java/com/apicatalog/did/key/DidKey.java @@ -6,7 +6,7 @@ import com.apicatalog.multibase.Multibase; import com.apicatalog.multicodec.Multicodec; import com.apicatalog.multicodec.Multicodec.Tag; -import com.apicatalog.multicodec.Multicoder; +import com.apicatalog.multicodec.MulticodecDecoder; /** * Immutable DID Key @@ -26,7 +26,7 @@ public class DidKey extends Did { public static final String METHOD_KEY = "key"; - protected static final Multicoder MULTICODER = Multicoder.getInstance(Tag.Key); + protected static final MulticodecDecoder MULTICODER = MulticodecDecoder.getInstance(Tag.Key); private final Multicodec codec; From 346dfabbbdfa86f0252ea63fa7b74300f12b6937 Mon Sep 17 00:00:00 2001 From: Filip Date: Tue, 21 Nov 2023 23:55:29 +0100 Subject: [PATCH 2/3] Use copper-multibase --- pom_parent.xml | 7 ---- .../java/com/apicatalog/did/key/DidKey.java | 12 +++---- .../com/apicatalog/multibase/Multibase.java | 36 ------------------- 3 files changed, 5 insertions(+), 50 deletions(-) delete mode 100644 src/main/java/com/apicatalog/multibase/Multibase.java diff --git a/pom_parent.xml b/pom_parent.xml index 93cbd18..573c710 100644 --- a/pom_parent.xml +++ b/pom_parent.xml @@ -93,13 +93,6 @@ - - - scijava.org - https://maven.scijava.org/content/repositories/public/ - - - diff --git a/src/main/java/com/apicatalog/did/key/DidKey.java b/src/main/java/com/apicatalog/did/key/DidKey.java index 937203e..264f4a7 100644 --- a/src/main/java/com/apicatalog/did/key/DidKey.java +++ b/src/main/java/com/apicatalog/did/key/DidKey.java @@ -4,6 +4,7 @@ import com.apicatalog.did.Did; import com.apicatalog.multibase.Multibase; +import com.apicatalog.multibase.MultibaseDecoder; import com.apicatalog.multicodec.Multicodec; import com.apicatalog.multicodec.Multicodec.Tag; import com.apicatalog.multicodec.MulticodecDecoder; @@ -26,7 +27,8 @@ public class DidKey extends Did { public static final String METHOD_KEY = "key"; - protected static final MulticodecDecoder MULTICODER = MulticodecDecoder.getInstance(Tag.Key); + protected static final MulticodecDecoder MULTICODEC = MulticodecDecoder.getInstance(Tag.Key); + protected static final MultibaseDecoder MULTIBASE = MultibaseDecoder.getInstance(Multibase.BASE_58_BTC); private final Multicodec codec; @@ -66,13 +68,9 @@ public static final DidKey from(final Did did) { throw new IllegalArgumentException("The given DID method [" + did.getMethod() + "] is not 'key'. DID [" + did.toString() + "]."); } - if (!Multibase.isAlgorithmSupported(did.getMethodSpecificId())) { - throw new IllegalArgumentException(); - } - - final byte[] decoded = Multibase.decode(did.getMethodSpecificId()); + final byte[] decoded = MULTIBASE.decode(did.getMethodSpecificId()); - final Multicodec codec = MULTICODER.getCodec(decoded).orElseThrow(() -> new IllegalArgumentException("Cannot detect did:key codec.")); + final Multicodec codec = MULTICODEC.getCodec(decoded).orElseThrow(() -> new IllegalArgumentException("Cannot detect did:key codec.")); final byte[] rawKey = codec.decode(decoded); diff --git a/src/main/java/com/apicatalog/multibase/Multibase.java b/src/main/java/com/apicatalog/multibase/Multibase.java deleted file mode 100644 index 8037269..0000000 --- a/src/main/java/com/apicatalog/multibase/Multibase.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.apicatalog.multibase; - -public class Multibase { - - public enum Algorithm { - Base58Btc, - } - - public static boolean isAlgorithmSupported(String encoded) { - return encoded != null && !encoded.isEmpty() && 'z' == encoded.charAt(0); - } - - public static byte[] decode(String encoded) { - return io.ipfs.multibase.Multibase.decode(encoded); - } - - public static String encode(Algorithm algorithm, byte[] data) { - - if (algorithm == null) { - throw new IllegalArgumentException("The 'algorithm' parameter must not be null."); - } - if (data == null || data.length == 0) { - throw new IllegalArgumentException("The 'data' parameter must not be an empty array nor null."); - } - - switch (algorithm) { - case Base58Btc: - return io.ipfs.multibase.Multibase.encode(io.ipfs.multibase.Multibase.Base.Base58BTC, data); - - default: - break; - } - - throw new IllegalArgumentException("Unsupported algorithm [" + algorithm + "]."); - } -} From f6b360eb965b2cbcb39ea5e4f3620aa4b6a6b490 Mon Sep 17 00:00:00 2001 From: Filip Date: Tue, 21 Nov 2023 23:56:26 +0100 Subject: [PATCH 3/3] Bump version to 0.0.7 --- pom.xml | 2 +- pom_jre8.xml | 2 +- pom_parent.xml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 2f2eb20..1e103d0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.apicatalog carbon - 0.0.7-SNAPSHOT + 0.0.7 pom_parent.xml carbon-did diff --git a/pom_jre8.xml b/pom_jre8.xml index 471b8ed..26f153a 100644 --- a/pom_jre8.xml +++ b/pom_jre8.xml @@ -6,7 +6,7 @@ com.apicatalog carbon - 0.0.7-SNAPSHOT + 0.0.7 pom_parent.xml carbon-did-jre8 diff --git a/pom_parent.xml b/pom_parent.xml index 573c710..16c82c1 100644 --- a/pom_parent.xml +++ b/pom_parent.xml @@ -6,7 +6,7 @@ 4.0.0 com.apicatalog carbon - 0.0.7-SNAPSHOT + 0.0.7 pom Carbon DIDs @@ -69,12 +69,12 @@ provided - - com.apicatalog - copper-multibase - ${copper.multibase.version} - provided - + + com.apicatalog + copper-multibase + ${copper.multibase.version} + provided +