Skip to content

Commit

Permalink
Merge pull request #106 from Weber-H2O2/dev
Browse files Browse the repository at this point in the history 
More features supported in `eigen_service`
  • Loading branch information
@Weber-H2O2
Weber-H2O2 committed Sep 14, 2021
2 parents 9082af2 + b5e6632 commit b6a404e
Show file tree
Hide file tree
Showing 3 changed files with 321 additions and 155 deletions.
5 changes: 3 additions & 2 deletions l2/eigen_service/package.json
View file
Expand Up @@ -5,7 +5,8 @@
"license": "APACHE",
"scripts": {
"start": "node ./src/app.js",
"test": "node ./test/app.js"
"test": "node ./test/app.js",
"clean": "rm -f ./db_pk.sqlite & rm -f ./db_transaction_history.sqlite"
},
"devDependencies": {
"express": "~4.17.1",
Expand All @@ -18,4 +19,4 @@
"elliptic": "^6.5.4",
"standard-ecies": "^2.0.0"
}
}
}
248 changes: 151 additions & 97 deletions l2/eigen_service/src/app.js
View file
@@ -1,59 +1,62 @@
const express = require('express')
const express = require("express");
const log4js = require("./log");
var logger = log4js.logger("APP")
var db_pk = require("./database_pk")
var db_txh = require("./database_transaction_history")
var util = require("./util.js")
var logger = log4js.logger("APP");
var db_pk = require("./database_pk");
var db_txh = require("./database_transaction_history");
var util = require("./util.js");
const { Op } = require("sequelize");

const app = express()
const app = express();
app.use(log4js.useLog());


var bodyParser = require('body-parser');
var bodyParser = require("body-parser");
app.use(bodyParser.json());

// query key
app.get('/stores', async function (req, res) {
return res.json(util.Succ(await db_pk.findAll()))
})
app.get("/stores", async function (req, res) {
return res.json(util.Succ(await db_pk.findAll()));
});

app.get('/store', async function (req, res) {
var digest = req.query.digest
if (!util.has_value(digest)) {
logger.error("digest is empty")
return res.json(util.Err(1, "digest missing"))
}
var result = await db_pk.findByDigest(digest);
if (!result) {
return res.json(util.Succ({}))
}
res.json(util.Succ(result))
})
app.get("/store", async function (req, res) {
var digest = req.query.digest;
if (!util.has_value(digest)) {
logger.error("digest is empty");
return res.json(util.Err(1, "digest missing"));
}
var result = await db_pk.findByDigest(digest);
if (!result) {
return res.json(util.Succ({}));
}
res.json(util.Succ(result));
});

// add new key
app.post("/store", async function (req, res) {
var digest = req.body.digest;
var pk = req.body.public_key;
if (!util.has_value(digest) || !util.has_value(pk)) {
return res.json(util.Err(1, "missing dig or pk"))
}
var digest = req.body.digest;
var pk = req.body.public_key;
if (!util.has_value(digest) || !util.has_value(pk)) {
return res.json(util.Err(1, "missing dig or pk"));
}

var result = db_pk.updateOrAdd(digest, digest, pk);
res.json(util.Succ(result))
})
var result = db_pk.updateOrAdd(digest, digest, pk);
res.json(util.Succ(result));
});

// update
app.put("/store", async function (req, res) {
var old_digest = req.body.old_digest;
var digest = req.body.digest;
var pk = req.body.public_key;
if (!util.has_value(digest) || !util.has_value(pk) ||
!util.has_value(old_digest)) {
return res.json(util.Err(1, "missing dig or pk"))
}
var result = db_pk.updateOrAdd(old_digest, digest, pk);
res.json(util.Succ(result))
})
var old_digest = req.body.old_digest;
var digest = req.body.digest;
var pk = req.body.public_key;
if (
!util.has_value(digest) ||
!util.has_value(pk) ||
!util.has_value(old_digest)
) {
return res.json(util.Err(1, "missing dig or pk"));
}
var result = db_pk.updateOrAdd(old_digest, digest, pk);
res.json(util.Succ(result));
});

/*
app.get("/txhs", async function(req, res) {
Expand All @@ -62,71 +65,122 @@ app.get("/txhs", async function(req, res) {
*/

