Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
},
"defaultProject": "prokeyLink",
"cli": {
"defaultCollection": "@angular-eslint/schematics"
"defaultCollection": "@angular-eslint/schematics",
"analytics": false
}
}
2 changes: 1 addition & 1 deletion lib/prokey-webcore
Submodule prokey-webcore updated 78 files
+22 −0 .eslintrc.json
+8 −0 .prettierrc
+18 −0 .vscode/launch.json
+240 −0 data/BlockchainProviders.json
+90 −0 data/NetworkProviders.json
+23 −37 data/ProkeyCoinsInfo.json
+222 −0 data/erc20.abi.json
+36 −7 package.json
+22 −1 protob/combined.proto.txt
+376 −0 src/blockchain/BitcoinBlockchain.ts
+13 −5 src/blockchain/BlockchainBase.ts
+157 −0 src/blockchain/BlockchainProviders.ts
+159 −0 src/blockchain/EthereumBlockchain.ts
+183 −0 src/blockchain/RippleBlockchain.ts
+81 −0 src/blockchain/_servers/BaseBlockchainServer.ts
+321 −0 src/blockchain/_servers/blockbook/BlockbookBitcoinModel.ts
+14 −11 src/blockchain/_servers/blockbook/BlockbookCommonModel.ts
+168 −0 src/blockchain/_servers/blockbook/BlockbookEthereumModel.ts
+63 −0 src/blockchain/_servers/blockbook/BlockbookRequestModels.ts
+152 −0 src/blockchain/_servers/blockbook/BlockbookServer.ts
+69 −0 src/blockchain/_servers/public/PublicEthereumServer.ts
+348 −0 src/blockchain/_servers/ripple/RippleRpcModel.ts
+128 −0 src/blockchain/_servers/ripple/RippleRpcServer.ts
+0 −53 src/blockchain/servers/prokey/src/ProkeyBaseBlockChain.ts
+0 −278 src/blockchain/servers/prokey/src/bitcoin/Bitcoin.ts
+0 −155 src/blockchain/servers/prokey/src/ethereum/Ethereum.ts
+0 −67 src/blockchain/servers/prokey/src/nem/NemBlockchain.ts
+0 −80 src/blockchain/servers/prokey/src/nem/NemModels.ts
+0 −202 src/blockchain/servers/prokey/src/omni/Omni.ts
+0 −95 src/blockchain/servers/prokey/src/ripple/ProkeyRippleBlockChain.ts
+0 −84 src/blockchain/servers/prokey/src/ripple/RippleModel.ts
+3 −0 src/coins/CoinInfo.ts
+2 −1 src/device/BitcoinCommands.ts
+47 −0 src/device/EthereumCommands.ts
+265 −73 src/models/BitcoinWalletModel.ts
+60 −0 src/models/EthereumTypedDataModel.ts
+156 −36 src/models/EthereumWalletModel.ts
+6 −0 src/models/GenericWalletModel.ts
+26 −2 src/models/OmniWalletModel.ts
+6 −1 src/models/Prokey.ts
+201 −0 src/models/RippleWalletModel.ts
+9 −0 src/utils/DeviceUtils.ts
+1 −0 src/utils/constants.ts
+61 −0 src/utils/ethereum-hashTypedData.ts
+66 −0 src/utils/ethereum-providers.ts
+9 −0 src/utils/format-units.ts
+10 −0 src/utils/pathUtils.ts
+97 −0 src/utils/publicKeyUtils.ts
+15 −3 src/utils/utils.ts
+317 −351 src/wallet/BitcoinWallet.ts
+265 −155 src/wallet/EthereumWallet.ts
+235 −173 src/wallet/OmniWallet.ts
+139 −85 src/wallet/RippleWallet.ts
+160 −165 src/wallet/nem/NemWallet.ts
+1 −0 test/testFixtures/bitcoin/fee-estimation-1.json
+1 −0 test/testFixtures/bitcoin/fee-estimation-2.json
+1 −0 test/testFixtures/bitcoin/fee-estimation-3.json
+1 −0 test/testFixtures/bitcoin/fee-estimation-4.json
+1 −0 test/testFixtures/bitcoin/fee-estimation-5.json
+1 −0 test/testFixtures/bitcoin/fee-estimation-6.json
+574 −0 test/testFixtures/bitcoin/fee-list.json
+12 −0 test/testFixtures/blockbook-response/bitcoin/account-discovery/response-with-no-utxo/account.json
+78 −0 test/testFixtures/blockbook-response/bitcoin/account-discovery/response-with-one-utxo/account.json
+11 −0 test/testFixtures/blockbook-response/bitcoin/account-discovery/response-with-one-utxo/utxos.json
+132 −0 test/testFixtures/blockbook-response/bitcoin/account-discovery/response-with-two-utxos/account.json
+20 −0 test/testFixtures/blockbook-response/bitcoin/account-discovery/response-with-two-utxos/utxos.json
+134 −0 test/testFixtures/blockbook-response/ethereum/account-discovery-response-with-no-token-transfers.json
+470 −0 test/testFixtures/blockbook-response/ethereum/account-discovery-response-with-tokens.json
+11 −0 test/testFixtures/blockbook-response/ethereum/empty-account.json
+23 −0 test/testFixtures/device-features/device-features-eip1559.json
+23 −0 test/testFixtures/device-features/device-features-no-eip1559.json
+31 −0 test/testFixtures/ethers-tx-result.json
+68 −0 test/utils/ethereum-providers.test.ts
+27 −0 test/utils/format-units.test.ts
+113 −0 test/utils/publicKeyUtils.test.ts
+311 −0 test/wallet/BitcoinWallet.test.ts
+211 −0 test/wallet/Ethereum/GenerateTransaction.test.ts
+265 −0 test/wallet/EthereumWallet.test.ts
48 changes: 25 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,24 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~13.3.0",
"@angular/cdk": "^13.2.5",
"@angular/common": "~13.3.0",
"@angular/compiler": "~13.3.0",
"@angular/core": "~13.3.0",
"@angular/forms": "~13.3.0",
"@angular/localize": "~13.3.0",
"@angular/material": "13.3.1",
"@angular/platform-browser": "~13.3.0",
"@angular/platform-browser-dynamic": "~13.3.0",
"@angular/router": "~13.3.0",
"@angular/animations": "~14.0.1",
"@angular/cdk": "^14.0.1",
"@angular/common": "~14.0.1",
"@angular/compiler": "~14.0.1",
"@angular/core": "~14.0.1",
"@angular/forms": "~14.0.1",
"@angular/localize": "~14.0.1",
"@angular/material": "14.0.1",
"@angular/platform-browser": "~14.0.1",
"@angular/platform-browser-dynamic": "~14.0.1",
"@angular/router": "~14.0.1",
"@ethersproject/bignumber": "^5.6.2",
"@ethersproject/providers": "^5.6.8",
"@walletconnect/client": "^1.7.7",
"@walletconnect/types": "^1.7.7",
"@walletconnect/utils": "^1.7.7",
"@walletconnect/client": "^1.8.0",
"@walletconnect/sign-client": "2.17.3",
"@walletconnect/types": "^2.17.3",
"@walletconnect/legacy-types": "^2.0.0",
"@walletconnect/utils": "^2.17.3",
"big-integer": "^1.6.51",
"buffer": "^6.0.3",
"compare-versions": "^4.1.3",
Expand All @@ -37,14 +39,14 @@
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~13.3.0",
"@angular-eslint/builder": "13.1.0",
"@angular-eslint/eslint-plugin": "13.1.0",
"@angular-eslint/eslint-plugin-template": "13.1.0",
"@angular-eslint/schematics": "13.1.0",
"@angular-eslint/template-parser": "13.1.0",
"@angular/cli": "~13.3.0",
"@angular/compiler-cli": "~13.3.0",
"@angular-devkit/build-angular": "~14.0.1",
"@angular-eslint/builder": "14.0.1",
"@angular-eslint/eslint-plugin": "14.0.1",
"@angular-eslint/eslint-plugin-template": "14.0.1",
"@angular-eslint/schematics": "14.0.1",
"@angular-eslint/template-parser": "14.0.1",
"@angular/cli": "~14.0.1",
"@angular/compiler-cli": "~14.0.1",
"@types/hdkey": "^2.0.1",
"@types/jasmine": "~3.10.0",
"@types/node": "^12.20.46",
Expand All @@ -60,6 +62,6 @@
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"prettier": "^2.6.1",
"typescript": "~4.5.2"
"typescript": "~4.6.2"
}
}
2 changes: 1 addition & 1 deletion src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ <h1 class="pindevice">Please enter your device PIN</h1>
<section *ngIf="isWalletConnectConnected && !showDeviceAction && !showPinOnDevice" class="section goBack">
<div class="goBackInner">
<p>Device is <span class="text-success">connected</span></p>
<p class="distance">
<p *ngIf="!isWCv2" class="distance">
Now go back to {{ dappMeta.peerMeta.url }} tab and leave this tab open.<br />Requested operation will be handled
here.
</p>
Expand Down
Loading