carbon-js-sdk 0.5.5 → 0.5.7-beta.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.
Files changed (91) hide show
  1. package/lib/clients/BatchQueryClient.js +4 -4
  2. package/lib/clients/CarbonQueryClient.js +2 -2
  3. package/lib/clients/ETHClient.js +15 -15
  4. package/lib/clients/HydrogenClient.js +1 -1
  5. package/lib/clients/NEOClient.js +7 -7
  6. package/lib/clients/TokenClient.js +20 -16
  7. package/lib/clients/ZILClient.js +17 -17
  8. package/lib/codec/bank/query.d.ts +3 -0
  9. package/lib/codec/bank/query.js +53 -11
  10. package/lib/codec/broker/query.js +14 -14
  11. package/lib/codec/cosmos/gov/v1/query.js +2 -2
  12. package/lib/codec/cosmos/gov/v1/tx.js +2 -2
  13. package/lib/codec/cosmos/gov/v1beta1/query.js +2 -2
  14. package/lib/codec/cosmos/gov/v1beta1/tx.js +2 -2
  15. package/lib/codec/cosmos/group/v1/events.js +2 -2
  16. package/lib/codec/cosmos/group/v1/tx.js +4 -4
  17. package/lib/codec/cosmos/tx/v1beta1/tx.js +4 -4
  18. package/lib/codec/evmcontract/genesis.d.ts +18 -0
  19. package/lib/codec/evmcontract/genesis.js +46 -0
  20. package/lib/codec/evmcontract/query.d.ts +12 -0
  21. package/lib/codec/evmcontract/query.js +20 -0
  22. package/lib/codec/evmcontract/tx.d.ts +12 -0
  23. package/lib/codec/evmcontract/tx.js +20 -0
  24. package/lib/codec/google/protobuf/any.d.ts +1 -4
  25. package/lib/codec/google/protobuf/timestamp.d.ts +2 -0
  26. package/lib/codec/index.d.ts +7 -4
  27. package/lib/codec/index.js +671 -434
  28. package/lib/codec/insurance/query.d.ts +48 -0
  29. package/lib/codec/insurance/query.js +217 -1
  30. package/lib/codec/insurance/tx.d.ts +32 -0
  31. package/lib/codec/insurance/tx.js +125 -1
  32. package/lib/codec/liquidation/query.js +12 -12
  33. package/lib/codec/liquiditypool/event.d.ts +62 -0
  34. package/lib/codec/liquiditypool/event.js +505 -1
  35. package/lib/codec/oracle/oracle.d.ts +11 -0
  36. package/lib/codec/oracle/oracle.js +59 -1
  37. package/lib/codec/oracle/query.d.ts +70 -1
  38. package/lib/codec/oracle/query.js +332 -1
  39. package/lib/codec/order/order.d.ts +1 -1
  40. package/lib/codec/order/order.js +15 -1
  41. package/lib/codec/position/query.js +4 -4
  42. package/lib/constant/generic.js +1 -1
  43. package/lib/modules/cdp.js +44 -44
  44. package/lib/modules/cosmwasm.js +1 -1
  45. package/lib/modules/evm.js +5 -5
  46. package/lib/modules/gov.js +12 -12
  47. package/lib/modules/liquiditypool.js +1 -1
  48. package/lib/provider/account/EthLedgerAccount/EthLedgerAccount.js +1 -1
  49. package/lib/provider/account/NeoLedgerAccount/N3Ledger/ErrorCode.js +1 -1
  50. package/lib/provider/account/NeoLedgerAccount/N3Ledger/main.js +8 -8
  51. package/lib/provider/account/NeoLedgerAccount/NeoLedgerAccount.js +3 -3
  52. package/lib/provider/account/NeoLedgerAccount/NeonLedger.js +1 -1
  53. package/lib/provider/amino/types/admin.js +27 -27
  54. package/lib/provider/amino/types/bank.js +1 -1
  55. package/lib/provider/amino/types/broker.js +1 -1
  56. package/lib/provider/amino/types/cdp.js +25 -25
  57. package/lib/provider/amino/types/coin.js +4 -4
  58. package/lib/provider/amino/types/evm.js +2 -2
  59. package/lib/provider/amino/types/evmmerge.js +1 -1
  60. package/lib/provider/amino/types/feemarket.js +1 -1
  61. package/lib/provider/amino/types/gov.js +5 -5
  62. package/lib/provider/amino/types/ibc.js +1 -1
  63. package/lib/provider/amino/types/leverage.js +1 -1
  64. package/lib/provider/amino/types/liquidityPool.js +7 -7
  65. package/lib/provider/amino/types/market.js +6 -6
  66. package/lib/provider/amino/types/oracle.js +2 -2
  67. package/lib/provider/amino/types/order.js +4 -4
  68. package/lib/provider/amino/types/position.js +1 -1
  69. package/lib/provider/amino/types/profile.js +1 -1
  70. package/lib/provider/amino/types/staking.js +4 -4
  71. package/lib/provider/amino/types/subaccount.js +3 -3
  72. package/lib/provider/amino/utils.js +11 -11
  73. package/lib/provider/keplr/KeplrAccount.js +2 -2
  74. package/lib/provider/ledger/ledger.js +2 -2
  75. package/lib/provider/metamask/MetaMask.js +10 -10
  76. package/lib/provider/o3/O3Wallet.js +2 -2
  77. package/lib/util/address.js +14 -14
  78. package/lib/util/api.js +4 -4
  79. package/lib/util/blockchain.js +4 -4
  80. package/lib/util/eip712.js +3 -3
  81. package/lib/util/fetch.js +1 -1
  82. package/lib/util/generic.js +3 -3
  83. package/lib/util/legacyEIP712.js +2 -2
  84. package/lib/util/number.js +5 -5
  85. package/lib/util/tx.d.ts +2 -0
  86. package/lib/wallet/CarbonSigner.js +2 -2
  87. package/lib/wallet/CarbonSigningClient.js +15 -15
  88. package/lib/wallet/CarbonWallet.js +9 -9
  89. package/lib/websocket/connector.js +3 -3
  90. package/lib/websocket/models.d.ts +1 -0
  91. package/package.json +1 -1
