diff --git a/javascript/tokenscript-viewer/package-lock.json b/javascript/tokenscript-viewer/package-lock.json index bac4b77..8bc3c09 100644 --- a/javascript/tokenscript-viewer/package-lock.json +++ b/javascript/tokenscript-viewer/package-lock.json @@ -43,7 +43,7 @@ }, "../engine-js": { "name": "@tokenscript/engine-js", - "version": "1.5.2", + "version": "1.5.3", "license": "ISC", "dependencies": { "@ethereum-attestation-service/eas-sdk": "^2.5.0", diff --git a/javascript/tokenscript-viewer/package.json b/javascript/tokenscript-viewer/package.json index f510f8f..5e8aae2 100644 --- a/javascript/tokenscript-viewer/package.json +++ b/javascript/tokenscript-viewer/package.json @@ -8,7 +8,7 @@ "start": "stencil build --dev --watch --serve", "generate": "stencil generate", "test": "echo \"Error: no test specified\" && exit 1", - "postinstall": "npx -y patch-package" + "postinstall": "npx -y patch-package && cd ../engine-js && npx -y patch-package" }, "author": "", "license": "ISC", @@ -48,7 +48,7 @@ "@xmldom/xmldom": "^0.9.0-beta.6" }, "xmldsigjs": { - "pkijs": "3.0.11" + "pkijs": "3.1.0" }, "elliptic": "^6.5.4" } diff --git a/javascript/tokenscript-viewer/patches/pkijs+3.0.11.patch b/javascript/tokenscript-viewer/patches/pkijs+3.0.11.patch deleted file mode 100644 index cac8d50..0000000 --- a/javascript/tokenscript-viewer/patches/pkijs+3.0.11.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/node_modules/pkijs/build/index.es.js b/node_modules/pkijs/build/index.es.js -index 5f55776..5c1f00e 100644 ---- a/node_modules/pkijs/build/index.es.js -+++ b/node_modules/pkijs/build/index.es.js -@@ -3567,6 +3567,7 @@ ECNamedCurves.namedCurves = {}; - _a.register("P-256", "1.2.840.10045.3.1.7", 32); - _a.register("P-384", "1.3.132.0.34", 48); - _a.register("P-521", "1.3.132.0.35", 66); -+ _a.register("K-256", "1.3.132.0.10", 32); - _a.register("brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", 32); - _a.register("brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11", 48); - _a.register("brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13", 64); -@@ -3779,6 +3780,7 @@ class PublicKeyInfo extends PkiObject { - }); - } - catch (ex) { -+ console.warn(ex); - } - } - } -@@ -5783,6 +5785,13 @@ class CryptoEngine extends AbstractCryptoEngine { - return { - name: "P-521" - }; -+ case "1.3.132.0.10": -+ return { -+ name: "K-256", -+ hash: { -+ name: "SHA-256" -+ } -+ }; - } - if (safety) { - throw new Error(`Unsupported algorithm identifier ${target ? `for ${target} ` : EMPTY_STRING}: ${oid}`); -@@ -5952,6 +5961,9 @@ class CryptoEngine extends AbstractCryptoEngine { - case "P-521": - result = "1.3.132.0.35"; - break; -+ case "K-256": -+ result = "1.3.132.0.10"; -+ break; - } - if (!result && safety) { - throw new Error(`Unsupported algorithm ${target ? `for ${target} ` : EMPTY_STRING}: ${algorithm.name}`); -diff --git a/node_modules/pkijs/build/index.js b/node_modules/pkijs/build/index.js -index 669c2b7..f8248cb 100644 ---- a/node_modules/pkijs/build/index.js -+++ b/node_modules/pkijs/build/index.js -@@ -3593,6 +3593,7 @@ ECNamedCurves.namedCurves = {}; - _a.register("P-256", "1.2.840.10045.3.1.7", 32); - _a.register("P-384", "1.3.132.0.34", 48); - _a.register("P-521", "1.3.132.0.35", 66); -+ _a.register("K-256", "1.3.132.0.10", 32); - _a.register("brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", 32); - _a.register("brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11", 48); - _a.register("brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13", 64); -@@ -3805,6 +3806,7 @@ class PublicKeyInfo extends PkiObject { - }); - } - catch (ex) { -+ console.warn(ex); - } - } - } -@@ -5809,6 +5811,13 @@ class CryptoEngine extends AbstractCryptoEngine { - return { - name: "P-521" - }; -+ case "1.3.132.0.10": -+ return { -+ name: "K-256", -+ hash: { -+ name: "SHA-256" -+ } -+ }; - } - if (safety) { - throw new Error(`Unsupported algorithm identifier ${target ? `for ${target} ` : EMPTY_STRING}: ${oid}`); -@@ -5978,6 +5987,9 @@ class CryptoEngine extends AbstractCryptoEngine { - case "P-521": - result = "1.3.132.0.35"; - break; -+ case "K-256": -+ result = "1.3.132.0.10"; -+ break; - } - if (!result && safety) { - throw new Error(`Unsupported algorithm ${target ? `for ${target} ` : EMPTY_STRING}: ${algorithm.name}`);