fix: 🐛 Fix a few of bugs about crypto and transaction

ddnlink · Jun 6, 2020 · 71fbddd · 71fbddd
1 parent c9b6f08
commit 71fbddd
Show file tree

Hide file tree

Showing 13 changed files with 66 additions and 592 deletions.
diff --git a/examples/fun-tests/src/constants.js b/examples/fun-tests/src/constants.js
@@ -43,7 +43,7 @@ export default {
       send: "10000000", 
       vote: "100000000",
       secondSignature: "500000000",
-      delegate: "2500000000",
+      delegate: "10000000000",
       multiSignature: "500000000",
       dappRegistration: "2500000000",
       dappWithdrawal: "10000000",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ddn",
-  "version": "3.4.0",
+  "version": "3.4.15",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ddnlink/ddn.git"

diff --git a/packages/asset-dapp/src/dapp.js b/packages/asset-dapp/src/dapp.js
@@ -182,10 +182,10 @@ class Dapp extends Asset.Base {
             }
         }
 
+        let delegatesArr = []
         if (!dapp.delegates) {
             throw new Error("Have no dapp delegates");
         } else {
-            let delegatesArr = []
             delegatesArr = typeof dapp.delegates === 'string' ? dapp.delegates.split(',') : dapp.delegates;
             if (delegatesArr.length < 5 ||
                 delegatesArr.length > this.config.settings.delegateNumber) {

diff --git a/packages/asset-dapp/test/unit/dapps.test.js b/packages/asset-dapp/test/unit/dapps.test.js
@@ -255,7 +255,7 @@ beforeAll(done => {
                 debug('signatures', body);
                 node.expect(err).be.not.ok;
 
-                // node.expect(body).to.have.property("success").to.be.true;
+                node.expect(body).to.have.property("success").to.be.true;
                 node.expect(body).to.have.property("transaction").that.is.an("object");
                 done();
             });
@@ -295,7 +295,9 @@ describe("PUT /dapps", () => {
     //         });
     // });
 
-    it("Category is number, Using invalid Category, Should fail", done => {
+    it("Category is number, Using invalid Category, Should fail", async done => {
+        await node.onNewBlockAsync();
+
         node.api.put("/dapps")
             .set("Accept", "application/json")
             .set("version", node.version)

diff --git a/packages/crypto/src/crypto.js b/packages/crypto/src/crypto.js
@@ -146,6 +146,11 @@ function generateAddress(publicKey, tokenPrefix) {
  * @param {string} publicKey 公钥
  */
 function verifyBytes(bytes, signature, publicKey) {
+    // 保证字节类型
+    if (!(bytes instanceof Buffer)) {
+        bytes = Buffer.from(bytes);
+    }
+
     const hash = createHash(bytes);
 
     const signatureBuffer = Buffer.from(signature, "hex");
@@ -163,23 +168,17 @@ function verifyHash(hash, signature, publicKey) {
 
 // 验证签名 
 // todo: 本方法并没有被实际使用，请参考 peer/kernal/transaction/transaction.js的 verifySignature 重构
-async function verify(transaction, signature, senderPublicKey) {
-    // let remove = 64;
-
-    // // 如果有二次签名就先减掉
-    if (transaction.signature) {
+async function verify(transaction, senderPublicKey) {
+    if (!transaction.signature) {
         return false;
     }
 
-    // const bytes = await getBytes(transaction);
-    // const data2 = Buffer.allocUnsafe(bytes.length - remove);
-
-    // for (let i = 0; i < data2.length; i++) {
-    //     data2[i] = bytes[i];
-    // }
+    if (!senderPublicKey) {
+        senderPublicKey = transaction.senderPublicKey;
+    }
 
     const bytes = await getBytes(transaction, true, true);
-    return verifyBytes(bytes, signature, senderPublicKey)
+    return verifyBytes(bytes, transaction.signature, senderPublicKey)
 }
 
 /**
@@ -192,7 +191,6 @@ async function verifySecondSignature(transaction, publicKey) {
         return false;
     }
     const bytes = await getBytes(transaction, false, true);
-
     return verifyBytes(bytes, transaction.sign_signature, publicKey)
 }
 

diff --git a/packages/crypto/test/naci.test.js b/packages/crypto/test/naci.test.js
@@ -58,14 +58,12 @@ describe('NaCI', () => {
     })
 
     it("#createHash should be ok, and return a Buffer, Uint8Array too.", (done) => {
-        const buf = Buffer.from('test');
+        const buf = Buffer.from('test'); // 转化一下
         const hash1 = DdnCrypto.createHash(buf);
-        const hash2 = DdnCrypto.createHash('test');
 
         debug(hash1);
         expect(hash1 instanceof Buffer).be.true;
         expect(hash1 instanceof Uint8Array).be.true;
-        expect(hash2).be.not.ok;
         done();
     })
 })
diff --git a/packages/node-sdk/src/constants/constants.ddn.js b/packages/node-sdk/src/constants/constants.ddn.js
@@ -43,7 +43,7 @@ export default {
       send: "10000000", 
       vote: "10000000",
       secondSignature: "500000000",
-      delegate: "2500000000",
+      delegate: "10000000000",
       multiSignature: "500000000",
       dappRegistration: "2500000000",
       dappWithdrawal: "10000000",
@@ -82,7 +82,7 @@ export default {
       send: "10000000", 
       vote: "10000000",
       secondSignature: "500000000",
-      delegate: "2500000000",
+      delegate: "10000000000",
       multisignature: "500000000",
       dappRegistration: "2500000000",
       dappWithdrawal: "10000000",

diff --git a/packages/node-sdk/test/unit/nodeSdk.transaction.test.js b/packages/node-sdk/test/unit/nodeSdk.transaction.test.js
@@ -178,7 +178,7 @@ describe("transaction.js", () => {
 
 			it("should have sign_signature as hex string", () => {
 				expect(trs.sign_signature).to.be.a("string")
-				// .and.match(() => {
+				// .to.match(() => {
 				// 	try {
 				// 		Buffer.from(trs.sign_signature, "hex");
 				// 	} catch (e) {

diff --git a/packages/peer/src/constants.js b/packages/peer/src/constants.js
@@ -47,7 +47,7 @@ export default {
       send: "10000000", 
       vote: "100000000",
       secondSignature: "500000000",
-      delegate: "2500000000",
+      delegate: "10000000000",
       multiSignature: "500000000",
       dappRegistration: "2500000000",
       dappWithdrawal: "10000000",

diff --git a/packages/peer/test/unit/1.delegates.test.js b/packages/peer/test/unit/1.delegates.test.js
@@ -577,7 +577,7 @@ describe("PUT /delegates to regist with funds", () => {
                 debug("blank username, fail", JSON.stringify(body));
                 node.expect(err).be.not.ok;
                 node.expect(body).to.have.property("success").to.be.false;
-                node.expect(body).to.have.property("error");
+                node.expect(body).to.have.property("error").to.match(/^Username is undefined/);
                 done();
             });
     });
@@ -839,8 +839,9 @@ describe("GET /delegates/voters", () => {
             .end((err, { body }) => {
                 debug("get votes no publicKey fail", JSON.stringify(body));
                 node.expect(err).be.not.ok;
-                node.expect(body).to.have.property("success");
-                node.expect(body).to.have.property("error");
+                node.expect(body).to.have.property("success").be.true;
+                node.expect(body).to.have.property("accounts");
+                node.expect(body.accounts.length).to.be.equal(0);
 
                 done();
             });

diff --git a/packages/peer/test/unit/peers.delegates.test.js b/packages/peer/test/unit/peers.delegates.test.js
@@ -191,7 +191,6 @@ describe("Registering a delegate", () => {
                             node.expect(err).to.be.not.ok;
                             account2.username = node.randomDelegateName().toLowerCase();
                             const transaction = await node.ddn.delegate.createDelegate(account2.username, account2.password);
-                            // console.log(transaction);
 
                             node.peer.post("/transactions")
                                 .set("Accept", "application/json")

diff --git a/packages/peer/test/unit/peers.votes.test.js b/packages/peer/test/unit/peers.votes.test.js
@@ -6,7 +6,7 @@ import node from "@ddn/node-sdk/lib/test";
 import DdnUtils from '@ddn/utils';
 import Debug from "debug";
 
-const debug = new Debug('peer');
+const debug = new Debug('debug');
 
 const account = node.randomAccount();
 const voterAccount = node.randomAccount();
@@ -193,6 +193,32 @@ describe("POST /peer/transactions", () => {
         });
     });
 
+    // 不能投给普通用户
+    it("Voting for an common user. Should be fail", async done => {
+        const transaction = await node.ddn.vote.createVote([`+${account.publicKey}`], account.password);
+        node.onNewBlock(err => {
+            node.expect(err).to.be.not.ok;
+            node.peer.post("/transactions")
+                .set("Accept", "application/json")
+                .set("version", node.version)
+                .set("nethash", node.config.nethash)
+                .set("port", node.config.port)
+                .send({
+                    transaction
+                })
+                .expect("Content-Type", /json/)
+                .expect(200)
+                .end((err, { body }) => {
+                    node.expect(err).to.be.not.ok;
+
+                    debug("Voting for an common user, fail", body);
+                    node.expect(body).to.have.property("success").to.be.false;
+                    node.expect(body).to.have.property("error").to.equal('Delegate not found');
+                    done();
+                });
+        });
+    });
+
     // Not right test, because sometimes new block comes and we don't have time to vote
     it("Registering a new delegate. Should be ok", done => {
         node.api.post("/accounts/open")
@@ -256,32 +282,6 @@ describe("POST /peer/transactions", () => {
             });
     });
 
-    // 不能投给普通用户
-    it("Voting for an common user. Should be fail", async done => {
-        const transaction = await node.ddn.vote.createVote([`+${account.publicKey}`], account.password);
-        node.onNewBlock(err => {
-            node.expect(err).to.be.not.ok;
-            node.peer.post("/transactions")
-                .set("Accept", "application/json")
-                .set("version", node.version)
-                .set("nethash", node.config.nethash)
-                .set("port", node.config.port)
-                .send({
-                    transaction
-                })
-                .expect("Content-Type", /json/)
-                .expect(200)
-                .end((err, { body }) => {
-                    node.expect(err).to.be.not.ok;
-
-                    debug(body);
-                    node.expect(body).to.have.property("success").to.be.false;
-                    node.expect(body).to.have.property("error").to.equal('Delegate not found');
-                    done();
-                });
-        });
-    });
-
     // 只有受托人才能接受投票
     it("Voting for a delegate. Should be ok", async done => {
         const transaction = await node.ddn.vote.createVote([`+${delegate2_pubKey}`], account.password);
@@ -300,7 +300,7 @@ describe("POST /peer/transactions", () => {
                 .end((err, { body }) => {
                     node.expect(err).to.be.not.ok;
 
-                    debug(body);
+                    debug("Voting for a delegate ok", body);
                     node.expect(body).to.have.property("success").to.be.true;
                     done();
                 });