Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add getNrgPrice Java API call #500

Merged
merged 4 commits into from
Jun 5, 2018
Merged

Add getNrgPrice Java API call #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4666b67
added getNrgPrice functionality
aionick May 22, 2018
629c5a8
init NrgOracle before get recommended nrg
aionick May 22, 2018
3b6ac0b
removed req method for getNrgPrice
aionick May 22, 2018
3467903
moved init nrgOracle logic to ApiAion
aionick May 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions modApiServer/src/org/aion/api/server/ApiAion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.aion.zero.impl.blockchain.AionPendingStateImpl;
import org.aion.zero.impl.blockchain.IAionChain;
import org.aion.zero.impl.config.CfgAion;
import org.aion.zero.impl.core.IAionBlockchain;
import org.aion.zero.impl.db.AionBlockStore;
import org.aion.zero.impl.types.AionBlock;
import org.aion.zero.impl.types.AionBlockSummary;
Expand Down Expand Up @@ -658,6 +659,19 @@ protected boolean setReportedHashrate(String hashrate, String clientId) {
return false;
}

// Returns a fully initialized NrgOracle object.
protected NrgOracle getNrgOracle(IAionChain _ac) {
IAionBlockchain bc = (IAionBlockchain)_ac.getBlockchain();
long nrgPriceDefault = CfgAion.inst().getApi().getNrg().getNrgPriceDefault();
long nrgPriceMax = CfgAion.inst().getApi().getNrg().getNrgPriceMax();

NrgOracle.Strategy oracleStrategy = NrgOracle.Strategy.SIMPLE;
if (CfgAion.inst().getApi().getNrg().isOracleEnabled())
oracleStrategy = NrgOracle.Strategy.BLK_PRICE;

return new NrgOracle(bc, nrgPriceDefault, nrgPriceMax, oracleStrategy);
}

protected long getRecommendedNrgPrice() {
if (this.nrgOracle != null)
return this.nrgOracle.getNrgPrice();
Expand Down
12 changes: 1 addition & 11 deletions modApiServer/src/org/aion/api/server/http/ApiWeb3Aion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,7 @@ public ApiWeb3Aion(final IAionChain _ac) {
isFilterEnabled = CfgAion.inst().getApi().getRpc().isFiltersEnabled();
isSeedMode = CfgAion.inst().getConsensus().isSeed();


// instantiate nrg price oracle
IAionBlockchain bc = (IAionBlockchain)_ac.getBlockchain();
long nrgPriceDefault = CfgAion.inst().getApi().getNrg().getNrgPriceDefault();
long nrgPriceMax = CfgAion.inst().getApi().getNrg().getNrgPriceMax();

NrgOracle.Strategy oracleStrategy = NrgOracle.Strategy.SIMPLE;
if (CfgAion.inst().getApi().getNrg().isOracleEnabled())
oracleStrategy = NrgOracle.Strategy.BLK_PRICE;

this.nrgOracle = new NrgOracle(bc, nrgPriceDefault, nrgPriceMax, oracleStrategy);
this.nrgOracle = getNrgOracle(_ac);

if (isFilterEnabled) {
evtMgr = this.ac.getAionHub().getEventMgr();
Expand Down
2 changes: 2 additions & 0 deletions modApiServer/src/org/aion/api/server/nrgprice/strategy/NrgBlockPriceAveraging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
* This class is NOT thread-safe
* Policy: holder class (NrgOracle) should provide any concurrency guarantees it needs to
*
* NOT TESTED. DON'T USE.
*
* @author ali sharif
*/
public class NrgBlockPriceAveraging extends NrgPriceAdvisor<AionBlock, AionTransaction> {
Expand Down
Loading