@ledgerhq/live-common 23.0.0-next.2 → 23.0.0-next.3
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../src/families/cardano/logic.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,KAAK,IAAI,WAAW,EACpB,OAAO,IAAI,aAAa,EACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAGL,OAAO,EACP,QAAQ,EAGT,MAAM,6CAA6C,CAAC;AAErD,OAAO,EACL,OAAO,EACP,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,eAAe,EACf,KAAK,EACN,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../../src/families/cardano/logic.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,11 +46,11 @@ var ledgerjs_hw_app_cardano_1 = require("@cardano-foundation/ledgerjs-hw-app-car
|
|
|
46
46
|
var utils_1 = require("@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils");
|
|
47
47
|
var types_1 = require("./types");
|
|
48
48
|
var bip32ed25519_1 = require("@stricahq/bip32ed25519");
|
|
49
|
-
var bs58_1 = __importDefault(require("bs58"));
|
|
50
49
|
var bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
51
50
|
var networks_1 = require("./networks");
|
|
52
51
|
var groupBy_1 = __importDefault(require("lodash/groupBy"));
|
|
53
52
|
var cryptoassets_1 = require("@ledgerhq/cryptoassets");
|
|
53
|
+
var ShelleyTypeAddress_1 = __importDefault(require("@stricahq/typhonjs/dist/address/ShelleyTypeAddress"));
|
|
54
54
|
/**
|
|
55
55
|
* returns BipPath object with account, chain and index field for cardano
|
|
56
56
|
*
|
|
@@ -135,23 +135,16 @@ var isValidAddress = function (address, networkId) {
|
|
|
135
135
|
if (!address)
|
|
136
136
|
return false;
|
|
137
137
|
try {
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
return false;
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
catch (error) {
|
|
145
|
-
try {
|
|
146
|
-
var hexAddress = typhonjs_1.utils.decodeBech32(address);
|
|
147
|
-
var addressNetworkId = Number(hexAddress.value.toLowerCase().charAt(1));
|
|
138
|
+
var cardanoAddress = typhonjs_1.utils.getAddressFromBech32(address);
|
|
139
|
+
if (cardanoAddress instanceof ShelleyTypeAddress_1["default"]) {
|
|
140
|
+
var addressNetworkId = Number(cardanoAddress.getHex().toLowerCase().charAt(1));
|
|
148
141
|
if (addressNetworkId !== networkId) {
|
|
149
142
|
return false;
|
|
150
143
|
}
|
|
151
144
|
}
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
145
|
+
}
|
|
146
|
+
catch (error) {
|
|
147
|
+
return false;
|
|
155
148
|
}
|
|
156
149
|
return true;
|
|
157
150
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../src/families/cardano/logic.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAMqB;AAErB,+CAI4B;AAC5B,uFAOqD;AACrD,gFAAqF;AACrF,iCAOiB;AACjB,uDAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"logic.js","sourceRoot":"","sources":["../../../src/families/cardano/logic.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"type": "git",
|
|
9
9
|
"url": "https://github.com/LedgerHQ/ledger-live-common"
|
|
10
10
|
},
|
|
11
|
-
"version": "23.0.0-next.
|
|
11
|
+
"version": "23.0.0-next.3",
|
|
12
12
|
"main": "lib/index.js",
|
|
13
13
|
"types": "lib/index.d.ts",
|
|
14
14
|
"license": "Apache-2.0",
|
|
@@ -83,7 +83,7 @@
|
|
|
83
83
|
"@solana/spl-token": "^0.2.0",
|
|
84
84
|
"@solana/web3.js": "^1.41.4",
|
|
85
85
|
"@stricahq/bip32ed25519": "^1.0.3",
|
|
86
|
-
"@stricahq/typhonjs": "^1.
|
|
86
|
+
"@stricahq/typhonjs": "^1.2.3",
|
|
87
87
|
"@taquito/ledger-signer": "stablelib",
|
|
88
88
|
"@taquito/taquito": "stablelib",
|
|
89
89
|
"@taquito/utils": "stablelib",
|
|
@@ -29,13 +29,13 @@ import {
|
|
|
29
29
|
Token,
|
|
30
30
|
} from "./types";
|
|
31
31
|
import { Bip32PublicKey } from "@stricahq/bip32ed25519";
|
|
32
|
-
import bs58 from "bs58";
|
|
33
32
|
import BigNumber from "bignumber.js";
|
|
34
33
|
import { getNetworkParameters } from "./networks";
|
|
35
34
|
import { CryptoCurrency, OperationType } from "../../types";
|
|
36
35
|
import groupBy from "lodash/groupBy";
|
|
37
36
|
import { APITransaction } from "./api/api-types";
|
|
38
37
|
import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
|
|
38
|
+
import ShelleyTypeAddress from "@stricahq/typhonjs/dist/address/ShelleyTypeAddress";
|
|
39
39
|
|
|
40
40
|
/**
|
|
41
41
|
* returns BipPath object with account, chain and index field for cardano
|
|
@@ -152,21 +152,17 @@ export const isValidAddress = (address: string, networkId: number): boolean => {
|
|
|
152
152
|
if (!address) return false;
|
|
153
153
|
|
|
154
154
|
try {
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
} catch (error) {
|
|
161
|
-
try {
|
|
162
|
-
const hexAddress = TyphonUtils.decodeBech32(address);
|
|
163
|
-
const addressNetworkId = Number(hexAddress.value.toLowerCase().charAt(1));
|
|
155
|
+
const cardanoAddress = TyphonUtils.getAddressFromBech32(address);
|
|
156
|
+
if (cardanoAddress instanceof ShelleyTypeAddress) {
|
|
157
|
+
const addressNetworkId = Number(
|
|
158
|
+
cardanoAddress.getHex().toLowerCase().charAt(1)
|
|
159
|
+
);
|
|
164
160
|
if (addressNetworkId !== networkId) {
|
|
165
161
|
return false;
|
|
166
162
|
}
|
|
167
|
-
} catch (error) {
|
|
168
|
-
return false;
|
|
169
163
|
}
|
|
164
|
+
} catch (error) {
|
|
165
|
+
return false;
|
|
170
166
|
}
|
|
171
167
|
return true;
|
|
172
168
|
};
|