From c3afc13dd660348e99b727c2dd01930eec8d99c3 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 14 Jan 2019 15:50:32 +0100 Subject: Upgrade bignumber.js version --- packages/website/ts/blockchain.ts | 2 +- packages/website/ts/components/fill_order.tsx | 4 ++-- packages/website/ts/utils/utils.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index 37f746f7c..ea5a59340 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -944,7 +944,7 @@ export class Blockchain { try { const gasInfo = await backendClient.getGasInfoAsync(); const gasPriceInGwei = new BigNumber(gasInfo.fast / 10); - const gasPriceInWei = gasPriceInGwei.mul(1000000000); + const gasPriceInWei = gasPriceInGwei.multipliedBy(1000000000); this._defaultGasPrice = gasPriceInWei; } catch (err) { return; diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx index 7fee8c4df..95a3671c4 100644 --- a/packages/website/ts/components/fill_order.tsx +++ b/packages/website/ts/components/fill_order.tsx @@ -205,7 +205,7 @@ export class FillOrder extends React.Component { amount: orderMakerAmount .times(takerAssetToken.amount) .div(orderTakerAmount) - .floor(), + .integerValue(BigNumber.ROUND_FLOOR), symbol: makerToken.symbol, }; const fillAssetToken = { @@ -219,7 +219,7 @@ export class FillOrder extends React.Component { const orderReceiveAmountBigNumber = orderMakerAmount .times(this.props.orderFillAmount) .dividedBy(orderTakerAmount) - .floor(); + .integerValue(BigNumber.ROUND_FLOOR); orderReceiveAmount = this._formatCurrencyAmount(orderReceiveAmountBigNumber, makerToken.decimals); } const isUserMaker = diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index 890f1553a..e84f9d0cc 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -394,7 +394,7 @@ export const utils = { }, getUsdValueFormattedAmount(amount: BigNumber, decimals: number, price: BigNumber): string { const unitAmount = Web3Wrapper.toUnitAmount(amount, decimals); - const value = unitAmount.mul(price); + const value = unitAmount.multipliedBy(price); return utils.format(value, constants.NUMERAL_USD_FORMAT); }, openUrl(url: string): void { -- cgit From b22a6b4e09117edf9b234010c5a4bd70e2604b03 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 18 Jan 2019 13:12:19 +0100 Subject: Create Python tools section and add missing Python packages to it --- .../website/ts/pages/documentation/docs_home.tsx | 69 ++++++++++++++++------ packages/website/ts/types.ts | 5 +- 2 files changed, 53 insertions(+), 21 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/documentation/docs_home.tsx b/packages/website/ts/pages/documentation/docs_home.tsx index d11cf02fb..f708f6d77 100644 --- a/packages/website/ts/pages/documentation/docs_home.tsx +++ b/packages/website/ts/pages/documentation/docs_home.tsx @@ -55,7 +55,7 @@ const TUTORIALS: TutorialInfo[] = [ ]; const CATEGORY_TO_PACKAGES: ObjectMap = { - [Categories.ZeroExProtocol]: [ + [Categories.ZeroExProtocolTypescript]: [ { description: 'A library for interacting with the 0x protocol. It is a high level package which combines a number of smaller specific-purpose packages such as [order-utils](https://0x.org/docs/order-utils) and [contract-wrappers](https://0x.org/docs/contract-wrappers).', @@ -90,23 +90,6 @@ const CATEGORY_TO_PACKAGES: ObjectMap = { to: WebsitePaths.SmartContracts, }, }, - { - description: - "A Python library for interacting with 0x orders. Generate an orderHash, sign an order, validate it's signature and more.", - link: { - title: '0x-order-utils.py', - to: 'http://0x-order-utils-py.s3-website-us-east-1.amazonaws.com/', - shouldOpenInNewTab: true, - }, - }, - { - description: 'A Python Standard Relayer API client', - link: { - title: '0x-sra-client.py', - to: 'https://pypi.org/project/0x-sra-client/', - shouldOpenInNewTab: true, - }, - }, { description: 'An http & websocket client for interacting with relayers that have implemented the [Standard Relayer API](https://github.com/0xProject/standard-relayer-api)', @@ -190,6 +173,51 @@ const CATEGORY_TO_PACKAGES: ObjectMap = { }, }, ], + [Categories.ZeroExProtocolPython]: [ + { + description: + "A library for interacting with 0x orders. Generate an orderHash, sign an order, validate it's signature and more.", + link: { + title: '0x-order-utils.py', + to: 'http://0x-order-utils-py.s3-website-us-east-1.amazonaws.com/', + shouldOpenInNewTab: true, + }, + }, + { + description: 'A Standard Relayer API client', + link: { + title: '0x-sra-client.py', + to: 'https://pypi.org/project/0x-sra-client/', + shouldOpenInNewTab: true, + }, + }, + { + description: 'Package containing the addresses at which the 0x smart contracts have been deployed', + link: { + title: '0x-contract-addresses.py', + to: + 'https://github.com/0xProject/0x-monorepo/blob/development/python-packages/contract_addresses/README.md', + shouldOpenInNewTab: true, + }, + }, + { + description: 'Package containing the 0x smart contract compilation artifacts', + link: { + title: '0x-contract-artifacts.py', + to: + 'https://github.com/0xProject/0x-monorepo/blob/development/python-packages/contract_artifacts/README.md', + shouldOpenInNewTab: true, + }, + }, + { + description: '0x JSON schemas for those developing on top of 0x protocol', + link: { + title: '0x-json-schemas.py', + to: 'https://github.com/0xProject/0x-monorepo/blob/development/python-packages/json_schemas/README.md', + shouldOpenInNewTab: true, + }, + }, + ], [Categories.Ethereum]: [ { description: @@ -409,7 +437,10 @@ export class DocsHome extends React.Component { title: this.props.translate.get(tutorialInfo.link.title as Key, Deco.Cap), }; }), - [Categories.ZeroExProtocol]: _.map(CATEGORY_TO_PACKAGES[Categories.ZeroExProtocol], pkg => pkg.link), + [Categories.ZeroExProtocolTypescript]: _.map( + CATEGORY_TO_PACKAGES[Categories.ZeroExProtocolTypescript], + pkg => pkg.link, + ), [Categories.Ethereum]: _.map(CATEGORY_TO_PACKAGES[Categories.Ethereum], pkg => pkg.link), [Categories.CommunityMaintained]: _.map( CATEGORY_TO_PACKAGES[Categories.CommunityMaintained], diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts index 9492da5a5..081c6d014 100644 --- a/packages/website/ts/types.ts +++ b/packages/website/ts/types.ts @@ -655,8 +655,9 @@ export interface TutorialInfo { } export enum Categories { - ZeroExProtocol = '0x Protocol', - Ethereum = 'Ethereum', + ZeroExProtocolTypescript = '0x Protocol (Typescript/Javascript)', + ZeroExProtocolPython = '0x Protocol (Python)', + Ethereum = 'Ethereum (Typescript/Javascript)', CommunityMaintained = 'Community Maintained', } -- cgit From 6275b7ba3b55b69b336c00b28074b21bad6eac9f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 18 Jan 2019 22:35:04 +0100 Subject: Remove .py suffix --- packages/website/ts/pages/documentation/docs_home.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/documentation/docs_home.tsx b/packages/website/ts/pages/documentation/docs_home.tsx index f708f6d77..055fdb8f1 100644 --- a/packages/website/ts/pages/documentation/docs_home.tsx +++ b/packages/website/ts/pages/documentation/docs_home.tsx @@ -178,7 +178,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap = { description: "A library for interacting with 0x orders. Generate an orderHash, sign an order, validate it's signature and more.", link: { - title: '0x-order-utils.py', + title: '0x-order-utils', to: 'http://0x-order-utils-py.s3-website-us-east-1.amazonaws.com/', shouldOpenInNewTab: true, }, @@ -186,7 +186,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap = { { description: 'A Standard Relayer API client', link: { - title: '0x-sra-client.py', + title: '0x-sra-client', to: 'https://pypi.org/project/0x-sra-client/', shouldOpenInNewTab: true, }, @@ -194,7 +194,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap = { { description: 'Package containing the addresses at which the 0x smart contracts have been deployed', link: { - title: '0x-contract-addresses.py', + title: '0x-contract-addresses', to: 'https://github.com/0xProject/0x-monorepo/blob/development/python-packages/contract_addresses/README.md', shouldOpenInNewTab: true, @@ -203,7 +203,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap = { { description: 'Package containing the 0x smart contract compilation artifacts', link: { - title: '0x-contract-artifacts.py', + title: '0x-contract-artifacts', to: 'https://github.com/0xProject/0x-monorepo/blob/development/python-packages/contract_artifacts/README.md', shouldOpenInNewTab: true, @@ -212,7 +212,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap = { { description: '0x JSON schemas for those developing on top of 0x protocol', link: { - title: '0x-json-schemas.py', + title: '0x-json-schemas', to: 'https://github.com/0xProject/0x-monorepo/blob/development/python-packages/json_schemas/README.md', shouldOpenInNewTab: true, }, -- cgit From 310d981990733371da91641e3b9e785bc2732432 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 18 Jan 2019 22:37:13 +0100 Subject: Link all Python packages to Pypi --- packages/website/ts/pages/documentation/docs_home.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/documentation/docs_home.tsx b/packages/website/ts/pages/documentation/docs_home.tsx index 055fdb8f1..2b5d99e5b 100644 --- a/packages/website/ts/pages/documentation/docs_home.tsx +++ b/packages/website/ts/pages/documentation/docs_home.tsx @@ -179,7 +179,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap = { "A library for interacting with 0x orders. Generate an orderHash, sign an order, validate it's signature and more.", link: { title: '0x-order-utils', - to: 'http://0x-order-utils-py.s3-website-us-east-1.amazonaws.com/', + to: 'https://pypi.org/project/0x-order-utils/', shouldOpenInNewTab: true, }, }, @@ -195,8 +195,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap = { description: 'Package containing the addresses at which the 0x smart contracts have been deployed', link: { title: '0x-contract-addresses', - to: - 'https://github.com/0xProject/0x-monorepo/blob/development/python-packages/contract_addresses/README.md', + to: 'https://pypi.org/project/0x-contract-addresses/', shouldOpenInNewTab: true, }, }, @@ -204,8 +203,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap = { description: 'Package containing the 0x smart contract compilation artifacts', link: { title: '0x-contract-artifacts', - to: - 'https://github.com/0xProject/0x-monorepo/blob/development/python-packages/contract_artifacts/README.md', + to: 'https://pypi.org/project/0x-contract-artifacts/', shouldOpenInNewTab: true, }, }, @@ -213,7 +211,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap = { description: '0x JSON schemas for those developing on top of 0x protocol', link: { title: '0x-json-schemas', - to: 'https://github.com/0xProject/0x-monorepo/blob/development/python-packages/json_schemas/README.md', + to: 'https://pypi.org/project/0x-json-schemas/', shouldOpenInNewTab: true, }, }, -- cgit From da7c969eeb19129189c2965e6a268779b04c9bae Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 18 Jan 2019 22:41:55 +0100 Subject: Add entry for contract demo package --- packages/website/ts/pages/documentation/docs_home.tsx | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/documentation/docs_home.tsx b/packages/website/ts/pages/documentation/docs_home.tsx index 2b5d99e5b..4c12b8f67 100644 --- a/packages/website/ts/pages/documentation/docs_home.tsx +++ b/packages/website/ts/pages/documentation/docs_home.tsx @@ -215,6 +215,14 @@ const CATEGORY_TO_PACKAGES: ObjectMap = { shouldOpenInNewTab: true, }, }, + { + description: 'Demo project showing how to interact with the 0x smart contracts using Python', + link: { + title: '0x-contract-demo', + to: 'https://github.com/0xProject/0x-monorepo/blob/development/python-packages/contract_demo/README.md', + shouldOpenInNewTab: true, + }, + }, ], [Categories.Ethereum]: [ { -- cgit From dabcd2cf47f01139be484892110e4aa60ac848ce Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 21 Jan 2019 16:14:17 +0100 Subject: Fix linter issue --- packages/website/ts/pages/documentation/docs_home.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/pages/documentation/docs_home.tsx b/packages/website/ts/pages/documentation/docs_home.tsx index 4c12b8f67..5849a2a03 100644 --- a/packages/website/ts/pages/documentation/docs_home.tsx +++ b/packages/website/ts/pages/documentation/docs_home.tsx @@ -503,4 +503,4 @@ export class DocsHome extends React.Component { }); return menuItems; } -} +} // tslint:disable:max-file-line-count -- cgit