@openocean.finance/wallet 1.0.6 → 1.0.8
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 +28 -17
- package/lib/Wallets/index.js +2 -2
- package/package.json +5 -2
|
@@ -64,9 +64,11 @@ 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"));
|
|
69
67
|
var hw_transport_webusb_1 = __importDefault(require("@ledgerhq/hw-transport-webusb"));
|
|
68
|
+
var web3_provider_engine_1 = __importDefault(require("web3-provider-engine"));
|
|
69
|
+
var fetch_1 = __importDefault(require("web3-provider-engine/subproviders/fetch"));
|
|
70
|
+
var web3_subprovider_1 = __importDefault(require("@ledgerhq/web3-subprovider"));
|
|
71
|
+
var web3_1 = __importDefault(require("web3"));
|
|
70
72
|
var LedgerWallet = /** @class */ (function (_super) {
|
|
71
73
|
__extends(LedgerWallet, _super);
|
|
72
74
|
function LedgerWallet() {
|
|
@@ -85,27 +87,36 @@ var LedgerWallet = /** @class */ (function (_super) {
|
|
|
85
87
|
*/
|
|
86
88
|
LedgerWallet.prototype.requestConnect = function (chainId) {
|
|
87
89
|
return __awaiter(this, void 0, void 0, function () {
|
|
88
|
-
var
|
|
89
|
-
return __generator(this, function (
|
|
90
|
-
switch (
|
|
90
|
+
var networkId, engine, getTransport, ledger, address, e_1;
|
|
91
|
+
return __generator(this, function (_a) {
|
|
92
|
+
switch (_a.label) {
|
|
91
93
|
case 0:
|
|
92
|
-
|
|
93
|
-
|
|
94
|
+
_a.trys.push([0, 2, , 3]);
|
|
95
|
+
console.log('requestConnect1');
|
|
96
|
+
networkId = 1;
|
|
97
|
+
engine = new web3_provider_engine_1.default();
|
|
98
|
+
getTransport = function () { return hw_transport_webusb_1.default.create(); };
|
|
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" }));
|
|
106
|
+
engine.start();
|
|
107
|
+
// @ts-ignore
|
|
108
|
+
this.sdk = new web3_1.default(engine);
|
|
109
|
+
return [4 /*yield*/, this.sdk.eth.getAccounts()];
|
|
94
110
|
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;
|
|
111
|
+
address = _a.sent();
|
|
112
|
+
console.log('requestConnect3', address);
|
|
102
113
|
this.address = address;
|
|
103
114
|
this.chainId = chainId;
|
|
104
115
|
return [2 /*return*/, address];
|
|
105
|
-
case
|
|
106
|
-
e_1 =
|
|
116
|
+
case 2:
|
|
117
|
+
e_1 = _a.sent();
|
|
107
118
|
throw new Error(types_1.EnumErrors.NoLedger);
|
|
108
|
-
case
|
|
119
|
+
case 3: return [2 /*return*/];
|
|
109
120
|
}
|
|
110
121
|
});
|
|
111
122
|
});
|
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
|
-
|
|
43
|
+
var LedgerWallet_1 = __importDefault(require("./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
|
-
|
|
48
|
+
LedgerWallet: new LedgerWallet_1.default(),
|
|
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.0.
|
|
3
|
+
"version": "1.0.8",
|
|
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",
|
|
@@ -48,6 +49,7 @@
|
|
|
48
49
|
"@ledgerhq/hw-app-eth": "6.10.0",
|
|
49
50
|
"@ledgerhq/hw-transport-webusb": "6.27.1",
|
|
50
51
|
"@ledgerhq/logs": "^6.10.0",
|
|
52
|
+
"@ledgerhq/web3-subprovider": "^5.36.0-deprecated",
|
|
51
53
|
"@near-wallet-selector/core": "^7.8.2",
|
|
52
54
|
"@near-wallet-selector/meteor-wallet": "^7.8.2",
|
|
53
55
|
"@near-wallet-selector/my-near-wallet": "^7.8.2",
|
|
@@ -65,7 +67,8 @@
|
|
|
65
67
|
"near-api-js": "^0.44.2",
|
|
66
68
|
"osmojs": "^13.0.0-rc.7-i-alpha",
|
|
67
69
|
"path-browserify": "^1.0.1",
|
|
68
|
-
"web3": "^1.7.4"
|
|
70
|
+
"web3": "^1.7.4",
|
|
71
|
+
"web3-provider-engine": "^16.0.5"
|
|
69
72
|
},
|
|
70
73
|
"eslintConfig": {
|
|
71
74
|
"root": true,
|