Skip to content

Commit

Permalink
Merge with truffle branch
Browse files Browse the repository at this point in the history
  • Loading branch information
akru committed Jun 13, 2018
2 parents f485159 + 5700f9a commit 852612b
Show file tree
Hide file tree
Showing 82 changed files with 1,101 additions and 2,097 deletions.
6 changes: 4 additions & 2 deletions .gitignore
@@ -1,2 +1,4 @@
.cache/*.json
.libs.json
build
node_modules
package-lock.json
*.swp
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "ens"]
path = ens
url = https://github.com/ensdomains/ens
17 changes: 8 additions & 9 deletions .travis.yml
@@ -1,16 +1,15 @@
language: node_js
dist: trusty
sudo: false

services:
- docker

node_js:
- "6"
- "8"

install:
- npm install -g aira-deploy ethereumjs-testrpc
- npm install

script:
- aira-deploy --abi

cache:
directories:
- .cache
- docker run --rm -d -p 8545:8545 foamspace/cliquebait:latest
- sleep 30
- npm test
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2017, Airalab
Copyright (c) 2015-2018, Airalab
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
35 changes: 17 additions & 18 deletions README.md
@@ -1,32 +1,31 @@
## Airalab smart contracts
Robonomics platform contracts
=============================

[![Build Status](https://travis-ci.org/airalab/core.svg?branch=master)](https://travis-ci.org/airalab/core)
[![GitHub release](https://img.shields.io/github/release/airalab/core.svg)]()
[![Build Status](https://travis-ci.org/airalab/robonomics_contracts.svg?branch=master)](https://travis-ci.org/airalab/robonomics_contracts)
[![GitHub release](https://img.shields.io/github/release/airalab/robonomics_contracts.svg)]()

> Keep all significant smart-contracts in this repository.
- [API Reference](https://airalab.github.io/core/docs)
- [ABIs](https://github.com/airalab/core/tree/master/abi)
- [EthPM](https://www.ethpm.com/registry)
How to use
----------

Tested on Truffle@4.1.11

To build contracts run in it's directory:

## How to build
Tested on Truffle@3.4.11
To build a single package run in it's directory:
```
truffle compile
```

To install dependencies:

To run testing framework:

```
truffle install airalab-token airalab-common
truffle test
```

To publish a package to EthPM register run:
To deploy contracts in testnet run in it's directory:

```
truffle publish
truffle migrate
```

Configuration of RPC is located in truffle.js file. Here's links to our packages in EthPM:
- [airalab-common](https://www.ethpm.com/registry/packages/39)
- [airalab-token](https://www.ethpm.com/registry/packages/40)
- [airalab-liability](https://www.ethpm.com/registry/packages/41)
148 changes: 0 additions & 148 deletions SecurityRegulations.md

This file was deleted.

1 change: 0 additions & 1 deletion abi/Ambix.json

This file was deleted.

1 change: 0 additions & 1 deletion abi/Destroyable.json

This file was deleted.

1 change: 0 additions & 1 deletion abi/ERC20.json

This file was deleted.

1 change: 0 additions & 1 deletion abi/Factory.json

This file was deleted.

0 comments on commit 852612b

Please sign in to comment.