Skip to content
This repository has been archived by the owner on Jul 9, 2021. It is now read-only.

Commit

Permalink
Tweaks to address review:
Browse files Browse the repository at this point in the history
* trim deployedBytecode so it's undefined unless a contract has pure functions
* rename TxOpts -> SendTransactionOpts
* create sendTransactionOptsSchema in json-schemas
* fix dependencies in @0x/abi-gen-wrappers
  • Loading branch information
xianny committed Oct 8, 2019
1 parent bafae3f commit 5e08cbc
Show file tree
Hide file tree
Showing 42 changed files with 667 additions and 698 deletions.
10 changes: 5 additions & 5 deletions contracts/exchange/src/wrapper_interfaces.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PromiseWithTransactionHash } from '@0x/base-contract';
import { TxOpts } from '@0x/types';
import { SendTransactionOpts } from '@0x/types';
import { BlockParam, CallData, TransactionReceiptWithDecodedLogs, TxData } from 'ethereum-types';

// Generated Wrapper Interfaces
Expand All @@ -8,7 +8,7 @@ export interface AssetProxyDispatcher {
awaitTransactionSuccessAsync: (
assetProxy: string,
txData?: Partial<TxData>,
txOpts?: TxOpts,
txOpts?: SendTransactionOpts,
) => PromiseWithTransactionHash<TransactionReceiptWithDecodedLogs>;
};
getAssetProxy: {
Expand All @@ -21,14 +21,14 @@ export interface Authorizable extends Ownable {
awaitTransactionSuccessAsync: (
target: string,
txData?: Partial<TxData>,
txOpts?: TxOpts,
txOpts?: SendTransactionOpts,
) => PromiseWithTransactionHash<TransactionReceiptWithDecodedLogs>;
};
removeAuthorizedAddress: {
awaitTransactionSuccessAsync: (
target: string,
txData?: Partial<TxData>,
txOpts?: TxOpts,
txOpts?: SendTransactionOpts,
) => PromiseWithTransactionHash<TransactionReceiptWithDecodedLogs>;
};
authorized: {
Expand All @@ -41,7 +41,7 @@ export interface Ownable {
awaitTransactionSuccessAsync: (
newOwner: string,
txData?: Partial<TxData>,
txOpts?: TxOpts,
txOpts?: SendTransactionOpts,
) => PromiseWithTransactionHash<TransactionReceiptWithDecodedLogs>;
};
owner: {
Expand Down
2 changes: 1 addition & 1 deletion packages/0x.js/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export {
SimpleEvmOutput,
SimpleEvmBytecodeOutput,
EIP712DomainWithDefaultSchema,
TxOpts,
SendTransactionOpts,
EventCallback,
IndexedFilterValues,
DecodedLogEvent,
Expand Down
17 changes: 8 additions & 9 deletions packages/abi-gen-wrappers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,20 @@
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-wrappers/README.md",
"devDependencies": {
"@0x/abi-gen": "^4.3.0-beta.0",
"@0x/assert": "^2.2.0-beta.0",
"@0x/json-schemas": "^4.1.0-beta.0",
"@0x/contract-artifacts": "^2.3.0-beta.0",
"@0x/tslint-config": "^3.0.1",
"@0x/types": "^2.5.0-beta.0",
"@0x/utils": "^4.6.0-beta.0",
"@0x/web3-wrapper": "^6.1.0-beta.0",
"ethereum-types": "^2.2.0-beta.0",
"ethers": "~4.0.4",
"lodash": "^4.17.11",
"shx": "^0.2.2"
},
"dependencies": {
"@0x/assert": "^2.2.0-beta.0",
"@0x/base-contract": "^5.5.0-beta.0",
"@0x/contract-addresses": "^3.3.0-beta.0",
"@0x/contract-artifacts": "^2.3.0-beta.0"
"@0x/json-schemas": "^4.1.0-beta.0",
"@0x/types": "^2.5.0-beta.0",
"@0x/utils": "^4.6.0-beta.0",
"@0x/web3-wrapper": "^6.1.0-beta.0",
"ethereum-types": "^2.2.0-beta.0",
"ethers": "~4.0.4"
},
"publishConfig": {
"access": "public"
Expand Down

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 13 additions & 7 deletions packages/abi-gen-wrappers/src/generated-wrappers/dev_utils.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5e08cbc

Please sign in to comment.