Skip to content

Commit

Permalink
Merge pull request johannbarbie#2 from grined/master
Browse files Browse the repository at this point in the history
Fix Info. Add relayfee field
  • Loading branch information
johannbarbie committed Jan 26, 2015
2 parents 3aa48f9 + bd5ffff commit f5b5c3c
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 0 deletions.
75 changes: 75 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,78 @@ target
.project
datanucleus.log
.classpath

BitcoindClient4J.iml
### Maven template
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties


### Java template
*.class

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*


### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm

*.iml

## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:

# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries

# Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml

# Gradle:
# .idea/gradle.xml
# .idea/libraries

# Mongo Explorer plugin:
# .idea/mongoSettings.xml

## File-based project format:
*.ipr
*.iws

## Plugin-specific files:

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties


8 changes: 8 additions & 0 deletions src/main/java/com/_37coins/bcJsonRpc/pojo/Info.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class Info {
private long keypoololdest;
private long keypoolsize;
private BigDecimal paytxfee;
private BigDecimal relayfee;
private String errors;
public long getVersion() {
return version;
Expand Down Expand Up @@ -108,4 +109,11 @@ public void setErrors(String errors) {
this.errors = errors;
}

public BigDecimal getRelayfee() {
return relayfee;
}

public void setRelayfee(BigDecimal relayfee) {
this.relayfee = relayfee;
}
}

0 comments on commit f5b5c3c

Please sign in to comment.