@openocean.finance/wallet 1.0.8 → 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 -19
- package/package.json +2 -1
|
@@ -64,9 +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
|
+
var logs_1 = require("@ledgerhq/logs");
|
|
68
|
+
var hw_app_eth_1 = __importDefault(require("@ledgerhq/hw-app-eth"));
|
|
67
69
|
var hw_transport_webusb_1 = __importDefault(require("@ledgerhq/hw-transport-webusb"));
|
|
68
70
|
var web3_provider_engine_1 = __importDefault(require("web3-provider-engine"));
|
|
69
|
-
var fetch_1 = __importDefault(require("web3-provider-engine/subproviders/fetch"));
|
|
70
71
|
var web3_subprovider_1 = __importDefault(require("@ledgerhq/web3-subprovider"));
|
|
71
72
|
var web3_1 = __importDefault(require("web3"));
|
|
72
73
|
var LedgerWallet = /** @class */ (function (_super) {
|
|
@@ -87,36 +88,37 @@ var LedgerWallet = /** @class */ (function (_super) {
|
|
|
87
88
|
*/
|
|
88
89
|
LedgerWallet.prototype.requestConnect = function (chainId) {
|
|
89
90
|
return __awaiter(this, void 0, void 0, function () {
|
|
90
|
-
var
|
|
91
|
+
var transport_1, appEth, engine, accounts, address, e_1;
|
|
91
92
|
return __generator(this, function (_a) {
|
|
92
93
|
switch (_a.label) {
|
|
93
94
|
case 0:
|
|
94
|
-
_a.trys.push([0,
|
|
95
|
-
|
|
96
|
-
|
|
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);
|
|
97
102
|
engine = new web3_provider_engine_1.default();
|
|
98
|
-
|
|
99
|
-
ledger = (0, web3_subprovider_1.default)(getTransport, {
|
|
100
|
-
networkId: networkId,
|
|
101
|
-
accountsLength: 5
|
|
102
|
-
});
|
|
103
|
-
console.log('requestConnect2', ledger);
|
|
104
|
-
engine.addProvider(ledger);
|
|
105
|
-
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 }));
|
|
106
104
|
engine.start();
|
|
107
|
-
|
|
105
|
+
console.log('requestConnect2', engine);
|
|
106
|
+
// 将ProviderEngine实例注入到web3对象中
|
|
108
107
|
this.sdk = new web3_1.default(engine);
|
|
108
|
+
console.log('requestConnect3', this.sdk);
|
|
109
109
|
return [4 /*yield*/, this.sdk.eth.getAccounts()];
|
|
110
|
-
case
|
|
111
|
-
|
|
112
|
-
console.log('
|
|
110
|
+
case 2:
|
|
111
|
+
accounts = _a.sent();
|
|
112
|
+
console.log('requestConnect4', accounts);
|
|
113
|
+
address = accounts[0];
|
|
113
114
|
this.address = address;
|
|
114
115
|
this.chainId = chainId;
|
|
115
116
|
return [2 /*return*/, address];
|
|
116
|
-
case
|
|
117
|
+
case 3:
|
|
117
118
|
e_1 = _a.sent();
|
|
119
|
+
console.log('requestConnect4', JSON.stringify(e_1));
|
|
118
120
|
throw new Error(types_1.EnumErrors.NoLedger);
|
|
119
|
-
case
|
|
121
|
+
case 4: return [2 /*return*/];
|
|
120
122
|
}
|
|
121
123
|
});
|
|
122
124
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openocean.finance/wallet",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"description": "A multi-chain wallets manager",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -47,6 +47,7 @@
|
|
|
47
47
|
"@gnosis.pm/safe-apps-sdk": "^7.5.0",
|
|
48
48
|
"@ledgerhq/devices": "6.27.1",
|
|
49
49
|
"@ledgerhq/hw-app-eth": "6.10.0",
|
|
50
|
+
"@ledgerhq/hw-transport-u2f": "^5.36.0-deprecated",
|
|
50
51
|
"@ledgerhq/hw-transport-webusb": "6.27.1",
|
|
51
52
|
"@ledgerhq/logs": "^6.10.0",
|
|
52
53
|
"@ledgerhq/web3-subprovider": "^5.36.0-deprecated",
|