Skip to content

Commit

Permalink
Merge pull request #15 from JincorTech/develop
Browse files Browse the repository at this point in the history
Develop into master
  • Loading branch information
AlekNS authored Feb 1, 2018
2 parents 8e25fd6 + 2c4bda1 commit b49ec80
Show file tree
Hide file tree
Showing 84 changed files with 3,476 additions and 11,072 deletions.
10 changes: 2 additions & 8 deletions .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ VERIFY_TIMEOUT=
RPC_TYPE=http
RPC_ADDRESS=https://ropsten.infura.io/ujGcHij7xZIyz2afx4h2

WEB3_RESTORE_START_BLOCK=2518791

ICO_SC_ADDRESS=
ICO_SC_ABI_FILEPATH=
WHITELIST_SC_ADDRESS=
WHITELIST_SC_ABI_FILEPATH=
WHITELIST_OWNER_PK_FILEPATH=
ERC20_TOKEN_ADDRESS=0x7267e91c9dd6f402bea68a943374b7652575b989
WEB3_RESTORE_START_BLOCK=

ERC20_TOKEN_ABI_FILEPATH=test/abi/StandardToken.abi
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ services:
- docker
script:
- chmod ugo+x ./build.sh
- export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "prod"; elif [
"$TRAVIS_BRANCH" == "dev" ]; then echo "stage"; else echo "dev-$(git rev-parse
--short HEAD)"; fi`
- export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "prod"; elif [ "$TRAVIS_BRANCH"
== "dev" ]; then echo "stage"; else echo "dev-$(git rev-parse --short HEAD)"; fi`
- "./build.sh $TAG"
notifications:
slack:
secure: GVCcLWm0I+h0XXppj7PW197wR5zcg+2jN3PBq4Pxq3XaNHLwMKClNmzfXfU0FqbXzj2VJwyny0tL5/rk8rOjaI26n2wc+ALzCr4p2nCP0f+zNezpOEvLkUbIhZFHyZNZzg4m2zIkm1b3sfEX/gPetCGhrtq09Ke8+BS749U9nc2ysHZ3Fr9coTMeogq5AiHfWQxjBuwMZoedgaSs3mK+fR9+fHGbytocLsk2NrpukDNpyq8egzD5nam7D0wGN8GRfBPtRMP4bWUhnqozNl4XRC7dAm+rFiCKP2pYbckDhdNdaYBjAXBLmnsvG5I4xVT9gRZ37PWJr3HNIzNARwQnqKr9tD4zbuvK1JmdClu0naMK/hvhQhuTM7K9A7sJ1xRCad6umenSOAaiBwSU1HkLWmQT/jrc6Vii6dhaEryi/kLsCAo3Cw3avA7QiGmkLEh7mXazCiOX8KHXb0O74K+SczS1wlncK1HdtZI9osriE2YtCk7EL1aTdnvVzdazDdAEW202fAEEDG42/5XfUy4X880Tx8Zf1zJSOYiESiv6Mv83GSCX5M5aU3AYd2nYPTTNq1scIenUtA14fRWTotun56+FOLwfWKqdJjRA3PQv7TDtF3Dkzlzc/pQtbAb0MKV1FFXK1fdekvGq2YAM5JfUEtYIJivIJWCSyLt2hGiINgs=
File renamed without changes.
732 changes: 732 additions & 0 deletions apiary.apib

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ set -ex
IMAGE_NAME="jincort/backend-token-wallets"
DOCKER_FILE="Dockerfile.$TAG"
DOCKER_FILE=$( [ -e "$DOCKER_FILE" ] && echo $DOCKER_FILE || echo Dockerfile )
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker build -f $DOCKER_FILE -t ${IMAGE_NAME}:${TAG} . || exit 1
docker push ${IMAGE_NAME}:${TAG}
222 changes: 222 additions & 0 deletions contracts/erc20.abi
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
[
{
"constant": false,
"inputs": [
{
"name": "_spender",
"type": "address"
},
{
"name": "_value",
"type": "uint256"
}
],
"name": "approve",
"outputs": [
{
"name": "success",
"type": "bool"
}
],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "totalSupply",
"outputs": [
{
"name": "",
"type": "uint256"
}
],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "decimals",
"outputs": [
{
"name": "",
"type": "uint8"
}
],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "symbol",
"outputs": [
{
"name": "",
"type": "string"
}
],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "name",
"outputs": [
{
"name": "",
"type": "string"
}
],
"payable": false,
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "_from",
"type": "address"
},
{
"name": "_to",
"type": "address"
},
{
"name": "_value",
"type": "uint256"
}
],
"name": "transferFrom",
"outputs": [
{
"name": "",
"type": "bool"
}
],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [
{
"name": "_account",
"type": "address"
}
],
"name": "balanceOf",
"outputs": [
{
"name": "",
"type": "uint256"
}
],
"payable": false,
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "_to",
"type": "address"
},
{
"name": "_value",
"type": "uint256"
}
],
"name": "transfer",
"outputs": [
{
"name": "success",
"type": "bool"
}
],
"payable": false,
"type": "function"
},
{
"constant": true,
"inputs": [
{
"name": "_owner",
"type": "address"
},
{
"name": "_spender",
"type": "address"
}
],
"name": "allowance",
"outputs": [
{
"name": "",
"type": "uint256"
}
],
"payable": false,
"type": "function"
},
{
"inputs": [
{
"name": "_initialOwner",
"type": "address"
},
{
"name": "_supply",
"type": "uint256"
}
],
"payable": false,
"type": "constructor"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"name": "_from",
"type": "address"
},
{
"indexed": true,
"name": "_to",
"type": "address"
},
{
"indexed": false,
"name": "_value",
"type": "uint256"
}
],
"name": "Transfer",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"name": "_owner",
"type": "address"
},
{
"indexed": true,
"name": "_spender",
"type": "address"
},
{
"indexed": false,
"name": "_value",
"type": "uint256"
}
],
"name": "Approval",
"type": "event"
}
]
36 changes: 36 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"dotenv": "4.0.0",
"ethereumjs-wallet": "0.6.0",
"express": "~4.16.2",
"express-basic-auth": "1.1.3",
"express-bearer-token": "2.1.1",
"express-jwt": "5.3.0",
"express-winston": "2.4.0",
Expand All @@ -47,6 +48,7 @@
"node-mailjet": "3.2.1",
"node-uuid": "^1.4.8",
"nsqjs": "0.10.0",
"prom-client": "10.2.2",
"qr-image": "3.2.0",
"redis": "2.8.0",
"reflect-metadata": "0.1.12",
Expand Down
Loading

0 comments on commit b49ec80

Please # to comment.