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 #70 from gnosis/development
Browse files Browse the repository at this point in the history
Feature - Safe route [updated safe-contracts and transaction-history-service]
  • Loading branch information
apanizo authored Oct 17, 2018
2 parents d314df9 + eb1c6fd commit f6f37dd
Show file tree
Hide file tree
Showing 151 changed files with 109,215 additions and 48,876 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ before_script:
# Give some time to docker to enable all services
- sleep 15
- cd ..
script:
- yarn build
after_success:
- cd safe-transaction-history
- docker-compose stop
Expand Down
1 change: 0 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ Add additional notes about how to deploy this on a live system
* [Material UI 1.X](https://material-ui-next.com/) - React components that implement Google's Material Design
* [redux, immutable, reselect, final-form](https://redux.js.org/) - React ecosystem libraries
* [Flow](https://flow.org/) - Sttic Type Checker
* [Surge](https://surge.sh/) - Static web publishing for generating staging links on GitHub

## Contributing

Expand Down
1,149 changes: 1,149 additions & 0 deletions safe-contracts/build/contracts/BaseSafe.json

Large diffs are not rendered by default.

582 changes: 291 additions & 291 deletions safe-contracts/build/contracts/CreateAndAddModules.json

Large diffs are not rendered by default.

2,658 changes: 1,329 additions & 1,329 deletions safe-contracts/build/contracts/DailyLimitModule.json

Large diffs are not rendered by default.

292 changes: 146 additions & 146 deletions safe-contracts/build/contracts/DelegateConstructorProxy.json

Large diffs are not rendered by default.

84 changes: 42 additions & 42 deletions safe-contracts/build/contracts/Enum.json
Original file line number Diff line number Diff line change
@@ -1,151 +1,151 @@
{
"contractName": "Enum",
"abi": [],
"bytecode": "0x6080604052348015600f57600080fd5b50603580601d6000396000f3006080604052600080fd00a165627a7a72305820641ab8b295edfaa2b1c8a8e0ae7d17ea2f4c8b95ea27e45d8947ed9a4799ca1f0029",
"deployedBytecode": "0x6080604052600080fd00a165627a7a72305820641ab8b295edfaa2b1c8a8e0ae7d17ea2f4c8b95ea27e45d8947ed9a4799ca1f0029",
"sourceMap": "115:95:1:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;115:95:1;;;;;;;",
"deployedSourceMap": "115:95:1:-;;;;;",
"bytecode": "0x6080604052348015600f57600080fd5b50603580601d6000396000f3006080604052600080fd00a165627a7a72305820e8f35ac07bd2a835eacbee7ba38b086a012b371f6bdc0da93abfb72fe3b38ec20029",
"deployedBytecode": "0x6080604052600080fd00a165627a7a72305820e8f35ac07bd2a835eacbee7ba38b086a012b371f6bdc0da93abfb72fe3b38ec20029",
"sourceMap": "115:95:7:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;115:95:7;;;;;;;",
"deployedSourceMap": "115:95:7:-;;;;;",
"source": "pragma solidity 0.4.24;\n\n\n/// @title Enum - Collection of enums\n/// @author Richard Meissner - <[email protected]>\ncontract Enum {\n enum Operation {\n Call,\n DelegateCall,\n Create\n }\n}\n",
"sourcePath": "/Users/apanizo/git/gnosis/safe-contracts/contracts/Enum.sol",
"sourcePath": "/Users/apanizo/git/gnosis/safe-contracts/contracts/common/Enum.sol",
"ast": {
"absolutePath": "/Users/apanizo/git/gnosis/safe-contracts/contracts/Enum.sol",
"absolutePath": "/Users/apanizo/git/gnosis/safe-contracts/contracts/common/Enum.sol",
"exportedSymbols": {
"Enum": [
30
1659
]
},
"id": 31,
"id": 1660,
"nodeType": "SourceUnit",
"nodes": [
{
"id": 25,
"id": 1654,
"literals": [
"solidity",
"0.4",
".24"
],
"nodeType": "PragmaDirective",
"src": "0:23:1"
"src": "0:23:7"
},
{
"baseContracts": [],
"contractDependencies": [],
"contractKind": "contract",
"documentation": "@title Enum - Collection of enums\n @author Richard Meissner - <[email protected]>",
"fullyImplemented": true,
"id": 30,
"id": 1659,
"linearizedBaseContracts": [
30
1659
],
"name": "Enum",
"nodeType": "ContractDefinition",
"nodes": [
{
"canonicalName": "Enum.Operation",
"id": 29,
"id": 1658,
"members": [
{
"id": 26,
"id": 1655,
"name": "Call",
"nodeType": "EnumValue",
"src": "160:4:1"
"src": "160:4:7"
},
{
"id": 27,
"id": 1656,
"name": "DelegateCall",
"nodeType": "EnumValue",
"src": "174:12:1"
"src": "174:12:7"
},
{
"id": 28,
"id": 1657,
"name": "Create",
"nodeType": "EnumValue",
"src": "196:6:1"
"src": "196:6:7"
}
],
"name": "Operation",
"nodeType": "EnumDefinition",
"src": "135:73:1"
"src": "135:73:7"
}
],
"scope": 31,
"src": "115:95:1"
"scope": 1660,
"src": "115:95:7"
}
],
"src": "0:211:1"
"src": "0:211:7"
},
"legacyAST": {
"absolutePath": "/Users/apanizo/git/gnosis/safe-contracts/contracts/Enum.sol",
"absolutePath": "/Users/apanizo/git/gnosis/safe-contracts/contracts/common/Enum.sol",
"exportedSymbols": {
"Enum": [
30
1659
]
},
"id": 31,
"id": 1660,
"nodeType": "SourceUnit",
"nodes": [
{
"id": 25,
"id": 1654,
"literals": [
"solidity",
"0.4",
".24"
],
"nodeType": "PragmaDirective",
"src": "0:23:1"
"src": "0:23:7"
},
{
"baseContracts": [],
"contractDependencies": [],
"contractKind": "contract",
"documentation": "@title Enum - Collection of enums\n @author Richard Meissner - <[email protected]>",
"fullyImplemented": true,
"id": 30,
"id": 1659,
"linearizedBaseContracts": [
30
1659
],
"name": "Enum",
"nodeType": "ContractDefinition",
"nodes": [
{
"canonicalName": "Enum.Operation",
"id": 29,
"id": 1658,
"members": [
{
"id": 26,
"id": 1655,
"name": "Call",
"nodeType": "EnumValue",
"src": "160:4:1"
"src": "160:4:7"
},
{
"id": 27,
"id": 1656,
"name": "DelegateCall",
"nodeType": "EnumValue",
"src": "174:12:1"
"src": "174:12:7"
},
{
"id": 28,
"id": 1657,
"name": "Create",
"nodeType": "EnumValue",
"src": "196:6:1"
"src": "196:6:7"
}
],
"name": "Operation",
"nodeType": "EnumDefinition",
"src": "135:73:1"
"src": "135:73:7"
}
],
"scope": 31,
"src": "115:95:1"
"scope": 1660,
"src": "115:95:7"
}
],
"src": "0:211:1"
"src": "0:211:7"
},
"compiler": {
"name": "solc",
"version": "0.4.24+commit.e67f0147.Emscripten.clang"
},
"networks": {},
"schemaVersion": "2.0.0",
"updatedAt": "2018-08-20T07:44:41.083Z"
"updatedAt": "2018-10-05T14:25:58.921Z"
}
Loading

0 comments on commit f6f37dd

Please sign in to comment.