@@ -29,7 +29,7 @@ class BatchQueryClient {
29
29
  };
30
30
  if (typeof endpoint === "string") {
31
31
  // accept host.name:port and assume http protocol
32
- this.url = (0, rpcclient_1.hasProtocol)(endpoint) ? endpoint : "http://" + endpoint;
32
+ this.url = rpcclient_1.hasProtocol(endpoint) ? endpoint : "http://" + endpoint;
33
33
  }
34
34
  else {
35
35
  this.url = endpoint.url;
@@ -71,7 +71,7 @@ class BatchQueryClient {
71
71
  return;
72
72
  const requests = batch.map((s) => s.request);
73
73
  const requestIds = requests.map((request) => request.id);
74
- (0, http_1.http)("POST", this.url, this.headers, requests).then((raw) => {
74
+ http_1.http("POST", this.url, this.headers, requests).then((raw) => {
75
75
  // Requests with a single entry return as an object
76
76
  const arr = Array.isArray(raw) ? raw : [raw];
77
77
  arr.forEach((el, i) => {
@@ -79,8 +79,8 @@ class BatchQueryClient {
79
79
  if (!req)
80
80
  return;
81
81
  const { reject, resolve } = req;
82
- const response = (0, json_rpc_1.parseJsonRpcResponse)(el);
83
- if ((0, json_rpc_1.isJsonRpcErrorResponse)(response)) {
82
+ const response = json_rpc_1.parseJsonRpcResponse(el);
83
+ if (json_rpc_1.isJsonRpcErrorResponse(response)) {
84
84
  reject(new Error(JSON.stringify(response.error)));
85
85
  }
86
86
  else {
@@ -53,7 +53,7 @@ class CarbonQueryClient {
53
53
  constructor(tmClient) {
54
54
  this.tmClient = tmClient;
55
55
  this.baseClient = new stargate_1.QueryClient(this.tmClient);
56
- const rpcClient = (0, stargate_1.createProtobufRpcClient)(this.baseClient);
56
+ const rpcClient = stargate_1.createProtobufRpcClient(this.baseClient);
57
57
  this.chain = BlockchainClient_1.default.connectWithTm(this.tmClient);
58
58
  this.adl = new query_1.QueryClientImpl(rpcClient);
59
59
  this.alliance = new query_44.QueryClientImpl(rpcClient);
@@ -106,7 +106,7 @@ class CarbonQueryClient {
106
106
  };
107
107
  }
108
108
  getProtobufRpcClient() {
109
- return (0, stargate_1.createProtobufRpcClient)(this.baseClient);
109
+ return stargate_1.createProtobufRpcClient(this.baseClient);
110
110
  }
111
111
  }
112
112
  exports.default = CarbonQueryClient;
@@ -44,15 +44,15 @@ class ETHClient {
44
44
  ?
45
45
  this.tokenClient.getBlockchainV2(token.denom) == ETHClient.BLOCKCHAINV2_MAPPING[this.blockchain]
46
46
  :
47
- (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), api.network) == this.blockchain;
47
+ blockchain_1.blockchainForChainId(token.chainId.toNumber(), api.network) == this.blockchain;
48
48
  return isCorrectBlockchain &&
49
49
  token.tokenAddress.length == 40 &&
50
- token.bridgeAddress.toLowerCase() == (0, generic_1.stripHexPrefix)(lockProxyAddress) &&
50
+ token.bridgeAddress.toLowerCase() == generic_1.stripHexPrefix(lockProxyAddress) &&
51
51
  (!whitelistDenoms || whitelistDenoms.includes(token.denom)) &&
52
- this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress));
52
+ this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
53
53
  });
54
54
  const assetIds = tokens.map((token) => {
55
- return this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress));
55
+ return this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
56
56
  });
57
57
  const provider = this.getProvider();
58
58
  const contractAddress = this.getBalanceReaderAddress();
@@ -99,14 +99,14 @@ class ETHClient {
99
99
  }
100
100
  const carbonNetwork = networkConfig.network;
101
101
  const fromTokenId = fromToken.id;
102
- const fromTokenAddress = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
102
+ const fromTokenAddress = generic_1.appendHexPrefix(fromToken.tokenAddress);
103
103
  const toTokenDenom = toToken.denom;
104
104
  const recoveryAddressHex = ethers_1.ethers.utils.hexlify(util_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, carbonNetwork));
105
105
  const fromAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(fromTokenId));
106
106
  const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(toTokenDenom));
107
107
  const nonce = yield this.getTxNonce(fromAddress, params.nonce, rpcProvider);
108
108
  const contract = new ethers_1.ethers.Contract(this.getBridgeEntranceAddr(), eth_1.ABIs.bridgeEntrance, rpcProvider);
109
- const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
109
+ const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
110
110
  const tokenCreator = fromToken.creator;
111
111
  const targetAddressBytes = util_1.AddressUtils.SWTHAddress.getAddressBytes(tokenCreator, carbonNetwork);
112
112
  const targetProxyHash = ethers_1.ethers.utils.hexlify(targetAddressBytes);
@@ -135,9 +135,9 @@ class ETHClient {
135
135
  throw new Error("Minimum gas required: 150,000");
136
136
  }
137
137
  const networkConfig = this.getNetworkConfig();
138
- const assetId = (0, generic_1.appendHexPrefix)(token.tokenAddress);
139
- const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(token));
140
- const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
138
+ const assetId = generic_1.appendHexPrefix(token.tokenAddress);
139
+ const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
140
+ const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
141
141
  const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(token.id));
