From 4901fae98e466e31217a3b706b4c4341c40a9c98 Mon Sep 17 00:00:00 2001 From: Kerman Kohli Date: Tue, 5 Mar 2019 12:48:52 +1100 Subject: [PATCH 1/2] Export contract addresses as "Deployments" in exports --- artifacts/index.ts | 6 +++++- {deployments => artifacts}/outputs.ts | 0 package.json | 2 +- scripts/generate_outputs.sh | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) rename {deployments => artifacts}/outputs.ts (100%) diff --git a/artifacts/index.ts b/artifacts/index.ts index a885ef9ef..773ebc2e6 100644 --- a/artifacts/index.ts +++ b/artifacts/index.ts @@ -37,7 +37,7 @@ import { WethMock } from "./ts/WethMock"; import { WhiteList } from "./ts/WhiteList"; import { ZeroExExchangeWrapper } from "./ts/ZeroExExchangeWrapper"; - +import { outputs } from "./outputs"; // Export abi-gen contract wrappers export { @@ -123,3 +123,7 @@ export { ZeroExExchangeWrapper, }; +// Export the contract addresses +export { + outputs as Deployments +}; \ No newline at end of file diff --git a/deployments/outputs.ts b/artifacts/outputs.ts similarity index 100% rename from deployments/outputs.ts rename to artifacts/outputs.ts diff --git a/package.json b/package.json index 7dc967b30..4b5f1812a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "set-protocol-contracts", - "version": "1.2.1-beta.13", + "version": "1.2.1-beta.14", "description": "Smart contracts for {Set} Protocol", "main": "dist/artifacts/index.js", "typings": "dist/typings/artifacts/index.d.ts", diff --git a/scripts/generate_outputs.sh b/scripts/generate_outputs.sh index 2a5d202ac..822fe8f17 100644 --- a/scripts/generate_outputs.sh +++ b/scripts/generate_outputs.sh @@ -8,5 +8,5 @@ rm -f deployments/outputs.ts filename=outputs filename_base=$(basename $filename .json) -echo -e "export const $filename_base = " > "deployments/$filename_base.ts" -cat "deployments/$filename_base.json" >> "deployments/$filename_base.ts" \ No newline at end of file +echo -e "export const $filename_base = " > "artifacts/$filename_base.ts" +cat "deployments/$filename_base.json" >> "artifacts/$filename_base.ts" \ No newline at end of file From 03e44ee730523872076e32351067d2b113571ed0 Mon Sep 17 00:00:00 2001 From: felix2feng Date: Mon, 11 Mar 2019 16:48:38 -0700 Subject: [PATCH 2/2] Address comments --- .gitignore | 3 --- package.json | 2 +- scripts/generate_outputs.sh | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d6f98ab0f..bd6fd7c78 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,3 @@ yarn-error.log* # Snapshot blockchain/ - -# Ouputs -deployments/outputs.ts diff --git a/package.json b/package.json index 4b5f1812a..7dc967b30 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "set-protocol-contracts", - "version": "1.2.1-beta.14", + "version": "1.2.1-beta.13", "description": "Smart contracts for {Set} Protocol", "main": "dist/artifacts/index.js", "typings": "dist/typings/artifacts/index.d.ts", diff --git a/scripts/generate_outputs.sh b/scripts/generate_outputs.sh index 822fe8f17..fd5c809ee 100644 --- a/scripts/generate_outputs.sh +++ b/scripts/generate_outputs.sh @@ -1,8 +1,8 @@ # To make it really easy to work with the outputs file from the manager, # this script converts the JSON file into a typescript file -# Remove old transpiled outputs from the deployments/ directory -rm -f deployments/outputs.ts +# Remove old transpiled outputs from the artifacts/ directory +rm -f artifacts/outputs.ts # Output a TS file from the generated JSON file