Skip to content

Commit

Permalink
Merge pull request #17 from dragonchain/master
Browse files Browse the repository at this point in the history
Release 4.2.1
  • Loading branch information
cheeseandcereal committed Dec 23, 2019
2 parents d27cd60 + 71a3315 commit a732ac8
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 4.2.1

- **Feature:**
- Typing support for indexingEnabled return from getStatus
- **Development:**
- Deprecate ETC Testnet (Morden)

## 4.2.0

- **Feature:**
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dragonchain-sdk",
"version": "4.2.0",
"version": "4.2.1",
"description": "Dragonchain SDK for Node.JS and the Browser",
"license": "Apache-2.0",
"homepage": "https://github.com/dragonchain/dragonchain-sdk-javascript#readme",
Expand Down
7 changes: 5 additions & 2 deletions src/interfaces/DragonchainClientInterfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,6 @@ export interface ListAPIKeyResponse {
* "eth_mainnet": "0xa5C32bE6323Cd5E2BC87468F5F2D91849cDb3A3D",
* "eth_ropsten": "0x558c01dd95335749a29D040b24a183D8f7637BC8",
* "etc_mainnet": "0xf7A802DB95D783254A1f29F47785BA080daBF1db",
* "etc_morden": "0x5dd0ac246B54f0267Ee4f33a074382D19AD0fa66",
* "btc_mainnet": "17eK35gAem9Pezzs1RdntsoK9kK8dsF7DQ",
* "btc_testnet3": "mrgFVPYFMojNsx3gih84PSbQCDiB4rnoQJ"
* }
Expand All @@ -439,7 +438,6 @@ export interface PublicBlockchainAddressListResponse {
eth_mainnet?: string;
etc_mainnet?: string;
eth_ropsten?: string;
etc_morden?: string;
btc_mainnet?: string;
btc_testnet3?: string;
}
Expand Down Expand Up @@ -651,6 +649,7 @@ export interface SmartContractList {
* "hashAlgo": "blake2b",
* "version": "3.3.1",
* "encryptionAlgo": "secp256k1"
* "indexingEnabled": true
* }
* ```
*/
Expand Down Expand Up @@ -683,6 +682,10 @@ export interface L1DragonchainStatusResult {
* Encryption algorithm used for blocks on this chain
*/
encryptionAlgo: string;
/**
* Whether or not indexing is enabled on this chain
*/
indexingEnabled: boolean;
}

/**
Expand Down
6 changes: 3 additions & 3 deletions src/services/dragonchain-client/DragonchainClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,7 @@ export class DragonchainClient {
rpcAddress?: string;
/**
* The ethereum chain id to use. Will automatically derive this if providing a custom rpcAddress. This should be an integer.
* Without providing a custom rpcAddress, Dragonchain manages and supports: 1=ETH Mainnet|3=ETH Ropsten|61=ETC Mainnet|62=ETC Morden
* Without providing a custom rpcAddress, Dragonchain manages and supports: 1=ETH Mainnet|3=ETH Ropsten|61=ETC Mainnet
*/
chainId?: number;
}) => {
Expand Down Expand Up @@ -1028,7 +1028,7 @@ export class DragonchainClient {
rpcAddress?: string;
/**
* The ethereum chain id to use. Will automatically derive this if providing a custom rpcAddress. This should be an integer.
* Without providing a custom rpcAddress, Dragonchain manages and supports: 1=ETH Mainnet|3=ETH Ropsten|61=ETC Mainnet|2=ETC Morden
* Without providing a custom rpcAddress, Dragonchain manages and supports: 1=ETH Mainnet|3=ETH Ropsten|61=ETC Mainnet
*/
chainId?: number;
}) => {
Expand Down Expand Up @@ -1362,7 +1362,7 @@ export class DragonchainClient {
/**
* The ethereum network that the transaction is for (ETH/ETC mainnet or testnet)
*/
network: 'ETH_MAINNET' | 'ETH_ROPSTEN' | 'ETC_MAINNET' | 'ETC_MORDEN';
network: 'ETH_MAINNET' | 'ETH_ROPSTEN' | 'ETC_MAINNET';
/**
* The (hex-encoded) address to send the transaction to
*/
Expand Down

0 comments on commit a732ac8

Please sign in to comment.