Skip to content

Commit

Permalink
Merge pull request #190 from Augmint/staging
Browse files Browse the repository at this point in the history
Release 1.0.4
  • Loading branch information
Peter Petrovics authored Apr 9, 2019
2 parents 4b055a9 + d8730c0 commit 399058c
Show file tree
Hide file tree
Showing 9 changed files with 560 additions and 56 deletions.
33 changes: 26 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,49 @@
{
"name": "augmint-contracts",
"version": "0.1.0",
"version": "1.0.4",
"description": "Augmint Stable Tokens - Solidity contracts",
"homepage": ".",
"private": true,
"author": "“Augmint”",
"homepage": "https://github.com/Augmint/augmint-contracts#readme",
"license": "AGPL-3.0-only",
"repository": {
"type": "git",
"url": "https://github.com/Augmint/augmint-contracts.git"
},
"bugs": {
"url": "https://github.com/Augmint/augmint-contracts/issues"
},
"keywords": [
"ethereum",
"solidity",
"augmint",
"stablecoin",
"aeur"
],
"engines": {
"node": "10.15.3",
"yarn": "1.13.0"
},
"bin": {
"augmint-contracts": "./scripts/augmint-contracts.sh"
},
"scripts": {
"start": "./runganache.sh & $(yarn bin)/truffle migrate --reset && echo 'Migration done. Contracts deployed to ganache. Contract artifacts are in build/contracts folder.' & wait",
"start": "yarn runmigrate",
"build": "truffle compile",
"clean": "rm build/contracts/*",
"test": "truffle test",
"coverage": "solidity-coverage",
"migrate": "truffle migrate",
"compile": "yarn build",
"ganache:run": "./runganache.sh",
"runmigrate": "yarn start"
"ganache:run": "./scripts/augmint-contracts.sh runganache",
"runmigrate": "./scripts/augmint-contracts.sh runmigrate & wait"
},
"devDependencies": {
"abiniser": "0.5.1",
"babel-register": "6.26.0",
"bignumber.js": "5.0.0",
"coveralls": "3.0.3",
"dotenv": "7.0.0",
"eslint": "5.16.0",
"ganache-cli": "6.4.2",
"moment": "2.22.2",
"random-seed": "0.3.0",
Expand All @@ -39,4 +58,4 @@
"bignumber.js"
]
}
}
}
16 changes: 16 additions & 0 deletions scripts/augmint-contracts.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env bash
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
echo $DIR
case "$1" in
runmigrate )
$DIR/runmigrate.sh
;;

runganache )
$DIR/runganache.sh
;;

*)
echo "Usage: $0 {runmigrate|runganache}"
;;
esac
File renamed without changes.
1 change: 1 addition & 0 deletions runganache.sh → scripts/runganache.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash
echo "launching ganache-cli (aka testrpc) with deterministic addresses" $(yarn bin)
yarn ganache-cli \
--gasLimit 0x47D5DE \
Expand Down
2 changes: 2 additions & 0 deletions scripts/runmigrate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
yarn ganache:run & yarn migrate --reset && echo 'Migration done. Contracts deployed to ganache. Contract artifacts are in build/contracts folder.'
1 change: 1 addition & 0 deletions runrinkeby.sh → scripts/runrinkeby.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash
geth \
--networkid=4 \
--syncmode=full \
Expand Down
1 change: 1 addition & 0 deletions runropsten.sh → scripts/runropsten.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash
geth --testnet \
--networkid 3 \
--cache=1024 \
Expand Down
18 changes: 10 additions & 8 deletions test/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
{
"extends": ['eslint:recommended'],
"extends": [
"eslint:recommended"
],
"parserOptions": {
"ecmaVersion": 2017,
"ecmaVersion": 2017
},
"env": {
"mocha": true,
"node": true,
"es6": true
},
"rules": {
"indent": ["warn", 4],
max-len: "off",
radix: "off",
no-unused-vars: "warn",
"indent": "off",
"max-len": "off",
"radix": "off",
"no-unused-vars": "warn",
"no-console": "off"
},
"globals": {
"web3": false,
"assert": false,
"artifacts": false,
"contract": false
}
}
}
}
Loading

0 comments on commit 399058c

Please sign in to comment.