aboutsummaryrefslogtreecommitdiffstats
path: root/packages/fill-scenarios
diff options
context:
space:
mode:
Diffstat (limited to 'packages/fill-scenarios')
-rw-r--r--packages/fill-scenarios/CHANGELOG.json46
-rw-r--r--packages/fill-scenarios/CHANGELOG.md22
-rw-r--r--packages/fill-scenarios/README.md10
-rw-r--r--packages/fill-scenarios/package.json38
-rw-r--r--packages/fill-scenarios/src/artifacts.ts11
-rw-r--r--packages/fill-scenarios/src/fill_scenarios.ts16
-rw-r--r--packages/fill-scenarios/src/globals.d.ts6
-rw-r--r--packages/fill-scenarios/tslint.json2
8 files changed, 95 insertions, 56 deletions
diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json
index 78a51d265..deeae5f5d 100644
--- a/packages/fill-scenarios/CHANGELOG.json
+++ b/packages/fill-scenarios/CHANGELOG.json
@@ -1,5 +1,51 @@
[
{
+ "timestamp": 1542208198,
+ "version": "1.0.12",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
+ "timestamp": 1542134075,
+ "version": "1.0.11",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
+ "timestamp": 1542028948,
+ "version": "1.0.10",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
+ "version": "1.0.9",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ],
+ "timestamp": 1541740904
+ },
+ {
+ "version": "1.0.8",
+ "changes": [
+ {
+ "note": "Updated to use new @0xproject/contract-artifacts and @0xproject/abi-gen-wrappers packages",
+ "pr": 1105
+ }
+ ],
+ "timestamp": 1539871071
+ },
+ {
"version": "1.0.7",
"changes": [
{
diff --git a/packages/fill-scenarios/CHANGELOG.md b/packages/fill-scenarios/CHANGELOG.md
index bf6fcf13e..c8bd402de 100644
--- a/packages/fill-scenarios/CHANGELOG.md
+++ b/packages/fill-scenarios/CHANGELOG.md
@@ -5,6 +5,26 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.12 - _November 14, 2018_
+
+ * Dependencies updated
+
+## v1.0.11 - _November 13, 2018_
+
+ * Dependencies updated
+
+## v1.0.10 - _November 12, 2018_
+
+ * Dependencies updated
+
+## v1.0.9 - _November 9, 2018_
+
+ * Dependencies updated
+
+## v1.0.8 - _October 18, 2018_
+
+ * Updated to use new @0xproject/contract-artifacts and @0xproject/abi-gen-wrappers packages (#1105)
+
## v1.0.7 - _October 4, 2018_
* Dependencies updated
@@ -41,7 +61,7 @@ CHANGELOG
* Dependencies updated
-## v1.0.1-rc.3 - _August 13, 2018_
+## v1.0.1-rc.3 - _August 14, 2018_
* Updated to use latest orderFactory interface, fixed `feeRecipient` spelling error in public interface (#936)
* Dependencies updated
diff --git a/packages/fill-scenarios/README.md b/packages/fill-scenarios/README.md
index 67df0941f..794b70e56 100644
--- a/packages/fill-scenarios/README.md
+++ b/packages/fill-scenarios/README.md
@@ -1,18 +1,18 @@
-## @0xproject/fill-scenarios
+## @0x/fill-scenarios
0x order fill scenario generator
## Installation
```bash
-yarn add @0xproject/fill-scenarios
+yarn add @0x/fill-scenarios
```
If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
```json
"compilerOptions": {
- "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+ "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
}
```
@@ -41,13 +41,13 @@ yarn install
To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
```bash
-PKG=@0xproject/fill-scenarios yarn build
+PKG=@0x/fill-scenarios yarn build
```
Or continuously rebuild on change:
```bash
-PKG=@0xproject/fill-scenarios yarn watch
+PKG=@0x/fill-scenarios yarn watch
```
### Clean
diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json
index 0616454d6..2d9bff0e7 100644
--- a/packages/fill-scenarios/package.json
+++ b/packages/fill-scenarios/package.json
@@ -1,21 +1,14 @@
{
- "name": "@0xproject/fill-scenarios",
- "version": "1.0.7",
+ "name": "@0x/fill-scenarios",
+ "version": "1.0.12",
"description": "0x order fill scenario generator",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
- "build": "yarn pre_build && tsc -b",
+ "build": "yarn tsc -b",
"build:ci": "yarn build",
- "pre_build": "run-s update_artifacts generate_contract_wrappers",
- "update_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/2.0.0-trimmed/$i.json lib/artifacts; done;",
- "generate_contract_wrappers": "abi-gen --abis 'lib/artifacts/@(Exchange|DummyERC20Token|DummyERC721Token).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers",
- "copy_monorepo_scripts": "copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
"clean": "shx rm -rf lib src/generated_contract_wrappers",
- "lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/*"
- },
- "config": {
- "contracts": "Exchange DummyERC20Token DummyERC721Token"
+ "lint": "tslint --format stylish --project ."
},
"license": "Apache-2.0",
"repository": {
@@ -27,25 +20,24 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md",
"devDependencies": {
- "@0xproject/abi-gen": "^1.0.13",
- "@0xproject/tslint-config": "^1.0.8",
+ "@0x/tslint-config": "^1.0.10",
"@types/lodash": "4.14.104",
- "copyfiles": "^2.0.0",
"make-promises-safe": "^1.1.0",
- "npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"tslint": "5.11.0",
"typescript": "3.0.1"
},
"dependencies": {
- "@0xproject/base-contract": "^3.0.1",
- "@0xproject/order-utils": "^1.0.7",
- "@0xproject/types": "^1.1.4",
- "@0xproject/typescript-typings": "^3.0.2",
- "@0xproject/utils": "^2.0.2",
- "@0xproject/web3-wrapper": "^3.0.3",
- "ethereum-types": "^1.0.11",
- "ethers": "4.0.0-beta.14",
+ "@0x/abi-gen-wrappers": "^1.0.5",
+ "@0x/base-contract": "^3.0.6",
+ "@0x/contract-artifacts": "^1.1.0",
+ "@0x/order-utils": "^3.0.2",
+ "@0x/types": "^1.2.1",
+ "@0x/typescript-typings": "^3.0.4",
+ "@0x/utils": "^2.0.5",
+ "@0x/web3-wrapper": "^3.1.4",
+ "ethereum-types": "^1.1.2",
+ "ethers": "~4.0.4",
"lodash": "^4.17.5"
},
"publishConfig": {
diff --git a/packages/fill-scenarios/src/artifacts.ts b/packages/fill-scenarios/src/artifacts.ts
deleted file mode 100644
index b78ca0cc2..000000000
--- a/packages/fill-scenarios/src/artifacts.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { ContractArtifact } from 'ethereum-types';
-
-import * as DummyERC20Token from './artifacts/DummyERC20Token.json';
-import * as DummyERC721Token from './artifacts/DummyERC721Token.json';
-import * as Exchange from './artifacts/Exchange.json';
-
-export const artifacts = {
- DummyERC20Token: (DummyERC20Token as any) as ContractArtifact,
- DummyERC721Token: (DummyERC721Token as any) as ContractArtifact,
- Exchange: (Exchange as any) as ContractArtifact,
-};
diff --git a/packages/fill-scenarios/src/fill_scenarios.ts b/packages/fill-scenarios/src/fill_scenarios.ts
index 604eeaffc..0154bcd0a 100644
--- a/packages/fill-scenarios/src/fill_scenarios.ts
+++ b/packages/fill-scenarios/src/fill_scenarios.ts
@@ -1,16 +1,14 @@
-import { assetDataUtils } from '@0xproject/order-utils';
-import { orderFactory } from '@0xproject/order-utils/lib/src/order_factory';
-import { AssetProxyId, ERC721AssetData, OrderWithoutExchangeAddress, SignedOrder } from '@0xproject/types';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { DummyERC20TokenContract, DummyERC721TokenContract, ExchangeContract } from '@0x/abi-gen-wrappers';
+import * as artifacts from '@0x/contract-artifacts';
+import { assetDataUtils } from '@0x/order-utils';
+import { orderFactory } from '@0x/order-utils/lib/src/order_factory';
+import { AssetProxyId, ERC721AssetData, OrderWithoutExchangeAddress, SignedOrder } from '@0x/types';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
import { Provider } from 'ethereum-types';
import * as _ from 'lodash';
-import { artifacts } from './artifacts';
import { constants } from './constants';
-import { DummyERC20TokenContract } from './generated_contract_wrappers/dummy_erc20_token';
-import { DummyERC721TokenContract } from './generated_contract_wrappers/dummy_erc721_token';
-import { ExchangeContract } from './generated_contract_wrappers/exchange';
export class FillScenarios {
private readonly _web3Wrapper: Web3Wrapper;
diff --git a/packages/fill-scenarios/src/globals.d.ts b/packages/fill-scenarios/src/globals.d.ts
deleted file mode 100644
index 94e63a32d..000000000
--- a/packages/fill-scenarios/src/globals.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare module '*.json' {
- const json: any;
- /* tslint:disable */
- export default json;
- /* tslint:enable */
-}
diff --git a/packages/fill-scenarios/tslint.json b/packages/fill-scenarios/tslint.json
index ffaefe83a..dd9053357 100644
--- a/packages/fill-scenarios/tslint.json
+++ b/packages/fill-scenarios/tslint.json
@@ -1,3 +1,3 @@
{
- "extends": ["@0xproject/tslint-config"]
+ "extends": ["@0x/tslint-config"]
}
generated by cgit (git 2.34.1) at 2024-11-15 12:06:36 +0800