Revert " update some test;fix issue1;fix pr ontio#7 (ontio#8)"

This reverts commit 098d4f4.
backslash47 · Apr 7, 2018 · e3caba2 · e3caba2
1 parent 098d4f4
commit e3caba2
Show file tree

Hide file tree

Showing 30 changed files with 143 additions and 1,179 deletions.
diff --git a/package.json b/package.json
@@ -5,9 +5,9 @@
   "main": "./lib/index.js",
   "types": "./lib/types/index.d.ts",
   "scripts": {
-    "test": "./node_modules/.bin/jest",
-    "build:dev": "./node_modules/.bin/webpack --display-error-details --config webpack.config.js --progress --color",
-    "build:prod": "./node_modules/.bin/webpack --env.prod --config webpack.config.js --progress --color"
+    "test": "jest",
+    "build:dev": "webpack --display-error-details --config webpack.config.js --progress --color",
+    "build:prod": "webpack --env.prod --config webpack.config.js --progress --color"
   },
   "jest": {
     "moduleFileExtensions": [

diff --git a/src/SDK/index.ts b/src/SDK/index.ts
@@ -32,33 +32,6 @@ import axios from 'axios'
 import {BigNumber} from 'bignumber.js'
 import {DDO} from '../transaction/ddo';
 export class SDK {
-    static SERVER_NODE : string
-    static REST_PORT   : string
-    static SOCKET_PORT : string
-
-    static setServerNode(node : string) {
-        if(node) {
-            SDK.SERVER_NODE = node
-            return;
-        } 
-        throw new Error('Can not set ' + node + 'as server node')
-    }
-
-    static setRestPort(port: string) {
-        if (port) {
-            SDK.REST_PORT = port
-            return;
-        }
-        throw new Error('Can not set ' + port + ' as restful port')
-    }
-
-    static setSocketPort(port: string) {
-        if (port) {
-            SDK.SOCKET_PORT = port 
-            return;
-        }
-        throw new Error('Can not set ' + port + 'as socket port')
-    }
 
     static getDecryptError(err:any) {
         return {
@@ -107,8 +80,7 @@ export class SDK {
                 socket.close()
             }
         } 
-        let socket = `ws://${SDK.SERVER_NODE}:${SDK.SOCKET_PORT}`
-        var txSender = new TxSender(socket)
+        var txSender = new TxSender(ONT_NETWORK.TEST)
         txSender.sendTxWithSocket(param, socketCallback)
         // callback && sendBackResult2Native(JSON.stringify(obj), callback)
         return obj
@@ -118,8 +90,10 @@ export class SDK {
         password : string, callback ?: string) {
         let identity = new Identity()
         let wallet = Wallet.parseJson(walletDataStr)
+        let privateKey = ''
         try {
             //TODO check ontid
+            privateKey = scrypt.decrypt(encryptedPrivateKey, password)
             identity = Identity.importIdentity(label, encryptedPrivateKey, password)
         } catch (err) {
             let obj  = this.getDecryptError(err)
@@ -135,10 +109,9 @@ export class SDK {
             desc : ''
         }
         //check ontid on chain
-        let tx = buildGetDDOTx(identity.ontid)
+        let tx = buildGetDDOTx(identity.ontid, privateKey)
         let param = buildRestfulParam(tx)
-        let restUrl = `http://${SDK.SERVER_NODE}:${SDK.REST_PORT}/`
-        let url = sendRawTxRestfulUrl(restUrl, true)
+        let url = sendRawTxRestfulUrl(TEST_ONT_URL.REST_URL, true)
         axios.post(url, param).then((res:any) => {
             if (res.data.Result && res.data.Result.length > 0 && res.data.Result[0] !== '0000000000000000') {
 
@@ -157,7 +130,9 @@ export class SDK {
     static importIdentity(label : string, encryptedPrivateKey : string, password : string, callback ?: string) {
         let identity = new Identity()
         let error = {}
+        let privateKey
         try {
+            privateKey = scrypt.decrypt(encryptedPrivateKey, password)
             identity = Identity.importIdentity(label, encryptedPrivateKey, password)
             let wallet = new Wallet()
             wallet.create(identity.label)
@@ -170,11 +145,10 @@ export class SDK {
                 desc: ''
             }
             //check ontid on chain
-            let tx = buildGetDDOTx(identity.ontid)
+            let tx = buildGetDDOTx(identity.ontid, privateKey)
             let param = buildRestfulParam(tx)
-            let restUrl = `http://${SDK.SERVER_NODE}:${SDK.REST_PORT}/`            
-            let url = sendRawTxRestfulUrl(restUrl, true)
-            return axios.post(url, param).then((res: any) => {
+            let url = sendRawTxRestfulUrl(TEST_ONT_URL.REST_URL, true)
+            axios.post(url, param).then((res: any) => {
                 if (res.data.Result && res.data.Result.length > 0 && res.data.Result[0] !== '0000000000000000') {
 
                 } else {
@@ -189,7 +163,7 @@ export class SDK {
         } catch(err) {
             error = this.getDecryptError(err)
             callback && sendBackResult2Native(JSON.stringify(error), callback)
-            return Promise.reject(error) 
+            return error
         }
     }
 
@@ -206,9 +180,8 @@ export class SDK {
         //register ontid
         let tx = buildRegisterOntidTx(identity.ontid, privateKey)
         let param = buildRestfulParam(tx)
-        let restUrl = `http://${SDK.SERVER_NODE}:${SDK.REST_PORT}${REST_API.sendRawTx}`
-
-        axios.post(restUrl, param).then((res: any) => {
+        const url = TEST_ONT_URL.sendRawTxByRestful
+        axios.post(url, param).then((res: any) => {
             if(res.data.Error === 0) {
                 callback && sendBackResult2Native(JSON.stringify(obj), callback)
             } else {
@@ -349,8 +322,7 @@ export class SDK {
             // let txId = core.getHash(tx.serialize())
             let param = buildTxParam(tx)
             //通过socket能获得推送的结果
-            let socket = `ws://${SDK.SERVER_NODE}:${SDK.SOCKET_PORT}`
-            var txSender = new TxSender(socket)
+            var txSender = new TxSender(ONT_NETWORK.TEST)
             const socketCallback = function(res : any, socket : any) {
                 console.log('res: '+ JSON.stringify(res))
                 if(res.Action === 'InvokeTransaction' && res.Error === 0) {
@@ -393,7 +365,7 @@ export class SDK {
         if(address.length === 40) {
             address = core.u160ToAddress(address)
         }
-        let request = `http://${SDK.SERVER_NODE}:${SDK.REST_PORT}${REST_API.getBalance}/${address}`
+        let request = `http://${TEST_NODE}:${HTTP_REST_PORT}${REST_API.getBalance}/${address}`
         axios.get(request).then((res : any) => {
             if(res.data.Error === 0) {
                 let result = res.data.Result
@@ -451,7 +423,7 @@ export class SDK {
 
         let tx = makeTransferTransaction('ONT',from, to, value, privateKey)
         var param = buildRestfulParam(tx)
-        let request = `http://${SDK.SERVER_NODE}:${SDK.REST_PORT}${REST_API.sendRawTx}`
+        let request = `http://${TEST_NODE}:${HTTP_REST_PORT}${REST_API.sendRawTx}`
         axios.post(request, param).then( (res:any) => {
             console.log('transfer response: ' + JSON.stringify(res.data))
             if(res.data.Error === 0) {

diff --git a/src/claim.ts b/src/claim.ts
@@ -62,7 +62,7 @@ export class Claim {
         this.Id = CryptoJS.SHA256(CryptoJS.enc.Hex.parse(JSON.stringify(body))).toString()
     }
 
-    sign( privateKey: string ) : Signature {
+    sign( privateKey: string ) {
         let claimBody = {
             Context: this.Context,
             Id: this.Id,

diff --git a/src/common/fixed64.ts b/src/common/fixed64.ts
diff --git a/src/consts.ts b/src/consts.ts
@@ -42,7 +42,7 @@ export class Algorithm {
 export const DEFAULT_ALGORITHM = {
   algorithm : "ECDSA",
   parameters : {
-    "curve": "secp256r1" // also called p256
+    "curve": "secp256r1"
   }
 }
 
@@ -77,7 +77,7 @@ export const TEST_ONT_URL = {
 
   RPC_URL: `http://${TEST_NODE}:${HTTP_JSON_PORT}/`,
 
-REST_URL: `http://${TEST_NODE}:${HTTP_REST_PORT}/`,
+  REST_URL: `http://${TEST_NODE}:${HTTP_REST_PORT}/`,
 
   sendRawTxByRestful : `http://${TEST_NODE}:${HTTP_REST_PORT}${REST_API.sendRawTx}`
 }

diff --git a/src/core.ts b/src/core.ts
@@ -21,13 +21,10 @@ import * as base58 from 'bs58'
 import * as ecurve from 'ecurve'
 import * as bigInteger from 'bigi'
 import { ab2hexstring, hexstring2ab, StringReader, hexstr2str, num2hexstring } from './utils'
-import { ADDR_VERSION, TEST_ONT_URL } from './consts'
+import { ADDR_VERSION } from './consts'
 import * as scrypt from './scrypt'
 import {ERROR_CODE} from './error'
 import { VmType } from './transaction/vmcode';
-import { buildGetDDOTx, buildRestfulParam, sendRawTxRestfulUrl} from './transaction/transactionBuilder'
-import axios from 'axios'
-import { DDO } from './transaction/ddo'
 
 var ec = require('elliptic').ec
 var wif = require('wif')
@@ -150,20 +147,12 @@ export function signatureData(data: string, privateKey: string): string {
     return signatureValue.toString('hex');
 }
 
-
-/* 
-@data original value of signature
-@signature 
-@publicKey the public key of the signer. is array-like or buffer
-*/
-export function verifySignature(data: string, signature: string, publicKey: any) {
+export function verifySignature(data : string, signature : string, publicKey : string) {
     let msg = cryptoJS.enc.Hex.parse(data)
     let msgHash = cryptoJS.SHA256(msg)
 
     let elliptic = new ec('p256')
-    let r = signature.substr(0, 64)
-    let s = signature.substr(64, 64)
-    const result = elliptic.verify(msgHash.toString(), { r, s }, publicKey, null)
+    const result = elliptic.verify(data.toString(), signature, publicKey, null)
     return result
 }
 
@@ -223,30 +212,11 @@ export function checkPrivateKey(encryptedPrivateKey : string, password : string)
     return true
 }
 
-/* 
-@claim claim json object
-*/
+
 export function verifyOntidClaim(claim : any) {
     if(!claim.Metadata || !claim.Metadata.Issuer) {
         throw new Error('Invalid claim.')
     }
-    let issuerDid = claim.Metadata.Issuer
-    let tx = buildGetDDOTx(issuerDid)
-    let param = buildRestfulParam(tx)
-    let url = sendRawTxRestfulUrl(TEST_ONT_URL.REST_URL, true)
-    return axios.post(url, param).then( (res:any) => {
-        if (res.data.Result && res.data.Result.length > 0) {
-            console.log('ddo hexstr: '+ res.data.Result[0])
-            const ddo = DDO.deserialize(res.data.Result[0])
-            console.log('ddo: ' + JSON.stringify(ddo))
-            if(ddo.publicKeys.length > 0) {
-                const pk = ddo.publicKeys[0].pk
-                const signature = claim.Signature.Value
-                claim.delete('Signature')
-                return verifySignature(JSON.stringify(claim), signature, hexstring2ab(pk))
-            } else {
-                return false
-            }
-        }
-    })
+    let issuer = claim.Metadata.Issuer
+    //TODO
 }
diff --git a/src/crypto.ts b/src/crypto.ts
@@ -13,26 +13,3 @@ export enum SignatureSchema {
 
 	SHA512withEDDSA
 }
-
-export enum CurveLabel {
-	P224 = 1,
-	P256 = 2,
-	P384 = 3,
-	P521 = 4,
-
-	SM2P256V1 = 20,
-
-	ED25519 = 25
-}
-
-export enum KeyType {
-	PK_ECDSA = 0x12,
-	PK_SM2 = 0x13,
-	PK_EDDSA = 0x14,
-}
-
-export class PublicKey {
-	algorithm: number
-	curve: number
-	pk: string
-}
diff --git a/src/index.ts b/src/index.ts
@@ -31,6 +31,7 @@ import * as core from './core'
 import * as utils from './utils'
 import * as CONST from './consts'
 import { SDK } from './SDK/index'
+import { CompleterResult } from 'readline';
 
 class ONT {
   Account : any
@@ -80,7 +81,7 @@ class ONT {
     this.CONST.HTTP_REST_PORT = port
   }
 
-  setSocketPort(port: string) {
+  setWsPortyarn(port: string) {
     this.CONST.HTTP_WS_PORT = port
   }
 }