pharpend/Vanillae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pharpend/develop' of https://github.com/aeternity/Vanillae into pharpend/develop

Browse Source
This commit is contained in:
pharpend
2023-10-07 21:15:58 -06:00
parent 9ec0d7c9a0 18be0c53f2
commit 58e8c1507c
6 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jrx/.gitignore
+1
View File
@@ -1,2 +1,3 @@
dist dist
src/jex_include src/jex_include
docs
jrx/jex.eterms
+1 -1
View File
@@ -4,6 +4,6 @@
{version, "0.1.0"}. {version, "0.1.0"}.
{deps, ["local-tweetnacl-1.0.3", {deps, ["local-tweetnacl-1.0.3",
"local-awcp-0.2.3", "local-awcp-0.2.3",
"local-vdk_aecrypt-0.1.1", "local-vdk_aecrypt-0.1.2",
"local-vdk_aeser-0.1.0", "local-vdk_aeser-0.1.0",
"local-vdk_binary-0.1.0"]}. "local-vdk_binary-0.1.0"]}.
jrx/src/b_lib.ts
+3 -1
View File
@@ -52,7 +52,7 @@
import * as awcp from './jex_include/local-awcp-0.2.3/dist/awcp.js'; 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.1/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_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'; 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 // 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#L141-L143
// https://github.com/aeternity/aepp-sdk-js/blob/5df22dd297abebc0607710793a7234e6761570d4/src/utils/crypto.ts#L160-L167 // 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); let hashed_salted_msg : Uint8Array = vdk_aecrypt.hash_and_salt_msg(msg_str);
//console.error('hi 2');
// @ts-ignore yes nacl is stupid // @ts-ignore yes nacl is stupid
let signature : Uint8Array = nacl.sign.detached(hashed_salted_msg, secret_key); let signature : Uint8Array = nacl.sign.detached(hashed_salted_msg, secret_key);
let signature_str : string = vdk_binary.bytes_to_hex_str(signature); let signature_str : string = vdk_binary.bytes_to_hex_str(signature);
libs/vdk_aecrypt/jex.eterms
+1 -1
View File
@@ -1,6 +1,6 @@
{type, library}. {type, library}.
{realm, local}. {realm, local}.
{name, vdk_aecrypt}. {name, vdk_aecrypt}.
{version, "0.1.1"}. {version, "0.1.2"}.
{deps, ["local-blakejs-1.2.1", {deps, ["local-blakejs-1.2.1",
"local-vdk_binary-0.1.0"]}. "local-vdk_binary-0.1.0"]}.
libs/vdk_aecrypt/src/vdk_aecrypt.ts
+1
View File
@@ -119,6 +119,7 @@ hash
(data_bytes : Uint8Array) (data_bytes : Uint8Array)
: Uint8Array : Uint8Array
{ {
// console.error('hash!');
return blake2b.blake2b(data_bytes, // bytes to hash return blake2b.blake2b(data_bytes, // bytes to hash
undefined, // key (optional) undefined, // key (optional)
32); // resulting byte length 32); // resulting byte length
utils/jex/notes.md
+4
View File
@@ -1,4 +1,8 @@
- need separate development and release modes - 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 need an external version and a jex version
- external packages don't need their own docs - external packages don't need their own docs
- need to build tarballs for entire realm - need to build tarballs for entire realm