@openocean.finance/wallet 1.0.7 → 1.0.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.
- package/lib/Wallets/LedgerWallet.js +33 -18
- package/package.json +6 -2
|
@@ -64,9 +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
|
|
69
|
-
var
|
|
67
|
+
// import TransportWebUSB from "@ledgerhq/hw-transport-webusb";
|
|
68
|
+
var hw_transport_u2f_1 = __importDefault(require("@ledgerhq/hw-transport-u2f"));
|
|
69
|
+
var web3_provider_engine_1 = __importDefault(require("web3-provider-engine"));
|
|
70
|
+
var fetch_1 = __importDefault(require("web3-provider-engine/subproviders/fetch"));
|
|
71
|
+
var web3_subprovider_1 = __importDefault(require("@ledgerhq/web3-subprovider"));
|
|
72
|
+
var web3_1 = __importDefault(require("web3"));
|
|
70
73
|
var LedgerWallet = /** @class */ (function (_super) {
|
|
71
74
|
__extends(LedgerWallet, _super);
|
|
72
75
|
function LedgerWallet() {
|
|
@@ -85,27 +88,39 @@ var LedgerWallet = /** @class */ (function (_super) {
|
|
|
85
88
|
*/
|
|
86
89
|
LedgerWallet.prototype.requestConnect = function (chainId) {
|
|
87
90
|
return __awaiter(this, void 0, void 0, function () {
|
|
88
|
-
var
|
|
89
|
-
return __generator(this, function (
|
|
90
|
-
switch (
|
|
91
|
+
var networkId, engine, getTransport, ledger, address, e_1;
|
|
92
|
+
return __generator(this, function (_a) {
|
|
93
|
+
switch (_a.label) {
|
|
91
94
|
case 0:
|
|
92
|
-
|
|
93
|
-
|
|
95
|
+
_a.trys.push([0, 2, , 3]);
|
|
96
|
+
console.log('requestConnect1');
|
|
97
|
+
networkId = 1;
|
|
98
|
+
engine = new web3_provider_engine_1.default();
|
|
99
|
+
getTransport = function () { return hw_transport_u2f_1.default.create(); };
|
|
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" }));
|
|
107
|
+
engine.start();
|
|
108
|
+
console.log('requestConnect3', engine);
|
|
109
|
+
// @ts-ignore
|
|
110
|
+
this.sdk = new web3_1.default(engine);
|
|
111
|
+
console.log('requestConnect5', this.sdk);
|
|
112
|
+
return [4 /*yield*/, this.sdk.eth.getAccounts()];
|
|
94
113
|
case 1:
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
this.sdk = new hw_app_eth_1.default(transport);
|
|
98
|
-
return [4 /*yield*/, this.sdk.getAddress("44'/60'/0'/0/0")];
|
|
99
|
-
case 2:
|
|
100
|
-
_a = _b.sent(), publicKey = _a.publicKey, address = _a.address;
|
|
101
|
-
this.sdk.publicKey = publicKey;
|
|
114
|
+
address = _a.sent();
|
|
115
|
+
console.log('requestConnect6', address);
|
|
102
116
|
this.address = address;
|
|
103
117
|
this.chainId = chainId;
|
|
104
118
|
return [2 /*return*/, address];
|
|
105
|
-
case
|
|
106
|
-
e_1 =
|
|
119
|
+
case 2:
|
|
120
|
+
e_1 = _a.sent();
|
|
121
|
+
console.log('requestConnect4', JSON.stringify(e_1));
|
|
107
122
|
throw new Error(types_1.EnumErrors.NoLedger);
|
|
108
|
-
case
|
|
123
|
+
case 3: return [2 /*return*/];
|
|
109
124
|
}
|
|
110
125
|
});
|
|
111
126
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openocean.finance/wallet",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.9",
|
|
4
4
|
"description": "A multi-chain wallets manager",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -24,6 +24,7 @@
|
|
|
24
24
|
"homepage": "",
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@types/node": "^17.0.21",
|
|
27
|
+
"@types/web3-provider-engine": "^14.0.1",
|
|
27
28
|
"clean-webpack-plugin": "^4.0.0-alpha.0",
|
|
28
29
|
"crypto-browserify": "^3.12.0",
|
|
29
30
|
"file-loader": "^6.2.0",
|
|
@@ -46,8 +47,10 @@
|
|
|
46
47
|
"@gnosis.pm/safe-apps-sdk": "^7.5.0",
|
|
47
48
|
"@ledgerhq/devices": "6.27.1",
|
|
48
49
|
"@ledgerhq/hw-app-eth": "6.10.0",
|
|
50
|
+
"@ledgerhq/hw-transport-u2f": "^5.36.0-deprecated",
|
|
49
51
|
"@ledgerhq/hw-transport-webusb": "6.27.1",
|
|
50
52
|
"@ledgerhq/logs": "^6.10.0",
|
|
53
|
+
"@ledgerhq/web3-subprovider": "^5.36.0-deprecated",
|
|
51
54
|
"@near-wallet-selector/core": "^7.8.2",
|
|
52
55
|
"@near-wallet-selector/meteor-wallet": "^7.8.2",
|
|
53
56
|
"@near-wallet-selector/my-near-wallet": "^7.8.2",
|
|
@@ -65,7 +68,8 @@
|
|
|
65
68
|
"near-api-js": "^0.44.2",
|
|
66
69
|
"osmojs": "^13.0.0-rc.7-i-alpha",
|
|
67
70
|
"path-browserify": "^1.0.1",
|
|
68
|
-
"web3": "^1.7.4"
|
|
71
|
+
"web3": "^1.7.4",
|
|
72
|
+
"web3-provider-engine": "^16.0.5"
|
|
69
73
|
},
|
|
70
74
|
"eslintConfig": {
|
|
71
75
|
"root": true,
|