From 884bf6dee780e1e163a4bc901bde6482b6a08d09 Mon Sep 17 00:00:00 2001 From: satyam Date: Mon, 13 Aug 2018 21:45:16 +0530 Subject: [PATCH 01/40] change logic --- .travis.yml | 2 +- package.json | 1 + scripts/docs.sh | 14 +++++++++----- 3 files changed, 11 insertions(+), 6 deletions(-) mode change 100644 => 100755 scripts/docs.sh diff --git a/.travis.yml b/.travis.yml index b74d76fd4..cb927a403 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: before_script: - truffle version script: -- npm run test +- npm run docs notifications: slack: secure: W4FZSabLrzF74f317hutolEHnlq2GBlQxU6b85L5XymrjgLEhlgE16c5Qz7Emoyt6le6PXL+sfG2ujJc3XYys/6hppgrHSAasuJnKCdQNpmMZ9BNyMs6WGkmB3enIf3K/FLXb26AQdwpQdIXuOeJUTf879u+YoiZV0eZH8d3+fsIOyovq9N6X5pKOpDM9iT8gGB4t7fie7xf51s+iUaHxyO9G7jDginZ4rBXHcU7mxCub9z+Z1H8+kCTnPWaF+KKVEXx4Z0nI3+urboD7E4OIP02LwrThQls2CppA3X0EoesTcdvj/HLErY/JvsXIFiFEEHZzB1Wi+k2TiOeLcYwEuHIVij+HPxxlJNX/j8uy01Uk8s4rd+0EhvfdKHJqUKqxH4YN2npcKfHEss7bU3y7dUinXQfYShW5ZewHdvc7pnnxBTfhvmdi64HdNrXAPq+s1rhciH7MmnU+tsm4lhrpr+FBuHzUMA9fOCr7b0SQytZEgWpiUls88gdbh3yG8TjyZxmZJGx09cwEP0q7VoH0UwFh7mIu5XmYdd5tWUhavTiO7YV8cUPn7MvwMsTltB3YBpF/fB26L7ka8zBhCsjm9prW6SVYU/dyO3m91VeZtO/zJFHRDA6Q58JGVW2rgzO39z193qC1EGRXqTie96VwAAtNg8+hRb+bI/CWDVzSPc= diff --git a/package.json b/package.json index 126f5e8ec..8754e5563 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ }, "scripts": { "test": "scripts/test.sh", + "docs": "scripts/docs.sh", "lint": "eslint .", "lint:fix": "eslint . --fix", "lint:sol": "solium -d .", diff --git a/scripts/docs.sh b/scripts/docs.sh old mode 100644 new mode 100755 index 9c61e9166..d93e94dda --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -4,7 +4,7 @@ set -o errexit # Global variables -DIRECTORY=polymath-core-docs +DIRECTORY=polymath-developer-portal WEBSITE_DIRECTORY=versioned_docs CORE_ROUTE=$PWD @@ -31,7 +31,7 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ -solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $HOME/tmp/polymath-core-docs/docs) +solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $HOME/tmp/polymath-developer-portal/docs) echo "Successfully docs are generated..." echo "Transferring the API DOCS to $latestTag directory" mv ../../docs/api_* $latestTag @@ -41,11 +41,13 @@ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $HOME/tmp/polymath-core-docs/d git add . git commit -m "create new api docs for $latestTag" > /dev/null 2>&1 git push origin $latestTag > /dev/null 2>&1 + #git commit -m "create new api docs for $latestTag" > /dev/null 2>&1 + #git push origin $latestTag > /dev/null 2>&1 # Remove the repository echo "Removing the repository from the system...." cd ../../../../ - rm -rf polymath-core-docs + rm -rf polymath-developer-portal exit 1 } @@ -70,11 +72,13 @@ echo "Latest tag is: $latestTag" cd ~/tmp if [ ! -d $DIRECTORY ]; then -git clone https://github.com/PolymathNetwork/polymath-core-docs.git > /dev/null 2>&1 +#git clone https://${GH_USR}:${GH_PWD}@github.com/PolymathNetwork/polymath-core-docs.git > /dev/null 2>&1 +git clone https://${GH_USR}:${GH_PWD}@github.com/PolymathNetwork/polymath-core-docs.git cd $DIRECTORY else cd $DIRECTORY -git pull > /dev/null 2>&1 +#git pull > /dev/null 2>&1 +git pull fi cd docs/website From 454d8509420ee047d512e21fa6181e8442b6fc00 Mon Sep 17 00:00:00 2001 From: satyam Date: Mon, 13 Aug 2018 21:50:46 +0530 Subject: [PATCH 02/40] minor fixes --- scripts/docs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index d93e94dda..447311e89 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -31,7 +31,7 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ -solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $HOME/tmp/polymath-developer-portal/docs) +solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $HOME/polymath-developer-portal/docs) echo "Successfully docs are generated..." echo "Transferring the API DOCS to $latestTag directory" mv ../../docs/api_* $latestTag @@ -46,7 +46,7 @@ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $HOME/tmp/polymath-developer-p # Remove the repository echo "Removing the repository from the system...." - cd ../../../../ + cd ../../../ rm -rf polymath-developer-portal exit 1 } @@ -69,7 +69,7 @@ versionNo=$(echo "$latestTag" | cut -b 2-6) echo "Latest tag is: $latestTag" # clone the polymath-core-docs -cd ~/tmp +#cd ~/tmp if [ ! -d $DIRECTORY ]; then #git clone https://${GH_USR}:${GH_PWD}@github.com/PolymathNetwork/polymath-core-docs.git > /dev/null 2>&1 From fa9b42e10e828a71372dd0bae993708d652a5b68 Mon Sep 17 00:00:00 2001 From: satyam Date: Mon, 13 Aug 2018 21:59:38 +0530 Subject: [PATCH 03/40] change repo --- scripts/docs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index 447311e89..7549a06a7 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -68,12 +68,12 @@ versionNo=$(echo "$latestTag" | cut -b 2-6) #print the tag echo "Latest tag is: $latestTag" -# clone the polymath-core-docs +# clone the polymath-developer-portal #cd ~/tmp if [ ! -d $DIRECTORY ]; then -#git clone https://${GH_USR}:${GH_PWD}@github.com/PolymathNetwork/polymath-core-docs.git > /dev/null 2>&1 -git clone https://${GH_USR}:${GH_PWD}@github.com/PolymathNetwork/polymath-core-docs.git +#git clone https://${GH_USR}:${GH_PWD}@github.com/PolymathNetwork/polymath-developer-portal.git > /dev/null 2>&1 +git clone https://${GH_USR}:${GH_PWD}@github.com/PolymathNetwork/polymath-developer-portal.git cd $DIRECTORY else cd $DIRECTORY From 9a3e04950e0d11a34e43600a5ccb42bfd2432e0b Mon Sep 17 00:00:00 2001 From: satyam Date: Mon, 13 Aug 2018 22:06:53 +0530 Subject: [PATCH 04/40] realign the folder structure --- scripts/docs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index 7549a06a7..f289f68ec 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -31,10 +31,10 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ -solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $HOME/polymath-developer-portal/docs) +solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $HOME/polymath-developer-portal/) echo "Successfully docs are generated..." echo "Transferring the API DOCS to $latestTag directory" - mv ../../docs/api_* $latestTag + mv ../docs/api_* $latestTag # Commit the changes echo "Commiting the new changes..." @@ -81,7 +81,7 @@ cd $DIRECTORY git pull fi -cd docs/website +cd website if [ ! -d $WEBSITE_DIRECTORY ]; then echo "Created: versioned_docs directory" From db6c04af1b160cf7e5bedd9ec3eea8ee470a38ce Mon Sep 17 00:00:00 2001 From: satyam Date: Mon, 13 Aug 2018 22:27:41 +0530 Subject: [PATCH 05/40] minor fixes --- scripts/docs.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index f289f68ec..ea7f30c55 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -34,13 +34,15 @@ create_docs() { solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $HOME/polymath-developer-portal/) echo "Successfully docs are generated..." echo "Transferring the API DOCS to $latestTag directory" - mv ../docs/api_* $latestTag + mv ../../docs/api_* $latestTag # Commit the changes echo "Commiting the new changes..." git add . - git commit -m "create new api docs for $latestTag" > /dev/null 2>&1 - git push origin $latestTag > /dev/null 2>&1 + git commit -m "create new api docs for $latestTag" + #git commit -m "create new api docs for $latestTag" > /dev/null 2>&1 + #git push origin $latestTag > /dev/null 2>&1 + git push origin $latestTag #git commit -m "create new api docs for $latestTag" > /dev/null 2>&1 #git push origin $latestTag > /dev/null 2>&1 @@ -48,12 +50,12 @@ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $HOME/polymath-developer-porta echo "Removing the repository from the system...." cd ../../../ rm -rf polymath-developer-portal - exit 1 + exit 0 } reject_docs() { echo "$latestTag docs are already exist into the $DIRECTORY" - exit 1 + exit 0 } echo "Checking the latest tag branch merge on masters" @@ -69,16 +71,14 @@ versionNo=$(echo "$latestTag" | cut -b 2-6) echo "Latest tag is: $latestTag" # clone the polymath-developer-portal -#cd ~/tmp if [ ! -d $DIRECTORY ]; then -#git clone https://${GH_USR}:${GH_PWD}@github.com/PolymathNetwork/polymath-developer-portal.git > /dev/null 2>&1 -git clone https://${GH_USR}:${GH_PWD}@github.com/PolymathNetwork/polymath-developer-portal.git +git clone https://${GH_USR}:${GH_PWD}@github.com/PolymathNetwork/polymath-developer-portal.git > /dev/null 2>&1 cd $DIRECTORY else cd $DIRECTORY -#git pull > /dev/null 2>&1 -git pull +git checkout master > /dev/null 2>&1 +git pull origin master > /dev/null 2>&1 fi cd website From 5d7a1f9ceb1ceaf14de72e3104ef300980681f6f Mon Sep 17 00:00:00 2001 From: satyam Date: Mon, 13 Aug 2018 22:50:43 +0530 Subject: [PATCH 06/40] package added --- package.json | 1 + yarn.lock | 319 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 189 insertions(+), 131 deletions(-) diff --git a/package.json b/package.json index 8754e5563..7a7d58a29 100644 --- a/package.json +++ b/package.json @@ -61,6 +61,7 @@ "readline-sync": "^1.4.9", "shelljs": "^0.8.2", "solc": "^0.4.24", + "solidity-docgen": "^0.1.0", "truffle-contract": "^3.0.4", "truffle-hdwallet-provider-privkey": "^0.1.0", "web3": "^1.0.0-beta.33" diff --git a/yarn.lock b/yarn.lock index 0058c14c5..71b1a40ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13,6 +13,23 @@ version "0.7.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" +"@soldoc/markdown@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@soldoc/markdown/-/markdown-0.1.0.tgz#9f85be75049af9721b5129f133d52dafbf5f671e" + +"@soldoc/soldoc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@soldoc/soldoc/-/soldoc-0.4.3.tgz#24ffee9264228e1c3edd61fd3162d63587954933" + dependencies: + "@soldoc/markdown" "^0.1.0" + chalk "^2.3.1" + deep-assign "^2.0.0" + fs-extra "^5.0.0" + shelljs "^0.8.1" + solc "^0.4.19" + valid-url "^1.0.9" + yargs "^11.0.0" + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -242,6 +259,10 @@ arrify@^1.0.0, arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" +asap@~2.0.3: + version "2.0.6" + resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + asn1.js@^4.0.0: version "4.10.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" @@ -1031,9 +1052,9 @@ big.js@^3.1.3: version "3.2.0" resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" -bignumber.js@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-6.0.0.tgz#bbfa047644609a5af093e9cbd83b0461fa3f6002" +bignumber.js@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-5.0.0.tgz#fbce63f09776b3000a83185badcde525daf34833" "bignumber.js@git+https://github.com/debris/bignumber.js#master": version "2.0.7" @@ -1159,6 +1180,10 @@ browser-stdout@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f" +browser-stdout@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" + browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.0.6: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -1384,7 +1409,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" dependencies: @@ -1623,23 +1648,21 @@ commander@2.11.0: version "2.11.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" +commander@2.15.1, commander@^2.8.1, commander@^2.9.0: + version "2.15.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" + commander@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873" -commander@2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - dependencies: - graceful-readlink ">= 1.0.0" - commander@^2.11.0: version "2.14.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" -commander@^2.8.1, commander@^2.9.0: - version "2.15.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" +commander@^2.14.1: + version "2.17.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" commander@~2.8.1: version "2.8.1" @@ -1710,6 +1733,10 @@ copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" +core-js@^1.0.0: + version "1.2.7" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" + core-js@^2.4.0, core-js@^2.5.0: version "2.5.3" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" @@ -1861,12 +1888,6 @@ debug@2.2.0: dependencies: ms "0.7.1" -debug@2.6.8: - version "2.6.8" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" - dependencies: - ms "2.0.0" - debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -1945,6 +1966,12 @@ decompress@^4.0.0: pify "^2.3.0" strip-dirs "^2.0.0" +deep-assign@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/deep-assign/-/deep-assign-2.0.0.tgz#ebe06b1f07f08dae597620e3dd1622f371a1c572" + dependencies: + is-obj "^1.0.0" + deep-equal@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" @@ -2050,15 +2077,11 @@ diff@1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf" -diff@3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" - diff@3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75" -diff@^3.3.1, diff@^3.5.0: +diff@3.5.0, diff@^3.3.1, diff@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" @@ -2861,6 +2884,18 @@ fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" +fbjs@^0.8.16: + version "0.8.17" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" + dependencies: + core-js "^1.0.0" + isomorphic-fetch "^2.1.1" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.18" + fd-slicer@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" @@ -3054,6 +3089,14 @@ fs-extra@^4.0.2: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-minipass@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" @@ -3193,17 +3236,6 @@ glob@3.2.11: inherits "2" minimatch "0.3" -glob@7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.2" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@~7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" @@ -3340,6 +3372,10 @@ growl@1.10.3: version "1.10.3" resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f" +growl@1.10.5: + version "1.10.5" + resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" + growl@1.9.2: version "1.9.2" resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f" @@ -3837,6 +3873,10 @@ is-number@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" +is-obj@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + is-object@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470" @@ -3957,7 +3997,7 @@ isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" -isomorphic-fetch@^2.2.0: +isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" dependencies: @@ -4029,6 +4069,10 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" +"js-tokens@^3.0.0 || ^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + js-yaml@3.x, js-yaml@^3.6.1, js-yaml@^3.9.1: version "3.11.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef" @@ -4143,10 +4187,6 @@ json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" -json3@3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" - json5@^0.5.0, json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -4384,57 +4424,10 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" -lodash._baseassign@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e" - dependencies: - lodash._basecopy "^3.0.0" - lodash.keys "^3.0.0" - -lodash._basecopy@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" - -lodash._basecreate@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821" - -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - -lodash._isiterateecall@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" - lodash.assign@^4.0.3, lodash.assign@^4.0.6: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" -lodash.create@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7" - dependencies: - lodash._baseassign "^3.0.0" - lodash._basecreate "^3.0.0" - lodash._isiterateecall "^3.0.0" - -lodash.isarguments@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - -lodash.isarray@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - -lodash.keys@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - dependencies: - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash@^4.13.1, lodash@^4.14.0, lodash@^4.14.2, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.5, lodash@^4.3.0: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" @@ -4476,6 +4469,12 @@ loose-envify@^1.0.0: dependencies: js-tokens "^3.0.0" +loose-envify@^1.1.0, loose-envify@^1.3.1: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + lowercase-keys@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" @@ -4712,7 +4711,7 @@ minimatch@0.3: lru-cache "2" sigmund "~1.0.0" -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -4785,24 +4784,7 @@ mocha@^2.4.5: supports-color "1.2.0" to-iso-string "0.0.2" -mocha@^3.4.2: - version "3.5.3" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d" - dependencies: - browser-stdout "1.3.0" - commander "2.9.0" - debug "2.6.8" - diff "3.2.0" - escape-string-regexp "1.0.5" - glob "7.1.1" - growl "1.9.2" - he "1.1.1" - json3 "3.3.2" - lodash.create "3.1.1" - mkdirp "0.5.1" - supports-color "3.1.2" - -mocha@^4.0.1: +mocha@^4.0.1, mocha@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.1.0.tgz#7d86cfbcf35cb829e2754c32e17355ec05338794" dependencies: @@ -4817,6 +4799,22 @@ mocha@^4.0.1: mkdirp "0.5.1" supports-color "4.4.0" +mocha@^5.0.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" + dependencies: + browser-stdout "1.3.1" + commander "2.15.1" + debug "3.1.0" + diff "3.5.0" + escape-string-regexp "1.0.5" + glob "7.1.2" + growl "1.10.5" + he "1.1.1" + minimatch "3.0.4" + mkdirp "0.5.1" + supports-color "5.4.0" + mock-fs@^4.1.0: version "4.5.0" resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.5.0.tgz#75245b966f7e3defe197b03454af9c5b355594b7" @@ -4842,6 +4840,10 @@ multimatch@^2.0.0: arrify "^1.0.0" minimatch "^3.0.0" +mustache@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.1.tgz#ef5db3c0d11f1640e9baa47f4e65ba0c3fcd82b9" + mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" @@ -5124,9 +5126,9 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" -openzeppelin-solidity@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/openzeppelin-solidity/-/openzeppelin-solidity-1.9.0.tgz#929c2e8eab5d1935a048390a77645b36dfc5cfad" +openzeppelin-solidity@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/openzeppelin-solidity/-/openzeppelin-solidity-1.10.0.tgz#d77eee6653f5958d051318a61ba0b436f92216c0" optimist@^0.6.1: version "0.6.1" @@ -5155,7 +5157,7 @@ ora@^0.2.3: cli-spinners "^0.1.2" object-assign "^4.0.1" -original-require@^1.0.1: +original-require@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/original-require/-/original-require-1.0.1.tgz#0f130471584cd33511c5ec38c8d59213f9ac5e20" @@ -5478,6 +5480,19 @@ promise-to-callback@^1.0.0: is-fn "^1.0.0" set-immediate-shim "^1.0.1" +promise@^7.1.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" + dependencies: + asap "~2.0.3" + +prop-types@^15.6.0: + version "15.6.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" + dependencies: + loose-envify "^1.3.1" + object-assign "^4.1.1" + proxy-addr@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341" @@ -5586,6 +5601,24 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" +react-dom@^16.2.0: + version "16.4.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.2.tgz#4afed569689f2c561d2b8da0b819669c38a0bda4" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.0" + +react@^16.2.0: + version "16.4.2" + resolved "https://registry.yarnpkg.com/react/-/react-16.4.2.tgz#2cd90154e3a9d9dd8da2991149fdca3c260e129f" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.0" + read-chunk@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.1.0.tgz#6a04c0928005ed9d42e1a6ac5600e19cbc7ff655" @@ -6163,7 +6196,7 @@ shelljs@^0.7.4: interpret "^1.0.0" rechoir "^0.6.2" -shelljs@^0.8.0, shelljs@^0.8.2: +shelljs@^0.8.0, shelljs@^0.8.1, shelljs@^0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35" dependencies: @@ -6265,7 +6298,17 @@ sol-merger@^0.1.2: fs-extra "^4.0.2" glob "^7.1.2" -solc@0.4.23, solc@^0.4.2: +solc@0.4.24, solc@^0.4.19, solc@^0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.24.tgz#354f14b269b38cbaa82a47d1ff151723502b954e" + dependencies: + fs-extra "^0.30.0" + memorystream "^0.3.1" + require-from-string "^1.1.0" + semver "^5.3.0" + yargs "^4.7.1" + +solc@^0.4.2: version "0.4.23" resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.23.tgz#54a0ff4015827b32fddb62c0a418b5247310a58e" dependencies: @@ -6289,6 +6332,18 @@ solidity-coverage@^0.5.0: solidity-parser-sc "0.4.8" web3 "^0.18.4" +solidity-docgen@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/solidity-docgen/-/solidity-docgen-0.1.0.tgz#f3a56ff074e8c7d832af3a3d462c3b5abf0f64cb" + dependencies: + commander "^2.14.1" + lodash "^4.17.5" + mocha "^5.0.1" + mustache "^2.3.0" + react "^16.2.0" + react-dom "^16.2.0" + shelljs "^0.8.1" + solidity-parser-sc@0.4.8: version "0.4.8" resolved "https://registry.yarnpkg.com/solidity-parser-sc/-/solidity-parser-sc-0.4.8.tgz#b2d14f0effe638f78b38b489cb4a763ad88613cd" @@ -6577,18 +6632,18 @@ supports-color@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e" -supports-color@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5" - dependencies: - has-flag "^1.0.0" - supports-color@4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e" dependencies: has-flag "^2.0.0" +supports-color@5.4.0, supports-color@^5.3.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" + dependencies: + has-flag "^3.0.0" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -6605,12 +6660,6 @@ supports-color@^4.2.1: dependencies: has-flag "^2.0.0" -supports-color@^5.3.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" - dependencies: - has-flag "^3.0.0" - swarm-js@0.1.37: version "0.1.37" resolved "https://registry.yarnpkg.com/swarm-js/-/swarm-js-0.1.37.tgz#27d485317a340bbeec40292af783cc10acfa4663" @@ -6872,13 +6921,13 @@ truffle-wallet-provider@0.0.5: web3 "^0.18.2" web3-provider-engine "^8.4.0" -truffle@^4.1.7: - version "4.1.8" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-4.1.8.tgz#b0b9175e0270145999567a3f0a2337c914a23a9c" +truffle@^4.1.11: + version "4.1.14" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-4.1.14.tgz#8d2c298e29abf9b1e486e44ff9faca6d34bb9030" dependencies: - mocha "^3.4.2" - original-require "^1.0.1" - solc "0.4.23" + mocha "^4.1.0" + original-require "1.0.1" + solc "0.4.24" tty-browserify@0.0.0: version "0.0.0" @@ -6917,6 +6966,10 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" +ua-parser-js@^0.7.18: + version "0.7.18" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed" + uglify-js@^2.6, uglify-js@^2.8.29: version "2.8.29" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" @@ -7070,6 +7123,10 @@ v8-compile-cache@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz#8d32e4f16974654657e676e0e467a348e89b0dc4" +valid-url@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" + validate-npm-package-license@^3.0.1: version "3.0.3" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" @@ -7660,7 +7717,7 @@ yargs@^10.0.3: y18n "^3.2.1" yargs-parser "^8.1.0" -yargs@^11.1.0: +yargs@^11.0.0, yargs@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" dependencies: From 29eebdfa080312768ce1f7e7401c4c20fda21744 Mon Sep 17 00:00:00 2001 From: satyam Date: Mon, 13 Aug 2018 23:00:26 +0530 Subject: [PATCH 07/40] install module in developer directory --- scripts/docs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/docs.sh b/scripts/docs.sh index ea7f30c55..621f690e4 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -30,6 +30,7 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen + npm install > /dev/null 2>&1 migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $HOME/polymath-developer-portal/) echo "Successfully docs are generated..." From 231ae6f6140b3c5b3ba5dec902de925674b33fc9 Mon Sep 17 00:00:00 2001 From: satyam Date: Mon, 13 Aug 2018 23:10:04 +0530 Subject: [PATCH 08/40] fix routing error --- scripts/docs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index 621f690e4..e1333a90c 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -30,9 +30,9 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen - npm install > /dev/null 2>&1 + #npm install > /dev/null 2>&1 migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ -solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $HOME/polymath-developer-portal/) +solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." echo "Transferring the API DOCS to $latestTag directory" mv ../../docs/api_* $latestTag From 3fce34291543ea2b8b9a7b5495d5ef5fbc1afa69 Mon Sep 17 00:00:00 2001 From: satyam Date: Mon, 13 Aug 2018 23:53:18 +0530 Subject: [PATCH 09/40] add solc --- scripts/docs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index e1333a90c..b4143d1ce 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -31,6 +31,7 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen #npm install > /dev/null 2>&1 + migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." @@ -58,7 +59,7 @@ reject_docs() { echo "$latestTag docs are already exist into the $DIRECTORY" exit 0 } - +apt-get install solc@0.4.24 echo "Checking the latest tag branch merge on masters" # Get new tags from remote From 73552cbc48995f9bb128dcc351d3146e0328ecbe Mon Sep 17 00:00:00 2001 From: satyam Date: Mon, 13 Aug 2018 23:57:21 +0530 Subject: [PATCH 10/40] provide permission --- scripts/docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index b4143d1ce..da97793ce 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -59,7 +59,7 @@ reject_docs() { echo "$latestTag docs are already exist into the $DIRECTORY" exit 0 } -apt-get install solc@0.4.24 +sudo apt-get install solc@0.4.24 echo "Checking the latest tag branch merge on masters" # Get new tags from remote From 22f6ac66776658994ffa3ec282004ed693953f4e Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 08:24:22 +0530 Subject: [PATCH 11/40] change in the installation command --- scripts/docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index da97793ce..fc1e748ad 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -59,7 +59,7 @@ reject_docs() { echo "$latestTag docs are already exist into the $DIRECTORY" exit 0 } -sudo apt-get install solc@0.4.24 +sudo apt-get install solc echo "Checking the latest tag branch merge on masters" # Get new tags from remote From 87fa4c0434def72cf80b0e0800ba2203466ff2da Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 08:26:43 +0530 Subject: [PATCH 12/40] fix1 --- scripts/docs.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/docs.sh b/scripts/docs.sh index fc1e748ad..ffe5b181f 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -59,7 +59,10 @@ reject_docs() { echo "$latestTag docs are already exist into the $DIRECTORY" exit 0 } +sudo add-apt-repository ppa:ethereum/ethereum +sudo apt-get update sudo apt-get install solc +solc --version echo "Checking the latest tag branch merge on masters" # Get new tags from remote From 23dad34bc4484d45666479961573a7146a19bf71 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 08:35:59 +0530 Subject: [PATCH 13/40] add echos --- scripts/docs.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index ffe5b181f..b2dee2858 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -59,9 +59,12 @@ reject_docs() { echo "$latestTag docs are already exist into the $DIRECTORY" exit 0 } -sudo add-apt-repository ppa:ethereum/ethereum -sudo apt-get update -sudo apt-get install solc +echo "doing step 1" +cat < (echo "") | sudo add-apt-repository ppa:ethereum/ethereum +echo "doing step 2" +sudo apt-get update -y +echo "doing step 3" +sudo apt-get install solc -y solc --version echo "Checking the latest tag branch merge on masters" From 33808b7ccbc0fd6c8e63d9c1b4bdd81fab923118 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 08:39:36 +0530 Subject: [PATCH 14/40] fix2 --- scripts/docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index b2dee2858..74f206a5d 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -60,7 +60,7 @@ reject_docs() { exit 0 } echo "doing step 1" -cat < (echo "") | sudo add-apt-repository ppa:ethereum/ethereum +sudo add-apt-repository -y ppa:ethereum/ethereum echo "doing step 2" sudo apt-get update -y echo "doing step 3" From 099253df4e960f8a745bc68d79c9505e99fe5046 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 08:42:15 +0530 Subject: [PATCH 15/40] change --- scripts/docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index 74f206a5d..900edbd2a 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -60,7 +60,7 @@ reject_docs() { exit 0 } echo "doing step 1" -sudo add-apt-repository -y ppa:ethereum/ethereum +cat <(echo "") | sudo add-apt-repository ppa:ethereum/ethereum echo "doing step 2" sudo apt-get update -y echo "doing step 3" From 2625afe06a476469379c747b969e1057d7fe64d6 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 08:47:54 +0530 Subject: [PATCH 16/40] fix3 --- scripts/docs.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index 900edbd2a..9ad1b85c0 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -59,13 +59,14 @@ reject_docs() { echo "$latestTag docs are already exist into the $DIRECTORY" exit 0 } +which solc echo "doing step 1" -cat <(echo "") | sudo add-apt-repository ppa:ethereum/ethereum +echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum echo "doing step 2" -sudo apt-get update -y +sudo apt-get -y update echo "doing step 3" -sudo apt-get install solc -y -solc --version +sudo apt-get -y install solc +which solc echo "Checking the latest tag branch merge on masters" # Get new tags from remote From 86dbde5c6cb606434b602c065ea57b4908ace683 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 08:49:35 +0530 Subject: [PATCH 17/40] fix4 --- scripts/docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index 9ad1b85c0..1b166e010 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -59,7 +59,7 @@ reject_docs() { echo "$latestTag docs are already exist into the $DIRECTORY" exit 0 } -which solc + echo "doing step 1" echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum echo "doing step 2" From 96f5ec7cb28a6a2fd0d7abe068c5f5d5debe5eaa Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 08:56:51 +0530 Subject: [PATCH 18/40] fix 4 --- .travis.yml | 2 +- scripts/docs.sh | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb927a403..a9275d3f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: before_script: - truffle version script: -- npm run docs +- scripts/docs.sh notifications: slack: secure: W4FZSabLrzF74f317hutolEHnlq2GBlQxU6b85L5XymrjgLEhlgE16c5Qz7Emoyt6le6PXL+sfG2ujJc3XYys/6hppgrHSAasuJnKCdQNpmMZ9BNyMs6WGkmB3enIf3K/FLXb26AQdwpQdIXuOeJUTf879u+YoiZV0eZH8d3+fsIOyovq9N6X5pKOpDM9iT8gGB4t7fie7xf51s+iUaHxyO9G7jDginZ4rBXHcU7mxCub9z+Z1H8+kCTnPWaF+KKVEXx4Z0nI3+urboD7E4OIP02LwrThQls2CppA3X0EoesTcdvj/HLErY/JvsXIFiFEEHZzB1Wi+k2TiOeLcYwEuHIVij+HPxxlJNX/j8uy01Uk8s4rd+0EhvfdKHJqUKqxH4YN2npcKfHEss7bU3y7dUinXQfYShW5ZewHdvc7pnnxBTfhvmdi64HdNrXAPq+s1rhciH7MmnU+tsm4lhrpr+FBuHzUMA9fOCr7b0SQytZEgWpiUls88gdbh3yG8TjyZxmZJGx09cwEP0q7VoH0UwFh7mIu5XmYdd5tWUhavTiO7YV8cUPn7MvwMsTltB3YBpF/fB26L7ka8zBhCsjm9prW6SVYU/dyO3m91VeZtO/zJFHRDA6Q58JGVW2rgzO39z193qC1EGRXqTie96VwAAtNg8+hRb+bI/CWDVzSPc= diff --git a/scripts/docs.sh b/scripts/docs.sh index 1b166e010..e32a87a9a 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -60,12 +60,6 @@ reject_docs() { exit 0 } -echo "doing step 1" -echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum -echo "doing step 2" -sudo apt-get -y update -echo "doing step 3" -sudo apt-get -y install solc which solc echo "Checking the latest tag branch merge on masters" From 56b4b3ac3c1eff265b22de575f1756643817a088 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 08:59:00 +0530 Subject: [PATCH 19/40] fix 5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a9275d3f8..52e2c8f28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: before_script: - truffle version script: -- scripts/docs.sh +- bash scripts/docs.sh notifications: slack: secure: W4FZSabLrzF74f317hutolEHnlq2GBlQxU6b85L5XymrjgLEhlgE16c5Qz7Emoyt6le6PXL+sfG2ujJc3XYys/6hppgrHSAasuJnKCdQNpmMZ9BNyMs6WGkmB3enIf3K/FLXb26AQdwpQdIXuOeJUTf879u+YoiZV0eZH8d3+fsIOyovq9N6X5pKOpDM9iT8gGB4t7fie7xf51s+iUaHxyO9G7jDginZ4rBXHcU7mxCub9z+Z1H8+kCTnPWaF+KKVEXx4Z0nI3+urboD7E4OIP02LwrThQls2CppA3X0EoesTcdvj/HLErY/JvsXIFiFEEHZzB1Wi+k2TiOeLcYwEuHIVij+HPxxlJNX/j8uy01Uk8s4rd+0EhvfdKHJqUKqxH4YN2npcKfHEss7bU3y7dUinXQfYShW5ZewHdvc7pnnxBTfhvmdi64HdNrXAPq+s1rhciH7MmnU+tsm4lhrpr+FBuHzUMA9fOCr7b0SQytZEgWpiUls88gdbh3yG8TjyZxmZJGx09cwEP0q7VoH0UwFh7mIu5XmYdd5tWUhavTiO7YV8cUPn7MvwMsTltB3YBpF/fB26L7ka8zBhCsjm9prW6SVYU/dyO3m91VeZtO/zJFHRDA6Q58JGVW2rgzO39z193qC1EGRXqTie96VwAAtNg8+hRb+bI/CWDVzSPc= From ac8f9eceb0f00c4f0ab9cd6b0baba6e38c04440a Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 09:02:20 +0530 Subject: [PATCH 20/40] fix 6 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 52e2c8f28..363c7dbb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,7 @@ matrix: - env: SOLIDITY_COVERAGE=true before_script: - truffle version -script: -- bash scripts/docs.sh +script: bash scripts/docs.sh notifications: slack: secure: W4FZSabLrzF74f317hutolEHnlq2GBlQxU6b85L5XymrjgLEhlgE16c5Qz7Emoyt6le6PXL+sfG2ujJc3XYys/6hppgrHSAasuJnKCdQNpmMZ9BNyMs6WGkmB3enIf3K/FLXb26AQdwpQdIXuOeJUTf879u+YoiZV0eZH8d3+fsIOyovq9N6X5pKOpDM9iT8gGB4t7fie7xf51s+iUaHxyO9G7jDginZ4rBXHcU7mxCub9z+Z1H8+kCTnPWaF+KKVEXx4Z0nI3+urboD7E4OIP02LwrThQls2CppA3X0EoesTcdvj/HLErY/JvsXIFiFEEHZzB1Wi+k2TiOeLcYwEuHIVij+HPxxlJNX/j8uy01Uk8s4rd+0EhvfdKHJqUKqxH4YN2npcKfHEss7bU3y7dUinXQfYShW5ZewHdvc7pnnxBTfhvmdi64HdNrXAPq+s1rhciH7MmnU+tsm4lhrpr+FBuHzUMA9fOCr7b0SQytZEgWpiUls88gdbh3yG8TjyZxmZJGx09cwEP0q7VoH0UwFh7mIu5XmYdd5tWUhavTiO7YV8cUPn7MvwMsTltB3YBpF/fB26L7ka8zBhCsjm9prW6SVYU/dyO3m91VeZtO/zJFHRDA6Q58JGVW2rgzO39z193qC1EGRXqTie96VwAAtNg8+hRb+bI/CWDVzSPc= From 87716fb2a219cc0b48d06efbd123736f76cf00d3 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 09:18:38 +0530 Subject: [PATCH 21/40] fix 7 --- .travis.yml | 3 ++- scripts/docs.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 363c7dbb8..cb927a403 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ matrix: - env: SOLIDITY_COVERAGE=true before_script: - truffle version -script: bash scripts/docs.sh +script: +- npm run docs notifications: slack: secure: W4FZSabLrzF74f317hutolEHnlq2GBlQxU6b85L5XymrjgLEhlgE16c5Qz7Emoyt6le6PXL+sfG2ujJc3XYys/6hppgrHSAasuJnKCdQNpmMZ9BNyMs6WGkmB3enIf3K/FLXb26AQdwpQdIXuOeJUTf879u+YoiZV0eZH8d3+fsIOyovq9N6X5pKOpDM9iT8gGB4t7fie7xf51s+iUaHxyO9G7jDginZ4rBXHcU7mxCub9z+Z1H8+kCTnPWaF+KKVEXx4Z0nI3+urboD7E4OIP02LwrThQls2CppA3X0EoesTcdvj/HLErY/JvsXIFiFEEHZzB1Wi+k2TiOeLcYwEuHIVij+HPxxlJNX/j8uy01Uk8s4rd+0EhvfdKHJqUKqxH4YN2npcKfHEss7bU3y7dUinXQfYShW5ZewHdvc7pnnxBTfhvmdi64HdNrXAPq+s1rhciH7MmnU+tsm4lhrpr+FBuHzUMA9fOCr7b0SQytZEgWpiUls88gdbh3yG8TjyZxmZJGx09cwEP0q7VoH0UwFh7mIu5XmYdd5tWUhavTiO7YV8cUPn7MvwMsTltB3YBpF/fB26L7ka8zBhCsjm9prW6SVYU/dyO3m91VeZtO/zJFHRDA6Q58JGVW2rgzO39z193qC1EGRXqTie96VwAAtNg8+hRb+bI/CWDVzSPc= diff --git a/scripts/docs.sh b/scripts/docs.sh index e32a87a9a..5c2f6d835 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -32,7 +32,8 @@ create_docs() { # Command to generate the documentation using the solidity-docgen #npm install > /dev/null 2>&1 - migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ + migrate=$(SOLC_PATH="$CORE_ROUTE/node_modules/.bin/solc" \ +SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." echo "Transferring the API DOCS to $latestTag directory" @@ -60,7 +61,6 @@ reject_docs() { exit 0 } -which solc echo "Checking the latest tag branch merge on masters" # Get new tags from remote From ce72ede845bcefe4aa91e8aaf53b7a8823d11a10 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 09:21:00 +0530 Subject: [PATCH 22/40] fix 8 --- scripts/docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index 5c2f6d835..da987ce4a 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -32,7 +32,7 @@ create_docs() { # Command to generate the documentation using the solidity-docgen #npm install > /dev/null 2>&1 - migrate=$(SOLC_PATH="$CORE_ROUTE/node_modules/.bin/solc" \ + migrate=$(SOLC_PATH="$CORE_ROUTE/node_modules/.bin/solcjs" \ SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." From 866abbadc6e621a9eb0bdb05164940e4c6d78f01 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 09:24:17 +0530 Subject: [PATCH 23/40] fix 9 --- scripts/docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index da987ce4a..5ab7d56f8 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -32,7 +32,7 @@ create_docs() { # Command to generate the documentation using the solidity-docgen #npm install > /dev/null 2>&1 - migrate=$(SOLC_PATH="$CORE_ROUTE/node_modules/.bin/solcjs" \ + migrate=$(SOLC_PATH="$CORE_ROUTE/node_modules/.bin/solcjs --abi" \ SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." From 7e1342eb5808aa77ed1eae6e976d50c4cbfd6b56 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 09:26:19 +0530 Subject: [PATCH 24/40] fix 10 --- scripts/docs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index 5ab7d56f8..a753ce2f3 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -32,8 +32,8 @@ create_docs() { # Command to generate the documentation using the solidity-docgen #npm install > /dev/null 2>&1 - migrate=$(SOLC_PATH="$CORE_ROUTE/node_modules/.bin/solcjs --abi" \ -SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ + migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ +SOLC_PATH="$CORE_ROUTE/node_modules/.bin/solcjs --abi" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." echo "Transferring the API DOCS to $latestTag directory" From 534740bb041449f418923eb71bef5eba75d787fa Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 09:34:27 +0530 Subject: [PATCH 25/40] fix 11 --- scripts/docs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index a753ce2f3..06cb635d1 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -31,9 +31,9 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen #npm install > /dev/null 2>&1 - - migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ -SOLC_PATH="$CORE_ROUTE/node_modules/.bin/solcjs --abi" \ + echo $PWD + migrate=$(SOLC_PATH="$CORE_ROUTE/node_modules/.bin/solcjs --abi" +SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." echo "Transferring the API DOCS to $latestTag directory" From bce5afe60ff4f93e41b67202704c9dbc4bdc6cfd Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 09:42:30 +0530 Subject: [PATCH 26/40] fix 12 --- scripts/docs.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index 06cb635d1..c2cde8f08 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -31,8 +31,11 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen #npm install > /dev/null 2>&1 + echo -ne "\n" | sudo add-apt-repository ppa:ethereum/ethereum + sudo apt-get -y update + sudo apt-get -y install solc echo $PWD - migrate=$(SOLC_PATH="$CORE_ROUTE/node_modules/.bin/solcjs --abi" + migrate=$(SOLC_PATH="$CORE_ROUTE/node_modules/.bin/solcjs --abi" \ SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." From 8a72e1eab0a53a529935c3797b819496749f2e38 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 09:53:37 +0530 Subject: [PATCH 27/40] fix 13 --- .travis.yml | 1 + scripts/docs.sh | 8 ++------ scripts/solidity.sh | 13 +++++++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100755 scripts/solidity.sh diff --git a/.travis.yml b/.travis.yml index cb927a403..c7aa399b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ matrix: before_script: - truffle version script: +- bash scripts/solidity.sh - npm run docs notifications: slack: diff --git a/scripts/docs.sh b/scripts/docs.sh index c2cde8f08..d0e1d6c2c 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -31,12 +31,8 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen #npm install > /dev/null 2>&1 - echo -ne "\n" | sudo add-apt-repository ppa:ethereum/ethereum - sudo apt-get -y update - sudo apt-get -y install solc - echo $PWD - migrate=$(SOLC_PATH="$CORE_ROUTE/node_modules/.bin/solcjs --abi" \ -SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ + + migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." echo "Transferring the API DOCS to $latestTag directory" diff --git a/scripts/solidity.sh b/scripts/solidity.sh new file mode 100755 index 000000000..1af0b1f83 --- /dev/null +++ b/scripts/solidity.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +apt update -y && apt upgrade -y +apt install -y build-essential cmake libboost-all-dev +git clone --recursive https://github.com/ethereum/solidity.git +cd solidity +mkdir build && cd build +cmake .. +make +ls -l solc +ls -l lllc +make install +echo "export LD_LIBRARY_PATH='$LD_LIBRARY_PATH:/usr/local/lib'" >> ~/.bashrc \ No newline at end of file From 62c067294fcf2270e6b689b9d397d973da98c31a Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 09:55:47 +0530 Subject: [PATCH 28/40] fix 14 --- scripts/solidity.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/solidity.sh b/scripts/solidity.sh index 1af0b1f83..3154639e7 100755 --- a/scripts/solidity.sh +++ b/scripts/solidity.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -apt update -y && apt upgrade -y -apt install -y build-essential cmake libboost-all-dev +sudo apt update -y && sudo apt upgrade -y +sudo apt install -y build-essential cmake libboost-all-dev git clone --recursive https://github.com/ethereum/solidity.git cd solidity mkdir build && cd build From e580e0632e6a2a462bf1e194073f14c4b984f199 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 09:59:39 +0530 Subject: [PATCH 29/40] fix 15 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c7aa399b9..1583d8846 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: before_script: - truffle version script: -- bash scripts/solidity.sh +- bash scripts/docs.sh - npm run docs notifications: slack: From 015664d816ce0129920d67a97c4adc975abf9c89 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 10:03:43 +0530 Subject: [PATCH 30/40] fix 16 --- .travis.yml | 3 +-- scripts/docs.sh | 8 +++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1583d8846..a00115910 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,7 @@ matrix: before_script: - truffle version script: -- bash scripts/docs.sh -- npm run docs +- bash -x scripts/docs.sh notifications: slack: secure: W4FZSabLrzF74f317hutolEHnlq2GBlQxU6b85L5XymrjgLEhlgE16c5Qz7Emoyt6le6PXL+sfG2ujJc3XYys/6hppgrHSAasuJnKCdQNpmMZ9BNyMs6WGkmB3enIf3K/FLXb26AQdwpQdIXuOeJUTf879u+YoiZV0eZH8d3+fsIOyovq9N6X5pKOpDM9iT8gGB4t7fie7xf51s+iUaHxyO9G7jDginZ4rBXHcU7mxCub9z+Z1H8+kCTnPWaF+KKVEXx4Z0nI3+urboD7E4OIP02LwrThQls2CppA3X0EoesTcdvj/HLErY/JvsXIFiFEEHZzB1Wi+k2TiOeLcYwEuHIVij+HPxxlJNX/j8uy01Uk8s4rd+0EhvfdKHJqUKqxH4YN2npcKfHEss7bU3y7dUinXQfYShW5ZewHdvc7pnnxBTfhvmdi64HdNrXAPq+s1rhciH7MmnU+tsm4lhrpr+FBuHzUMA9fOCr7b0SQytZEgWpiUls88gdbh3yG8TjyZxmZJGx09cwEP0q7VoH0UwFh7mIu5XmYdd5tWUhavTiO7YV8cUPn7MvwMsTltB3YBpF/fB26L7ka8zBhCsjm9prW6SVYU/dyO3m91VeZtO/zJFHRDA6Q58JGVW2rgzO39z193qC1EGRXqTie96VwAAtNg8+hRb+bI/CWDVzSPc= diff --git a/scripts/docs.sh b/scripts/docs.sh index d0e1d6c2c..58d5d8693 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -31,7 +31,13 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen #npm install > /dev/null 2>&1 - + echo "doing step 1" + echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum + echo "doing step 2" + sudo apt-get -y update + echo "doing step 3" + sudo apt-get -y install solc + which solc migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." From f7a9bb1be3021e02ec2d2196d727c3254726ff48 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 10:06:53 +0530 Subject: [PATCH 31/40] fix 17 --- .travis.yml | 1 + scripts/docs.sh | 8 +------- scripts/solidity.sh | 20 ++++++++------------ 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index a00115910..55dcc6879 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ matrix: before_script: - truffle version script: +- bash -x scripts/solidity.sh - bash -x scripts/docs.sh notifications: slack: diff --git a/scripts/docs.sh b/scripts/docs.sh index 58d5d8693..e10b9ef65 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -31,13 +31,7 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen #npm install > /dev/null 2>&1 - echo "doing step 1" - echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum - echo "doing step 2" - sudo apt-get -y update - echo "doing step 3" - sudo apt-get -y install solc - which solc + migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." diff --git a/scripts/solidity.sh b/scripts/solidity.sh index 3154639e7..505e457f6 100755 --- a/scripts/solidity.sh +++ b/scripts/solidity.sh @@ -1,13 +1,9 @@ -#!/usr/bin/env bash +#!/bin/bash -sudo apt update -y && sudo apt upgrade -y -sudo apt install -y build-essential cmake libboost-all-dev -git clone --recursive https://github.com/ethereum/solidity.git -cd solidity -mkdir build && cd build -cmake .. -make -ls -l solc -ls -l lllc -make install -echo "export LD_LIBRARY_PATH='$LD_LIBRARY_PATH:/usr/local/lib'" >> ~/.bashrc \ No newline at end of file +echo "doing step 1" +echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum +echo "doing step 2" +sudo apt-get -y update +echo "doing step 3" +sudo apt-get -y install solc +which solc \ No newline at end of file From b48969bbcaccb0752418a85e54a13b40eedb7c46 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 10:11:48 +0530 Subject: [PATCH 32/40] fix 18 --- .travis.yml | 4 ++-- scripts/solidity.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55dcc6879..c7aa399b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ matrix: before_script: - truffle version script: -- bash -x scripts/solidity.sh -- bash -x scripts/docs.sh +- bash scripts/solidity.sh +- npm run docs notifications: slack: secure: W4FZSabLrzF74f317hutolEHnlq2GBlQxU6b85L5XymrjgLEhlgE16c5Qz7Emoyt6le6PXL+sfG2ujJc3XYys/6hppgrHSAasuJnKCdQNpmMZ9BNyMs6WGkmB3enIf3K/FLXb26AQdwpQdIXuOeJUTf879u+YoiZV0eZH8d3+fsIOyovq9N6X5pKOpDM9iT8gGB4t7fie7xf51s+iUaHxyO9G7jDginZ4rBXHcU7mxCub9z+Z1H8+kCTnPWaF+KKVEXx4Z0nI3+urboD7E4OIP02LwrThQls2CppA3X0EoesTcdvj/HLErY/JvsXIFiFEEHZzB1Wi+k2TiOeLcYwEuHIVij+HPxxlJNX/j8uy01Uk8s4rd+0EhvfdKHJqUKqxH4YN2npcKfHEss7bU3y7dUinXQfYShW5ZewHdvc7pnnxBTfhvmdi64HdNrXAPq+s1rhciH7MmnU+tsm4lhrpr+FBuHzUMA9fOCr7b0SQytZEgWpiUls88gdbh3yG8TjyZxmZJGx09cwEP0q7VoH0UwFh7mIu5XmYdd5tWUhavTiO7YV8cUPn7MvwMsTltB3YBpF/fB26L7ka8zBhCsjm9prW6SVYU/dyO3m91VeZtO/zJFHRDA6Q58JGVW2rgzO39z193qC1EGRXqTie96VwAAtNg8+hRb+bI/CWDVzSPc= diff --git a/scripts/solidity.sh b/scripts/solidity.sh index 505e457f6..3c30c0d38 100755 --- a/scripts/solidity.sh +++ b/scripts/solidity.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash echo "doing step 1" echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum @@ -6,4 +6,5 @@ echo "doing step 2" sudo apt-get -y update echo "doing step 3" sudo apt-get -y install solc +echo "Installing solc ...." which solc \ No newline at end of file From 274de1ee434d11c760cdda59ab50332226fd97df Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 10:16:07 +0530 Subject: [PATCH 33/40] try --- scripts/docs.sh | 2 +- scripts/solidity.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/docs.sh b/scripts/docs.sh index e10b9ef65..3dfa56565 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -31,7 +31,7 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen #npm install > /dev/null 2>&1 - + which solc migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." diff --git a/scripts/solidity.sh b/scripts/solidity.sh index 3c30c0d38..03db50ef9 100755 --- a/scripts/solidity.sh +++ b/scripts/solidity.sh @@ -7,4 +7,4 @@ sudo apt-get -y update echo "doing step 3" sudo apt-get -y install solc echo "Installing solc ...." -which solc \ No newline at end of file +solc --version \ No newline at end of file From 909f40cca93956d506645e9c5f7c9065140ec37d Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 10:26:17 +0530 Subject: [PATCH 34/40] trying --- .travis.yml | 2 +- scripts/solidity.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c7aa399b9..fd44c47da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: before_script: - truffle version script: -- bash scripts/solidity.sh +- bash -x scripts/solidity.sh - npm run docs notifications: slack: diff --git a/scripts/solidity.sh b/scripts/solidity.sh index 03db50ef9..5cb64ae62 100755 --- a/scripts/solidity.sh +++ b/scripts/solidity.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash echo "doing step 1" -echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum +echo -ne '\n' | add-apt-repository ppa:ethereum/ethereum echo "doing step 2" -sudo apt-get -y update +apt-get -y update echo "doing step 3" -sudo apt-get -y install solc +apt-get -y install solc echo "Installing solc ...." solc --version \ No newline at end of file From 51b4f83d47d9a97b04e45bbfce7160bb85ee3316 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 10:31:33 +0530 Subject: [PATCH 35/40] again trying --- .travis.yml | 1 - scripts/docs.sh | 1 + scripts/solidity.sh | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd44c47da..cb927a403 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ matrix: before_script: - truffle version script: -- bash -x scripts/solidity.sh - npm run docs notifications: slack: diff --git a/scripts/docs.sh b/scripts/docs.sh index 3dfa56565..5d9f103a9 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -60,6 +60,7 @@ reject_docs() { exit 0 } +bash $CORE_ROUTE/scripts/solidity.sh echo "Checking the latest tag branch merge on masters" # Get new tags from remote diff --git a/scripts/solidity.sh b/scripts/solidity.sh index 5cb64ae62..03db50ef9 100755 --- a/scripts/solidity.sh +++ b/scripts/solidity.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash echo "doing step 1" -echo -ne '\n' | add-apt-repository ppa:ethereum/ethereum +echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum echo "doing step 2" -apt-get -y update +sudo apt-get -y update echo "doing step 3" -apt-get -y install solc +sudo apt-get -y install solc echo "Installing solc ...." solc --version \ No newline at end of file From 17619bae9e9546a2eb0c123403b018bcdd1ce408 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 10:35:01 +0530 Subject: [PATCH 36/40] again again trying --- scripts/solidity.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/solidity.sh b/scripts/solidity.sh index 03db50ef9..7d7e62635 100755 --- a/scripts/solidity.sh +++ b/scripts/solidity.sh @@ -1,10 +1,6 @@ #!/usr/bin/env bash -echo "doing step 1" echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum -echo "doing step 2" sudo apt-get -y update -echo "doing step 3" sudo apt-get -y install solc -echo "Installing solc ...." solc --version \ No newline at end of file From 52ccc086ab50094e703970e4b6acb363dc338fce Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 10:38:24 +0530 Subject: [PATCH 37/40] ise baar tho chalega --- .travis.yml | 4 ++++ scripts/docs.sh | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cb927a403..dbe367084 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,10 @@ matrix: fast_finish: true allow_failures: - env: SOLIDITY_COVERAGE=true +before_install: +- echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum +- sudo apt-get -y update +- sudo apt-get -y install solc before_script: - truffle version script: diff --git a/scripts/docs.sh b/scripts/docs.sh index 5d9f103a9..3dfa56565 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -60,7 +60,6 @@ reject_docs() { exit 0 } -bash $CORE_ROUTE/scripts/solidity.sh echo "Checking the latest tag branch merge on masters" # Get new tags from remote From 9dc7d57e4d2e06b3a8b0720ea917e31e47e5814b Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 10:56:39 +0530 Subject: [PATCH 38/40] ise baar tho thok bajake chalna hai --- .travis.yml | 1 + scripts/docs.sh | 9 ++++----- scripts/solidity.sh | 6 ------ 3 files changed, 5 insertions(+), 11 deletions(-) delete mode 100755 scripts/solidity.sh diff --git a/.travis.yml b/.travis.yml index dbe367084..8b65f8639 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ before_install: before_script: - truffle version script: +- npm run test - npm run docs notifications: slack: diff --git a/scripts/docs.sh b/scripts/docs.sh index 3dfa56565..248461fd0 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -31,7 +31,6 @@ create_docs() { echo "Generating the API documentation in branch $latestTag" # Command to generate the documentation using the solidity-docgen #npm install > /dev/null 2>&1 - which solc migrate=$(SOLC_ARGS="openzeppelin-solidity="$CORE_ROUTE"/node_modules/openzeppelin-solidity" \ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer-portal/) echo "Successfully docs are generated..." @@ -41,10 +40,10 @@ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer # Commit the changes echo "Commiting the new changes..." git add . - git commit -m "create new api docs for $latestTag" - #git commit -m "create new api docs for $latestTag" > /dev/null 2>&1 - #git push origin $latestTag > /dev/null 2>&1 - git push origin $latestTag + #git commit -m "create new api docs for $latestTag" + git commit -m "create new api docs for $latestTag" > /dev/null 2>&1 + git push origin $latestTag > /dev/null 2>&1 + #git push origin $latestTag #git commit -m "create new api docs for $latestTag" > /dev/null 2>&1 #git push origin $latestTag > /dev/null 2>&1 diff --git a/scripts/solidity.sh b/scripts/solidity.sh deleted file mode 100755 index 7d7e62635..000000000 --- a/scripts/solidity.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum -sudo apt-get -y update -sudo apt-get -y install solc -solc --version \ No newline at end of file From a6e215e736ab6faddd67fe902a08468bed6050d1 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 11:19:35 +0530 Subject: [PATCH 39/40] boundary checks implemented --- scripts/docs.sh | 12 ++++++++---- scripts/wait.sh | 9 +++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 scripts/wait.sh diff --git a/scripts/docs.sh b/scripts/docs.sh index 248461fd0..6cb78ded3 100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -14,6 +14,12 @@ create_docs() { # getting the all available branches if [ "$(git branch | grep -w $latestTag)" == "" ]; then + # Check whether the branch is already present or not + if [ "$(git branch -r | grep "origin/$latestTag" | wc -l)" -eq 1 ]; + then + echo "$latesTag Branch is already present on remote" + exit 0 + fi # Checkout and create the $latestTag branch git checkout -b $latestTag @@ -40,12 +46,10 @@ solidity-docgen $CORE_ROUTE $CORE_ROUTE/contracts $CORE_ROUTE/polymath-developer # Commit the changes echo "Commiting the new changes..." git add . - #git commit -m "create new api docs for $latestTag" - git commit -m "create new api docs for $latestTag" > /dev/null 2>&1 - git push origin $latestTag > /dev/null 2>&1 - #git push origin $latestTag #git commit -m "create new api docs for $latestTag" > /dev/null 2>&1 #git push origin $latestTag > /dev/null 2>&1 + git commit -m "create new api docs for $latestTag" + git push origin $latestTag # Remove the repository echo "Removing the repository from the system...." diff --git a/scripts/wait.sh b/scripts/wait.sh new file mode 100644 index 000000000..50f1412a4 --- /dev/null +++ b/scripts/wait.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +tail -f /dev/null >/tmp/apt-get.log & # Run in background, with output redirected +pid=$! # Get PID of background command +while kill -0 $pid # Signal 0 just tests whether the process exists +do + echo -n "executing" + sleep 5; +done \ No newline at end of file From 4dee561989df31856763754131c0a45ffdc36f27 Mon Sep 17 00:00:00 2001 From: satyam Date: Tue, 14 Aug 2018 11:44:57 +0530 Subject: [PATCH 40/40] coverage get true --- .travis.yml | 2 +- scripts/coverage.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8b65f8639..d662ccd45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ cache: directories: - node_modules env: -- SOLIDITY_COVERAGE=false +- SOLIDITY_COVERAGE=true matrix: fast_finish: true allow_failures: diff --git a/scripts/coverage.sh b/scripts/coverage.sh index 8a50f77b4..a65d7751b 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -1,3 +1,9 @@ #!/usr/bin/env bash SOLIDITY_COVERAGE=true scripts/test.sh +pid=$! # Get PID of background command +while kill -0 $pid # Signal 0 just tests whether the process exists +do + echo -n "waiting...." + sleep 180; +done \ No newline at end of file