Skip to content

Commit

Permalink
Merge pull request #503 from crypto-com/dev
Browse files Browse the repository at this point in the history
Release v0.2.3 to production - NFT support phase 1
  • Loading branch information
crypto-eddy authored Jun 17, 2021
2 parents bc09b9a + fcd3813 commit 3807ec2
Show file tree
Hide file tree
Showing 49 changed files with 2,753 additions and 391 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@ All notable changes to this project will be documented in this file.

*Released*

## [v0.2.3] - 2021-06-17

### Additions
- Implemented search for the wallet list view
- Added support for croeseid testnet version 3
- Fix governance votes tally numbers
- Add a new NFT UI tab and NFT section on the home screen
- Load, persist in the DB, and show to the UI all current accounts NFTs
- Add support to send and receive NFTs: Sign and broadcast NFT transactions
- Add capability to load the previous account NFT related transaction history: Send, Receive, Mint, Issue, etc, ...

## [v0.2.2] - 2021-05-24

### Additions
Expand Down
3 changes: 2 additions & 1 deletion electron/IpcMain.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Bytes } from '@crypto-com/chain-jslib/lib/dist/utils/bytes/bytes';
import {Bytes} from "@crypto-org-chain/chain-jslib/lib/dist/utils/bytes/bytes";

const { ipcMain } = require('electron');
import { LedgerSignerNative } from './LedgerSignerNative';
export class IpcMain {
Expand Down
17 changes: 11 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chain-desktop-wallet",
"version": "0.2.2",
"version": "0.2.3",
"description": "Crypto.com Chain Desktop Wallet App",
"repository": "github:crypto-com/chain-desktop-wallet",
"author": "Crypto.org <chain@crypto.org>",
Expand All @@ -13,7 +13,7 @@
"@babel/helper-builder-react-jsx": "^7.10.4",
"@babel/helper-builder-react-jsx-experimental": "^7.12.11",
"@cosmjs/stargate": "^0.24.0-alpha.22",
"@crypto-com/chain-jslib": "0.0.15",
"@crypto-org-chain/chain-jslib": "0.0.22",
"@ledgerhq/hw-transport-node-hid": "^5.41.0",
"@ledgerhq/hw-transport-webhid": "^5.38.0",
"@ledgerhq/hw-transport-webusb": "^5.38.0",
Expand Down Expand Up @@ -49,6 +49,7 @@
"react": "^17.0.1",
"react-copy-to-clipboard": "^5.0.2",
"react-dom": "^17.0.1",
"react-player": "^2.9.0",
"react-refresh": "^0.8.3",
"react-router-dom": "^5.2.0",
"react-script": "^2.0.5",
Expand All @@ -57,7 +58,6 @@
"scrypt-js": "^3.0.1",
"stylelint-config-css-modules": "^2.2.0",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-standard": "^21.0.0",
"stylelint-declaration-block-no-ignored-properties": "^2.3.0",
"stylelint-order": "^4.1.0",
"ts-pnp": "1.2.0",
Expand Down Expand Up @@ -168,6 +168,7 @@
"@typescript-eslint/eslint-plugin": "4.5.0",
"@typescript-eslint/parser": "4.5.0",
"@umijs/fabric": "2.3.1",
"autoprefixer": "10.2.5",
"babel-eslint": "10.1.0",
"babel-jest": "26.6.0",
"babel-loader": "8.1.0",
Expand Down Expand Up @@ -197,7 +198,6 @@
"eslint-webpack-plugin": "^2.1.0",
"file-loader": "6.1.1",
"fs-extra": "9.0.1",
"autoprefixer": "10.2.5",
"html-webpack-plugin": "4.5.0",
"husky": "4.3.0",
"identity-obj-proxy": "3.0.0",
Expand Down Expand Up @@ -228,7 +228,8 @@
"sass-loader": "8.0.2",
"semver": "7.3.2",
"style-loader": "1.3.0",
"stylelint": "13.7.2",
"stylelint": "13.13.1",
"stylelint-config-standard": "^22.0.0",
"terser-webpack-plugin": "4.2.3",
"wait-on": "5.2.1",
"webpack": "4.44.2",
Expand Down Expand Up @@ -300,6 +301,10 @@
"ssri": "8.0.1",
"hosted-git-info": "3.0.8",
"underscore": "1.12.1",
"trim": "0.0.3"
"trim": "0.0.3",
"dns-packet": "5.2.2",
"css-what": "5.0.1",
"trim-newlines": "3.0.1",
"normalize-url": "5.3.1"
}
}
Binary file added src/assets/nft-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 21 additions & 1 deletion src/config/StaticConfig.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { CroNetwork } from '@crypto-com/chain-jslib/lib/dist/core/cro';
import { CroNetwork } from '@crypto-org-chain/chain-jslib/lib/dist/core/cro';
import { getRandomId } from '../crypto/RandomGen';

export const APP_DB_NAMESPACE = 'data-store';
export const MARKET_API_BASE_URL = 'https://crypto.org/api';
export const NV_GRAPHQL_API_ENDPOINT = 'https://crypto.com/nft-api/graphql';
export const DEFAULT_CLIENT_MEMO = 'client:chain-desktop-app';

export const NodePorts = {
Expand Down Expand Up @@ -51,6 +52,23 @@ const TestNetConfig: WalletConfig = {
},
};

const TestNetCroeseid3: WalletConfig = {
enabled: true,
name: 'TESTNET CROESEID 3',
derivationPath: "m/44'/1'/0'/0/0",
explorerUrl: 'https://crypto.org/explorer/croeseid3',
indexingUrl: 'https://crypto.org/explorer/croeseid3/api/v1/',
nodeUrl: CroNetwork.TestnetCroeseid3.defaultNodeUrl,
network: CroNetwork.TestnetCroeseid3,
disableDefaultClientMemo: false,
enableGeneralSettings: false,
analyticsDisabled: false,
fee: {
gasLimit: FIXED_DEFAULT_GAS_LIMIT,
networkFee: FIXED_DEFAULT_FEE,
},
};

// This constant value is used when actual values are not known yet
// For instance :
export const NOT_KNOWN_YET_VALUE = 'TO_BE_DECIDED';
Expand Down Expand Up @@ -104,6 +122,7 @@ export const DefaultWalletConfigs = {
TestNetConfig,
MainNetConfig,
CustomDevNet,
TestNetCroeseid3,
};

// Every created wallet get initialized with a new CRO asset
Expand Down Expand Up @@ -134,4 +153,5 @@ export type Network = {
validatorPubKeyPrefix: string;
validatorAddressPrefix: string;
coin: { baseDenom: string; croDenom: string };
rpcUrl?: string;
};
2 changes: 1 addition & 1 deletion src/crypto/Cryptographer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import scrypt from 'scrypt-js';
import { utils } from '@crypto-com/chain-jslib';
import { utils } from '@crypto-org-chain/chain-jslib';
import { AES, enc, lib, mode, pad } from 'crypto-js';
import { EncryptionResult, HashResult, InitialVector } from '../models/SecretStorage';

Expand Down
Loading

0 comments on commit 3807ec2

Please sign in to comment.