@openocean.finance/wallet 1.1.8 → 1.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/lib/Wallets/LedgerWallet.js +17 -25
  2. package/package.json +1 -3
package/lib/Wallets/LedgerWallet.js CHANGED
@@ -64,13 +64,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
64
64
  var ledger_svg_1 = __importDefault(require("../assets/ledger.svg"));
65
65
  var types_1 = require("../types");
66
66
  var BaseWallet_1 = __importDefault(require("./BaseWallet"));
67
+ var logs_1 = require("@ledgerhq/logs");
67
68
  var hw_app_eth_1 = __importDefault(require("@ledgerhq/hw-app-eth"));
68
69
  var hw_transport_webusb_1 = __importDefault(require("@ledgerhq/hw-transport-webusb"));
69
- var web3_provider_engine_1 = __importDefault(require("web3-provider-engine"));
70
- var web3_subprovider_1 = __importDefault(require("@ledgerhq/web3-subprovider"));
71
- var fetch_1 = __importDefault(require("web3-provider-engine/subproviders/fetch"));
72
- var vm_1 = __importDefault(require("web3-provider-engine/subproviders/vm"));
73
- var web3_1 = __importDefault(require("web3"));
70
+ // import ProviderEngine from 'web3-provider-engine';
71
+ // import createLedgerSubprovider from '@ledgerhq/web3-subprovider';
72
+ // import FetchSubprovider from 'web3-provider-engine/subproviders/fetch';
73
+ // import VmSubprovider from 'web3-provider-engine/subproviders/vm';
74
+ // import Web3 from "web3";
74
75
  var LedgerWallet = /** @class */ (function (_super) {
75
76
  __extends(LedgerWallet, _super);
76
77
  function LedgerWallet() {
@@ -89,35 +90,26 @@ var LedgerWallet = /** @class */ (function (_super) {
89
90
  */
90
91
  LedgerWallet.prototype.requestConnect = function (chainId) {
91
92
  return __awaiter(this, void 0, void 0, function () {
92
- var transport_1, appEth, engine, accounts, address, e_1;
93
- return __generator(this, function (_a) {
94
- switch (_a.label) {
93
+ var transport, appEth, _a, publicKey, address, e_1;
94
+ return __generator(this, function (_b) {
95
+ switch (_b.label) {
95
96
  case 0:
96
- _a.trys.push([0, 3, , 4]);
97
+ _b.trys.push([0, 3, , 4]);
97
98
  return [4 /*yield*/, hw_transport_webusb_1.default.create()];
98
99
  case 1:
99
- transport_1 = _a.sent();
100
- appEth = new hw_app_eth_1.default(transport_1);
100
+ transport = _b.sent();
101
+ (0, logs_1.listen)(function (log) { return console.log(log); });
102
+ appEth = new hw_app_eth_1.default(transport);
101
103
  console.log('requestConnect1', appEth);
102
- engine = new web3_provider_engine_1.default();
103
- engine.addProvider((0, web3_subprovider_1.default)(function () { return transport_1; }, { networkId: 1 }));
104
- engine.addProvider(new fetch_1.default({ rpcUrl: "https://eth.llamarpc.com" }));
105
- engine.addProvider(new vm_1.default());
106
- engine.start();
107
- console.log('requestConnect2', engine);
108
- // 将ProviderEngine实例注入到web3对象中
109
- this.sdk = new web3_1.default(engine);
110
- console.log('requestConnect3', this.sdk);
111
- return [4 /*yield*/, this.sdk.eth.getAccounts()];
104
+ return [4 /*yield*/, this.sdk.getAddress("44'/60'/0'/0/0")];
112
105
  case 2:
113
- accounts = _a.sent();
114
- console.log('requestConnect4', accounts);
115
- address = accounts[0];
106
+ _a = _b.sent(), publicKey = _a.publicKey, address = _a.address;
107
+ this.sdk.publicKey = publicKey;
116
108
  this.address = address;
117
109
  this.chainId = chainId;
118
110
  return [2 /*return*/, address];
119
111
  case 3:
120
- e_1 = _a.sent();
112
+ e_1 = _b.sent();
121
113
  console.log('requestConnect5', JSON.stringify(e_1));
122
114
  throw new Error(types_1.EnumErrors.NoLedger);
123
115
  case 4: return [2 /*return*/];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openocean.finance/wallet",
3
- "version": "1.1.8",
3
+ "version": "1.1.9",
4
4
  "description": "A multi-chain wallets manager",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
@@ -45,11 +45,9 @@
45
45
  "@cosmjs/stargate": "^0.28.4",
46
46
  "@gnosis.pm/safe-apps-provider": "^0.11.3",
47
47
  "@gnosis.pm/safe-apps-sdk": "^7.5.0",
48
- "@ledgerhq/devices": "^6.27.1",
49
48
  "@ledgerhq/hw-app-eth": "6.10.0",
50
49
  "@ledgerhq/hw-transport-webusb": "6.27.1",
51
50
  "@ledgerhq/logs": "^6.10.0",
52
- "@ledgerhq/web3-subprovider": "^5.36.0-deprecated",
53
51
  "@near-wallet-selector/core": "^7.8.2",
54
52
  "@near-wallet-selector/meteor-wallet": "^7.8.2",
55
53
  "@near-wallet-selector/my-near-wallet": "^7.8.2",