@firmachain/firma-js 0.2.47 → 0.2.48
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/dist/index.js +1 -5
- package/dist/sdk/FirmaAuthzService.js +5 -5
- package/dist/sdk/FirmaBankService.js +1 -1
- package/dist/sdk/FirmaChainService.d.ts +5 -0
- package/dist/sdk/FirmaChainService.js +44 -0
- package/dist/sdk/FirmaContractService.js +5 -5
- package/dist/sdk/FirmaCosmWasmCw20.d.ts +17 -0
- package/dist/sdk/FirmaCosmWasmCw20.js +269 -0
- package/dist/sdk/FirmaCosmWasmService.js +9 -9
- package/dist/sdk/FirmaDistributionService.js +5 -5
- package/dist/sdk/FirmaFeeGrantService.js +3 -3
- package/dist/sdk/FirmaGovService.js +7 -7
- package/dist/sdk/FirmaIbcService.js +1 -1
- package/dist/sdk/FirmaNftService.js +5 -5
- package/dist/sdk/FirmaSDK.d.ts +3 -1
- package/dist/sdk/FirmaSDK.js +4 -1
- package/dist/sdk/FirmaStakingService.js +5 -5
- package/dist/sdk/FirmaTokenService.js +4 -4
- package/dist/sdk/FirmaUtil.js +16 -20
- package/dist/sdk/FirmaWalletService.js +3 -3
- package/dist/sdk/firmachain/amino/addresses.js +11 -11
- package/dist/sdk/firmachain/amino/aminotypes.js +32 -36
- package/dist/sdk/firmachain/amino/encoding.js +26 -30
- package/dist/sdk/firmachain/amino/multisig.js +5 -5
- package/dist/sdk/firmachain/amino/signature.js +4 -4
- package/dist/sdk/firmachain/amino/signdoc.js +1 -1
- package/dist/sdk/firmachain/amino/wallet.js +10 -14
- package/dist/sdk/firmachain/authz/AuthzQueryClient.js +3 -3
- package/dist/sdk/firmachain/authz/index.js +1 -5
- package/dist/sdk/firmachain/bank/BankQueryClient.js +4 -4
- package/dist/sdk/firmachain/bank/index.js +1 -5
- package/dist/sdk/firmachain/common/LedgerSigningStargateClient.js +2 -2
- package/dist/sdk/firmachain/common/LedgerWallet.js +10 -14
- package/dist/sdk/firmachain/common/accounts.js +2 -2
- package/dist/sdk/firmachain/common/index.js +1 -5
- package/dist/sdk/firmachain/common/signing.js +5 -9
- package/dist/sdk/firmachain/common/signingaminostargateclient.js +16 -16
- package/dist/sdk/firmachain/common/signingstargateclient.js +14 -18
- package/dist/sdk/firmachain/common/stargateclient.js +6 -6
- package/dist/sdk/firmachain/contract/ContractQueryClient.js +2 -2
- package/dist/sdk/firmachain/contract/ContractTxTypes.d.ts +4 -4
- package/dist/sdk/firmachain/contract/index.js +1 -5
- package/dist/sdk/firmachain/cosmwasm/CosmWasmQueryClient.js +8 -8
- package/dist/sdk/firmachain/cosmwasm/index.js +1 -5
- package/dist/sdk/firmachain/distribution/DistributionQueryClient.js +5 -5
- package/dist/sdk/firmachain/distribution/index.js +1 -5
- package/dist/sdk/firmachain/feegrant/FeeGrantQueryClient.js +2 -2
- package/dist/sdk/firmachain/feegrant/index.js +1 -5
- package/dist/sdk/firmachain/google/protobuf/any.d.ts +1 -1
- package/dist/sdk/firmachain/google/protobuf/descriptor.d.ts +27 -27
- package/dist/sdk/firmachain/google/protobuf/duration.d.ts +1 -1
- package/dist/sdk/firmachain/google/protobuf/timestamp.d.ts +1 -1
- package/dist/sdk/firmachain/gov/GovQueryClient.js +2 -2
- package/dist/sdk/firmachain/gov/index.js +1 -5
- package/dist/sdk/firmachain/ibc/IbcQueryClient.js +1 -1
- package/dist/sdk/firmachain/ibc/index.js +1 -5
- package/dist/sdk/firmachain/mint/index.js +1 -5
- package/dist/sdk/firmachain/nft/NftTxTypes.d.ts +6 -6
- package/dist/sdk/firmachain/nft/index.js +1 -5
- package/dist/sdk/firmachain/slashing/index.js +1 -5
- package/dist/sdk/firmachain/staking/StakingQueryClient.d.ts +2 -2
- package/dist/sdk/firmachain/staking/StakingQueryClient.js +8 -8
- package/dist/sdk/firmachain/staking/index.js +1 -5
- package/dist/sdk/firmachain/token/TokenTxTypes.d.ts +8 -8
- package/dist/sdk/firmachain/token/index.js +1 -5
- package/package.json +24 -24
|
@@ -238,7 +238,7 @@ var FirmaGovService = /** @class */ (function () {
|
|
|
238
238
|
proposer = _a.sent();
|
|
239
239
|
message = gov_1.GovTxClient.msgSubmitProposal({ content: content, initialDeposit: [sendAmount], proposer: proposer });
|
|
240
240
|
txClient = new gov_1.GovTxClient(wallet, this.config.rpcAddress);
|
|
241
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
241
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
242
242
|
case 2: return [2 /*return*/, _a.sent()];
|
|
243
243
|
case 3:
|
|
244
244
|
error_8 = _a.sent();
|
|
@@ -278,7 +278,7 @@ var FirmaGovService = /** @class */ (function () {
|
|
|
278
278
|
proposer: proposer
|
|
279
279
|
});
|
|
280
280
|
txClient = new gov_1.GovTxClient(wallet, this.config.rpcAddress);
|
|
281
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
281
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
282
282
|
case 2: return [2 /*return*/, _a.sent()];
|
|
283
283
|
case 3:
|
|
284
284
|
error_9 = _a.sent();
|
|
@@ -319,7 +319,7 @@ var FirmaGovService = /** @class */ (function () {
|
|
|
319
319
|
proposer: proposer
|
|
320
320
|
});
|
|
321
321
|
txClient = new gov_1.GovTxClient(wallet, this.config.rpcAddress);
|
|
322
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
322
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
323
323
|
case 2: return [2 /*return*/, _a.sent()];
|
|
324
324
|
case 3:
|
|
325
325
|
error_10 = _a.sent();
|
|
@@ -360,7 +360,7 @@ var FirmaGovService = /** @class */ (function () {
|
|
|
360
360
|
proposer: proposer
|
|
361
361
|
});
|
|
362
362
|
txClient = new gov_1.GovTxClient(wallet, this.config.rpcAddress);
|
|
363
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
363
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
364
364
|
case 2: return [2 /*return*/, _a.sent()];
|
|
365
365
|
case 3:
|
|
366
366
|
error_11 = _a.sent();
|
|
@@ -403,7 +403,7 @@ var FirmaGovService = /** @class */ (function () {
|
|
|
403
403
|
proposer: proposer
|
|
404
404
|
});
|
|
405
405
|
txClient = new gov_1.GovTxClient(wallet, this.config.rpcAddress);
|
|
406
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
406
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
407
407
|
case 2: return [2 /*return*/, _a.sent()];
|
|
408
408
|
case 3:
|
|
409
409
|
error_12 = _a.sent();
|
|
@@ -580,7 +580,7 @@ var FirmaGovService = /** @class */ (function () {
|
|
|
580
580
|
voter = _a.sent();
|
|
581
581
|
txClient = new gov_1.GovTxClient(wallet, this.config.rpcAddress);
|
|
582
582
|
message = gov_1.GovTxClient.msgVote({ proposalId: proposalId, voter: voter, option: option });
|
|
583
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
583
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
584
584
|
case 2: return [2 /*return*/, _a.sent()];
|
|
585
585
|
case 3:
|
|
586
586
|
error_19 = _a.sent();
|
|
@@ -629,7 +629,7 @@ var FirmaGovService = /** @class */ (function () {
|
|
|
629
629
|
sendAmount = { denom: this.config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amount) };
|
|
630
630
|
message = gov_1.GovTxClient.msgDeposit({ proposalId: proposalId, depositor: depositor, amount: [sendAmount] });
|
|
631
631
|
txClient = new gov_1.GovTxClient(wallet, this.config.rpcAddress);
|
|
632
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
632
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
633
633
|
case 2: return [2 /*return*/, _a.sent()];
|
|
634
634
|
case 3:
|
|
635
635
|
error_21 = _a.sent();
|
|
@@ -106,7 +106,7 @@ var FirmaIbcService = /** @class */ (function () {
|
|
|
106
106
|
token: { denom: denom, amount: amount },
|
|
107
107
|
timeoutHeight: timeoutHeight, timeoutTimestamp: timeoutTimestamp });
|
|
108
108
|
ibcTxClient = new ibc_1.IbcTxClient(wallet, this.config.rpcAddress);
|
|
109
|
-
return [4 /*yield*/, ibcTxClient.sign([message],
|
|
109
|
+
return [4 /*yield*/, ibcTxClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
110
110
|
case 2: return [2 /*return*/, _a.sent()];
|
|
111
111
|
case 3:
|
|
112
112
|
error_3 = _a.sent();
|
|
@@ -195,7 +195,7 @@ var NftService = /** @class */ (function () {
|
|
|
195
195
|
address = _a.sent();
|
|
196
196
|
message = nft_1.NftTxClient.msgTransfer({ owner: address, toAddress: toAddress, nftId: parseInt(nftID) });
|
|
197
197
|
nftTxClient = new nft_1.NftTxClient(wallet, this.config.rpcAddress);
|
|
198
|
-
return [4 /*yield*/, nftTxClient.sign([message],
|
|
198
|
+
return [4 /*yield*/, nftTxClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
199
199
|
case 2: return [2 /*return*/, _a.sent()];
|
|
200
200
|
case 3:
|
|
201
201
|
error_7 = _a.sent();
|
|
@@ -264,7 +264,7 @@ var NftService = /** @class */ (function () {
|
|
|
264
264
|
address = _a.sent();
|
|
265
265
|
message = nft_1.NftTxClient.msgBurn({ owner: address, nftId: parseInt(nftID) });
|
|
266
266
|
nftTxClient = new nft_1.NftTxClient(wallet, this.config.rpcAddress);
|
|
267
|
-
return [4 /*yield*/, nftTxClient.sign([message],
|
|
267
|
+
return [4 /*yield*/, nftTxClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
268
268
|
case 2: return [2 /*return*/, _a.sent()];
|
|
269
269
|
case 3:
|
|
270
270
|
error_10 = _a.sent();
|
|
@@ -307,7 +307,7 @@ var NftService = /** @class */ (function () {
|
|
|
307
307
|
case 0:
|
|
308
308
|
_a.trys.push([0, 3, , 4]);
|
|
309
309
|
nftTxClient = new nft_1.NftTxClient(wallet, this.config.rpcAddress);
|
|
310
|
-
return [4 /*yield*/, nftTxClient.sign(msgList,
|
|
310
|
+
return [4 /*yield*/, nftTxClient.sign(msgList, FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
311
311
|
case 1:
|
|
312
312
|
txRaw = _a.sent();
|
|
313
313
|
return [4 /*yield*/, FirmaUtil_1.FirmaUtil.estimateGas(txRaw)];
|
|
@@ -356,7 +356,7 @@ var NftService = /** @class */ (function () {
|
|
|
356
356
|
address = _a.sent();
|
|
357
357
|
message = nft_1.NftTxClient.msgMint({ owner: address, tokenURI: tokenURI });
|
|
358
358
|
nftTxClient = new nft_1.NftTxClient(wallet, this.config.rpcAddress);
|
|
359
|
-
return [4 /*yield*/, nftTxClient.sign([message],
|
|
359
|
+
return [4 /*yield*/, nftTxClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
360
360
|
case 2: return [2 /*return*/, _a.sent()];
|
|
361
361
|
case 3:
|
|
362
362
|
error_14 = _a.sent();
|
|
@@ -399,7 +399,7 @@ var NftService = /** @class */ (function () {
|
|
|
399
399
|
case 0:
|
|
400
400
|
_a.trys.push([0, 2, , 3]);
|
|
401
401
|
contractTxClient = new nft_1.NftTxClient(wallet, this.config.rpcAddress);
|
|
402
|
-
return [4 /*yield*/, contractTxClient.signAndBroadcast(msgList,
|
|
402
|
+
return [4 /*yield*/, contractTxClient.signAndBroadcast(msgList, FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
403
403
|
case 1: return [2 /*return*/, _a.sent()];
|
|
404
404
|
case 2:
|
|
405
405
|
error_16 = _a.sent();
|
package/dist/sdk/FirmaSDK.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ import { FirmaGovService } from "./FirmaGovService";
|
|
|
12
12
|
import { ChainService } from "./FirmaChainService";
|
|
13
13
|
import { SlashingService } from "./FirmaSlashingService";
|
|
14
14
|
import { FirmaAuthzService } from "./FirmaAuthzService";
|
|
15
|
+
import { FirmaCosmWasmCw20Service } from "./FirmaCosmWasmCw20";
|
|
15
16
|
import { FirmaCosmWasmService } from "./FirmaCosmWasmService";
|
|
16
17
|
import { FirmaIbcService } from "./FirmaIbcService";
|
|
17
18
|
import { FirmaMintService } from "./FirmaMintService";
|
|
@@ -33,5 +34,6 @@ export declare class FirmaSDK {
|
|
|
33
34
|
CosmWasm: FirmaCosmWasmService;
|
|
34
35
|
Ibc: FirmaIbcService;
|
|
35
36
|
Mint: FirmaMintService;
|
|
36
|
-
|
|
37
|
+
Cw20: FirmaCosmWasmCw20Service;
|
|
38
|
+
constructor(Config: FirmaConfig, Wallet?: FirmaWalletService, Bank?: FirmaBankService, FeeGrant?: FirmaFeeGrantService, Staking?: FirmaStakingService, Distribution?: FirmaDistributionService, Gov?: FirmaGovService, Nft?: NftService, Token?: TokenService, Contract?: ContractService, Ipfs?: IpfsService, BlockChain?: ChainService, Slashing?: SlashingService, Authz?: FirmaAuthzService, CosmWasm?: FirmaCosmWasmService, Ibc?: FirmaIbcService, Mint?: FirmaMintService, Cw20?: FirmaCosmWasmCw20Service);
|
|
37
39
|
}
|
package/dist/sdk/FirmaSDK.js
CHANGED
|
@@ -15,11 +15,12 @@ var FirmaGovService_1 = require("./FirmaGovService");
|
|
|
15
15
|
var FirmaChainService_1 = require("./FirmaChainService");
|
|
16
16
|
var FirmaSlashingService_1 = require("./FirmaSlashingService");
|
|
17
17
|
var FirmaAuthzService_1 = require("./FirmaAuthzService");
|
|
18
|
+
var FirmaCosmWasmCw20_1 = require("./FirmaCosmWasmCw20");
|
|
18
19
|
var FirmaCosmWasmService_1 = require("./FirmaCosmWasmService");
|
|
19
20
|
var FirmaIbcService_1 = require("./FirmaIbcService");
|
|
20
21
|
var FirmaMintService_1 = require("./FirmaMintService");
|
|
21
22
|
var FirmaSDK = /** @class */ (function () {
|
|
22
|
-
function FirmaSDK(Config, Wallet, Bank, FeeGrant, Staking, Distribution, Gov, Nft, Token, Contract, Ipfs, BlockChain, Slashing, Authz, CosmWasm, Ibc, Mint) {
|
|
23
|
+
function FirmaSDK(Config, Wallet, Bank, FeeGrant, Staking, Distribution, Gov, Nft, Token, Contract, Ipfs, BlockChain, Slashing, Authz, CosmWasm, Ibc, Mint, Cw20) {
|
|
23
24
|
if (Wallet === void 0) { Wallet = new FirmaWalletService_1.FirmaWalletService(Config); }
|
|
24
25
|
if (Bank === void 0) { Bank = new FirmaBankService_1.FirmaBankService(Config); }
|
|
25
26
|
if (FeeGrant === void 0) { FeeGrant = new FirmaFeeGrantService_1.FirmaFeeGrantService(Config); }
|
|
@@ -36,6 +37,7 @@ var FirmaSDK = /** @class */ (function () {
|
|
|
36
37
|
if (CosmWasm === void 0) { CosmWasm = new FirmaCosmWasmService_1.FirmaCosmWasmService(Config); }
|
|
37
38
|
if (Ibc === void 0) { Ibc = new FirmaIbcService_1.FirmaIbcService(Config); }
|
|
38
39
|
if (Mint === void 0) { Mint = new FirmaMintService_1.FirmaMintService(Config); }
|
|
40
|
+
if (Cw20 === void 0) { Cw20 = new FirmaCosmWasmCw20_1.FirmaCosmWasmCw20Service(Config, CosmWasm); }
|
|
39
41
|
this.Config = Config;
|
|
40
42
|
this.Wallet = Wallet;
|
|
41
43
|
this.Bank = Bank;
|
|
@@ -53,6 +55,7 @@ var FirmaSDK = /** @class */ (function () {
|
|
|
53
55
|
this.CosmWasm = CosmWasm;
|
|
54
56
|
this.Ibc = Ibc;
|
|
55
57
|
this.Mint = Mint;
|
|
58
|
+
this.Cw20 = Cw20;
|
|
56
59
|
FirmaUtil_1.FirmaUtil.config = Config;
|
|
57
60
|
}
|
|
58
61
|
return FirmaSDK;
|
|
@@ -130,7 +130,7 @@ var FirmaStakingService = /** @class */ (function () {
|
|
|
130
130
|
validatorAddress: validatorAddres,
|
|
131
131
|
amount: sendAmount
|
|
132
132
|
});
|
|
133
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
133
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
134
134
|
case 2: return [2 /*return*/, _a.sent()];
|
|
135
135
|
case 3:
|
|
136
136
|
error_4 = _a.sent();
|
|
@@ -159,7 +159,7 @@ var FirmaStakingService = /** @class */ (function () {
|
|
|
159
159
|
validatorAddress: validatorAddres,
|
|
160
160
|
amount: sendAmount
|
|
161
161
|
});
|
|
162
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
162
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
163
163
|
case 2: return [2 /*return*/, _a.sent()];
|
|
164
164
|
case 3:
|
|
165
165
|
error_5 = _a.sent();
|
|
@@ -189,7 +189,7 @@ var FirmaStakingService = /** @class */ (function () {
|
|
|
189
189
|
validatorDstAddress: validatorDstAddress,
|
|
190
190
|
amount: sendAmount
|
|
191
191
|
});
|
|
192
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
192
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
193
193
|
case 2: return [2 /*return*/, _a.sent()];
|
|
194
194
|
case 3:
|
|
195
195
|
error_6 = _a.sent();
|
|
@@ -218,7 +218,7 @@ var FirmaStakingService = /** @class */ (function () {
|
|
|
218
218
|
pubkey: validatorInfo.pubkey,
|
|
219
219
|
value: validatorInfo.value
|
|
220
220
|
});
|
|
221
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
221
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
222
222
|
case 1: return [2 /*return*/, _a.sent()];
|
|
223
223
|
case 2:
|
|
224
224
|
error_7 = _a.sent();
|
|
@@ -244,7 +244,7 @@ var FirmaStakingService = /** @class */ (function () {
|
|
|
244
244
|
commissionRate: commissionRate,
|
|
245
245
|
minSelfDelegation: minSelfDelegation
|
|
246
246
|
});
|
|
247
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
247
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
248
248
|
case 1: return [2 /*return*/, _a.sent()];
|
|
249
249
|
case 2:
|
|
250
250
|
error_8 = _a.sent();
|
|
@@ -151,7 +151,7 @@ var TokenService = /** @class */ (function () {
|
|
|
151
151
|
tokenURI: tokenURI
|
|
152
152
|
});
|
|
153
153
|
txClient = new token_1.TokenTxClient(wallet, this.config.rpcAddress);
|
|
154
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
154
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
155
155
|
case 2: return [2 /*return*/, _a.sent()];
|
|
156
156
|
case 3:
|
|
157
157
|
error_5 = _a.sent();
|
|
@@ -179,7 +179,7 @@ var TokenService = /** @class */ (function () {
|
|
|
179
179
|
amount: amount
|
|
180
180
|
});
|
|
181
181
|
txClient = new token_1.TokenTxClient(wallet, this.config.rpcAddress);
|
|
182
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
182
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
183
183
|
case 2: return [2 /*return*/, _a.sent()];
|
|
184
184
|
case 3:
|
|
185
185
|
error_6 = _a.sent();
|
|
@@ -208,7 +208,7 @@ var TokenService = /** @class */ (function () {
|
|
|
208
208
|
toAddress: toAddress
|
|
209
209
|
});
|
|
210
210
|
txClient = new token_1.TokenTxClient(wallet, this.config.rpcAddress);
|
|
211
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
211
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
212
212
|
case 2: return [2 /*return*/, _a.sent()];
|
|
213
213
|
case 3:
|
|
214
214
|
error_7 = _a.sent();
|
|
@@ -241,7 +241,7 @@ var TokenService = /** @class */ (function () {
|
|
|
241
241
|
burnable: isBurnable
|
|
242
242
|
});
|
|
243
243
|
txClient = new token_1.TokenTxClient(wallet, this.config.rpcAddress);
|
|
244
|
-
return [4 /*yield*/, txClient.sign([message],
|
|
244
|
+
return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
|
|
245
245
|
case 2: return [2 /*return*/, _a.sent()];
|
|
246
246
|
case 3:
|
|
247
247
|
error_8 = _a.sent();
|
package/dist/sdk/FirmaUtil.js
CHANGED
|
@@ -62,14 +62,10 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
62
62
|
}
|
|
63
63
|
return ar;
|
|
64
64
|
};
|
|
65
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
ar[i] = from[i];
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
65
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
66
|
+
for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
|
|
67
|
+
to[j] = from[i];
|
|
68
|
+
return to;
|
|
73
69
|
};
|
|
74
70
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
75
71
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
@@ -212,7 +208,7 @@ var FirmaUtil = /** @class */ (function () {
|
|
|
212
208
|
return false;
|
|
213
209
|
};
|
|
214
210
|
FirmaUtil.buf2hex = function (buffer) {
|
|
215
|
-
return __spreadArray([], __read(new Uint8Array(buffer))
|
|
211
|
+
return __spreadArray([], __read(new Uint8Array(buffer))).map(function (x) { return x.toString(16).padStart(2, '0'); })
|
|
216
212
|
.join('');
|
|
217
213
|
};
|
|
218
214
|
// for evm address support
|
|
@@ -225,8 +221,8 @@ var FirmaUtil = /** @class */ (function () {
|
|
|
225
221
|
return encoding_1.Bech32.encode(FirmaUtil.config.prefix + "valoper", data);
|
|
226
222
|
};
|
|
227
223
|
FirmaUtil.getValConsAddressFromAccAddress = function (consensusPubkey) {
|
|
228
|
-
var ed25519PubkeyRaw =
|
|
229
|
-
var addressData =
|
|
224
|
+
var ed25519PubkeyRaw = encoding_2.fromBase64(consensusPubkey);
|
|
225
|
+
var addressData = crypto_1.sha256(ed25519PubkeyRaw).slice(0, 20);
|
|
230
226
|
return encoding_1.Bech32.encode(FirmaUtil.config.prefix + "valcons", addressData);
|
|
231
227
|
};
|
|
232
228
|
FirmaUtil.getAccAddressFromValOperAddress = function (address) {
|
|
@@ -264,7 +260,7 @@ var FirmaUtil = /** @class */ (function () {
|
|
|
264
260
|
case 0:
|
|
265
261
|
_a.trys.push([0, 2, , 3]);
|
|
266
262
|
encodedTx = Uint8Array.from(tx_1.TxRaw.encode(txRaw).finish());
|
|
267
|
-
hexTx = "0x"
|
|
263
|
+
hexTx = "0x" + Buffer.from(encodedTx).toString("hex");
|
|
268
264
|
queryClient = new TendermintQueryClient_1.TendermintQueryClient(FirmaUtil.config.rpcAddress);
|
|
269
265
|
return [4 /*yield*/, queryClient.queryEstimateGas(hexTx)];
|
|
270
266
|
case 1:
|
|
@@ -288,7 +284,7 @@ var FirmaUtil = /** @class */ (function () {
|
|
|
288
284
|
case 0:
|
|
289
285
|
_a.trys.push([0, 2, , 3]);
|
|
290
286
|
encodedTx = Uint8Array.from(txRaw);
|
|
291
|
-
hexTx = "0x"
|
|
287
|
+
hexTx = "0x" + Buffer.from(encodedTx).toString("hex");
|
|
292
288
|
console.log("hexTx:" + hexTx);
|
|
293
289
|
queryClient = new TendermintQueryClient_1.TendermintQueryClient(FirmaUtil.config.rpcAddress);
|
|
294
290
|
return [4 /*yield*/, queryClient.queryEstimateGas(hexTx)];
|
|
@@ -308,7 +304,7 @@ var FirmaUtil = /** @class */ (function () {
|
|
|
308
304
|
FirmaUtil.printLog = function (log) {
|
|
309
305
|
if (FirmaUtil.config.isShowLog === false)
|
|
310
306
|
return;
|
|
311
|
-
console.log("[FirmaSDK] "
|
|
307
|
+
console.log("[FirmaSDK] " + log);
|
|
312
308
|
};
|
|
313
309
|
FirmaUtil.experimentalAdr36Sign = function (wallet, data) {
|
|
314
310
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -363,7 +359,7 @@ var FirmaUtil = /** @class */ (function () {
|
|
|
363
359
|
if (recoveryIndex > 3) {
|
|
364
360
|
throw new Error('Invalid recovery index');
|
|
365
361
|
}
|
|
366
|
-
sig = crypto_1.Secp256k1Signature.fromFixedLength(
|
|
362
|
+
sig = crypto_1.Secp256k1Signature.fromFixedLength(encoding_2.fromBase64(signature));
|
|
367
363
|
extendedSig = new crypto_1.ExtendedSecp256k1Signature(sig.r(), sig.s(), recoveryIndex);
|
|
368
364
|
_b.label = 1;
|
|
369
365
|
case 1:
|
|
@@ -371,9 +367,9 @@ var FirmaUtil = /** @class */ (function () {
|
|
|
371
367
|
return [4 /*yield*/, crypto_1.Secp256k1.recoverPubkey(extendedSig, hash)];
|
|
372
368
|
case 2:
|
|
373
369
|
recoveredPubKey = _b.sent();
|
|
374
|
-
return [2 /*return*/,
|
|
370
|
+
return [2 /*return*/, amino_1.pubkeyToAddress({
|
|
375
371
|
type: 'tendermint/PubKeySecp256k1',
|
|
376
|
-
value:
|
|
372
|
+
value: encoding_2.toBase64(crypto_1.Secp256k1.compressPubkey(recoveredPubKey)),
|
|
377
373
|
}, 'firma')];
|
|
378
374
|
case 3:
|
|
379
375
|
_a = _b.sent();
|
|
@@ -409,16 +405,16 @@ var FirmaUtil = /** @class */ (function () {
|
|
|
409
405
|
});
|
|
410
406
|
};
|
|
411
407
|
FirmaUtil.verifyDirectSignature = function (address, signature, signDoc) {
|
|
412
|
-
var messageHash =
|
|
408
|
+
var messageHash = crypto_1.sha256(proto_signing_1.makeSignBytes(signDoc));
|
|
413
409
|
return this.verifySignature(address, signature, messageHash);
|
|
414
410
|
};
|
|
415
411
|
;
|
|
416
412
|
FirmaUtil.parseSignDocValues = function (signDocString) {
|
|
417
413
|
var signDoc = JSON.parse(signDocString);
|
|
418
|
-
return __assign(__assign({}, signDoc), { bodyBytes:
|
|
414
|
+
return __assign(__assign({}, signDoc), { bodyBytes: encoding_2.fromHex(signDoc.bodyBytes), authInfoBytes: encoding_2.fromHex(signDoc.authInfoBytes), accountNumber: long_1.default.fromString(signDoc.accountNumber) });
|
|
419
415
|
};
|
|
420
416
|
FirmaUtil.stringifySignDocValues = function (signDoc) {
|
|
421
|
-
return JSON.stringify(__assign(__assign({}, signDoc), { bodyBytes:
|
|
417
|
+
return JSON.stringify(__assign(__assign({}, signDoc), { bodyBytes: encoding_2.toHex(signDoc.bodyBytes), authInfoBytes: encoding_2.toHex(signDoc.authInfoBytes), accountNumber: signDoc.accountNumber.toString() }));
|
|
422
418
|
};
|
|
423
419
|
FirmaUtil.makeSignDoc = function (signerAddress, pubkey, messages, txMisc) {
|
|
424
420
|
if (txMisc === void 0) { txMisc = exports.DefaultTxMisc; }
|
|
@@ -92,7 +92,7 @@ var FirmaWalletService = /** @class */ (function () {
|
|
|
92
92
|
return __awaiter(this, void 0, void 0, function () {
|
|
93
93
|
return __generator(this, function (_a) {
|
|
94
94
|
switch (_a.label) {
|
|
95
|
-
case 0: return [4 /*yield*/,
|
|
95
|
+
case 0: return [4 /*yield*/, LedgerWallet_1.signFromLedger(this.ledger, messages, option, registry)];
|
|
96
96
|
case 1: return [2 /*return*/, _a.sent()];
|
|
97
97
|
}
|
|
98
98
|
});
|
|
@@ -147,7 +147,7 @@ var FirmaWalletService = /** @class */ (function () {
|
|
|
147
147
|
};
|
|
148
148
|
FirmaWalletService.getHdPath = function (hdPath, accountIndex) {
|
|
149
149
|
try {
|
|
150
|
-
return [
|
|
150
|
+
return [crypto_1.stringToPath(hdPath + accountIndex + "'/0/0")];
|
|
151
151
|
}
|
|
152
152
|
catch (error) {
|
|
153
153
|
FirmaUtil_1.FirmaUtil.printLog(error);
|
|
@@ -193,7 +193,7 @@ var FirmaWalletService = /** @class */ (function () {
|
|
|
193
193
|
seed = _a.sent();
|
|
194
194
|
hdpath = FirmaWalletService.getHdPath(this.getHdPath(), accountIndex);
|
|
195
195
|
privkey = crypto_1.Slip10.derivePath(crypto_1.Slip10Curve.Secp256k1, seed, hdpath[0]).privkey;
|
|
196
|
-
privateKey = "0x"
|
|
196
|
+
privateKey = "0x" + Buffer.from(privkey).toString("hex");
|
|
197
197
|
return [2 /*return*/, privateKey];
|
|
198
198
|
case 2:
|
|
199
199
|
error_4 = _a.sent();
|
|
@@ -8,32 +8,32 @@ var encoding_2 = require("./encoding");
|
|
|
8
8
|
var pubkeys_1 = require("./pubkeys");
|
|
9
9
|
function rawEd25519PubkeyToRawAddress(pubkeyData) {
|
|
10
10
|
if (pubkeyData.length !== 32) {
|
|
11
|
-
throw new Error("Invalid Ed25519 pubkey length: "
|
|
11
|
+
throw new Error("Invalid Ed25519 pubkey length: " + pubkeyData.length);
|
|
12
12
|
}
|
|
13
|
-
return
|
|
13
|
+
return crypto_1.sha256(pubkeyData).slice(0, 20);
|
|
14
14
|
}
|
|
15
15
|
exports.rawEd25519PubkeyToRawAddress = rawEd25519PubkeyToRawAddress;
|
|
16
16
|
function rawSecp256k1PubkeyToRawAddress(pubkeyData) {
|
|
17
17
|
if (pubkeyData.length !== 33) {
|
|
18
|
-
throw new Error("Invalid Secp256k1 pubkey length (compressed): "
|
|
18
|
+
throw new Error("Invalid Secp256k1 pubkey length (compressed): " + pubkeyData.length);
|
|
19
19
|
}
|
|
20
|
-
return
|
|
20
|
+
return crypto_1.ripemd160(crypto_1.sha256(pubkeyData));
|
|
21
21
|
}
|
|
22
22
|
exports.rawSecp256k1PubkeyToRawAddress = rawSecp256k1PubkeyToRawAddress;
|
|
23
23
|
// For secp256k1 this assumes we already have a compressed pubkey.
|
|
24
24
|
function pubkeyToRawAddress(pubkey) {
|
|
25
|
-
if (
|
|
26
|
-
var pubkeyData =
|
|
25
|
+
if (pubkeys_1.isSecp256k1Pubkey(pubkey)) {
|
|
26
|
+
var pubkeyData = encoding_1.fromBase64(pubkey.value);
|
|
27
27
|
return rawSecp256k1PubkeyToRawAddress(pubkeyData);
|
|
28
28
|
}
|
|
29
|
-
else if (
|
|
30
|
-
var pubkeyData =
|
|
29
|
+
else if (pubkeys_1.isEd25519Pubkey(pubkey)) {
|
|
30
|
+
var pubkeyData = encoding_1.fromBase64(pubkey.value);
|
|
31
31
|
return rawEd25519PubkeyToRawAddress(pubkeyData);
|
|
32
32
|
}
|
|
33
|
-
else if (
|
|
33
|
+
else if (pubkeys_1.isMultisigThresholdPubkey(pubkey)) {
|
|
34
34
|
// https://github.com/tendermint/tendermint/blob/38b401657e4ad7a7eeb3c30a3cbf512037df3740/crypto/multisig/threshold_pubkey.go#L71-L74
|
|
35
|
-
var pubkeyData =
|
|
36
|
-
return
|
|
35
|
+
var pubkeyData = encoding_2.encodeAminoPubkey(pubkey);
|
|
36
|
+
return crypto_1.sha256(pubkeyData).slice(0, 20);
|
|
37
37
|
}
|
|
38
38
|
else {
|
|
39
39
|
throw new Error("Unsupported public key type");
|