Skip to content

Commit

Permalink
Successful to compile
Browse files Browse the repository at this point in the history
  • Loading branch information
masaun committed Feb 2, 2020
1 parent d9ce878 commit a5015ab
Show file tree
Hide file tree
Showing 66 changed files with 194 additions and 54 deletions.
51 changes: 51 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = space
indent_size = 4

[*.sol]
indent_style = space
indent_size = 4

[*.py]
indent_style = space
indent_size = 4

[*.rb]
indent_style = space
indent_size = 2

[*.java]
indent_style = space
indent_size = 4

[*.php]
indent_style = space
tab_width = 4

[*.html]
indent_style = space
indent_size = 2

[*.js]
indent_style = space
indent_size = 2

[*.jsx]
indent_style = space
indent_size = 2

[*.css]
indent_style = space
indent_size = 2

[*.md]
trim_trailing_whitespace = false

[{package.json,.travis.yml}]
indent_style = space
indent_size = 2
126 changes: 126 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,129 @@ solidity/build/TestNonStandardERC20Token.abi
solidity/build/TestNonStandardERC20Token.bin
solidity/build/TestSafeMath.abi
solidity/build/TestSafeMath.bin




###################################
# Add
###################################
secrets.json

node_modules
build
ganache
contractAddresses
package-lock.json
.secret
output

/node_modules

wallet.json


#------------------------------------------


# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# Log of ethereum-bridge (for provable-things)
bridge.log

# lol macs
.DS_Store/

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*


# Logs
.DS_Store
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

# next.js build output
.next

# zos sessions
zos.dev-*

# contracts build
build


1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.7.14
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 0 additions & 12 deletions contracts/bancor/solidity/.solcover.js

This file was deleted.

38 changes: 0 additions & 38 deletions contracts/bancor/solidity/truffle-config.js

This file was deleted.

16 changes: 14 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,17 @@
"verify": "node scripts/verify-all.js",
"flatten": "node scripts/flatten.js",
"snyk-protect": "snyk protect",
"prepare": "npm run snyk-protect"
"prepare": "npm run snyk-protect",

"test": "echo \"Error: no test specified\" && exit 1",
"test:truffle": "truffle test ./test/*",
"start-blank": "rm -rf client/src && cp -rf barebones/src client/",
"client": "cd client && npm run start",
"console:development": "truffle console --network development",
"compile:development": "truffle compile --network development",
"migrate:development": "truffle migrate --reset --network development",
"compile:ropsten": "truffle compile --network ropsten",
"migrate:ropsten": "truffle migrate --reset --network ropsten"
},
"dependencies": {
"decimal.js": "10.2.0",
Expand All @@ -26,7 +36,9 @@
"truffle-contract": "3.0.8",
"truffle-flattener": "1.4.2",
"web3": "1.2.1",
"snyk": "^1.259.0"
"snyk": "^1.259.0",
"@truffle/hdwallet-provider": "^1.0.29",
"dotenv": "^8.2.0"
},
"snyk": true
}
4 changes: 2 additions & 2 deletions truffle-config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require('dotenv').config();
//require('dotenv').config();

const HDWalletProvider = require('@truffle/hdwallet-provider'); // @notice - Should new module.
//const HDWalletProvider = require('@truffle/hdwallet-provider'); // @notice - Should new module.
const mnemonic = process.env.MNEMONIC;


Expand Down

0 comments on commit a5015ab

Please sign in to comment.