From 87e68556c5aa79fa22703aba3a97aeeb2817d00c Mon Sep 17 00:00:00 2001 From: Dima Smoliar Date: Fri, 5 Apr 2024 12:23:33 +0300 Subject: [PATCH 01/10] Bump blade-web3 to v1.3. Fix transactions populated by BladeWallet on mainnet. Fix appMetadata modifying. Signed-off-by: Dima Smoliar --- sdk/package-lock.json | 377 ++++++++---------- sdk/package.json | 2 +- .../out/hs/blade/BladeTransactionAdapter.ts | 36 +- .../hs/hashpack/HashpackTransactionAdapter.ts | 2 +- 4 files changed, 179 insertions(+), 238 deletions(-) diff --git a/sdk/package-lock.json b/sdk/package-lock.json index 99773f1e1..2bb17fb3f 100644 --- a/sdk/package-lock.json +++ b/sdk/package-lock.json @@ -9,7 +9,7 @@ "version": "1.17.0", "license": "Apache-2.0", "dependencies": { - "@bladelabs/blade-web3.js": "^1.2.0", + "@bladelabs/blade-web3.js": "1.3.0", "@hashgraph/cryptography": "1.4.3", "@hashgraph/hashconnect": "file:./../hashconnect/lib", "@hashgraph/hedera-custodians-integration": "1.2.5", @@ -1939,18 +1939,105 @@ "dev": true }, "node_modules/@bladelabs/blade-web3.js": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@bladelabs/blade-web3.js/-/blade-web3.js-1.2.2.tgz", - "integrity": "sha512-U/oRT8SUf1IBBqo3FrR8CWQeKOi2+/7AUZoxZxeLINRXviKaP4qHVvE8QmeVcIFg6A/FfdVH0kpi3kSatzZIbg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@bladelabs/blade-web3.js/-/blade-web3.js-1.3.0.tgz", + "integrity": "sha512-xYjveiXBexXurbrXOEnKh83UEkgXh54GMqH1qaFn99REy3UwAUy2Nb2qLEXPCI3PN5mxxK+ruswAjL7ZbBbHtA==", "dependencies": { - "@hashgraph/hedera-wallet-connect": "^0.1.0", + "@hashgraph/sdk": "2.40.0", "@walletconnect/modal": "^2.6.2", + "@walletconnect/sign-client": "2.11.0", + "buffer": "6.0.3", "rxjs": "^7.8.0" }, "peerDependencies": { "@hashgraph/sdk": "^2.16.0" } }, + "node_modules/@bladelabs/blade-web3.js/node_modules/@hashgraph/cryptography": { + "version": "1.4.8-beta.5", + "resolved": "https://registry.npmjs.org/@hashgraph/cryptography/-/cryptography-1.4.8-beta.5.tgz", + "integrity": "sha512-soq2vGLRkdl2Evr+gIvIjCXJjqA1hOAjysBGG+dhP6tKx2PEgEjb3hON/sMbxm3Q4qQdkML/vEthdAV707+flw==", + "dependencies": { + "asn1js": "^3.0.5", + "bignumber.js": "^9.1.1", + "bn.js": "^5.2.1", + "buffer": "^6.0.3", + "crypto-js": "^4.2.0", + "elliptic": "^6.5.4", + "js-base64": "^3.7.4", + "node-forge": "^1.3.1", + "spark-md5": "^3.0.2", + "tweetnacl": "^1.0.3", + "utf8": "^3.0.0" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "expo": "^49.0.16", + "expo-crypto": "^10.1.2", + "expo-random": "^12.1.2" + }, + "peerDependenciesMeta": { + "expo": { + "optional": true + }, + "expo-crypto": { + "optional": true + }, + "expo-random": { + "optional": true + } + } + }, + "node_modules/@bladelabs/blade-web3.js/node_modules/@hashgraph/proto": { + "version": "2.14.0-beta.3", + "resolved": "https://registry.npmjs.org/@hashgraph/proto/-/proto-2.14.0-beta.3.tgz", + "integrity": "sha512-y2DYFXpXZN0ywULaPycRmmryaUBzSDQ2+UAAYdE1jQr8NPcIL2gv8wB5GKBBQqz1HihRNXiyJgYSGoNSeq9qsg==", + "dependencies": { + "long": "^4.0.0", + "protobufjs": "^7.2.5" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/@bladelabs/blade-web3.js/node_modules/@hashgraph/sdk": { + "version": "2.40.0", + "resolved": "https://registry.npmjs.org/@hashgraph/sdk/-/sdk-2.40.0.tgz", + "integrity": "sha512-wgkjCsOldSPbWZY3sKd7vGHqfcR5yQL/YNIbW7O1cihGN0G4nTzvYLjNLoNNIsA+XWMb0zkxWpQ0PAZaeQJgcw==", + "dependencies": { + "@ethersproject/abi": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/rlp": "^5.7.0", + "@grpc/grpc-js": "1.8.2", + "@hashgraph/cryptography": "1.4.8-beta.5", + "@hashgraph/proto": "2.14.0-beta.3", + "axios": "^1.6.4", + "bignumber.js": "^9.1.1", + "bn.js": "^5.1.1", + "crypto-js": "^4.2.0", + "js-base64": "^3.7.4", + "long": "^4.0.0", + "pino": "^8.14.1", + "pino-pretty": "^10.0.0", + "protobufjs": "^7.2.5", + "rfc4648": "^1.5.3", + "utf8": "^3.0.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "expo": "^49.0.16" + }, + "peerDependenciesMeta": { + "expo": { + "optional": true + } + } + }, "node_modules/@colors/colors": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", @@ -3233,22 +3320,6 @@ "node": ">= 6.0.0" } }, - "node_modules/@hashgraph/hedera-wallet-connect": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@hashgraph/hedera-wallet-connect/-/hedera-wallet-connect-0.1.0.tgz", - "integrity": "sha512-0Nnpao0tPIqZ+y+vrKCy6Bw1PgzqYE0yejxcWQnoI+ruPuyZFqzLGdp0S3nxt6Zxo7RP/28kWtS1Dlj6zqMYiQ==", - "dependencies": { - "@hashgraph/sdk": "^2.19.1", - "@json-rpc-tools/utils": "^2.0.0-beta.12", - "@walletconnect/core": "^2.1.3", - "@walletconnect/qrcode-modal": "^2.0.0-alpha.20", - "@walletconnect/sign-client": "^2.1.3", - "@walletconnect/types": "^2.1.3", - "buffer": "^6.0.3", - "events": "^3.3.0", - "rxjs": "^7.5.7" - } - }, "node_modules/@hashgraph/hethers": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/@hashgraph/hethers/-/hethers-1.2.6.tgz", @@ -4568,11 +4639,6 @@ "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", "dev": true }, - "node_modules/@ioredis/commands": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", - "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==" - }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -5368,25 +5434,6 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@json-rpc-tools/types": { - "version": "2.0.0-beta.12", - "resolved": "https://registry.npmjs.org/@json-rpc-tools/types/-/types-2.0.0-beta.12.tgz", - "integrity": "sha512-UM8w0RnD4DjYql/HlThe051ivW2Q8ulWarr7ux5Aas1UsOmcGQEg4slQo46p+BXgh1Nth7SHWS2tVnW/UUnCwQ==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dependencies": { - "keyvaluestorage-interface": "^1.0.0" - } - }, - "node_modules/@json-rpc-tools/utils": { - "version": "2.0.0-beta.12", - "resolved": "https://registry.npmjs.org/@json-rpc-tools/utils/-/utils-2.0.0-beta.12.tgz", - "integrity": "sha512-7j3REzegFNXdgA0rjllNKz84ikIAXm4Yv3mO8Lx9D64hUOU2tUZfELtKEm2wr8FsP5if46Xl9ZH/Ch7JB4nXJQ==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dependencies": { - "@json-rpc-tools/types": "^2.0.0-beta.12", - "@pedrouid/environment": "^1.0.1" - } - }, "node_modules/@lit-labs/ssr-dom-shim": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz", @@ -5915,11 +5962,6 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/@pedrouid/environment": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@pedrouid/environment/-/environment-1.0.1.tgz", - "integrity": "sha512-HaW78NszGzRZd9SeoI3JD11JqY+lubnaOx7Pewj5pfjqWXOEATpeKIFb9Z4t2WBUK2iryiXX3lzWwmYWgUL0Ug==" - }, "node_modules/@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -6809,9 +6851,9 @@ "dev": true }, "node_modules/@walletconnect/core": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/@walletconnect/core/-/core-2.11.2.tgz", - "integrity": "sha512-bB4SiXX8hX3/hyBfVPC5gwZCXCl+OPj+/EDVM71iAO3TDsh78KPbrVAbDnnsbHzZVHlsMohtXX3j5XVsheN3+g==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@walletconnect/core/-/core-2.11.0.tgz", + "integrity": "sha512-2Tjp5BCevI7dbmqo/OrCjX4tqgMqwJNQLlQAlphqPfvwlF9+tIu6pGcVbSN3U9zyXzWIZCeleqEaWUeSeET4Ew==", "dependencies": { "@walletconnect/heartbeat": "1.2.1", "@walletconnect/jsonrpc-provider": "1.0.13", @@ -6824,8 +6866,8 @@ "@walletconnect/relay-auth": "^1.0.4", "@walletconnect/safe-json": "^1.0.2", "@walletconnect/time": "^1.0.2", - "@walletconnect/types": "2.11.2", - "@walletconnect/utils": "2.11.2", + "@walletconnect/types": "2.11.0", + "@walletconnect/utils": "2.11.0", "events": "^3.3.0", "isomorphic-unfetch": "3.1.0", "lodash.isequal": "4.5.0", @@ -7050,11 +7092,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, - "node_modules/@walletconnect/mobile-registry": { - "version": "2.0.0-alpha.20", - "resolved": "https://registry.npmjs.org/@walletconnect/mobile-registry/-/mobile-registry-2.0.0-alpha.20.tgz", - "integrity": "sha512-Qunuhp6dnjkIQgVWRRktLE3KGRbNw7AgZnLAoTsOakOLLVL+l9zOIUuowRcbCOpPzDK8Vb5Y2gWSPR1tce0hAg==" - }, "node_modules/@walletconnect/modal": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/@walletconnect/modal/-/modal-2.6.2.tgz", @@ -7083,22 +7120,6 @@ "qrcode": "1.5.3" } }, - "node_modules/@walletconnect/qrcode-modal": { - "version": "2.0.0-alpha.20", - "resolved": "https://registry.npmjs.org/@walletconnect/qrcode-modal/-/qrcode-modal-2.0.0-alpha.20.tgz", - "integrity": "sha512-R+lKspxKfjQ5VCWFpuxQ49s+vEeBsKLXtAhOALRga/5dJVc33eRmgd6dJ2dEhkCaUJ6SDVPd3w3EF0jYBVBXPg==", - "deprecated": "WalletConnect's v1 SDKs are now deprecated. Please upgrade to a v2 SDK. For details see: https://docs.walletconnect.com/", - "dependencies": { - "@walletconnect/mobile-registry": "^2.0.0-alpha.20", - "@walletconnect/types": "^2.0.0-alpha.20", - "@walletconnect/utils": "^2.0.0-alpha.20", - "detect-browser": "^5.1.0", - "preact": "^10.4.1", - "qrcode": "^1.4.4", - "safe-json-utils": "^1.1.1", - "window-getters": "^1.0.1" - } - }, "node_modules/@walletconnect/relay-api": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@walletconnect/relay-api/-/relay-api-1.0.9.tgz", @@ -7145,18 +7166,18 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@walletconnect/sign-client": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/@walletconnect/sign-client/-/sign-client-2.11.2.tgz", - "integrity": "sha512-MfBcuSz2GmMH+P7MrCP46mVE5qhP0ZyWA0FyIH6/WuxQ6G+MgKsGfaITqakpRPsykWOJq8tXMs3XvUPDU413OQ==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@walletconnect/sign-client/-/sign-client-2.11.0.tgz", + "integrity": "sha512-H2ukscibBS+6WrzQWh+WyVBqO5z4F5et12JcwobdwgHnJSlqIoZxqnUYYWNCI5rUR5UKsKWaUyto4AE9N5dw4Q==", "dependencies": { - "@walletconnect/core": "2.11.2", + "@walletconnect/core": "2.11.0", "@walletconnect/events": "^1.0.1", "@walletconnect/heartbeat": "1.2.1", "@walletconnect/jsonrpc-utils": "1.0.8", "@walletconnect/logger": "^2.0.1", "@walletconnect/time": "^1.0.2", - "@walletconnect/types": "2.11.2", - "@walletconnect/utils": "2.11.2", + "@walletconnect/types": "2.11.0", + "@walletconnect/utils": "2.11.0", "events": "^3.3.0" } }, @@ -7174,9 +7195,9 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@walletconnect/types": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-2.11.2.tgz", - "integrity": "sha512-p632MFB+lJbip2cvtXPBQslpUdiw1sDtQ5y855bOlAGquay+6fZ4h1DcDePeKQDQM3P77ax2a9aNPZxV6y/h1Q==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-2.11.0.tgz", + "integrity": "sha512-AB5b1lrEbCGHxqS2vqfCkIoODieH+ZAUp9rA1O2ftrhnqDJiJK983Df87JhYhECsQUBHHfALphA8ydER0q+9sw==", "dependencies": { "@walletconnect/events": "^1.0.1", "@walletconnect/heartbeat": "1.2.1", @@ -7187,9 +7208,9 @@ } }, "node_modules/@walletconnect/utils": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/@walletconnect/utils/-/utils-2.11.2.tgz", - "integrity": "sha512-LyfdmrnZY6dWqlF4eDrx5jpUwsB2bEPjoqR5Z6rXPiHJKUOdJt7az+mNOn5KTSOlRpd1DmozrBrWr+G9fFLYVw==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@walletconnect/utils/-/utils-2.11.0.tgz", + "integrity": "sha512-hxkHPlTlDQILHfIKXlmzgNJau/YcSBC3XHUSuZuKZbNEw3duFT6h6pm3HT/1+j1a22IG05WDsNBuTCRkwss+BQ==", "dependencies": { "@stablelib/chacha20poly1305": "1.0.1", "@stablelib/hkdf": "1.0.1", @@ -7199,7 +7220,7 @@ "@walletconnect/relay-api": "^1.0.9", "@walletconnect/safe-json": "^1.0.2", "@walletconnect/time": "^1.0.2", - "@walletconnect/types": "2.11.2", + "@walletconnect/types": "2.11.0", "@walletconnect/window-getters": "^1.0.1", "@walletconnect/window-metadata": "^1.0.1", "detect-browser": "5.3.0", @@ -8564,14 +8585,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/cluster-key-slot": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", - "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -8837,9 +8850,9 @@ } }, "node_modules/cookie-es": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cookie-es/-/cookie-es-1.0.0.tgz", - "integrity": "sha512-mWYvfOLrfEc996hlKcdABeIiPHUPC6DM2QYZdGGOvhOTbA3tjm2eBwqlJpoFdjC89NI4Qt6h0Pu06Mp+1Pj5OQ==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/cookie-es/-/cookie-es-1.1.0.tgz", + "integrity": "sha512-L2rLOcK0wzWSfSDA33YR+PUHDG10a8px7rUHKWbGLP4YfbsMed2KFUw5fczvDPbT98DDe3LEzviswl810apTEw==" }, "node_modules/cookie-signature": { "version": "1.0.6", @@ -9259,14 +9272,6 @@ "node": ">=0.4.0" } }, - "node_modules/denque": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", - "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", - "engines": { - "node": ">=0.10" - } - }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -11568,29 +11573,6 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "node_modules/ioredis": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz", - "integrity": "sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==", - "dependencies": { - "@ioredis/commands": "^1.1.1", - "cluster-key-slot": "^1.1.0", - "debug": "^4.3.4", - "denque": "^2.1.0", - "lodash.defaults": "^4.2.0", - "lodash.isarguments": "^3.1.0", - "redis-errors": "^1.2.0", - "redis-parser": "^3.0.0", - "standard-as-callback": "^2.1.0" - }, - "engines": { - "node": ">=12.22.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/ioredis" - } - }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -14056,16 +14038,6 @@ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", "dev": true }, - "node_modules/lodash.defaults": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==" - }, - "node_modules/lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==" - }, "node_modules/lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", @@ -14637,9 +14609,9 @@ } }, "node_modules/node-fetch-native": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.2.tgz", - "integrity": "sha512-69mtXOFZ6hSkYiXAVB5SqaRvrbITC/NPyqv7yuu/qw0nmgPyYbIMYYNIDhNtwPrzk0ptrimrLz/hhjvm4w5Z+w==" + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.4.tgz", + "integrity": "sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==" }, "node_modules/node-forge": { "version": "1.3.1", @@ -14761,13 +14733,13 @@ } }, "node_modules/ofetch": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/ofetch/-/ofetch-1.3.3.tgz", - "integrity": "sha512-s1ZCMmQWXy4b5K/TW9i/DtiN8Ku+xCiHcjQ6/J/nDdssirrQNOoB165Zu8EqLMA2lln1JUth9a0aW9Ap2ctrUg==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/ofetch/-/ofetch-1.3.4.tgz", + "integrity": "sha512-KLIET85ik3vhEfS+3fDlc/BAZiAp+43QEC/yCo5zkNoY2YaKvNkOaFr/6wCFgFH1kuYQM5pMNi0Tg8koiIemtw==", "dependencies": { - "destr": "^2.0.1", - "node-fetch-native": "^1.4.0", - "ufo": "^1.3.0" + "destr": "^2.0.3", + "node-fetch-native": "^1.6.3", + "ufo": "^1.5.3" } }, "node_modules/ohash": { @@ -15269,15 +15241,6 @@ "node": "^10 || ^12 || >=14" } }, - "node_modules/preact": { - "version": "10.19.6", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.19.6.tgz", - "integrity": "sha512-gympg+T2Z1fG1unB8NH29yHJwnEaCH37Z32diPDku316OTnRPeMbiRV9kTrfZpocXjdfnWuFUl/Mj4BHaf6gnw==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/preact" - } - }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -15639,9 +15602,9 @@ } }, "node_modules/radix3": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/radix3/-/radix3-1.1.1.tgz", - "integrity": "sha512-yUUd5VTiFtcMEx0qFUxGAv5gbMc1un4RvEO1JZdP7ZUl/RHygZK6PknIKntmQRZxnMY3ZXD2ISaw1ij8GYW1yg==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/radix3/-/radix3-1.1.2.tgz", + "integrity": "sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==" }, "node_modules/randombytes": { "version": "2.1.0", @@ -15729,25 +15692,6 @@ "node": ">= 12.13.0" } }, - "node_modules/redis-errors": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", - "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==", - "engines": { - "node": ">=4" - } - }, - "node_modules/redis-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", - "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==", - "dependencies": { - "redis-errors": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/reflect-metadata": { "version": "0.1.14", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.14.tgz", @@ -15988,6 +15932,11 @@ "node": ">=0.10.0" } }, + "node_modules/rfc4648": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/rfc4648/-/rfc4648-1.5.3.tgz", + "integrity": "sha512-MjOWxM065+WswwnmNONOT+bD1nXzY9Km6u3kzvnx8F8/HXGZdz3T6e6vZJ8Q/RIMUSp/nxqjH3GwvJDy8ijeQQ==" + }, "node_modules/rfdc": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", @@ -16133,11 +16082,6 @@ } ] }, - "node_modules/safe-json-utils": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/safe-json-utils/-/safe-json-utils-1.1.1.tgz", - "integrity": "sha512-SAJWGKDs50tAbiDXLf89PDwt9XYkWyANFWVzn4dTXl5QyI8t2o/bW5/OJl3lvc2WVU4MEpTo9Yz5NVFNsp+OJQ==" - }, "node_modules/safe-stable-stringify": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz", @@ -16565,11 +16509,6 @@ "node": ">=8" } }, - "node_modules/standard-as-callback": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", - "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==" - }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -17271,9 +17210,9 @@ } }, "node_modules/ufo": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.4.0.tgz", - "integrity": "sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ==" + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz", + "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==" }, "node_modules/uint8arrays": { "version": "3.1.1", @@ -17373,35 +17312,35 @@ } }, "node_modules/unstorage": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/unstorage/-/unstorage-1.10.1.tgz", - "integrity": "sha512-rWQvLRfZNBpF+x8D3/gda5nUCQL2PgXy2jNG4U7/Rc9BGEv9+CAJd0YyGCROUBKs9v49Hg8huw3aih5Bf5TAVw==", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/unstorage/-/unstorage-1.10.2.tgz", + "integrity": "sha512-cULBcwDqrS8UhlIysUJs2Dk0Mmt8h7B0E6mtR+relW9nZvsf/u4SkAYyNliPiPW7XtFNb5u3IUMkxGxFTTRTgQ==", "dependencies": { "anymatch": "^3.1.3", - "chokidar": "^3.5.3", - "destr": "^2.0.2", - "h3": "^1.8.2", - "ioredis": "^5.3.2", - "listhen": "^1.5.5", - "lru-cache": "^10.0.2", + "chokidar": "^3.6.0", + "destr": "^2.0.3", + "h3": "^1.11.1", + "listhen": "^1.7.2", + "lru-cache": "^10.2.0", "mri": "^1.2.0", - "node-fetch-native": "^1.4.1", + "node-fetch-native": "^1.6.2", "ofetch": "^1.3.3", - "ufo": "^1.3.1" + "ufo": "^1.4.0" }, "peerDependencies": { - "@azure/app-configuration": "^1.4.1", + "@azure/app-configuration": "^1.5.0", "@azure/cosmos": "^4.0.0", "@azure/data-tables": "^13.2.2", - "@azure/identity": "^3.3.2", - "@azure/keyvault-secrets": "^4.7.0", - "@azure/storage-blob": "^12.16.0", - "@capacitor/preferences": "^5.0.6", - "@netlify/blobs": "^6.2.0", - "@planetscale/database": "^1.11.0", - "@upstash/redis": "^1.23.4", - "@vercel/kv": "^0.2.3", - "idb-keyval": "^6.2.1" + "@azure/identity": "^4.0.1", + "@azure/keyvault-secrets": "^4.8.0", + "@azure/storage-blob": "^12.17.0", + "@capacitor/preferences": "^5.0.7", + "@netlify/blobs": "^6.5.0 || ^7.0.0", + "@planetscale/database": "^1.16.0", + "@upstash/redis": "^1.28.4", + "@vercel/kv": "^1.0.1", + "idb-keyval": "^6.2.1", + "ioredis": "^5.3.2" }, "peerDependenciesMeta": { "@azure/app-configuration": { @@ -17439,6 +17378,9 @@ }, "idb-keyval": { "optional": true + }, + "ioredis": { + "optional": true } } }, @@ -18205,11 +18147,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/window-getters": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/window-getters/-/window-getters-1.0.1.tgz", - "integrity": "sha512-cojBfDeV58XEurDgj+rre15c7dvu27bWCPlOIpwQgreOsw6qQk0UGDR1hi7ZHKw5+L0AENUNNWGG2h4yr2Y3hQ==" - }, "node_modules/winston": { "version": "3.12.0", "resolved": "https://registry.npmjs.org/winston/-/winston-3.12.0.tgz", diff --git a/sdk/package.json b/sdk/package.json index 118827648..015a20952 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -67,7 +67,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@bladelabs/blade-web3.js": "^1.2.0", + "@bladelabs/blade-web3.js": "1.3.0", "@hashgraph/cryptography": "1.4.3", "@hashgraph/hashconnect": "file:./../hashconnect/lib", "@hashgraph/hedera-custodians-integration": "1.2.5", diff --git a/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts b/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts index ca5192b44..24b26e56e 100644 --- a/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts +++ b/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts @@ -65,6 +65,7 @@ import { HashpackTransactionResponseAdapter } from '../hashpack/HashpackTransact import { QueryBus } from '../../../../core/query/QueryBus.js'; import { AccountIdNotValid } from '../../../../domain/context/account/error/AccountIdNotValid.js'; import { GetAccountInfoQuery } from '../../../../app/usecase/query/account/info/GetAccountInfoQuery.js'; +import { SDK } from '../../../in'; @singleton() export class BladeTransactionAdapter extends HederaTransactionAdapter { @@ -101,14 +102,24 @@ export class BladeTransactionAdapter extends HederaTransactionAdapter { return currentNetwork; } - private async setSigner(): Promise { - this.signer = this.bc.getSigner(); + private setSigner(): void { + this.signer = this.bc.getSigners()[0]; + } + + private async killSession(): Promise { + if (!this.bc) return; + + try { + await this.bc.killSession(); + } catch (e) { + // ignore + } } async register(): Promise { Injectable.registerTransactionHandler(this); LogService.logTrace('Blade Registered as handler'); - this.connectBlade(true); + await this.connectBlade(true); return Promise.resolve({ account: this.account, @@ -118,17 +129,10 @@ export class BladeTransactionAdapter extends HederaTransactionAdapter { async connectBlade(pair = true, network?: string): Promise { const currentNetwork = network ?? this.networkService.environment; try { - this.bc = await BladeConnector.init( - ConnectorStrategy.EXTENSION, // preferred strategy is optional - { - // dApp metadata options are optional, but are highly recommended to use - name: 'Stablecoin Studio', - description: - 'Stablecoin Studio is an open-source SDK that makes it easy for web3 stablecoin platforms, institutional issuers, enterprises, and payment providers to build stablecoin applications on the Hedera network.', - url: 'https://hedera.com/stablecoin-studio', - icons: [], - }, - ); + this.bc = await BladeConnector.init(ConnectorStrategy.AUTO, { + ...SDK.appMetadata, + icons: [SDK.appMetadata.icon], + }); } catch (error: any) { LogService.logTrace('Error initializing Blade', error); return currentNetwork; @@ -188,7 +192,7 @@ export class BladeTransactionAdapter extends HederaTransactionAdapter { } async stop(): Promise { - if (this.bc) await this.bc.killSession(); + await this.killSession(); LogService.logTrace('Blade stopped'); this.eventService.emit(WalletEvents.walletDisconnect, { @@ -260,7 +264,7 @@ export class BladeTransactionAdapter extends HederaTransactionAdapter { getAccount(): Account { if (this.account) return this.account; throw new RuntimeError( - 'There are no accounts currently paired with HashPack!', + 'There are no accounts currently paired with Blade!', ); } diff --git a/sdk/src/port/out/hs/hashpack/HashpackTransactionAdapter.ts b/sdk/src/port/out/hs/hashpack/HashpackTransactionAdapter.ts index 7c8f57255..867dbad57 100644 --- a/sdk/src/port/out/hs/hashpack/HashpackTransactionAdapter.ts +++ b/sdk/src/port/out/hs/hashpack/HashpackTransactionAdapter.ts @@ -102,7 +102,7 @@ export class HashpackTransactionAdapter extends HederaTransactionAdapter { async init(network?: string): Promise { const currentNetwork = network ?? this.networkService.environment; this.initData = await this.hc.init( - SDK.appMetadata, + { ...SDK.appMetadata }, // prevent app metadata object modifying currentNetwork as 'testnet' | 'previewnet' | 'mainnet', ); const eventData: WalletInitEvent = { From 454830277319acbcadf04f94bccff15159cc2101 Mon Sep 17 00:00:00 2001 From: Dima Smoliar Date: Fri, 5 Apr 2024 12:44:30 +0300 Subject: [PATCH 02/10] add caret for blade-web3 version. Signed-off-by: Dima Smoliar --- sdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/package.json b/sdk/package.json index 015a20952..2a9943559 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -67,7 +67,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@bladelabs/blade-web3.js": "1.3.0", + "@bladelabs/blade-web3.js": "^1.3.0", "@hashgraph/cryptography": "1.4.3", "@hashgraph/hashconnect": "file:./../hashconnect/lib", "@hashgraph/hedera-custodians-integration": "1.2.5", From 5ed06423b137db15c0fafe76d33e91bfa90177c1 Mon Sep 17 00:00:00 2001 From: Dima Smoliar Date: Fri, 5 Apr 2024 13:03:14 +0300 Subject: [PATCH 03/10] update package-lock file. Signed-off-by: Dima Smoliar --- sdk/package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/package-lock.json b/sdk/package-lock.json index 2bb17fb3f..6888fe6f7 100644 --- a/sdk/package-lock.json +++ b/sdk/package-lock.json @@ -9,7 +9,7 @@ "version": "1.17.0", "license": "Apache-2.0", "dependencies": { - "@bladelabs/blade-web3.js": "1.3.0", + "@bladelabs/blade-web3.js": "^1.3.0", "@hashgraph/cryptography": "1.4.3", "@hashgraph/hashconnect": "file:./../hashconnect/lib", "@hashgraph/hedera-custodians-integration": "1.2.5", From 7550a0b5a08c5378726afd9b5e7888763d491348 Mon Sep 17 00:00:00 2001 From: Dima Smoliar Date: Fri, 5 Apr 2024 13:36:40 +0300 Subject: [PATCH 04/10] Remove unused dAppCode field. Signed-off-by: Dima Smoliar --- sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts b/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts index 24b26e56e..966501122 100644 --- a/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts +++ b/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts @@ -150,12 +150,10 @@ export class BladeTransactionAdapter extends HederaTransactionAdapter { currentNetwork == 'testnet' ? HederaNetwork.Testnet : HederaNetwork.Mainnet; - const params = { + const pairedAccountIds = await this.bc.createSession({ network: bladeNetwork, - dAppCode: 'SomeAwesomeDApp', // optional while testing, request specific one by contacting us - }; + }); - const pairedAccountIds = await this.bc.createSession(params); if (pairedAccountIds) { const accountInfo = await this.getAccountInfo( pairedAccountIds[0], From c09090d5121d38c0555a0fef1a466a5ee8ba9e7d Mon Sep 17 00:00:00 2001 From: Dima Smoliar Date: Thu, 11 Apr 2024 12:00:23 +0300 Subject: [PATCH 05/10] Sync hashgraph/sdk version to fix instanceof checks. Bump hashgraph/sdk to v 2.40 Signed-off-by: Dima Smoliar --- hashconnect/lib/package-lock.json | 60 ++++++++------- hashconnect/lib/package.json | 2 +- sdk/package-lock.json | 120 +++++------------------------- sdk/package.json | 2 +- 4 files changed, 53 insertions(+), 131 deletions(-) diff --git a/hashconnect/lib/package-lock.json b/hashconnect/lib/package-lock.json index abe252e48..c50fa5d57 100644 --- a/hashconnect/lib/package-lock.json +++ b/hashconnect/lib/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@hashgraph/cryptography": "1.4.3", - "@hashgraph/sdk": "2.38.0", + "@hashgraph/sdk": "2.40.0", "buffer": "^6.0.3", "crypto-es": "^1.2.7", "crypto-js": "^4.1.1", @@ -1344,9 +1344,9 @@ } }, "node_modules/@hashgraph/proto": { - "version": "2.14.0-beta.2", - "resolved": "https://registry.npmjs.org/@hashgraph/proto/-/proto-2.14.0-beta.2.tgz", - "integrity": "sha512-LuypRVyDc05podG/FoDlElgirAiBa8LuyKoAdOmZHUQOC3zNA7bFneTkZJR92Oxhnc56++QCLCOsRPjVLOYBcw==", + "version": "2.14.0-beta.3", + "resolved": "https://registry.npmjs.org/@hashgraph/proto/-/proto-2.14.0-beta.3.tgz", + "integrity": "sha512-y2DYFXpXZN0ywULaPycRmmryaUBzSDQ2+UAAYdE1jQr8NPcIL2gv8wB5GKBBQqz1HihRNXiyJgYSGoNSeq9qsg==", "dependencies": { "long": "^4.0.0", "protobufjs": "^7.2.5" @@ -1356,33 +1356,34 @@ } }, "node_modules/@hashgraph/sdk": { - "version": "2.38.0", - "resolved": "https://registry.npmjs.org/@hashgraph/sdk/-/sdk-2.38.0.tgz", - "integrity": "sha512-fe28I/xEAyaA1S8VrwR4oWGLonyjadD0sHyCbaO+9zPgpQXcM4wMeBZrbkia5riemY+adPHwrJ5FxASk3Rr3eg==", + "version": "2.40.0", + "resolved": "https://registry.npmjs.org/@hashgraph/sdk/-/sdk-2.40.0.tgz", + "integrity": "sha512-wgkjCsOldSPbWZY3sKd7vGHqfcR5yQL/YNIbW7O1cihGN0G4nTzvYLjNLoNNIsA+XWMb0zkxWpQ0PAZaeQJgcw==", "dependencies": { "@ethersproject/abi": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", "@ethersproject/rlp": "^5.7.0", "@grpc/grpc-js": "1.8.2", - "@hashgraph/cryptography": "1.4.8-beta.4", - "@hashgraph/proto": "2.14.0-beta.2", - "axios": "^1.3.1", + "@hashgraph/cryptography": "1.4.8-beta.5", + "@hashgraph/proto": "2.14.0-beta.3", + "axios": "^1.6.4", "bignumber.js": "^9.1.1", "bn.js": "^5.1.1", - "crypto-js": "^4.1.1", + "crypto-js": "^4.2.0", "js-base64": "^3.7.4", "long": "^4.0.0", "pino": "^8.14.1", "pino-pretty": "^10.0.0", "protobufjs": "^7.2.5", + "rfc4648": "^1.5.3", "utf8": "^3.0.0" }, "engines": { "node": ">=14.0.0" }, "peerDependencies": { - "expo": "^49.0.10" + "expo": "^49.0.16" }, "peerDependenciesMeta": { "expo": { @@ -1391,15 +1392,15 @@ } }, "node_modules/@hashgraph/sdk/node_modules/@hashgraph/cryptography": { - "version": "1.4.8-beta.4", - "resolved": "https://registry.npmjs.org/@hashgraph/cryptography/-/cryptography-1.4.8-beta.4.tgz", - "integrity": "sha512-43wpRuE6ML04dFNpNPHvEZTKlVT9+dOE7SxyQPMYunsFitJvlIDl1VvOXeOSGbVdsV+nDQQV7C9pZWRSV1e32g==", + "version": "1.4.8-beta.5", + "resolved": "https://registry.npmjs.org/@hashgraph/cryptography/-/cryptography-1.4.8-beta.5.tgz", + "integrity": "sha512-soq2vGLRkdl2Evr+gIvIjCXJjqA1hOAjysBGG+dhP6tKx2PEgEjb3hON/sMbxm3Q4qQdkML/vEthdAV707+flw==", "dependencies": { "asn1js": "^3.0.5", "bignumber.js": "^9.1.1", "bn.js": "^5.2.1", "buffer": "^6.0.3", - "crypto-js": "^4.1.1", + "crypto-js": "^4.2.0", "elliptic": "^6.5.4", "js-base64": "^3.7.4", "node-forge": "^1.3.1", @@ -1411,7 +1412,7 @@ "node": ">=12.0.0" }, "peerDependencies": { - "expo": "^45.0.3", + "expo": "^49.0.16", "expo-crypto": "^10.1.2", "expo-random": "^12.1.2" }, @@ -2459,11 +2460,11 @@ } }, "node_modules/axios": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz", - "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==", + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", + "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -3099,9 +3100,9 @@ "integrity": "sha512-UUqiVJ2gUuZFmbFsKmud3uuLcNP2+Opt+5ysmljycFCyhA0+T16XJmo1ev/t5kMChMqWh7IEvURNCqsg+SjZGQ==" }, "node_modules/crypto-js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz", - "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" }, "node_modules/cssom": { "version": "0.4.4", @@ -4351,9 +4352,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", @@ -7509,6 +7510,11 @@ "node": ">=0.10.0" } }, + "node_modules/rfc4648": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/rfc4648/-/rfc4648-1.5.3.tgz", + "integrity": "sha512-MjOWxM065+WswwnmNONOT+bD1nXzY9Km6u3kzvnx8F8/HXGZdz3T6e6vZJ8Q/RIMUSp/nxqjH3GwvJDy8ijeQQ==" + }, "node_modules/rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", diff --git a/hashconnect/lib/package.json b/hashconnect/lib/package.json index eeaded15e..be60ad1c8 100644 --- a/hashconnect/lib/package.json +++ b/hashconnect/lib/package.json @@ -87,7 +87,7 @@ "yarn": "^1.22.17" }, "dependencies": { - "@hashgraph/sdk": "2.38.0", + "@hashgraph/sdk": "2.40.0", "@hashgraph/cryptography": "1.4.3", "buffer": "^6.0.3", "crypto-es": "^1.2.7", diff --git a/sdk/package-lock.json b/sdk/package-lock.json index 6888fe6f7..528fc58ff 100644 --- a/sdk/package-lock.json +++ b/sdk/package-lock.json @@ -14,7 +14,7 @@ "@hashgraph/hashconnect": "file:./../hashconnect/lib", "@hashgraph/hedera-custodians-integration": "1.2.5", "@hashgraph/hethers": "^1.2.5", - "@hashgraph/sdk": "2.38.0", + "@hashgraph/sdk": "2.40.0", "@hashgraph/stablecoin-npm-contracts": "file:./../contracts", "@metamask/detect-provider": "^2.0.0", "@metamask/providers": "^10.2.1", @@ -1953,91 +1953,6 @@ "@hashgraph/sdk": "^2.16.0" } }, - "node_modules/@bladelabs/blade-web3.js/node_modules/@hashgraph/cryptography": { - "version": "1.4.8-beta.5", - "resolved": "https://registry.npmjs.org/@hashgraph/cryptography/-/cryptography-1.4.8-beta.5.tgz", - "integrity": "sha512-soq2vGLRkdl2Evr+gIvIjCXJjqA1hOAjysBGG+dhP6tKx2PEgEjb3hON/sMbxm3Q4qQdkML/vEthdAV707+flw==", - "dependencies": { - "asn1js": "^3.0.5", - "bignumber.js": "^9.1.1", - "bn.js": "^5.2.1", - "buffer": "^6.0.3", - "crypto-js": "^4.2.0", - "elliptic": "^6.5.4", - "js-base64": "^3.7.4", - "node-forge": "^1.3.1", - "spark-md5": "^3.0.2", - "tweetnacl": "^1.0.3", - "utf8": "^3.0.0" - }, - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "expo": "^49.0.16", - "expo-crypto": "^10.1.2", - "expo-random": "^12.1.2" - }, - "peerDependenciesMeta": { - "expo": { - "optional": true - }, - "expo-crypto": { - "optional": true - }, - "expo-random": { - "optional": true - } - } - }, - "node_modules/@bladelabs/blade-web3.js/node_modules/@hashgraph/proto": { - "version": "2.14.0-beta.3", - "resolved": "https://registry.npmjs.org/@hashgraph/proto/-/proto-2.14.0-beta.3.tgz", - "integrity": "sha512-y2DYFXpXZN0ywULaPycRmmryaUBzSDQ2+UAAYdE1jQr8NPcIL2gv8wB5GKBBQqz1HihRNXiyJgYSGoNSeq9qsg==", - "dependencies": { - "long": "^4.0.0", - "protobufjs": "^7.2.5" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/@bladelabs/blade-web3.js/node_modules/@hashgraph/sdk": { - "version": "2.40.0", - "resolved": "https://registry.npmjs.org/@hashgraph/sdk/-/sdk-2.40.0.tgz", - "integrity": "sha512-wgkjCsOldSPbWZY3sKd7vGHqfcR5yQL/YNIbW7O1cihGN0G4nTzvYLjNLoNNIsA+XWMb0zkxWpQ0PAZaeQJgcw==", - "dependencies": { - "@ethersproject/abi": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/rlp": "^5.7.0", - "@grpc/grpc-js": "1.8.2", - "@hashgraph/cryptography": "1.4.8-beta.5", - "@hashgraph/proto": "2.14.0-beta.3", - "axios": "^1.6.4", - "bignumber.js": "^9.1.1", - "bn.js": "^5.1.1", - "crypto-js": "^4.2.0", - "js-base64": "^3.7.4", - "long": "^4.0.0", - "pino": "^8.14.1", - "pino-pretty": "^10.0.0", - "protobufjs": "^7.2.5", - "rfc4648": "^1.5.3", - "utf8": "^3.0.0" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "expo": "^49.0.16" - }, - "peerDependenciesMeta": { - "expo": { - "optional": true - } - } - }, "node_modules/@colors/colors": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", @@ -3356,33 +3271,34 @@ } }, "node_modules/@hashgraph/sdk": { - "version": "2.38.0", - "resolved": "https://registry.npmjs.org/@hashgraph/sdk/-/sdk-2.38.0.tgz", - "integrity": "sha512-fe28I/xEAyaA1S8VrwR4oWGLonyjadD0sHyCbaO+9zPgpQXcM4wMeBZrbkia5riemY+adPHwrJ5FxASk3Rr3eg==", + "version": "2.40.0", + "resolved": "https://registry.npmjs.org/@hashgraph/sdk/-/sdk-2.40.0.tgz", + "integrity": "sha512-wgkjCsOldSPbWZY3sKd7vGHqfcR5yQL/YNIbW7O1cihGN0G4nTzvYLjNLoNNIsA+XWMb0zkxWpQ0PAZaeQJgcw==", "dependencies": { "@ethersproject/abi": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", "@ethersproject/rlp": "^5.7.0", "@grpc/grpc-js": "1.8.2", - "@hashgraph/cryptography": "1.4.8-beta.4", - "@hashgraph/proto": "2.14.0-beta.2", - "axios": "^1.3.1", + "@hashgraph/cryptography": "1.4.8-beta.5", + "@hashgraph/proto": "2.14.0-beta.3", + "axios": "^1.6.4", "bignumber.js": "^9.1.1", "bn.js": "^5.1.1", - "crypto-js": "^4.1.1", + "crypto-js": "^4.2.0", "js-base64": "^3.7.4", "long": "^4.0.0", "pino": "^8.14.1", "pino-pretty": "^10.0.0", "protobufjs": "^7.2.5", + "rfc4648": "^1.5.3", "utf8": "^3.0.0" }, "engines": { "node": ">=14.0.0" }, "peerDependencies": { - "expo": "^49.0.10" + "expo": "^49.0.16" }, "peerDependenciesMeta": { "expo": { @@ -3391,15 +3307,15 @@ } }, "node_modules/@hashgraph/sdk/node_modules/@hashgraph/cryptography": { - "version": "1.4.8-beta.4", - "resolved": "https://registry.npmjs.org/@hashgraph/cryptography/-/cryptography-1.4.8-beta.4.tgz", - "integrity": "sha512-43wpRuE6ML04dFNpNPHvEZTKlVT9+dOE7SxyQPMYunsFitJvlIDl1VvOXeOSGbVdsV+nDQQV7C9pZWRSV1e32g==", + "version": "1.4.8-beta.5", + "resolved": "https://registry.npmjs.org/@hashgraph/cryptography/-/cryptography-1.4.8-beta.5.tgz", + "integrity": "sha512-soq2vGLRkdl2Evr+gIvIjCXJjqA1hOAjysBGG+dhP6tKx2PEgEjb3hON/sMbxm3Q4qQdkML/vEthdAV707+flw==", "dependencies": { "asn1js": "^3.0.5", "bignumber.js": "^9.1.1", "bn.js": "^5.2.1", "buffer": "^6.0.3", - "crypto-js": "^4.1.1", + "crypto-js": "^4.2.0", "elliptic": "^6.5.4", "js-base64": "^3.7.4", "node-forge": "^1.3.1", @@ -3411,7 +3327,7 @@ "node": ">=12.0.0" }, "peerDependencies": { - "expo": "^45.0.3", + "expo": "^49.0.16", "expo-crypto": "^10.1.2", "expo-random": "^12.1.2" }, @@ -3428,9 +3344,9 @@ } }, "node_modules/@hashgraph/sdk/node_modules/@hashgraph/proto": { - "version": "2.14.0-beta.2", - "resolved": "https://registry.npmjs.org/@hashgraph/proto/-/proto-2.14.0-beta.2.tgz", - "integrity": "sha512-LuypRVyDc05podG/FoDlElgirAiBa8LuyKoAdOmZHUQOC3zNA7bFneTkZJR92Oxhnc56++QCLCOsRPjVLOYBcw==", + "version": "2.14.0-beta.3", + "resolved": "https://registry.npmjs.org/@hashgraph/proto/-/proto-2.14.0-beta.3.tgz", + "integrity": "sha512-y2DYFXpXZN0ywULaPycRmmryaUBzSDQ2+UAAYdE1jQr8NPcIL2gv8wB5GKBBQqz1HihRNXiyJgYSGoNSeq9qsg==", "dependencies": { "long": "^4.0.0", "protobufjs": "^7.2.5" diff --git a/sdk/package.json b/sdk/package.json index 2a9943559..da37828c2 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -72,7 +72,7 @@ "@hashgraph/hashconnect": "file:./../hashconnect/lib", "@hashgraph/hedera-custodians-integration": "1.2.5", "@hashgraph/hethers": "^1.2.5", - "@hashgraph/sdk": "2.38.0", + "@hashgraph/sdk": "2.40.0", "@hashgraph/stablecoin-npm-contracts": "file:./../contracts", "@metamask/detect-provider": "^2.0.0", "@metamask/providers": "^10.2.1", From d34b42d91c761e4dba6386f74007a010ac7f7054 Mon Sep 17 00:00:00 2001 From: Alberto Molina Date: Mon, 15 Apr 2024 16:59:45 +0200 Subject: [PATCH 06/10] fix: package-lock and blade icon Signed-off-by: Alberto Molina --- cli/package-lock.json | 4 ++-- sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts | 2 +- web/package-lock.json | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/package-lock.json b/cli/package-lock.json index bf02bbc7f..8ca25413e 100644 --- a/cli/package-lock.json +++ b/cli/package-lock.json @@ -58,12 +58,12 @@ "version": "1.18.0", "license": "Apache-2.0", "dependencies": { - "@bladelabs/blade-web3.js": "^1.2.0", + "@bladelabs/blade-web3.js": "^1.3.0", "@hashgraph/cryptography": "1.4.3", "@hashgraph/hashconnect": "file:./../hashconnect/lib", "@hashgraph/hedera-custodians-integration": "1.2.5", "@hashgraph/hethers": "^1.2.5", - "@hashgraph/sdk": "2.38.0", + "@hashgraph/sdk": "2.40.0", "@hashgraph/stablecoin-npm-contracts": "file:./../contracts", "@metamask/detect-provider": "^2.0.0", "@metamask/providers": "^10.2.1", diff --git a/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts b/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts index b97b07e8a..b2f1144be 100644 --- a/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts +++ b/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts @@ -132,7 +132,7 @@ export class BladeTransactionAdapter extends HederaTransactionAdapter { try { this.bc = await BladeConnector.init(ConnectorStrategy.AUTO, { ...SDK.appMetadata, - icons: [SDK.appMetadata.icon], + icons: [], }); } catch (error: any) { LogService.logTrace('Error initializing Blade', error); diff --git a/web/package-lock.json b/web/package-lock.json index 54599e15e..120f2bcdb 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -13179,7 +13179,7 @@ "license": "Apache-2.0", "dependencies": { "@hashgraph/cryptography": "1.4.3", - "@hashgraph/sdk": "2.38.0", + "@hashgraph/sdk": "2.40.0", "buffer": "^6.0.3", "crypto-es": "^1.2.7", "crypto-js": "^4.1.1", @@ -21623,12 +21623,12 @@ "version": "1.18.0", "license": "Apache-2.0", "dependencies": { - "@bladelabs/blade-web3.js": "^1.2.0", + "@bladelabs/blade-web3.js": "^1.3.0", "@hashgraph/cryptography": "1.4.3", "@hashgraph/hashconnect": "file:./../hashconnect/lib", "@hashgraph/hedera-custodians-integration": "1.2.5", "@hashgraph/hethers": "^1.2.5", - "@hashgraph/sdk": "2.38.0", + "@hashgraph/sdk": "2.40.0", "@hashgraph/stablecoin-npm-contracts": "file:./../contracts", "@metamask/detect-provider": "^2.0.0", "@metamask/providers": "^10.2.1", From 8240f80efba2df10ed33091d3662a152763019bb Mon Sep 17 00:00:00 2001 From: Alberto Molina Date: Mon, 22 Apr 2024 09:49:24 +0200 Subject: [PATCH 07/10] fix: hashpack removed from front end Signed-off-by: Alberto Molina --- web/src/components/ModalWalletConnect.tsx | 24 ----------------------- 1 file changed, 24 deletions(-) diff --git a/web/src/components/ModalWalletConnect.tsx b/web/src/components/ModalWalletConnect.tsx index add8c809a..06462bc40 100644 --- a/web/src/components/ModalWalletConnect.tsx +++ b/web/src/components/ModalWalletConnect.tsx @@ -340,30 +340,6 @@ const ModalWalletConnect = () => { justifyContent={'center'} alignItems={'stretch'} > - {availableWallets.includes(SupportedWallets.HASHPACK) ? ( - - - - Hashpack - - - ) : ( - - - - Hashpack - - - )} {availableWallets.includes(SupportedWallets.METAMASK) ? ( Date: Mon, 22 Apr 2024 10:09:21 +0200 Subject: [PATCH 08/10] feat: version number update Signed-off-by: Alberto Molina --- FACTORY_VERSION.md | 1 + cli/package-lock.json | 6 +++--- cli/package.json | 2 +- contracts/package-lock.json | 4 ++-- contracts/package.json | 2 +- hashconnect/lib/package-lock.json | 4 ++-- hashconnect/lib/package.json | 2 +- package.json | 2 +- sdk/package-lock.json | 8 ++++---- sdk/package.json | 2 +- web/package-lock.json | 10 +++++----- web/package.json | 2 +- 12 files changed, 23 insertions(+), 22 deletions(-) diff --git a/FACTORY_VERSION.md b/FACTORY_VERSION.md index 516c9c399..7a8394090 100644 --- a/FACTORY_VERSION.md +++ b/FACTORY_VERSION.md @@ -1,5 +1,6 @@ | Version | Contract name | Address | Network | | ------- | -------------- | ----------- | ------- | +| 1.18.1 | FactoryAddress | 0.0.2167166 | Testnet | | 1.18.0 | FactoryAddress | 0.0.2167166 | Testnet | | 1.17.0 | FactoryAddress | 0.0.2167166 | Testnet | | 1.16.0 | FactoryAddress | 0.0.2167166 | Testnet | diff --git a/cli/package-lock.json b/cli/package-lock.json index 8ca25413e..303e7231b 100644 --- a/cli/package-lock.json +++ b/cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@hashgraph/stablecoin-npm-cli", - "version": "1.18.0", + "version": "1.18.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@hashgraph/stablecoin-npm-cli", - "version": "1.18.0", + "version": "1.18.1", "license": "Apache-2.0", "dependencies": { "@hashgraph/stablecoin-npm-sdk": "file:./../sdk", @@ -55,7 +55,7 @@ }, "../sdk": { "name": "@hashgraph/stablecoin-npm-sdk", - "version": "1.18.0", + "version": "1.18.1", "license": "Apache-2.0", "dependencies": { "@bladelabs/blade-web3.js": "^1.3.0", diff --git a/cli/package.json b/cli/package.json index 8317a75ec..a65a374fc 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,6 +1,6 @@ { "name": "@hashgraph/stablecoin-npm-cli", - "version": "1.18.0", + "version": "1.18.1", "description": "CLI for Hedera Stablecoin", "main": "./build/src/index.js", "bin": { diff --git a/contracts/package-lock.json b/contracts/package-lock.json index c6e1fb408..48d70449b 100644 --- a/contracts/package-lock.json +++ b/contracts/package-lock.json @@ -1,12 +1,12 @@ { "name": "@hashgraph/stablecoin-npm-contracts", - "version": "1.18.0", + "version": "1.18.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@hashgraph/stablecoin-npm-contracts", - "version": "1.18.0", + "version": "1.18.1", "license": "Apache-2.0", "dependencies": { "@chainlink/contracts": "^0.5.1", diff --git a/contracts/package.json b/contracts/package.json index 8707d900f..96b29961f 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,6 +1,6 @@ { "name": "@hashgraph/stablecoin-npm-contracts", - "version": "1.18.0", + "version": "1.18.1", "description": "", "main": "./build/typechain-types/index.js", "module": "./build/typechain-types/index.js", diff --git a/hashconnect/lib/package-lock.json b/hashconnect/lib/package-lock.json index e5825a221..030bf7ed9 100644 --- a/hashconnect/lib/package-lock.json +++ b/hashconnect/lib/package-lock.json @@ -1,12 +1,12 @@ { "name": "@hashgraph/hashconnect", - "version": "1.18.0", + "version": "1.18.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@hashgraph/hashconnect", - "version": "1.18.0", + "version": "1.18.1", "license": "Apache-2.0", "dependencies": { "@hashgraph/cryptography": "1.4.3", diff --git a/hashconnect/lib/package.json b/hashconnect/lib/package.json index f7bc07c6a..a4bcb4a54 100644 --- a/hashconnect/lib/package.json +++ b/hashconnect/lib/package.json @@ -1,6 +1,6 @@ { "name": "@hashgraph/hashconnect", - "version": "1.18.0", + "version": "1.18.1", "description": "hashconnect interoperability library", "author": "Tyler Coté , Nick Hanna ", "license": "Apache-2.0", diff --git a/package.json b/package.json index 3aaf433a1..bbf67637d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-stable-coin", - "version": "1.18.0", + "version": "1.18.1", "description": "stablecoin studio", "scripts": { "install": "node install.js && npm run build:cli:full && npm run prepare", diff --git a/sdk/package-lock.json b/sdk/package-lock.json index 27d1cfa27..e962c0f10 100644 --- a/sdk/package-lock.json +++ b/sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "@hashgraph/stablecoin-npm-sdk", - "version": "1.18.0", + "version": "1.18.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@hashgraph/stablecoin-npm-sdk", - "version": "1.18.0", + "version": "1.18.1", "license": "Apache-2.0", "dependencies": { "@bladelabs/blade-web3.js": "^1.3.0", @@ -66,7 +66,7 @@ }, "../contracts": { "name": "@hashgraph/stablecoin-npm-contracts", - "version": "1.18.0", + "version": "1.18.1", "license": "Apache-2.0", "dependencies": { "@chainlink/contracts": "^0.5.1", @@ -114,7 +114,7 @@ }, "../hashconnect/lib": { "name": "@hashgraph/hashconnect", - "version": "1.18.0", + "version": "1.18.1", "license": "Apache-2.0", "dependencies": { "@hashgraph/cryptography": "1.4.3", diff --git a/sdk/package.json b/sdk/package.json index 6fa1dbd62..5402b5b9d 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@hashgraph/stablecoin-npm-sdk", - "version": "1.18.0", + "version": "1.18.1", "description": "stablecoin studio SDK", "main": "./build/cjs/src/index.js", "module": "./build/esm/src/index.js", diff --git a/web/package-lock.json b/web/package-lock.json index 120f2bcdb..2b72e3c38 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "@hashgraph/stablecoin-dapp", - "version": "1.18.0", + "version": "1.18.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@hashgraph/stablecoin-dapp", - "version": "1.18.0", + "version": "1.18.1", "dependencies": { "@chakra-ui/icons": "~2.0.17", "@chakra-ui/react": "~2.6.1", @@ -80,7 +80,7 @@ }, "../contracts": { "name": "@hashgraph/stablecoin-npm-contracts", - "version": "1.18.0", + "version": "1.18.1", "license": "Apache-2.0", "dependencies": { "@chainlink/contracts": "^0.5.1", @@ -13175,7 +13175,7 @@ }, "../hashconnect/lib": { "name": "@hashgraph/hashconnect", - "version": "1.18.0", + "version": "1.18.1", "license": "Apache-2.0", "dependencies": { "@hashgraph/cryptography": "1.4.3", @@ -21620,7 +21620,7 @@ }, "../sdk": { "name": "@hashgraph/stablecoin-npm-sdk", - "version": "1.18.0", + "version": "1.18.1", "license": "Apache-2.0", "dependencies": { "@bladelabs/blade-web3.js": "^1.3.0", diff --git a/web/package.json b/web/package.json index 576154939..cc3649271 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "@hashgraph/stablecoin-dapp", - "version": "1.18.0", + "version": "1.18.1", "files": [ "build/" ], From 7fa0ebc0bcefc884d556100fbb97436449f34162 Mon Sep 17 00:00:00 2001 From: Alberto Molina Date: Mon, 22 Apr 2024 10:23:24 +0200 Subject: [PATCH 09/10] fix: backend version Signed-off-by: Alberto Molina --- backend/package-lock.json | 4 ++-- backend/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index c1de8fa5e..dcdfeb1ee 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1,12 +1,12 @@ { "name": "@hashgraph/stablecoin-npm-backend", - "version": "1.18.0", + "version": "1.18.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@hashgraph/stablecoin-npm-backend", - "version": "1.18.0", + "version": "1.18.1", "license": "Apache-2.0", "dependencies": { "@hashgraph/sdk": "^2.43.0", diff --git a/backend/package.json b/backend/package.json index 7f243c00f..fa6d09d05 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "@hashgraph/stablecoin-npm-backend", - "version": "1.18.0", + "version": "1.18.1", "description": "", "author": "", "license": "Apache-2.0", From 806c857e62057ff872dcba059eb9b4907b7ec120 Mon Sep 17 00:00:00 2001 From: Alberto Molina Date: Mon, 22 Apr 2024 10:39:04 +0200 Subject: [PATCH 10/10] fix: icon in wallets Signed-off-by: Alberto Molina --- sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts | 2 +- web/README.md | 1 + web/src/Router/Router.tsx | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts b/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts index b2f1144be..b97b07e8a 100644 --- a/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts +++ b/sdk/src/port/out/hs/blade/BladeTransactionAdapter.ts @@ -132,7 +132,7 @@ export class BladeTransactionAdapter extends HederaTransactionAdapter { try { this.bc = await BladeConnector.init(ConnectorStrategy.AUTO, { ...SDK.appMetadata, - icons: [], + icons: [SDK.appMetadata.icon], }); } catch (error: any) { LogService.logTrace('Error initializing Blade', error); diff --git a/web/README.md b/web/README.md index 4a470ad43..dd2cfbccd 100644 --- a/web/README.md +++ b/web/README.md @@ -69,6 +69,7 @@ The ENV file contains the following parameters: - **REACT_APP_RPC_NODE**: This var is required if you want to create a new stablecoin. The var must be a unique rpc node service for Hedera network, and this is the service which would be used when the UI starts. The service is configured using the same properties than the mirror node. You can check the available JSON-RPC relays [here](https://github.com/hashgraph/stablecoin-studio/blob/main/README.md#JSON-RPC-Relays). - **REACT_APP_BACKEND_URL**: This var is only required if you want to enable multisignature functionality. It is the backend rest api endpoint. - **REACT_APP_CONSENSUS_NODES**: This var is only required if you want to enable multisignature functionality. It is a list of consensus nodes per environment. When generating a multisignature transaction the first consensus node of the environment will be added to the transaction. +- **REACT_APP_ICON**: url of the application icon to be displayed on wallets when connecting. ```bash REACT_APP_FACTORIES='[{"Environment":"mainnet","STABLE_COIN_FACTORY_ADDRESS":"0.0.1234567"},{"Environment":"testnet","STABLE_COIN_FACTORY_ADDRESS":"0.0.3950554"},{"Environment":"previewnet","STABLE_COIN_FACTORY_ADDRESS":"0.0.239703"}]' diff --git a/web/src/Router/Router.tsx b/web/src/Router/Router.tsx index dbc6e48e6..788074bc9 100644 --- a/web/src/Router/Router.tsx +++ b/web/src/Router/Router.tsx @@ -126,7 +126,7 @@ const Router = () => { SDK.appMetadata = { name: 'Hedera Stablecoin', description: 'An hedera dApp', - icon: 'https://dashboard-assets.dappradar.com/document/15402/hashpack-dapp-defi-hedera-logo-166x166_696a701b42fd20aaa41f2591ef2339c7.png', + icon: process.env.REACT_APP_ICON_URL ?? '', url: '', }; SDK.log = {