Merge master into multi-issuer to pick up CI changes. (#231)

* Fix typo in readme

* remove encoder and decoder tools

* Update readme

add link to centre.io

* housekeeping

* cleanup

* readme cleanup

remove out of date comments about openzeppelin - now installed via yarn

* add cloudformation template for codebuild project (#222)

* add cloudformation template for codebuild project

* fix linter warnings

* adjust policy name, linter fix

* Initial .travis.yml file

.travis.yml

@@ -0,0 +1,16 @@
+language: node_js
+node_js:
+  - 8
+
+before_install:
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.9.2
+  - export PATH="$HOME/.yarn/bin:$PATH"
+
+
+install:
+  - npm install -g truffle@4.1.13
+  - yarn install --frozen-lockfile
+
+script:
+  - yarn check --integrity && truffle compile && npm test
+

README.md

@@ -1,5 +1,5 @@
 # centre-tokens
-Fiat tokens on the CENTRE network.
+Fiat tokens on the [CENTRE](https://centre.io) network.
 
 # Setup
 Tests need node v8.0.0 or higher, as they depend on async/await functionality. Interacting with eth is very async-y so await makes it much easier to write tests.
@@ -27,7 +27,7 @@ to generate test coverage on all tests run:
 
 # Contracts
 The implementation uses 2 separate contracts - a proxy contract (`FiatTokenProxy.sol`)and an implementation contract(`FiatToken.sol`).
-This allows upgrading the contract, as a new implentation contact can be deployed and the Proxy updated to point to it.
+This allows upgrading the contract, as a new implementation contact can be deployed and the Proxy updated to point to it.
 ## FiatToken
 The FiatToken offers a number of capabilities, which briefly are described below. There are more
 [detailed design docs](./doc/tokendesign.md) in the `doc` folder.
@@ -57,13 +57,3 @@ need the allowance increased again by the `masterMinter`.
 The contract has an Owner, who can change the `owner`, `pauser`, `blacklister`, or `masterMinter` addresses. The `owner` can not change
 the `proxyOwner` address.
 
-# OpenZeppelin
-Contracts from OpenZeppelin version 1.10 are used where possible, with some modifications. These contracts are located
-in `contracts/thirdparty/openzepplin`. `Ownable` and `Pausable` have been modified. The other contacts are unmodified.
-
-## `Ownable` has been modified to:
-1. Remove the renounceOwnership function and OwnershipdRenounced event.
-## `Pausable` has been modified to:
-1. Add the pauser role, which controlls `pause`/`unpause`
-2. Remove `whenPaused`/`whenNotPaused` modifiers on `unpause`/`pause` methods
-3. Remove `whenPaused` as is is no longer used

ci/codebuild.yml → ci/codebuild.yaml

@@ -40,7 +40,7 @@ Resources:
         Location: !Ref CodeBuildBucket
         Name: artifacts
         NamespaceType: BUILD_ID
-      BadgeEnabled: True
+      BadgeEnabled: true
       Environment:
         Type: LINUX_CONTAINER
         ComputeType: BUILD_GENERAL1_SMALL
@@ -79,7 +79,7 @@ Resources:
             Action: "sts:AssumeRole"
       Path: "/"
       Policies:
-        - PolicyName: !Ref AWS::StackName
+        - PolicyName: "CodeBuildAccess"
           PolicyDocument:
             Version: "2012-10-17"
             Statement:
@@ -98,12 +98,9 @@ Resources:
                 Resource: !Sub "arn:aws:s3:::${AWS::StackName}-${AWS::AccountId}-${AWS::Region}*"
               - Sid: "AllowPublishToSNS"
                 Effect: "Allow"
-                Action:  "SNS:Publish"
+                Action:
+                  - "SNS:Publish"
                 Resource: !Ref FailedBuildTopic
 
   FailedBuildTopic:
     Type: AWS::SNS::Topic
-    Properties:
-      Subscription:
-      - { "Endpoint": "o6j1v0d5h5d8h5h7@circlefin.slack.com", "Protocol": "email" } # Slack notification
-      - { "Endpoint": "ohudson@circle.com", "Protocol": "email" } # Oliver's email

package.json

@@ -10,7 +10,7 @@
   "scripts": {
     "dev": "lite-server",
     "truffle-test": "scripts/start-ganache.sh && truffle test",
-    "test": "scripts/start-ganache.sh && truffle test scripts/tests/dataEncodingTests.js && ./node_modules/.bin/solidity-coverage"
+    "test": "scripts/start-ganache.sh && ./node_modules/.bin/solidity-coverage"
   },
   "repository": {
     "type": "git",
@@ -28,7 +28,6 @@
     "bignumber.js": "6.0.0",
     "clone": "2.1.2",
     "csv-parse": "3.0.0",
-    "ethereum-input-data-decoder": "0.0.12",
     "ethereumjs-abi": "^0.6.5",
     "ethereumjs-tx": "1.3.1",
     "g": "^2.0.1",