Skip to content

Commit 364c799

Browse files
committed
Merge branch 'release/0.1.7-beta'
2 parents 92af843 + ff2fe39 commit 364c799

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased]
99

10+
## [0.1.7] - 2018-07-30
11+
12+
13+
### Added
14+
1015
## [0.1.5] - 2018-03-27
1116

1217
### Added

README.md

+8-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
# CarrIOTA Field
1+
# DevIOTA Field
22

3-
Carriota Field is a Proxy for your IRI, that sends regular statistics
4-
to the Field server (http://field.carriota.com) and accepts jobs from the
3+
DevIOTA Field is a Proxy for your IRI, that sends regular statistics
4+
to the Field server (http://field.deviota.com) and accepts jobs from the
55
server's load balancer (optional).
66

7-
It is extremely tiny layer/app that does not require much resources.
8-
The idea behind Field is explained here:
9-
10-
https://medium.com/deviota/carriota-field-node-intel-and-balancing-223002156b54
11-
127
## Table of contents
138

149
* [Getting Started](#getting-started)
@@ -205,9 +200,9 @@ port = 21310
205200
customFieldId = true
206201
207202
; You can choose which Field(s) to connect to:
208-
fieldHostname[] = field.carriota.com:80
203+
fieldHostname[] = field.deviota.com:80
209204
; It can be several Fields. Just repeat:
210-
; fieldHostname[] = field.carriota.com:80
205+
; fieldHostname[] = field.deviota.com:80
211206
; fieldHostname[] = another.field.com:8080
212207
; fieldHostname[] = mytest.field.com:5000
213208
@@ -238,12 +233,12 @@ Some have additional short versions.
238233

239234
| Option | Description | Default |
240235
| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
241-
| --name | Name your node. This identifier will appear on the CarrIOTA Field Dashboard | CarrIOTA Field |
236+
| --name | Name your node. This identifier will appear on the DevIOTA Field Dashboard | CarrIOTA Field |
242237
| --address, -a | Optional IOTA address for donations. | |
243238
| --seed, -b | Optional. If no donation address is provided, you can provide a seed. In that case the field client will generate new, unused addresses dynamically. WARNING! Please do not use your usual, main seed. Generate a new one for this occasion. It is easy and adds up to everyone's security. | |
244239
| --config, -c | Path to Field configuration file. | |
245240
| --disableIRI, -d | Do not allow jobs to be passed from the Field load balancer. Just send the statistics about my node. | false |
246-
| --fieldHostname, -f | Field Server hostname (including port) or a space-separated list of multiple Field Server hostnames. | field.carriota.com:80 |
241+
| --fieldHostname, -f | Field Server hostname (including port) or a space-separated list of multiple Field Server hostnames. | field.deviota.com:80 |
247242
| --iriHostname, -h | Hostname where your IRI instance is running. | localhost |
248243
| --iriPort, -i | API port of your IRI instance. | 14265 |
249244
| --port, -p | Field port to be used | 21310 |
@@ -280,7 +275,7 @@ YHZIJOENEFSDMZGZA9WOGFTRXOFPVFFCDEYEFHPUGKEUAOTTMVLPSSNZNHRJD99WAVESLFPSGLMTUEIB
280275

281276
We are currently working to add automatic donations to participating nodes based on the work done.
282277
This feature is still in progress, however you can already tip the nodes. Just
283-
go to http://field.carriota.com select a node, copy its donation address and
278+
go to http://field.deviota.com select a node, copy its donation address and
284279
show it some love!
285280

286281
## Authors

config.ini.example

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ port = 21310
88
customFieldId = true
99

1010
; You can choose which Field(s) to connect to:
11-
fieldHostname[] = field.carriota.com:80
11+
fieldHostname[] = field.deviota.com:80
1212
; It can be several Fields. Just repeat:
13-
; fieldHostname[] = field.carriota.com:80
13+
; fieldHostname[] = field.deviota.com:80
1414
; fieldHostname[] = another.field.com:8080
1515
; fieldHostname[] = mytest.field.com:5000
1616

dist/field.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var fieldIDFilePath = path.join(os.homedir(), '.carriota-field.id');
3939
var DEFAULT_OPTIONS = {
4040
name: null,
4141
port: 21310,
42-
fieldHostname: ['field.carriota.com'],
42+
fieldHostname: ['field.deviota.com'],
4343
IRIHostname: 'localhost',
4444
IRIPort: 14265,
4545
logIdent: 'FIELD',
@@ -68,7 +68,7 @@ var Field = function (_Base) {
6868
};
6969

7070
var _this = _possibleConstructorReturn(this, (Field.__proto__ || Object.getPrototypeOf(Field)).call(this, _extends({}, DEFAULT_OPTIONS, _cleanOpts(options), {
71-
name: options.name || 'CarrIOTA Field Node #' + publicId
71+
name: options.name || 'DevIOTA Field Node #' + publicId
7272
})));
7373

7474
_this.api = new IOTA({

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "field.cli",
3-
"version": "0.1.6",
4-
"description": "CarrIOTA Field Client",
3+
"version": "0.1.7",
4+
"description": "DevIOTA Field Client",
55
"main": "dist/field.js",
66
"homepage": "https://semkodev.com",
77
"author": "Roman Semko <[email protected]> (http://twitter.com/RomanSemko)",

src/field.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const fieldIDFilePath = path.join(os.homedir(), '.carriota-field.id');
1616
const DEFAULT_OPTIONS = {
1717
name: null,
1818
port: 21310,
19-
fieldHostname: ['field.carriota.com'],
19+
fieldHostname: ['field.deviota.com'],
2020
IRIHostname: 'localhost',
2121
IRIPort: 14265,
2222
logIdent: 'FIELD',
@@ -58,7 +58,7 @@ class Field extends Base {
5858
super({
5959
...DEFAULT_OPTIONS,
6060
..._cleanOpts(options),
61-
name: options.name || `CarrIOTA Field Node #${publicId}`
61+
name: options.name || `DevIOTA Field Node #${publicId}`
6262
});
6363
this.api = new IOTA({
6464
host: `http://${this.opts.IRIHostname}`,

0 commit comments

Comments
 (0)