Skip to content
This repository has been archived by the owner on Nov 10, 2023. It is now read-only.

Commit

Permalink
Merge pull request #60 from gnosis/feature/WA-521-transaction-history…
Browse files Browse the repository at this point in the history
…-service

WA-521 - Feature: Transaction History Service V1
  • Loading branch information
apanizo authored Sep 6, 2018
2 parents d8b7d17 + 2bac13f commit 72d0f4c
Show file tree
Hide file tree
Showing 135 changed files with 82,140 additions and 22,642 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
build_webpack/
28 changes: 27 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,43 @@
if: (branch = development) OR (branch = master) OR (type = pull_request) OR (tag IS present)
sudo: required
services:
- docker
language: node_js
node_js:
- "8"
- "9"
os:
- linux
env:
- DOCKER_COMPOSE_VERSION=1.22.0
before_install:
# Install custom docker-compose version
- sudo rm /usr/local/bin/docker-compose
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin
# Shut down postgres because it blocks our db container's port map to :5432
# it comes enabled by default in docker-compose
- sudo service postgresql stop
# Wait for it to stop
- while sudo lsof -Pi :5432 -sTCP:LISTEN -t; do sleep 1; done
# Needed to deploy pull request and releases
- sudo apt-get -y install python-pip python-dev
- pip install awscli --upgrade --user
before_script:
# Used in the tests of the project
- export NODE_ENV=testing
- git clone https://github.com/gnosis/safe-transaction-history.git
- cd safe-transaction-history
- git checkout develop
- docker-compose build
- docker-compose up -d
# Give some time to docker to enable all services
- sleep 15
- cd ..
after_success:
- cd safe-transaction-history
- docker-compose stop
- cd ..
- |
if [ ${TRAVIS_BRANCH} = "master" ]; then
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"scripts": {
"start": "node scripts/start.js",
"build": "node scripts/build.js",
"test": "run-with-testrpc -l 40000000 --noVMErrorsOnRPCResponse true 'node scripts/test.js --env=jsdom'",
"test": "NODE_ENV=test && node scripts/test.js --env=jsdom",
"test-local": "NODE_ENV=test && node scripts/test.js --env=jsdom",
"precommit": "./precommit.sh",
"flow": "flow",
Expand Down Expand Up @@ -128,7 +128,7 @@
"<rootDir>/src/**/?(*.)(spec|test).js?(x)"
],
"testEnvironment": "node",
"testURL": "https://safe-react",
"testURL": "http://localhost:8000",
"transform": {
"^.+\\.(js|jsx)$": "<rootDir>/node_modules/babel-jest",
"^.+\\.(css|scss)$": "<rootDir>/config/jest/cssTransform.js",
Expand Down
372 changes: 180 additions & 192 deletions safe-contracts/build/contracts/CreateAndAddModules.json

Large diffs are not rendered by default.

1,610 changes: 799 additions & 811 deletions safe-contracts/build/contracts/DailyLimitModule.json

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions safe-contracts/build/contracts/DelegateConstructorProxy.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"id": 2,
"nodeType": "ImportDirective",
"scope": 24,
"sourceUnit": 2989,
"sourceUnit": 1689,
"src": "24:21:0",
"symbolAliases": [],
"unitAlias": ""
Expand All @@ -96,10 +96,10 @@
"id": 3,
"name": "Proxy",
"nodeType": "UserDefinedTypeName",
"referencedDeclaration": 2988,
"referencedDeclaration": 1688,
"src": "392:5:0",
"typeDescriptions": {
"typeIdentifier": "t_contract$_Proxy_$2988",
"typeIdentifier": "t_contract$_Proxy_$1688",
"typeString": "contract Proxy"
}
},
Expand All @@ -109,15 +109,15 @@
}
],
"contractDependencies": [
2988
1688
],
"contractKind": "contract",
"documentation": "@title Delegate Constructor Proxy - Generic proxy contract allows to execute all transactions applying the code of a master contract. It is possible to send along initialization data with the constructor.\n @author Stefan George - <stefan@gnosis.pm>\n @author Richard Meissner - <richard@gnosis.pm>",
"fullyImplemented": true,
"id": 23,
"linearizedBaseContracts": [
23,
2988
1688
],
"name": "DelegateConstructorProxy",
"nodeType": "ContractDefinition",
Expand Down Expand Up @@ -264,10 +264,10 @@
"name": "Proxy",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"referencedDeclaration": 2988,
"referencedDeclaration": 1688,
"src": "662:5:0",
"typeDescriptions": {
"typeIdentifier": "t_type$_t_contract$_Proxy_$2988_$",
"typeIdentifier": "t_type$_t_contract$_Proxy_$1688_$",
"typeString": "type(contract Proxy)"
}
},
Expand Down Expand Up @@ -382,7 +382,7 @@
"id": 2,
"nodeType": "ImportDirective",
"scope": 24,
"sourceUnit": 2989,
"sourceUnit": 1689,
"src": "24:21:0",
"symbolAliases": [],
"unitAlias": ""
Expand All @@ -396,10 +396,10 @@
"id": 3,
"name": "Proxy",
"nodeType": "UserDefinedTypeName",
"referencedDeclaration": 2988,
"referencedDeclaration": 1688,
"src": "392:5:0",
"typeDescriptions": {
"typeIdentifier": "t_contract$_Proxy_$2988",
"typeIdentifier": "t_contract$_Proxy_$1688",
"typeString": "contract Proxy"
}
},
Expand All @@ -409,15 +409,15 @@
}
],
"contractDependencies": [
2988
1688
],
"contractKind": "contract",
"documentation": "@title Delegate Constructor Proxy - Generic proxy contract allows to execute all transactions applying the code of a master contract. It is possible to send along initialization data with the constructor.\n @author Stefan George - <stefan@gnosis.pm>\n @author Richard Meissner - <richard@gnosis.pm>",
"fullyImplemented": true,
"id": 23,
"linearizedBaseContracts": [
23,
2988
1688
],
"name": "DelegateConstructorProxy",
"nodeType": "ContractDefinition",
Expand Down Expand Up @@ -564,10 +564,10 @@
"name": "Proxy",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"referencedDeclaration": 2988,
"referencedDeclaration": 1688,
"src": "662:5:0",
"typeDescriptions": {
"typeIdentifier": "t_type$_t_contract$_Proxy_$2988_$",
"typeIdentifier": "t_type$_t_contract$_Proxy_$1688_$",
"typeString": "type(contract Proxy)"
}
},
Expand Down Expand Up @@ -662,5 +662,5 @@
},
"networks": {},
"schemaVersion": "2.0.0",
"updatedAt": "2018-06-29T09:01:22.054Z"
"updatedAt": "2018-08-20T07:44:41.083Z"
}
2 changes: 1 addition & 1 deletion safe-contracts/build/contracts/Enum.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,5 +147,5 @@
},
"networks": {},
"schemaVersion": "2.0.0",
"updatedAt": "2018-06-29T09:01:22.054Z"
"updatedAt": "2018-08-20T07:44:41.083Z"
}
171 changes: 171 additions & 0 deletions safe-contracts/build/contracts/EtherPaymentFallback.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
{
"contractName": "EtherPaymentFallback",
"abi": [
{
"payable": true,
"stateMutability": "payable",
"type": "fallback"
}
],
"bytecode": "0x6080604052348015600f57600080fd5b50603280601d6000396000f30060806040520000a165627a7a723058208226d93ca47e5b6cb455362823a9ae7ae1ffe3fb79b732dd39f124670f780a070029",
"deployedBytecode": "0x60806040520000a165627a7a723058208226d93ca47e5b6cb455362823a9ae7ae1ffe3fb79b732dd39f124670f780a070029",
"sourceMap": "167:155:2:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;167:155:2;;;;;;;",
"deployedSourceMap": "167:155:2:-;;;",
"source": "pragma solidity 0.4.24;\n\n\n/// @title EtherPaymentFallback - A contract that has a fallback to accept ether payments\n/// @author Richard Meissner - <richard@gnosis.pm>\ncontract EtherPaymentFallback {\n\n /// @dev Fallback function accepts Ether transactions.\n function ()\n external\n payable\n {\n\n }\n}\n",
"sourcePath": "/Users/apanizo/git/gnosis/safe-contracts/contracts/EtherPaymentFallback.sol",
"ast": {
"absolutePath": "/Users/apanizo/git/gnosis/safe-contracts/contracts/EtherPaymentFallback.sol",
"exportedSymbols": {
"EtherPaymentFallback": [
37
]
},
"id": 38,
"nodeType": "SourceUnit",
"nodes": [
{
"id": 32,
"literals": [
"solidity",
"0.4",
".24"
],
"nodeType": "PragmaDirective",
"src": "0:23:2"
},
{
"baseContracts": [],
"contractDependencies": [],
"contractKind": "contract",
"documentation": "@title EtherPaymentFallback - A contract that has a fallback to accept ether payments\n @author Richard Meissner - <richard@gnosis.pm>",
"fullyImplemented": true,
"id": 37,
"linearizedBaseContracts": [
37
],
"name": "EtherPaymentFallback",
"nodeType": "ContractDefinition",
"nodes": [
{
"body": {
"id": 35,
"nodeType": "Block",
"src": "312:8:2",
"statements": []
},
"documentation": "@dev Fallback function accepts Ether transactions.",
"id": 36,
"implemented": true,
"isConstructor": false,
"isDeclaredConst": false,
"modifiers": [],
"name": "",
"nodeType": "FunctionDefinition",
"parameters": {
"id": 33,
"nodeType": "ParameterList",
"parameters": [],
"src": "272:2:2"
},
"payable": true,
"returnParameters": {
"id": 34,
"nodeType": "ParameterList",
"parameters": [],
"src": "312:0:2"
},
"scope": 37,
"src": "263:57:2",
"stateMutability": "payable",
"superFunction": null,
"visibility": "external"
}
],
"scope": 38,
"src": "167:155:2"
}
],
"src": "0:323:2"
},
"legacyAST": {
"absolutePath": "/Users/apanizo/git/gnosis/safe-contracts/contracts/EtherPaymentFallback.sol",
"exportedSymbols": {
"EtherPaymentFallback": [
37
]
},
"id": 38,
"nodeType": "SourceUnit",
"nodes": [
{
"id": 32,
"literals": [
"solidity",
"0.4",
".24"
],
"nodeType": "PragmaDirective",
"src": "0:23:2"
},
{
"baseContracts": [],
"contractDependencies": [],
"contractKind": "contract",
"documentation": "@title EtherPaymentFallback - A contract that has a fallback to accept ether payments\n @author Richard Meissner - <richard@gnosis.pm>",
"fullyImplemented": true,
"id": 37,
"linearizedBaseContracts": [
37
],
"name": "EtherPaymentFallback",
"nodeType": "ContractDefinition",
"nodes": [
{
"body": {
"id": 35,
"nodeType": "Block",
"src": "312:8:2",
"statements": []
},
"documentation": "@dev Fallback function accepts Ether transactions.",
"id": 36,
"implemented": true,
"isConstructor": false,
"isDeclaredConst": false,
"modifiers": [],
"name": "",
"nodeType": "FunctionDefinition",
"parameters": {
"id": 33,
"nodeType": "ParameterList",
"parameters": [],
"src": "272:2:2"
},
"payable": true,
"returnParameters": {
"id": 34,
"nodeType": "ParameterList",
"parameters": [],
"src": "312:0:2"
},
"scope": 37,
"src": "263:57:2",
"stateMutability": "payable",
"superFunction": null,
"visibility": "external"
}
],
"scope": 38,
"src": "167:155:2"
}
],
"src": "0:323:2"
},
"compiler": {
"name": "solc",
"version": "0.4.24+commit.e67f0147.Emscripten.clang"
},
"networks": {},
"schemaVersion": "2.0.0",
"updatedAt": "2018-08-20T07:44:41.083Z"
}
Loading

0 comments on commit 72d0f4c

Please sign in to comment.