142
142
  const swthAddress = ethers_1.ethers.utils.hexlify(address);
143
143
  const contractAddress = this.getLockProxyAddress();
@@ -188,16 +188,16 @@ class ETHClient {
188
188
  return "insufficient balance";
189
189
  }
190
190
  const networkConfig = this.getNetworkConfig();
191
- const assetId = (0, generic_1.appendHexPrefix)(tokenWithExternalBalances.tokenAddress);
192
- const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(tokenWithExternalBalances));
193
- const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
191
+ const assetId = generic_1.appendHexPrefix(tokenWithExternalBalances.tokenAddress);
192
+ const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(tokenWithExternalBalances));
193
+ const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
194
194
  const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(tokenWithExternalBalances.id));
195
195
  const nonce = Math.floor(Math.random() * 1000000000); // random nonce to prevent replay attacks
196
196
  const message = ethers_1.ethers.utils.solidityKeccak256(["string", "address", "bytes", "bytes", "bytes", "uint256", "uint256", "uint256"], ["sendTokens", assetId, targetProxyHash, toAssetHash, feeAddress, amount, feeAmount, nonce]);
197
197
  // logger("sendDeposit message", message)
198
198
  let signatureResult;
199
199
  const { address, signature } = yield getSignatureCallback(message);
200
- const signatureBytes = ethers_1.ethers.utils.arrayify((0, generic_1.appendHexPrefix)(signature));
200
+ const signatureBytes = ethers_1.ethers.utils.arrayify(generic_1.appendHexPrefix(signature));
201
201
  const rsv = ethers_1.ethers.utils.splitSignature(signatureBytes);
202
202
  // logger("sign result", address, signature)
