merge and update version

Mojicode · Mojicode · commit f7feac28ab74 · 2022-02-24T14:02:26.000+08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chainsql",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A database driver for chainsql ",
   "main": "dist/npm/",
   "directories": {
diff --git a/src/index.js b/src/index.js
@@ -284,6 +284,11 @@ ChainsqlAPI.prototype.trustSet = function (amount) {
 	return ripple.trustSet(amount);
 }
 
+ChainsqlAPI.prototype.accountAuthorize = function (nFlag, bSet, account) {
+	let ripple = new Ripple(this);
+	return ripple.accountAuthorize(nFlag, bSet, account);
+}
+
 ChainsqlAPI.prototype.escrowCreate = function (sDestAddr, amount, opt) {
 	let ripple = new Ripple(this);
 	return ripple.escrowCreate(sDestAddr, amount, opt);
diff --git a/src/ripple.js b/src/ripple.js
@@ -108,6 +108,9 @@ Ripple.prototype.prepareJson = function () {
 	else if (transactionType === "PayToContract") {
 		return chainsqlLibUtils.prepareTransaction(txJson, this.ChainsqlAPI.api, {});
 	}
+	else if (transactionType === "Authorize") {
+		return chainsqlLibUtils.prepareTransaction(txJson, this.ChainsqlAPI.api, {});
+	}
 }
 
 Ripple.prototype.preparePayment = function (account, amount, memos) {
@@ -273,6 +276,21 @@ Ripple.prototype.trustSet = function (amount) {
 	return this;
 }
 
+Ripple.prototype.accountAuthorize = function (nFlag, bSet, account) {
+	var self = this;
+	var setting = {};
+	setting.Account = this.ChainsqlAPI.connect.address;
+	if(bSet)
+		setting.SetFlag = nFlag;
+	else
+		setting.ClearFlag = nFlag;
+	setting.TransactionType = "Authorize";
+	setting.Destination = account;
+	this.txType = "Authorize";
+	this.txJSON = setting;
+	return this;
+}
+
 Ripple.prototype.escrowCreate = function (sDestAddr, amount, opt) {
 	var _amount = { value: 0 }
 	var type = typeof(amount);
diff --git a/test/testRipple.js b/test/testRipple.js
@@ -32,7 +32,7 @@ var user3 = {
 
 var tagStep = {
     active: 1, gateWay: 2, escrow: 3,
-    balances: 4, getLedger: 5, getTxs: 6
+    balances: 4, getLedger: 5, getTxs: 6,authorize:7,
 }
 var sCurrency = "aaa"
 var whiteLists = [
@@ -45,19 +45,20 @@ main();
 async function main() {
     // let res = await c.connect('ws://101.201.40.124:5006');
     let res = await c.connect('ws://localhost:5510');
-    await c.setSchema("8B0BA6D8848C76E19433EE90E2A88210E403339F2C5AC750271EFC862A173894");
+   // await c.setSchema("8B0BA6D8848C76E19433EE90E2A88210E403339F2C5AC750271EFC862A173894");
 
     c.as(root);
     c.setRestrict(true);
     /**************************************/
-    let nStep = tagStep.gateWay;
+    let nStep = tagStep.authorize;
     switch (nStep) {
         case tagStep.active: testActive(); break;// 激活若干账户
         case tagStep.gateWay: testGateWay(); break;//部署网管，信任，发行币转账
         case tagStep.escrow: testEscrow(); break;
         case tagStep.balances: testBalances(); break;//账户余额
         case tagStep.getTxs: testTransactions(); break;
         case tagStep.getLedger: testGetLedger(); break;
+        case tagStep.authorize: testAuthorize();break;
         default: break;
     }
     /**************************************/
@@ -251,3 +252,15 @@ var testGetLedger = async function () {
             console.log("err:", err);
         });
 }
+
+var testAuthorize = async function(){
+    try {
+        //参数： 授权/取消授权哪个权限、是否是授权、给谁授权
+        // 12 转账的权限,  13 部署合约的权限, 14 创建表的权限, 15发行数字资产的权限, 16 admin权限
+        var ret = await c.accountAuthorize(12, true, user2.address).submit({ expect: 'validate_success' });
+        console.log("accountAuthorize ", ret);
+    } catch (error) {
+        console.error("accountAuthorize ", error);
+    }
+    
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "chainsql",`
`3`		`- "version": "3.0.0",`
	`3`	`+ "version": "3.0.1",`
`4`	`4`	`"description": "A database driver for chainsql ",`
`5`	`5`	`"main": "dist/npm/",`
`6`	`6`	`"directories": {`