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