diff --git a/jrx/.gitignore b/jrx/.gitignore index c21f6dd..3d4888a 100644 --- a/jrx/.gitignore +++ b/jrx/.gitignore @@ -1,2 +1,3 @@ dist src/jex_include +docs diff --git a/jrx/jex.eterms b/jrx/jex.eterms index 8ca46d0..92fea89 100644 --- a/jrx/jex.eterms +++ b/jrx/jex.eterms @@ -4,6 +4,6 @@ {version, "0.1.0"}. {deps, ["local-tweetnacl-1.0.3", "local-awcp-0.2.3", - "local-vdk_aecrypt-0.1.0", + "local-vdk_aecrypt-0.1.2", "local-vdk_aeser-0.1.0", "local-vdk_binary-0.1.0"]}. diff --git a/jrx/src/b_lib.ts b/jrx/src/b_lib.ts index 04121af..5f04aab 100644 --- a/jrx/src/b_lib.ts +++ b/jrx/src/b_lib.ts @@ -52,7 +52,7 @@ import * as awcp from './jex_include/local-awcp-0.2.3/dist/awcp.js'; -import * as vdk_aecrypt from './jex_include/local-vdk_aecrypt-0.1.0/dist/vdk_aecrypt.js'; +import * as vdk_aecrypt from './jex_include/local-vdk_aecrypt-0.1.2/dist/vdk_aecrypt.js'; import * as vdk_aeser from './jex_include/local-vdk_aeser-0.1.0/dist/vdk_aeser.js'; import * as vdk_binary from './jex_include/local-vdk_binary-0.1.0/dist/vdk_binary.js'; @@ -402,7 +402,9 @@ msg_sign // use nacl detached signatures // https://github.com/aeternity/aepp-sdk-js/blob/5df22dd297abebc0607710793a7234e6761570d4/src/utils/crypto.ts#L141-L143 // https://github.com/aeternity/aepp-sdk-js/blob/5df22dd297abebc0607710793a7234e6761570d4/src/utils/crypto.ts#L160-L167 + //console.error('hi 1'); let hashed_salted_msg : Uint8Array = vdk_aecrypt.hash_and_salt_msg(msg_str); + //console.error('hi 2'); // @ts-ignore yes nacl is stupid let signature : Uint8Array = nacl.sign.detached(hashed_salted_msg, secret_key); let signature_str : string = vdk_binary.bytes_to_hex_str(signature); diff --git a/libs/vdk_aecrypt/jex.eterms b/libs/vdk_aecrypt/jex.eterms index 0d9809e..95d0948 100644 --- a/libs/vdk_aecrypt/jex.eterms +++ b/libs/vdk_aecrypt/jex.eterms @@ -1,6 +1,6 @@ {type, library}. {realm, local}. {name, vdk_aecrypt}. -{version, "0.1.1"}. +{version, "0.1.2"}. {deps, ["local-blakejs-1.2.1", "local-vdk_binary-0.1.0"]}. diff --git a/libs/vdk_aecrypt/src/vdk_aecrypt.ts b/libs/vdk_aecrypt/src/vdk_aecrypt.ts index 2d0adf6..764e0e3 100644 --- a/libs/vdk_aecrypt/src/vdk_aecrypt.ts +++ b/libs/vdk_aecrypt/src/vdk_aecrypt.ts @@ -119,6 +119,7 @@ hash (data_bytes : Uint8Array) : Uint8Array { + // console.error('hash!'); return blake2b.blake2b(data_bytes, // bytes to hash undefined, // key (optional) 32); // resulting byte length diff --git a/utils/jex/notes.md b/utils/jex/notes.md index 25c320d..82db940 100644 --- a/utils/jex/notes.md +++ b/utils/jex/notes.md @@ -1,4 +1,8 @@ - need separate development and release modes + - dev: use latest versions of every package, then "freeze" + - dev: warn if using not latest version + - dev: build versions + - dev: new version must be strictly greater than latest release - external packages need an external version and a jex version - external packages don't need their own docs - need to build tarballs for entire realm