Skip to content

Commit 42f1382

Browse files
authored
Merge pull request #444 from steemit/sps-develop2
SPS/HF21 Support
2 parents c3c5d9b + 8f8509f commit 42f1382

8 files changed

Lines changed: 361 additions & 155 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@steemit/steem-js",
3-
"version": "0.7.5",
3+
"version": "0.7.6",
44
"description": "Steem.js the JavaScript API for Steem blockchain",
55
"main": "lib/index.js",
66
"scripts": {

src/api/methods.js

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,7 @@ export default [
398398
{
399399
"api": "follow_api",
400400
"method": "get_feed_entries",
401-
"params": ["account", "entryId", "limit"
402-
]
401+
"params": ["account", "entryId", "limit"]
403402
},
404403
{
405404
"api": "follow_api",
@@ -485,11 +484,26 @@ export default [
485484
{
486485
"api": "market_history_api",
487486
"method": "get_market_history",
488-
"params": ["bucket_seconds" , "start", "end"]
487+
"params": ["bucket_seconds", "start", "end"]
489488
},
490489
{
491490
"api": "market_history_api",
492491
"method": "get_market_history_buckets",
493492
"params": []
493+
},
494+
{
495+
"api": "condenser_api",
496+
"method": "find_proposals",
497+
"params": ["id_set"]
498+
},
499+
{
500+
"api": "condenser_api",
501+
"method": "list_proposals",
502+
"params": ["start", "limit", "order_by", "order_direction", "status"]
503+
},
504+
{
505+
"api": "condenser_api",
506+
"method": "list_proposal_votes",
507+
"params": ["start", "limit", "order_by", "order_direction", "status"]
494508
}
495509
];

src/api/transports/ws.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ export default class WsTransport extends Transport {
2929
if (this.startPromise) {
3030
return this.startPromise;
3131
}
32-
32+
3333
this.startPromise = new Promise((resolve, reject) => {
3434
this.ws = new WebSocket(this.options.websocket);
3535
this.ws.onerror = (err) => {
3636
this.startPromise = null;
37-
reject(err);
37+
reject(err);
3838
};
3939
this.ws.onopen = () => {
4040
this.isOpen = true;
@@ -43,7 +43,7 @@ export default class WsTransport extends Transport {
4343
this.ws.onclose = this.onClose.bind(this);
4444
resolve();
4545
};
46-
});
46+
});
4747
return this.startPromise;
4848
}
4949

@@ -87,7 +87,7 @@ export default class WsTransport extends Transport {
8787
id: data.id || this.id++,
8888
method: 'call',
8989
jsonrpc: '2.0',
90-
params: [api, data.method, data.params]
90+
params: [api, data.method, data.params]
9191
}
9292
};
9393
this.inFlight++;

src/auth/serializer/src/ChainTypes.js

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,25 @@ ChainTypes.operations= {
5151
claim_reward_balance: 39,
5252
delegate_vesting_shares: 40,
5353
account_create_with_delegation: 41,
54-
fill_convert_request: 42,
55-
author_reward: 43,
56-
curation_reward: 44,
57-
comment_reward: 45,
58-
liquidity_reward: 46,
59-
interest: 47,
60-
fill_vesting_withdraw: 48,
61-
fill_order: 49,
62-
shutdown_witness: 50,
63-
fill_transfer_from_savings: 51,
64-
hardfork: 52,
65-
comment_payout_update: 53,
66-
return_vesting_delegation: 54,
67-
comment_benefactor_reward: 55
54+
witness_set_properties: 42,
55+
account_update2: 43,
56+
create_proposal: 44,
57+
update_proposal_votes: 45,
58+
remove_proposal: 46,
59+
fill_convert_request: 47,
60+
author_reward: 48,
61+
curation_reward: 49,
62+
comment_reward: 50,
63+
liquidity_reward: 51,
64+
interest: 52,
65+
fill_vesting_withdraw: 53,
66+
fill_order: 54,
67+
shutdown_witness: 55,
68+
fill_transfer_from_savings: 56,
69+
hardfork: 57,
70+
comment_payout_update: 58,
71+
return_vesting_delegation: 59,
72+
comment_benefactor_reward: 60
6873
};
6974

7075
//types.hpp

0 commit comments

Comments
 (0)