diff --git a/CHANGELOG.md b/CHANGELOG.md index d0506bc7b8..7791c9fcac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ ### Chores +- Introduced new version of the `@cardano-foundation/ledgerjs-hw-app-cardano` package ([PR 2930](https://github.com/input-output-hk/daedalus/pull/2930)) - Using new faker.js ([PR 2855](https://github.com/input-output-hk/daedalus/pull/2855)) - Removed `dockutil` due compatibility issues with MacOs Monterey 12.3 ([PR 2929](https://github.com/input-output-hk/daedalus/pull/2929)) - Fixed spelling issues and typos ([PR 2915](https://github.com/input-output-hk/daedalus/pull/2915)) diff --git a/cardano-foundation-ledgerjs-hw-app-cardano-v5.0.0-rc4.tgz b/cardano-foundation-ledgerjs-hw-app-cardano-v5.0.0-rc4.tgz new file mode 100644 index 0000000000..3eb24a247b Binary files /dev/null and b/cardano-foundation-ledgerjs-hw-app-cardano-v5.0.0-rc4.tgz differ diff --git a/installers/common/MacInstaller.hs b/installers/common/MacInstaller.hs index e6fb54bcbf..8f7e5aa356 100644 --- a/installers/common/MacInstaller.hs +++ b/installers/common/MacInstaller.hs @@ -224,6 +224,7 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon , "bip66" , "bitcoin-ops" , "blake2b" + , "blake2" , "blake-hash" , "blake2b-wasm" , "bn.js" diff --git a/package.json b/package.json index 75228e8e65..8c35df26dd 100644 --- a/package.json +++ b/package.json @@ -192,7 +192,7 @@ "yarn-lockfile": "1.1.1" }, "dependencies": { - "@cardano-foundation/ledgerjs-hw-app-cardano": "4.0.0", + "@cardano-foundation/ledgerjs-hw-app-cardano": "5.0.0", "@iohk-jormungandr/wallet-js": "0.5.0-pre7", "@ledgerhq/hw-transport-node-hid": "5.51.1", "aes-js": "3.1.2", diff --git a/yarn.lock b/yarn.lock index 0e932d3a56..499acabd4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1840,14 +1840,15 @@ version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" -"@cardano-foundation/ledgerjs-hw-app-cardano@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-4.0.0.tgz#d4532b23e2ccd652f94a469106933aad821a65e7" +"@cardano-foundation/ledgerjs-hw-app-cardano@5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-5.0.0.tgz#38d929abe7946a418d6c9788895a3114e6f7e293" dependencies: "@ledgerhq/hw-transport" "^5.12.0" "@types/ledgerhq__hw-transport" "^4.21.3" base-x "^3.0.5" bech32 "^1.1.4" + blake2 "^4.0.2" int64-buffer "^1.0.1" "@cnakazawa/watch@^1.0.3": @@ -4913,6 +4914,12 @@ blake-hash@^2.0.0: node-gyp-build "^4.2.2" readable-stream "^3.6.0" +blake2@^4.0.2: + version "4.1.1" + resolved "https://registry.yarnpkg.com/blake2/-/blake2-4.1.1.tgz#0c23524776ebbf76b3ffecb6fa73422a33f20526" + dependencies: + nan "^2.15.0" + blake2b-wasm@^1.1.0: version "1.1.7" resolved "https://registry.yarnpkg.com/blake2b-wasm/-/blake2b-wasm-1.1.7.tgz#e4d075da10068e5d4c3ec1fb9accc4d186c55d81" @@ -12177,7 +12184,7 @@ nan@^2.12.1: version "2.14.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" -nan@^2.13.2: +nan@^2.13.2, nan@^2.15.0: version "2.15.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" diff --git a/yarn2nix.nix b/yarn2nix.nix index c98c7fb8f2..9526cbd20d 100644 --- a/yarn2nix.nix +++ b/yarn2nix.nix @@ -122,7 +122,7 @@ yarn2nix.mkYarnPackage { rm -rf $out/resources/app/{installers,launcher-config.yaml,gulpfile.js,home} mkdir -pv $out/resources/app/node_modules - cp -rv $node_modules/{\@babel,\@protobufjs,regenerator-runtime,node-fetch,\@trezor,runtypes,parse-uri,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,keccak,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,tiny-worker,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,trezor-connect,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,cbor-web,util-deprecate,bech32,blake-hash,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,bytebuffer,protobufjs} $out/resources/app/node_modules + cp -rv $node_modules/{\@babel,\@protobufjs,regenerator-runtime,node-fetch,\@trezor,runtypes,parse-uri,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,keccak,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,tiny-worker,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,trezor-connect,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,cbor-web,util-deprecate,bech32,blake-hash,blake2,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,bytebuffer,protobufjs} $out/resources/app/node_modules cd $out/resources/app/ unzip ${./nix/windows-usb-libs.zip} @@ -153,6 +153,7 @@ yarn2nix.mkYarnPackage { dup @ledgerhq dup electron-chromedriver dup blake-hash + dup blake2 dup tiny-secp256k1 # We ship debug version because the release one has issues with ledger nano s @@ -167,7 +168,7 @@ yarn2nix.mkYarnPackage { mkdir -p $out/share/fonts ln -sv $out/share/daedalus/renderer/assets $out/share/fonts/daedalus mkdir -pv $out/share/daedalus/node_modules - cp -rv $node_modules/{\@babel,\@protobufjs,regenerator-runtime,node-fetch,\@trezor,runtypes,parse-uri,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,keccak,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,tiny-worker,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,trezor-connect,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,cbor-web,util-deprecate,bech32,blake-hash,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,bytebuffer,protobufjs} $out/share/daedalus/node_modules/ + cp -rv $node_modules/{\@babel,\@protobufjs,regenerator-runtime,node-fetch,\@trezor,runtypes,parse-uri,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,keccak,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,tiny-worker,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,trezor-connect,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,cbor-web,util-deprecate,bech32,blake-hash,blake2,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,bytebuffer,protobufjs} $out/share/daedalus/node_modules/ find $out $NIX_BUILD_TOP -name '*.node' mkdir -pv $out/share/daedalus/build