//TODO: retrieve by page
app.get("/txhs", async function(req, res) {
var action = req.query.action
console.log(req.query)
if (action != "search") {
return res.json(util.Err(1, "invalid action"))
}
let dict = req.query
delete dict['action']
return res.json(util.Succ(await db_txh.search(req.query)))
})
app.get("/txhs", async function (req, res) {
var action = req.query.action;
console.log(req.query);
let dict = req.query;
let page = dict["page"];
let page_size = dict["page_size"];
let order = dict["order"];
switch (action) {
case "search":
delete dict["action"];
delete dict["page"];
delete dict["page_size"];
delete dict["order"];
return res.json(
util.Succ(await db_txh.search(req.query, page, page_size, order))
);
break;
case "search_l2":
// TODO: 0x1, 0x2, 0x3 should replaced with enum
return res.json(
util.Succ(
await db_txh.search(
{
type: {
[Op.or]: [0x1, 0x2, 0x3],
},
},
page,
page_size,
order
)
)
);
break;

default:
return res.json(util.Err(1, "invalid action"));
break;
}
});

app.get("/txh", async function(req, res) {
var txid = req.query.txid
app.get("/txh", async function (req, res) {
var action = req.query.action;
console.log("action = ", action);
if (!action) {
var txid = req.query.txid;
if (!util.has_value(txid)) {
logger.error("txid is empty")
return res.json(util.Err(1, "txid missing"))
logger.error("txid is empty");
return res.json(util.Err(1, "txid missing"));
}
var result = await db_txh.getByTxid(txid);
if (!result) {
return res.json(util.Succ({}))
return res.json(util.Succ({}));
}
res.json(util.Succ(result))
})
res.json(util.Succ(result));
} else {
switch (action) {
case "transaction_count_l2":
return res.json(util.Succ(await db_txh.transaction_count_l2()));
break;
case "account_count_l2":
return res.json(util.Succ(await db_txh.account_count_l2()));
break;
default:
return res.json(util.Err(1, "invalid action"));
break;
}
}
});

// add new key
// add transaction
app.post("/txh", async function (req, res) {
var txid = req.body.txid;
var from = req.body.from;
var to = req.body.to;
var value = req.body.value;
var type = req.body.type;
if (!util.has_value(txid) ||
!util.has_value(from) ||
!util.has_value(value) ||
!util.has_value(to) ||
!util.has_value(type)) {
return res.json(util.Err(1, "missing fields"))
}
console.log(req.body);
var txid = req.body.txid;
var from = req.body.from;
var to = req.body.to;
var value = req.body.value;
var block_num = req.body.block_num;
var type = req.body.type;
if (
!util.has_value(txid) ||
!util.has_value(from) ||
!util.has_value(value) ||
!util.has_value(to) ||
!util.has_value(block_num) ||
!util.has_value(type)
) {
return res.json(util.Err(1, "missing fields"));
}
console.log(req.body);

var result = db_txh.updateOrAdd(txid, {
"txid": txid,
"from": from,
"to": to,
"value": value,
"type": Number(type),
"status": req.body.status || 0,
"sub_txid": req.body.sub_txid || ''
});
res.json(util.Succ(result))
})
var result = db_txh.updateOrAdd(txid, {
txid: txid,
from: from,
to: to,
value: value,
type: Number(type),
block_num: block_num,
status: req.body.status || 0,
sub_txid: req.body.sub_txid || "",
});
res.json(util.Succ(result));
});

// update
// update transaction status
app.put("/txh/:txid", async function (req, res) {
var txid = req.params.txid;
if (!util.has_value(txid)) {
return res.json(util.Err(1, "missing fields"))
}
var result = db_txh.updateOrAdd(txid, {
"status": req.body.status || 0,
"sub_txid": req.body.sub_txid || ''
});
res.json(util.Succ(result))
})
var txid = req.params.txid;
if (!util.has_value(txid)) {
return res.json(util.Err(1, "missing fields"));
}
var result = db_txh.updateOrAdd(txid, {
status: req.body.status || 0,
sub_txid: req.body.sub_txid || "",
});
res.json(util.Succ(result));
});

app.listen(3000, function() {
console.log("Eigen Service listening on port 3000!");
})
app.listen(3000, function () {
console.log("Eigen Service listening on port 3000!");
});

0 comments on commit b6a404e

Please sign in to comment.