203
203
  signatureResult = {
@@ -236,7 +236,7 @@ class ETHClient {
236
236
  if (!feeInfo.deposit_fee) {
237
237
  throw new Error("unsupported token");
238
238
  }
239
- if ((0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), this.configProvider.getConfig().network) !== this.blockchain) {
239
+ if (blockchain_1.blockchainForChainId(token.chainId.toNumber(), this.configProvider.getConfig().network) !== this.blockchain) {
240
240
  throw new Error("unsupported token");
241
241
  }
242
242
  let feeAmount = ethers_1.ethers.BigNumber.from(feeInfo.deposit_fee);
@@ -302,7 +302,7 @@ class ETHClient {
302
302
  getTargetProxyHash(token) {
303
303
  const networkConfig = this.getNetworkConfig();
304
304
  const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
305
- const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
305
+ const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
306
306
  return addressHex;
307
307
  }
308
308
  getProvider() {
@@ -29,7 +29,7 @@ exports.HydrogenEndpoints = {
29
29
  const formatDateField = (value) => {
30
30
  if (typeof value !== "string")
31
31
  return null;
32
- return (0, dayjs_1.default)(value);
32
+ return dayjs_1.default(value);
33
33
  };
34
34
  // temporary function to parse okt/okc blockchain
35
35
  // to remove when automatic deposit/withdraw feature is deployed
@@ -69,13 +69,13 @@ class NEOClient {
69
69
  ?
70
70
  !!sdk.token.getBlockchainV2(token.denom) && (blockchain_1.BLOCKCHAIN_V2_TO_V1_MAPPING[sdk.token.getBlockchainV2(token.denom)] == this.blockchain)
71
71
  :
72
- (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), sdk.network) == this.blockchain;
72
+ blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain;
73
73
  return (isCorrectBlockchain || token.denom === "swth") && token.tokenAddress.length == 40 && token.bridgeAddress.length == 40;
74
74
  });
75
75
  const client = new Neon.rpc.RPCClient(url, "2.5.2"); // TODO: should we change the RPC version??
76
76
  // NOTE: fetching of tokens is chunked in sets of 15 as we may hit
77
77
  // the gas limit on the RPC node and error out otherwise
78
- const promises = (0, lodash_1.chunk)(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
78
+ const promises = lodash_1.chunk(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
79
79
  var _a, _b, _c;
80
80
  let acc = {};
81
81
  for (const token of partition) {
@@ -117,8 +117,8 @@ class NEOClient {
117
117
  const targetProxyHash = this.getTargetProxyHash(token);
118
118
  const toAssetHash = Neon.u.str2hexstring(token.id);
119
119
  const addressBytes = address_1.SWTHAddress.getAddressBytes(swthAddress, networkConfig.network);
120
- const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
121
- const zeroAddressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(constant_1.ZeroAddress));
120
+ const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
121
+ const zeroAddressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(constant_1.ZeroAddress));
122
122
  const amount = ethers_1.ethers.BigNumber.from(token.externalBalance);
123
123
  const feeAmount = ethers_1.ethers.BigNumber.from(feeAmountInput !== null && feeAmountInput !== void 0 ? feeAmountInput : "100000000");
124
124
  const feeAddress = feeAmount.isZero() ? zeroAddressHex : networkConfig.feeAddress;
@@ -165,7 +165,7 @@ class NEOClient {
165
165
  const fromAddress = util_1.AddressUtils.NEOAddress.publicKeyToAddress(publicKeyOutput.publicKey);
166
166
  const targetProxyHash = this.getTargetProxyHash(token);
167
167
  const toAssetHash = Neon.u.str2hexstring(token.id);
168
- const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(address));
168
+ const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
169
169
  const nonce = Math.floor(Math.random() * 1000000);
170
170
  if (amount.lt(feeAmount)) {
171
171
  throw new Error("Invalid amount");
@@ -201,7 +201,7 @@ class NEOClient {
201
201
  const fromAddress = ledger.scriptHash;
202
202
  const targetProxyHash = this.getTargetProxyHash(token);
203
203
  const toAssetHash = Neon.u.str2hexstring(token.id);
204
- const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(address));
204
+ const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
205
205
  const feeAddress = networkConfig.feeAddress;
206
206
  const nonce = Math.floor(Math.random() * 1000000);
207
207
  if (amount.lt(feeAmount)) {
@@ -321,7 +321,7 @@ class NEOClient {
321
321
  getTargetProxyHash(token) {
322
322
  const networkConfig = this.getNetworkConfig();
323
323
  const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
324
- const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
324
+ const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
325
325
  return addressHex;
326
326
  }
327
327
  getNetworkConfig() {
@@ -67,22 +67,26 @@ class TokenClient {
67
67
  initialize() {
68
68
  return __awaiter(this, void 0, void 0, function* () {
69
69
  this.setCommonAssetConfig();
70
- // non-blocking reload
71
70
  try {
72
- this.reloadDenomGeckoMap().finally(() => {
73
- this.reloadUSDValues();
74
- this.reloadDenomTraces();
75
- });
71
+ yield Promise.all([
72
+ this.reloadTokens(),
73
+ this.reloadWrapperMap(),
74
+ this.getBridges(),
75
+ ]);
76
76
  }
77
- catch (error) {
78
- console.error("failed to reload usd values");
79
- console.error(error);
77
+ finally {
78
+ // non-blocking reload
79
+ try {
80
+ this.reloadDenomGeckoMap().finally(() => {
81
+ this.reloadUSDValues();
82
+ this.reloadDenomTraces();
83
+ });
84
+ }
85
+ catch (error) {
86
+ console.error("failed to reload usd values");
87
+ console.error(error);
88
+ }
80
89
  }
81
- yield Promise.all([
82
- this.reloadWrapperMap(),
83
- this.reloadTokens(),
84
- this.getBridges(),
85
- ]);
86
90
  });
87
91
  }
88
92
  registerGeckoIdMap(map) {
@@ -565,7 +569,7 @@ class TokenClient {
565
569
  if (!token)
566
570
  return undefined;
567
571
  const bridge = this.getBridgeFromToken(token);
568
- if (!bridge || !(0, blockchain_1.isIbcBridge)(bridge))
572
+ if (!bridge || !blockchain_1.isIbcBridge(bridge))
569
573
  return undefined;
570
574
  return bridge.chain_id_name;
571
575
  }
@@ -574,7 +578,7 @@ class TokenClient {
574
578
  // get swth on osmosis
575
579
  const osmoTmClient = yield tendermint_rpc_1.Tendermint34Client.connect(network_1.publicRpcNodes.Osmosis);
576
580
  const osmoClient = new stargate_1.QueryClient(osmoTmClient);
577
- const osmosRpcClient = (0, stargate_1.createProtobufRpcClient)(osmoClient);
581
+ const osmosRpcClient = stargate_1.createProtobufRpcClient(osmoClient);
578
582
  const osmoIbcClient = new query_1.QueryClientImpl(osmosRpcClient);
579
583
  const osmoDenomTraces = yield osmoIbcClient.DenomTraces({
580
584
  pagination: pagination_1.PageRequest.fromPartial({
@@ -667,7 +671,7 @@ class TokenClient {
667
671
  processTokenPrices(tokenPrices) {
668
672
  return tokenPrices.reduce((prevPrices, price) => {
669
673
  const newPrev = prevPrices;
670
- newPrev[price.denom] = (0, number_1.bnOrZero)(price.twap).shiftedBy(-constant_1.decTypeDecimals);
674
+ newPrev[price.denom] = number_1.bnOrZero(price.twap).shiftedBy(-constant_1.decTypeDecimals);
671
675
  return newPrev;
672
676
  }, {});
673
677
  }
@@ -77,12 +77,12 @@ class ZILClient {
77
77
  ?
78
78
  !!sdk.token.getBlockchainV2(token.denom) && (blockchain_1.BLOCKCHAIN_V2_TO_V1_MAPPING[sdk.token.getBlockchainV2(token.denom)] == this.blockchain)
79
79
  :
80
- (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), sdk.network) == this.blockchain;
80
+ blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain;
81
81
  return isCorrectBlockchain && token.tokenAddress.length == 40 && (!whitelistDenoms || whitelistDenoms.includes(token.denom));
82
82
  });
83
83
  const requests = tokens.map((token) => token.tokenAddress === zeroAddress
84
- ? (0, exports.balanceBatchRequest)(address.replace(/^0x/i, ""))
85
- : (0, exports.tokenBalanceBatchRequest)(token.tokenAddress, address));
84
+ ? exports.balanceBatchRequest(address.replace(/^0x/i, ""))
85
+ : exports.tokenBalanceBatchRequest(token.tokenAddress, address));
86
86
  const response = yield fetch(this.getProviderUrl(), {
87
87
  method: "post",
88
88
  headers: { "content-type": "application/json" },
@@ -107,7 +107,7 @@ class ZILClient {
107
107
  // if (!isValidAddress) {
108
108
  // throw new Error("invalid address")
109
109
  // }
110
- return (0, zilliqa_1.fromBech32Address)(bech32Address).toLowerCase().substr(2);
110
+ return zilliqa_1.fromBech32Address(bech32Address).toLowerCase().substr(2);
111
111
  });
112
112
  }
113
113
  // see examplesV2/zil_client.ts on how to confirm the transactions
@@ -153,7 +153,7 @@ class ZILClient {
153
153
  zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
154
154
  }
155
155
  const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
156
- const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
156
+ const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(zilAddress));
157
157
  if (balanceAndNonceResp.error !== undefined) {
158
158
  throw new Error(balanceAndNonceResp.error.message);
159
159
  }
@@ -171,7 +171,7 @@ class ZILClient {
171
171
  vname: "spender",
172
172
  type: "ByStr20",
173
173
  // TODO: Check if bridgeAddress corresponds to carbon token lock_proxy_hash
174
- value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : (0, generic_1.appendHexPrefix)(token.bridgeAddress),
174
+ value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : generic_1.appendHexPrefix(token.bridgeAddress),
175
175
  },
176
176
  {
177
177
  vname: "amount",
@@ -189,7 +189,7 @@ class ZILClient {
189
189
  }
190
190
  checkAllowanceZRC2(token, owner, spender) {
191
191
  return __awaiter(this, void 0, void 0, function* () {
192
- const contractAddress = (0, generic_1.appendHexPrefix)(token.tokenAddress);
192
+ const contractAddress = generic_1.appendHexPrefix(token.tokenAddress);
193
193
  const zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
194
194
  const resp = yield zilliqa.blockchain.getSmartContractSubState(contractAddress, "allowances", [owner, spender]);
195
195
  if (resp.error !== undefined) {
@@ -211,13 +211,13 @@ class ZILClient {
211
211
  }
212
212
  const carbonNetwork = networkConfig.network;
213
213
  const fromTokenId = fromToken.id;
214
- const fromTokenAddr = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
214
+ const fromTokenAddr = generic_1.appendHexPrefix(fromToken.tokenAddress);
215
215
  const toTokenDenom = toToken.denom;
216
- const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(fromToken));
216
+ const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(fromToken));
217
217
  const recoveryAddressHex = ethers_1.ethers.utils.hexlify(index_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, carbonNetwork));
218
218
  const fromAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(fromTokenId));
219
219
  const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(toTokenDenom));
220
- const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
220
+ const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
221
221
  const contractAddress = this.getBridgeEntranceAddr();
222
222
  let zilliqa;
223
223
  if (typeof signer === "string") {
@@ -232,7 +232,7 @@ class ZILClient {
232
232
  zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
233
233
  }
234
234
  const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
235
- const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(fromAddress));
235
+ const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(fromAddress));
236
236
  if (balanceAndNonceResp.error !== undefined) {
237
237
  throw new Error(balanceAndNonceResp.error.message);
238
238
  }
@@ -309,13 +309,13 @@ class ZILClient {
309
309
  return __awaiter(this, void 0, void 0, function* () {
310
310
  const { address, amount, token, gasPrice, gasLimit, zilAddress, signer } = params;
311
311
  const networkConfig = this.getNetworkConfig();
312
- const assetId = (0, generic_1.appendHexPrefix)(token.tokenAddress);
313
- const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(token));
314
- const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
312
+ const assetId = generic_1.appendHexPrefix(token.tokenAddress);
313
+ const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
314
+ const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
315
315
  const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(token.id));
316
316
  const swthAddress = ethers_1.ethers.utils.hexlify(address);
317
317
  // TODO: Check if bridgeAddress corresponds to carbon token lock_proxy_hash
318
- const contractAddress = (0, generic_1.appendHexPrefix)(token.bridgeAddress);
318
+ const contractAddress = generic_1.appendHexPrefix(token.bridgeAddress);
319
319
  let zilliqa;
320
320
  if (typeof signer === "string") {
321
321
  zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
@@ -329,7 +329,7 @@ class ZILClient {
329
329
  zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
330
330
  }
331
331
  const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
332
- const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
332
+ const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(zilAddress));
333
333
  if (balanceAndNonceResp.error !== undefined) {
334
334
  throw new Error(balanceAndNonceResp.error.message);
335
335
  }
@@ -414,7 +414,7 @@ class ZILClient {
414
414
  getTargetProxyHash(token) {
415
415
  const networkConfig = this.getNetworkConfig();
416
416
  const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
417
- const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
417
+ const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
418
418
  return addressHex;
419
419
  }
420
420
  getNetworkConfig() {
@@ -10,6 +10,9 @@ export interface InternalTransfer {
10
10
  transactionMemo: string;
11
11
  transactionBlockHeight: Long;
12
12
  transactionBlockTime?: Date;
13
+ senderUsername: string;
14
+ receiverUsername: string;
15
+ transactionCode: number;
13
16
  }
14
17
  export interface Coin {
15
18
  denom: string;
@@ -16,6 +16,9 @@ const baseInternalTransfer = {
16
16
  transactionHash: "",
17
17
  transactionMemo: "",
18
18
  transactionBlockHeight: long_1.default.UZERO,
19
+ senderUsername: "",
20
+ receiverUsername: "",
21
+ transactionCode: 0,
19
22
  };
20
23
  exports.InternalTransfer = {
21
24
  encode(message, writer = minimal_1.default.Writer.create()) {
@@ -26,19 +29,28 @@ exports.InternalTransfer = {
26
29
  writer.uint32(18).string(message.receiver);
27
30
  }
28
31
  if (message.transactionHash !== "") {
29
- writer.uint32(42).string(message.transactionHash);
32
+ writer.uint32(26).string(message.transactionHash);
30
33
  }
31
34
  for (const v of message.coins) {
32
- exports.Coin.encode(v, writer.uint32(50).fork()).ldelim();
35
+ exports.Coin.encode(v, writer.uint32(34).fork()).ldelim();
33
36
  }
34
37
  if (message.transactionMemo !== "") {
35
- writer.uint32(58).string(message.transactionMemo);
38
+ writer.uint32(42).string(message.transactionMemo);
36
39
  }
37
40
  if (!message.transactionBlockHeight.isZero()) {
38
- writer.uint32(64).uint64(message.transactionBlockHeight);
41
+ writer.uint32(48).uint64(message.transactionBlockHeight);
39
42
  }
40
43
  if (message.transactionBlockTime !== undefined) {
41
- timestamp_1.Timestamp.encode(toTimestamp(message.transactionBlockTime), writer.uint32(74).fork()).ldelim();
44
+ timestamp_1.Timestamp.encode(toTimestamp(message.transactionBlockTime), writer.uint32(58).fork()).ldelim();
45
+ }
46
+ if (message.senderUsername !== "") {
47
+ writer.uint32(66).string(message.senderUsername);
48
+ }
49
+ if (message.receiverUsername !== "") {
50
+ writer.uint32(74).string(message.receiverUsername);
51
+ }
52
+ if (message.transactionCode !== 0) {
53
+ writer.uint32(80).uint32(message.transactionCode);
42
54
  }
43
55
  return writer;
44
56
  },
@@ -56,21 +68,30 @@ exports.InternalTransfer = {
56
68
  case 2:
57
69
  message.receiver = reader.string();
58
70
  break;
59
- case 5:
71
+ case 3:
60
72
  message.transactionHash = reader.string();
61
73
  break;
62
- case 6:
74
+ case 4:
63
75
  message.coins.push(exports.Coin.decode(reader, reader.uint32()));
64
76
  break;
65
- case 7:
77
+ case 5:
66
78
  message.transactionMemo = reader.string();
67
79
  break;
68
- case 8:
80
+ case 6:
69
81
  message.transactionBlockHeight = reader.uint64();
70
82
  break;
71
- case 9:
83
+ case 7:
72
84
  message.transactionBlockTime = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
73
85
  break;
86
+ case 8:
87
+ message.senderUsername = reader.string();
88
+ break;
89
+ case 9:
90
+ message.receiverUsername = reader.string();
91
+ break;
92
+ case 10:
93
+ message.transactionCode = reader.uint32();
94
+ break;
74
95
  default:
75
96
  reader.skipType(tag & 7);
76
97
  break;
@@ -108,6 +129,18 @@ exports.InternalTransfer = {
108
129
  object.transactionBlockTime !== null
109
130
  ? fromJsonTimestamp(object.transactionBlockTime)
110
131
  : undefined;
132
+ message.senderUsername =
133
+ object.senderUsername !== undefined && object.senderUsername !== null
134
+ ? String(object.senderUsername)
135
+ : "";
136
+ message.receiverUsername =
137
+ object.receiverUsername !== undefined && object.receiverUsername !== null
138
+ ? String(object.receiverUsername)
139
+ : "";
140
+ message.transactionCode =
141
+ object.transactionCode !== undefined && object.transactionCode !== null
142
+ ? Number(object.transactionCode)
143
+ : 0;
111
144
  return message;
112
145
  },
113
146
  toJSON(message) {
@@ -128,10 +161,16 @@ exports.InternalTransfer = {
128
161
  (obj.transactionBlockHeight = (message.transactionBlockHeight || long_1.default.UZERO).toString());
129
162
  message.transactionBlockTime !== undefined &&
130
163
  (obj.transactionBlockTime = message.transactionBlockTime.toISOString());
164
+ message.senderUsername !== undefined &&
165
+ (obj.senderUsername = message.senderUsername);
166
+ message.receiverUsername !== undefined &&
167
+ (obj.receiverUsername = message.receiverUsername);
168
+ message.transactionCode !== undefined &&
169
+ (obj.transactionCode = message.transactionCode);
131
170
  return obj;
132
171
  },
133
172
  fromPartial(object) {
134
- var _a, _b, _c, _d, _e, _f;
173
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j;
135
174
  const message = Object.assign({}, baseInternalTransfer);
136
175
  message.sender = (_a = object.sender) !== null && _a !== void 0 ? _a : "";
137
176
  message.receiver = (_b = object.receiver) !== null && _b !== void 0 ? _b : "";
@@ -144,6 +183,9 @@ exports.InternalTransfer = {
144
183
  ? long_1.default.fromValue(object.transactionBlockHeight)
145
184
  : long_1.default.UZERO;
146
185
  message.transactionBlockTime = (_f = object.transactionBlockTime) !== null && _f !== void 0 ? _f : undefined;
186
+ message.senderUsername = (_g = object.senderUsername) !== null && _g !== void 0 ? _g : "";
187
+ message.receiverUsername = (_h = object.receiverUsername) !== null && _h !== void 0 ? _h : "";
188
+ message.transactionCode = (_j = object.transactionCode) !== null && _j !== void 0 ? _j : 0;
147
189
  return message;
148
190
  },
149
191
  };
@@ -177,22 +177,22 @@ exports.QueryTradesRequest = {
177
177
  writer.uint32(18).string(message.market);
178
178
  }
179
179
  if (!message.beforeId.isZero()) {
180
- writer.uint32(32).uint64(message.beforeId);
180
+ writer.uint32(24).uint64(message.beforeId);
181
181
  }
182
182
  if (!message.afterId.isZero()) {
183
- writer.uint32(40).uint64(message.afterId);
183
+ writer.uint32(32).uint64(message.afterId);
184
184
  }
185
185
  if (message.orderId !== "") {
186
- writer.uint32(58).string(message.orderId);
186
+ writer.uint32(42).string(message.orderId);
187
187
  }
188
188
  if (!message.afterBlock.isZero()) {
189
- writer.uint32(64).uint64(message.afterBlock);
189
+ writer.uint32(48).uint64(message.afterBlock);
190
190
  }
191
191
  if (!message.beforeBlock.isZero()) {
192
- writer.uint32(72).uint64(message.beforeBlock);
192
+ writer.uint32(56).uint64(message.beforeBlock);
193
193
  }
194
194
  if (message.pagination !== undefined) {
195
- pagination_1.PageRequest.encode(message.pagination, writer.uint32(82).fork()).ldelim();
195
+ pagination_1.PageRequest.encode(message.pagination, writer.uint32(66).fork()).ldelim();
196
196
  }
197
197
  return writer;
198
198
  },
@@ -209,22 +209,22 @@ exports.QueryTradesRequest = {
209
209
  case 2:
210
210
  message.market = reader.string();
211
211
  break;
212
- case 4:
212
+ case 3:
213
213
  message.beforeId = reader.uint64();
214
214
  break;
215
- case 5:
215
+ case 4:
216
216
  message.afterId = reader.uint64();
217
217
  break;
218
- case 7:
218
+ case 5:
219
219
  message.orderId = reader.string();
220
220
  break;
221
- case 8:
221
+ case 6:
222
222
  message.afterBlock = reader.uint64();
223
223
  break;
224
- case 9:
224
+ case 7:
225
225
  message.beforeBlock = reader.uint64();
226
226
  break;
227
- case 10:
227
+ case 8:
228
228
  message.pagination = pagination_1.PageRequest.decode(reader, reader.uint32());
229
229
  break;
230
230
  default:
@@ -420,7 +420,7 @@ exports.QueryTradesForPositionRequest = {
420
420
  writer.uint32(24).uint64(message.openedBlockHeight);
421
421
  }
422
422
  if (message.pagination !== undefined) {
423
- pagination_1.PageRequest.encode(message.pagination, writer.uint32(42).fork()).ldelim();
423
+ pagination_1.PageRequest.encode(message.pagination, writer.uint32(34).fork()).ldelim();
424
424
  }
425
425
  return writer;
426
426
  },
@@ -440,7 +440,7 @@ exports.QueryTradesForPositionRequest = {
440
440
  case 3:
441
441
  message.openedBlockHeight = reader.uint64();
442
442
  break;
443
- case 5:
443
+ case 4:
444
444
  message.pagination = pagination_1.PageRequest.decode(reader, reader.uint32());
445
445
  break;
446
446
  default:
@@ -159,7 +159,7 @@ exports.QueryProposalsRequest = {
159
159
  const message = Object.assign({}, baseQueryProposalsRequest);
160
160
  message.proposalStatus =
161
161
  object.proposalStatus !== undefined && object.proposalStatus !== null
162
- ? (0, gov_1.proposalStatusFromJSON)(object.proposalStatus)
162
+ ? gov_1.proposalStatusFromJSON(object.proposalStatus)
163
163
  : 0;
164
164
  message.voter =
165
165
  object.voter !== undefined && object.voter !== null
@@ -178,7 +178,7 @@ exports.QueryProposalsRequest = {
178
178
  toJSON(message) {
179
179
  const obj = {};
180
180
  message.proposalStatus !== undefined &&
181
- (obj.proposalStatus = (0, gov_1.proposalStatusToJSON)(message.proposalStatus));
181
+ (obj.proposalStatus = gov_1.proposalStatusToJSON(message.proposalStatus));
182
182
  message.voter !== undefined && (obj.voter = message.voter);
183
183
  message.depositor !== undefined && (obj.depositor = message.depositor);
184
184
  message.pagination !== undefined &&
@@ -300,7 +300,7 @@ exports.MsgVote = {
300
300
  : "";
301
301
  message.option =
302
302
  object.option !== undefined && object.option !== null
303
- ? (0, gov_1.voteOptionFromJSON)(object.option)
303
+ ? gov_1.voteOptionFromJSON(object.option)
304
304
  : 0;
305
305
  message.metadata =
306
306
  object.metadata !== undefined && object.metadata !== null
@@ -314,7 +314,7 @@ exports.MsgVote = {
314
314
  (obj.proposalId = (message.proposalId || long_1.default.UZERO).toString());
315
315
  message.voter !== undefined && (obj.voter = message.voter);
316
316
  message.option !== undefined &&
317
- (obj.option = (0, gov_1.voteOptionToJSON)(message.option));
317
+ (obj.option = gov_1.voteOptionToJSON(message.option));
318
318
  message.metadata !== undefined && (obj.metadata = message.metadata);
319
319
  return obj;
320
320
  },
@@ -159,7 +159,7 @@ exports.QueryProposalsRequest = {
159
159
  const message = Object.assign({}, baseQueryProposalsRequest);
160
160
  message.proposalStatus =
161
161
  object.proposalStatus !== undefined && object.proposalStatus !== null
162
- ? (0, gov_1.proposalStatusFromJSON)(object.proposalStatus)
162
+ ? gov_1.proposalStatusFromJSON(object.proposalStatus)
163
163
  : 0;
164
164
  message.voter =
165
165
  object.voter !== undefined && object.voter !== null
@@ -178,7 +178,7 @@ exports.QueryProposalsRequest = {
178
178
  toJSON(message) {
179
179
  const obj = {};
180
180
  message.proposalStatus !== undefined &&
181
- (obj.proposalStatus = (0, gov_1.proposalStatusToJSON)(message.proposalStatus));
181
+ (obj.proposalStatus = gov_1.proposalStatusToJSON(message.proposalStatus));
182
182
  message.voter !== undefined && (obj.voter = message.voter);
183
183
  message.depositor !== undefined && (obj.depositor = message.depositor);
184
184
  message.pagination !== undefined &&