@openocean.finance/wallet 1.0.9 → 1.1.0
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.
- package/lib/Wallets/LedgerWallet.js +21 -23
- package/package.json +1 -1
|
@@ -64,10 +64,10 @@ 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
|
-
|
|
68
|
-
var
|
|
67
|
+
var logs_1 = require("@ledgerhq/logs");
|
|
68
|
+
var hw_app_eth_1 = __importDefault(require("@ledgerhq/hw-app-eth"));
|
|
69
|
+
var hw_transport_webusb_1 = __importDefault(require("@ledgerhq/hw-transport-webusb"));
|
|
69
70
|
var web3_provider_engine_1 = __importDefault(require("web3-provider-engine"));
|
|
70
|
-
var fetch_1 = __importDefault(require("web3-provider-engine/subproviders/fetch"));
|
|
71
71
|
var web3_subprovider_1 = __importDefault(require("@ledgerhq/web3-subprovider"));
|
|
72
72
|
var web3_1 = __importDefault(require("web3"));
|
|
73
73
|
var LedgerWallet = /** @class */ (function (_super) {
|
|
@@ -88,39 +88,37 @@ var LedgerWallet = /** @class */ (function (_super) {
|
|
|
88
88
|
*/
|
|
89
89
|
LedgerWallet.prototype.requestConnect = function (chainId) {
|
|
90
90
|
return __awaiter(this, void 0, void 0, function () {
|
|
91
|
-
var
|
|
91
|
+
var transport_1, appEth, engine, accounts, address, e_1;
|
|
92
92
|
return __generator(this, function (_a) {
|
|
93
93
|
switch (_a.label) {
|
|
94
94
|
case 0:
|
|
95
|
-
_a.trys.push([0,
|
|
96
|
-
|
|
97
|
-
|
|
95
|
+
_a.trys.push([0, 3, , 4]);
|
|
96
|
+
return [4 /*yield*/, hw_transport_webusb_1.default.create()];
|
|
97
|
+
case 1:
|
|
98
|
+
transport_1 = _a.sent();
|
|
99
|
+
(0, logs_1.listen)(function (log) { return console.log(log); });
|
|
100
|
+
appEth = new hw_app_eth_1.default(transport_1);
|
|
101
|
+
console.log('requestConnect1', appEth);
|
|
98
102
|
engine = new web3_provider_engine_1.default();
|
|
99
|
-
|
|
100
|
-
ledger = (0, web3_subprovider_1.default)(getTransport, {
|
|
101
|
-
networkId: networkId,
|
|
102
|
-
accountsLength: 5
|
|
103
|
-
});
|
|
104
|
-
console.log('requestConnect2', ledger);
|
|
105
|
-
engine.addProvider(ledger);
|
|
106
|
-
engine.addProvider(new fetch_1.default({ rpcUrl: "https://eth.llamarpc.com" }));
|
|
103
|
+
engine.addProvider((0, web3_subprovider_1.default)(function (cb) { return cb(null, transport_1); }, { networkId: 1 }));
|
|
107
104
|
engine.start();
|
|
108
|
-
console.log('
|
|
109
|
-
//
|
|
105
|
+
console.log('requestConnect2', engine);
|
|
106
|
+
// 将ProviderEngine实例注入到web3对象中
|
|
110
107
|
this.sdk = new web3_1.default(engine);
|
|
111
|
-
console.log('
|
|
108
|
+
console.log('requestConnect3', this.sdk);
|
|
112
109
|
return [4 /*yield*/, this.sdk.eth.getAccounts()];
|
|
113
|
-
case
|
|
114
|
-
|
|
115
|
-
console.log('
|
|
110
|
+
case 2:
|
|
111
|
+
accounts = _a.sent();
|
|
112
|
+
console.log('requestConnect4', accounts);
|
|
113
|
+
address = accounts[0];
|
|
116
114
|
this.address = address;
|
|
117
115
|
this.chainId = chainId;
|
|
118
116
|
return [2 /*return*/, address];
|
|
119
|
-
case
|
|
117
|
+
case 3:
|
|
120
118
|
e_1 = _a.sent();
|
|
121
119
|
console.log('requestConnect4', JSON.stringify(e_1));
|
|
122
120
|
throw new Error(types_1.EnumErrors.NoLedger);
|
|
123
|
-
case
|
|
121
|
+
case 4: return [2 /*return*/];
|
|
124
122
|
}
|
|
125
123
|
});
|
|
126
124
|
});
|