From 924c2705b28f5821fd36d653fb3f7aa7bb015caf Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 10 Dec 2018 10:53:25 -0800 Subject: Refactor our extensions package --- contracts/extensions/tsconfig.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 contracts/extensions/tsconfig.json (limited to 'contracts/extensions/tsconfig.json') diff --git a/contracts/extensions/tsconfig.json b/contracts/extensions/tsconfig.json new file mode 100644 index 000000000..c894eb367 --- /dev/null +++ b/contracts/extensions/tsconfig.json @@ -0,0 +1,15 @@ +{ + "extends": "../../tsconfig", + "compilerOptions": { + "outDir": "lib", + "rootDir": ".", + "resolveJsonModule": true + }, + "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], + "files": [ + "./generated-artifacts/DutchAuction.json", + "./generated-artifacts/Forwarder.json", + "./generated-artifacts/OrderValidator.json" + ], + "exclude": ["./deploy/solc/solc_bin"] +} -- cgit v1.2.3 From 36736f82d4cb2dcaef550ea593ed38a12fcf213a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 11 Dec 2018 09:38:22 -0800 Subject: Move OrderValidator to the protocol package --- contracts/extensions/tsconfig.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'contracts/extensions/tsconfig.json') diff --git a/contracts/extensions/tsconfig.json b/contracts/extensions/tsconfig.json index c894eb367..a4ce1e002 100644 --- a/contracts/extensions/tsconfig.json +++ b/contracts/extensions/tsconfig.json @@ -6,10 +6,6 @@ "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], - "files": [ - "./generated-artifacts/DutchAuction.json", - "./generated-artifacts/Forwarder.json", - "./generated-artifacts/OrderValidator.json" - ], + "files": ["./generated-artifacts/DutchAuction.json", "./generated-artifacts/Forwarder.json"], "exclude": ["./deploy/solc/solc_bin"] } -- cgit v1.2.3 From 4417c76b130655da3b14209148191d43037e8f8a Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Tue, 11 Dec 2018 14:47:52 -0800 Subject: Ported Balance Threshold Filter to new contract directory structure --- contracts/extensions/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contracts/extensions/tsconfig.json') diff --git a/contracts/extensions/tsconfig.json b/contracts/extensions/tsconfig.json index a4ce1e002..5d3ebfe74 100644 --- a/contracts/extensions/tsconfig.json +++ b/contracts/extensions/tsconfig.json @@ -6,6 +6,6 @@ "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], - "files": ["./generated-artifacts/DutchAuction.json", "./generated-artifacts/Forwarder.json"], + "files": ["./generated-artifacts/BalanceThresholdFilter.json", "./generated-artifacts/DutchAuction.json", "./generated-artifacts/Forwarder.json"], "exclude": ["./deploy/solc/solc_bin"] } -- cgit v1.2.3 From 6a0f5f39eea5fef285a1e2e962be03c2fa8847ab Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Tue, 11 Dec 2018 15:55:36 -0800 Subject: Prettier / Linter fixes for TS --- contracts/extensions/tsconfig.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'contracts/extensions/tsconfig.json') diff --git a/contracts/extensions/tsconfig.json b/contracts/extensions/tsconfig.json index 5d3ebfe74..a303e3f5c 100644 --- a/contracts/extensions/tsconfig.json +++ b/contracts/extensions/tsconfig.json @@ -6,6 +6,10 @@ "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], - "files": ["./generated-artifacts/BalanceThresholdFilter.json", "./generated-artifacts/DutchAuction.json", "./generated-artifacts/Forwarder.json"], + "files": [ + "./generated-artifacts/BalanceThresholdFilter.json", + "./generated-artifacts/DutchAuction.json", + "./generated-artifacts/Forwarder.json" + ], "exclude": ["./deploy/solc/solc_bin"] } -- cgit v1.2.3 From 6b5b8fe8e05e497b6f4db4d3b0aa675d0bbdff50 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Wed, 12 Dec 2018 17:26:46 -0800 Subject: Fix build after rebase --- contracts/extensions/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'contracts/extensions/tsconfig.json') diff --git a/contracts/extensions/tsconfig.json b/contracts/extensions/tsconfig.json index a303e3f5c..506c283aa 100644 --- a/contracts/extensions/tsconfig.json +++ b/contracts/extensions/tsconfig.json @@ -9,7 +9,8 @@ "files": [ "./generated-artifacts/BalanceThresholdFilter.json", "./generated-artifacts/DutchAuction.json", - "./generated-artifacts/Forwarder.json" + "./generated-artifacts/Forwarder.json", + "./generated-artifacts/OrderMatcher.json" ], "exclude": ["./deploy/solc/solc_bin"] } -- cgit v1.2.3 From f7fd9789bac823fe4b7bb3df8b2d1f849f1a3212 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Thu, 20 Dec 2018 09:08:38 -0800 Subject: Move OrderValidator to extensions --- contracts/extensions/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'contracts/extensions/tsconfig.json') diff --git a/contracts/extensions/tsconfig.json b/contracts/extensions/tsconfig.json index 506c283aa..ed9b4fbe1 100644 --- a/contracts/extensions/tsconfig.json +++ b/contracts/extensions/tsconfig.json @@ -10,7 +10,8 @@ "./generated-artifacts/BalanceThresholdFilter.json", "./generated-artifacts/DutchAuction.json", "./generated-artifacts/Forwarder.json", - "./generated-artifacts/OrderMatcher.json" + "./generated-artifacts/OrderMatcher.json", + "./generated-artifacts/OrderValidator.json" ], "exclude": ["./deploy/solc/solc_bin"] } -- cgit v1.2.3