Skip to content

Commit 1ba834f

Browse files
author
fangxiuxiu
committed
add whitelist
1 parent 4f24bfe commit 1ba834f

3 files changed

Lines changed: 74 additions & 38 deletions

File tree

‎src/index.js‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,16 @@ ChainsqlAPI.prototype.accountSet = function (opt) {
251251
let ripple = new Ripple(this);
252252
return ripple.accountSet(opt);
253253
}
254-
254+
ChainsqlAPI.prototype.addWhitelistSet = function (whitelists) {
255+
let ripple = new Ripple(this);
256+
var flag = 10;
257+
return ripple.whitelistSet(whitelists, flag);
258+
}
259+
ChainsqlAPI.prototype.delWhitelistSet = function (whitelists) {
260+
let ripple = new Ripple(this);
261+
var flag = 11;
262+
return ripple.whitelistSet(whitelists, flag);
263+
}
255264
ChainsqlAPI.prototype.getTransferFee = function (issuerAddr) {
256265
let ripple = new Ripple(this);
257266
return ripple.getTransferFee(issuerAddr);

‎src/ripple.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,16 @@ Ripple.prototype.accountSet = function (opt) {
213213
this.txJSON = setting;
214214
return this;
215215
}
216+
Ripple.prototype.whitelistSet = function (whitelists, flag) {
217+
var self = this;
218+
var setting = {};
219+
setting.whitelists = whitelists;
220+
setting.setFlag = flag;
221+
222+
this.txType = "AccountSet";
223+
this.txJSON = setting;
224+
return this;
225+
}
216226

217227
Ripple.prototype.getTransferFee = function (issuerAddr) {
218228
var self = this;

‎test/testRipple.js‎

Lines changed: 54 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,16 @@ var tagStep = {
3535
balances: 4, getLedger: 5, getTxs: 6
3636
}
3737
var sCurrency = "aaa"
38+
var whiteLists = [
39+
{
40+
user: "zKQwdkkzpUQC9haHFEe2EwUsKHvvwwPHsv"
41+
}
42+
]
3843

3944
main();
4045
async function main() {
4146
// let res = await c.connect('ws://101.201.40.124:5006');
42-
let res = await c.connect('ws://192.168.29.69:6305');
47+
let res = await c.connect('ws://localhost:5510');
4348
await c.setSchema("8B0BA6D8848C76E19433EE90E2A88210E403339F2C5AC750271EFC862A173894");
4449

4550
c.as(root);
@@ -75,43 +80,55 @@ var testActive = async function () {
7580
}
7681

7782
var testGateWay = async function () {
78-
let res;
79-
console.log("----------- GateWay >>>>>>>>>>>>>");
80-
var opt = {
81-
enableRippling: true,
82-
rate: 1.002,
83-
min: 1,
84-
max: 1.5
85-
}
86-
c.as(issuer);
87-
res = await c.accountSet(opt).submit({ expect: 'validate_success' });
88-
console.log("\n accountSet issuer", issuer.address, ":", res)
89-
//
90-
var amount = {
91-
value: 20000,
92-
currency: sCurrency,
93-
issuer: issuer.address
94-
}
95-
//
96-
c.as(user);
97-
res = await c.trustSet(amount).submit({ expect: 'validate_success' });
98-
console.log("\n trustSet user", user.address, ":", res)
99-
c.as(user1);
100-
res = await c.trustSet(amount).submit({ expect: 'validate_success' });
101-
console.log("\n trustSet user1", user1.address, ":", res)
102-
//
103-
res = await c.api.getTrustlines(issuer.address);
104-
console.log("\n getTrustlines issuer", issuer.address, ":", res)
83+
try {
84+
let res;
85+
console.log("----------- GateWay >>>>>>>>>>>>>");
86+
var opt = {
87+
enableRippling: true,
88+
rate: 1.002,
89+
min: 1,
90+
max: 1.5
91+
}
92+
c.as(issuer);
93+
res = await c.accountSet(opt).submit({ expect: 'validate_success' });
94+
console.log("\n accountSet issuer", issuer.address, ":", res)
95+
//
96+
var amount = {
97+
value: 20000,
98+
currency: sCurrency,
99+
issuer: issuer.address
100+
}
101+
//
102+
c.as(user);
103+
res = await c.trustSet(amount).submit({ expect: 'validate_success' });
104+
console.log("\n trustSet user", user.address, ":", res)
105+
c.as(user1);
106+
res = await c.trustSet(amount).submit({ expect: 'validate_success' });
107+
console.log("\n trustSet user1", user1.address, ":", res)
108+
//
109+
res = await c.api.getTrustlines(issuer.address);
110+
console.log("\n getTrustlines issuer", issuer.address, ":", res)
111+
//
112+
c.as(issuer);
113+
res = await c.addWhitelistSet(whiteLists).submit({ expect: 'validate_success' });
114+
console.log("\n whitelistSet user", user.address, ":", res)
105115

106-
//
107-
c.as(issuer);
108-
res = await c.pay(user.address, amount).submit({ expect: 'validate_success' })
109-
console.log("\n transfer currency(issuer 2 user)", issuer.address, user.address, ":", res)
110-
c.as(user);
111-
amount.value = 10000;
112-
res = await c.pay(user1.address, amount).submit({ expect: 'validate_success' })
113-
console.log("\n transfer currency(user 2 user1)", user.address, user1.address, ":", res)
114-
console.log("\n----------- GateWay <<<<<<<<<<<<<");
116+
// res = await c.delWhitelistSet(whiteLists).submit({ expect: 'validate_success' });
117+
// console.log("\n whitelistSet user", user.address, ":", res)
118+
119+
//
120+
c.as(issuer);
121+
res = await c.pay(user.address, amount).submit({ expect: 'validate_success' })
122+
console.log("\n transfer currency(issuer 2 user)", issuer.address, user.address, ":", res)
123+
c.as(user);
124+
amount.value = 10000;
125+
res = await c.pay(user1.address, amount).submit({ expect: 'validate_success' })
126+
console.log("\n transfer currency(user 2 user1)", user.address, user1.address, ":", res)
127+
console.log("\n----------- GateWay <<<<<<<<<<<<<");
128+
} catch (error) {
129+
130+
}
131+
115132
}
116133

117134
var testEscrow = async function () {

0 commit comments

Comments
 (0)