@openocean.finance/wallet 1.1.0 → 1.1.2

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 (3) hide show
  1. package/lib/Wallets/LedgerWallet.js +8 -6
  2. package/lib/Wallets/index.js +2 -2
  3. package/package.json +2 -1
package/lib/Wallets/LedgerWallet.js CHANGED
@@ -64,11 +64,12 @@ 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");
68
67
  var hw_app_eth_1 = __importDefault(require("@ledgerhq/hw-app-eth"));
69
- var hw_transport_webusb_1 = __importDefault(require("@ledgerhq/hw-transport-webusb"));
68
+ var hw_transport_webhid_1 = __importDefault(require("@ledgerhq/hw-transport-webhid"));
70
69
  var web3_provider_engine_1 = __importDefault(require("web3-provider-engine"));
71
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"));
72
73
  var web3_1 = __importDefault(require("web3"));
73
74
  var LedgerWallet = /** @class */ (function (_super) {
74
75
  __extends(LedgerWallet, _super);
@@ -93,14 +94,15 @@ var LedgerWallet = /** @class */ (function (_super) {
93
94
  switch (_a.label) {
94
95
  case 0:
95
96
  _a.trys.push([0, 3, , 4]);
96
- return [4 /*yield*/, hw_transport_webusb_1.default.create()];
97
+ return [4 /*yield*/, hw_transport_webhid_1.default.create()];
97
98
  case 1:
98
99
  transport_1 = _a.sent();
99
- (0, logs_1.listen)(function (log) { return console.log(log); });
100
100
  appEth = new hw_app_eth_1.default(transport_1);
101
101
  console.log('requestConnect1', appEth);
102
102
  engine = new web3_provider_engine_1.default();
103
- engine.addProvider((0, web3_subprovider_1.default)(function (cb) { return cb(null, transport_1); }, { networkId: 1 }));
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());
104
106
  engine.start();
105
107
  console.log('requestConnect2', engine);
106
108
  // 将ProviderEngine实例注入到web3对象中
@@ -116,7 +118,7 @@ var LedgerWallet = /** @class */ (function (_super) {
116
118
  return [2 /*return*/, address];
117
119
  case 3:
118
120
  e_1 = _a.sent();
119
- console.log('requestConnect4', JSON.stringify(e_1));
121
+ console.log('requestConnect5', JSON.stringify(e_1));
120
122
  throw new Error(types_1.EnumErrors.NoLedger);
121
123
  case 4: return [2 /*return*/];
122
124
  }
package/lib/Wallets/index.js CHANGED
@@ -40,12 +40,12 @@ var UnstoppableDomains_1 = __importDefault(require("./UnstoppableDomains"));
40
40
  var MyNearWallet_1 = __importDefault(require("./MyNearWallet"));
41
41
  var MeteorWallet_1 = __importDefault(require("./MeteorWallet"));
42
42
  var SenderWallet_1 = __importDefault(require("./SenderWallet"));
43
- var LedgerWallet_1 = __importDefault(require("./LedgerWallet"));
43
+ // import LedgerWallet from "./LedgerWallet";
44
44
  var WalletObj = {
45
45
  MetaMask: new MetaMask_1.default(),
46
46
  CryptoCom: new CryptoCom_1.default(),
47
47
  TrustWallet: new TrustWallet_1.default(),
48
- LedgerWallet: new LedgerWallet_1.default(),
48
+ // LedgerWallet: new LedgerWallet(),
49
49
  OKXWallet: new OKXWallet_1.default(),
50
50
  BscWallet: new BscWallet_1.default(),
51
51
  UnstoppableDomains: new UnstoppableDomains_1.default(),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openocean.finance/wallet",
3
- "version": "1.1.0",
3
+ "version": "1.1.2",
4
4
  "description": "A multi-chain wallets manager",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
@@ -48,6 +48,7 @@
48
48
  "@ledgerhq/devices": "6.27.1",
49
49
  "@ledgerhq/hw-app-eth": "6.10.0",
50
50
  "@ledgerhq/hw-transport-u2f": "^5.36.0-deprecated",
51
+ "@ledgerhq/hw-transport-webhid": "^6.27.12",
51
52
  "@ledgerhq/hw-transport-webusb": "6.27.1",
52
53
  "@ledgerhq/logs": "^6.10.0",
53
54
  "@ledgerhq/web3-subprovider": "^5.36.0-deprecated",