godprotocol 1.0.5 → 1.0.6

package/Objects/Virtual_machine.js

@@ -1,112 +1,114 @@
-import { Block } from "./Blockchain";
-import Blockweb from "./Blockweb";
-import File_system from "./Filesystem";
-import Frame from "./Frame";
 import Opcodes from "./Opcodes";
 
 class Virtual_machine extends Opcodes {
-  constructor(chain) {
+  constructor(context) {
     super();
 
-    this.state = [chain];
-    this.web = new Blockweb(this);
-    this.fm = new File_system(this);
-
-    this.pointers = new Array();
+    this.account = context.parent.account;
+    this.contexts = [context];
   }
 
   get_context = (index) => {
-    return index != null ? this.state[index] : this.state.slice(-1)[0];
+    return this.contexts.slice(index != null ? index : -1)[0];
   };
 
-  push = (instructions) => {
-    this.pointers.push(0);
+  /* VM moment */
+  snap_id = () => {
+    return `${this.get_context().hash}-${this.mgr_index || -1}`;
+  };
 
-    while (this.pointers.slice(-1)[0] < instructions.length && !this.err_) {
-      let ins = instructions[this.pointers.slice(-1)[0]];
-      if (ins) {
-        let res = this.check_instruction(ins);
-        if (res) {
-        } else this.execute(ins);
-      }
+  parse_arg = (arg, cursor) => {
+    let context = this.get_context();
 
-      this.pointers[this.pointers.length - 1] = this.pointers.slice(-1)[0] + 1;
-    }
-    this.pointers.pop();
-    this.get_context().mine(this);
-  };
+    let args = arg.split("/"),
+      i = 0;
+    while (args[0] === "..") {
+      i++;
 
-  check_instruction = (instruction) => {
-    if (instruction instanceof Block) {
-      this.state.push(instruction);
-      instruction = instruction.data;
-    } else if (instruction instanceof Frame) {
-      instruction = instruction.instructions;
-    } else {
-      return;
+      args.splice(0, 1);
     }
 
-    this.push(instruction);
-    return true;
-  };
+    i = (i + 1) * -1;
+    context = i ? this.get_context(i) : context;
 
-  readonly = (tag) => {
-    let tags = tag.split(":");
-    tags[0] = tags[0].slice(1);
-    tags[1] = tags[1].slice(0, -1);
+    arg = args.join("/");
 
-    console.log(tags);
-  };
-
-  parse_arg = (arg) => {
-    let data;
-    if (!arg) return;
-    if (arg.startsWith("{")) {
-      data = this.readonly();
+    if (arg.startsWith("{*") && cursor) {
+      arg = context.explore(arg.splice(2, -1));
+    } else if (arg.startsWith("{") && !cursor) {
+      arg = context.explore(arg.slice(1, -1));
     }
 
-    return data;
+    return arg;
   };
 
-  execute(instruction) {
-    let [opcode, args] = instruction.split(" ");
+  execute = (instruction, mgr_index) => {
+    this.mgr_index = mgr_index;
+
+    let split = instruction.split(" ");
+    let opcode = split[0],
+      args = split.slice(1).join(" ");
 
     let context = this.get_context();
 
     context.add_tx(instruction);
-    args = this.parse_arg(args);
+
+    let chain;
+
+    args = this.parse_arg(args, opcode === "cursor");
+
+    context.on(opcode, args);
 
     switch (opcode) {
       case "chain":
-        let folder = context.parent.folder(args, context);
-        this.state.push(folder.chain);
+        chain = context.parent.add_chain(args, mgr_index);
+        this.contexts.push(chain);
+
+        chain.append_buffer();
+        context.parent.account.send(chain);
         break;
       case "link":
-        this.state.push(args);
+        let folder = context.parent.account.manager.oracle.get(args);
+
+        if (!folder) {
+          console.log(`LINKing Failed. - ${args}`);
+          return;
+        }
+
+        chain = folder.get_chain(context);
+
+        chain.append_buffer();
+
+        this.contexts.push(chain);
+
+        context.parent.account.send(chain);
         break;
-      case "mine":
-        context.mine(this);
-        this.state.slice(-2)[0].handle_children(context.get_latest_block());
+      case "listen":
+        context.add_listener(args);
         break;
-      case "pop_link":
-        this.state.pop();
+      case "mine":
+        let bloc = context.mine(this);
+        context.parent.account.send(bloc, null, bloc.chain.hash);
         break;
       case "pop":
-        context.mine(this);
-        this.state.pop();
+        let blk;
+        if (context.txs.length > 1) {
+          blk = context.mine(this);
+          context.parent.account.send(blk, null, blk.chain.hash);
+        }
+        this.contexts.pop();
         break;
-      case "run":
-        this.push(args.data);
+      case "cursor":
+        context.cursor = args;
+        break;
+      case "write":
+        context.parent.write(args, context);
         break;
       default:
-        if (["cursor", "write"].includes(opcode)) context[opcode](args);
-        else this.prepare_operation(opcode, context);
+        this.prepare_operation(opcode, context);
     }
-  }
 
-  err = (msg) => {
-    console.log(msg);
-    this.err_ = true;
+    context.after(opcode, args);
   };
 }
 

package/Objects/folder.js

@@ -1,94 +1,19 @@
-import fs from "fs";
-import { emitter } from "./Account";
-import File from "./file";
-import { Block, Chain } from "./Blockchain";
 import { hash } from "../utils/hash";
+import Filesystem from "./Filesystem";
 
-class Folder {
-  object_name = "folder";
+class Folder extends Filesystem {
+  constructor(name, parent) {
+    super();
 
-  constructor(name, parent, hash) {
     this.name = name;
     this.parent = parent;
-    this.hash = hash;
-    this.path = `${parent.path}/${this.hash}`;
+    this.hash = hash(this.name);
+    this.physical_address = `${this.parent.physical_address}/${this.name}`;
 
-    emitter.listen(this.path, (cb) => cb && cb(this));
+    this.account = this.parent.account;
 
-    this.active_file = null;
-    this.files = new Array();
-    this.folders = new Array();
-    this.chain = new Chain(this);
-
-    this.curs = -1;
-    this.content_buffer = new Object();
-
-    this.set_path();
+    this.set_paths();
   }
-
-  cursor = (curs) => (this.curs = curs);
-
-  write = (data) => {
-    let v = this.content_buffer[this.curs];
-
-    if (!v) {
-      v = new Array();
-      this.content_buffer[this.curs] = v;
-    }
-
-    v.push(data instanceof Block ? data.hash : data);
-  };
-
-  file = (name) => {
-    let file = this.files.find((f) => f.name === name);
-
-    if (!file) {
-      file = new File(name, this);
-      this.files.push(file);
-    }
-
-    return file;
-  };
-
-  get = (opcode) => {
-    let circ = this[opcode];
-
-    return circ;
-  };
-
-  get_column = () => {
-    this.get_active_file().block.get_column();
-  };
-
-  fetch_arg = (path) => {
-    let block = this.chain.explore({ parents: `./God/${path}` });
-    return block.file.parse(true);
-  };
-
-  folder = (name, context) => {
-    let name_hash = hash(name + context.hash);
-    let folder = this.folders.find((f) => f.hash === name_hash);
-    if (!folder) {
-      folder = new Folder(name, this, name_hash);
-      folder.account = this.account;
-
-      this.folders.push(folder);
-    }
-    folder.context = context.hash;
-
-    return folder;
-  };
-
-  parse = () => {
-    return this;
-  };
-
-  set_path = () => {
-    if (fs.existsSync(this.path)) {
-    } else {
-      fs.mkdirSync(this.path);
-    }
-  };
 }
 
 export default Folder;

package/framer.js

@@ -1,19 +1,39 @@
+import Frame from "./Objects/Frame";
+
 const framer = (initiator) => {
-  let frame = initiator.frame({
+  let frame = new Frame({
     Opcodes: {
       add: null,
       equal: null,
+      multiply: null,
+      subtract: null,
+      divide: null,
+      exp: null,
+      equal: null,
+      not_equal: null,
+      greater_than: null,
+      less_than: null,
+      gte: null,
+      lte: null,
+
       send: null,
-      jmp: null,
-      jmp_if: null,
       readonly: null,
       socket_send: null,
+
+      jmp: null,
+      jmp_if: null,
+      hold: null,
+
+      stdout: null,
+      stdin: null,
     },
     Datatypes: {
       Number: null,
       String: null,
       Twain: null,
       Array: null,
+      Void: null,
+      Boolean: null,
     },
     Objects: {
       Blockchain: {
@@ -33,8 +53,11 @@ const framer = (initiator) => {
       },
     },
   });
+  frame.to_instruction();
 
-  initiator.load({ instructions: frame.instructions });
+  initiator.load({
+    instructions: frame.flatten_instructions(),
+  });
 };
 
 export default framer;

package/opcodes/add.js

@@ -1,38 +1,15 @@
-import Num from "../Datatypes/Number";
-import { initiator } from "../Index";
-
-const add = (args) => {
-  console.log(args);
-
-  return;
-};
-
-const divide = (args) => {
-  let result = args.op1 / args.op2;
-
-  return new Num(result, "divide").load(initiator);
-};
-
-const exp = (args) => {
-  let result = args.op1 ** args.op2;
-
-  return new Num(result, "exp").load(initiator);
-};
-
-const multiply = (args) => {
-  let result = args.op1 * args.op2;
-
-  return new Num(result, "multiply").load(initiator);
-};
-
-const subtract = (args) => {
-  let result = args.op1 - args.op2;
-
-  return new Num(result, "subtract").load(initiator);
-};
-
-const equal = (args) => {
-  return new Num(Number(args.op1 === args.op2), "equal").load(initiator);
-};
-
-export { add, equal, divide, multiply, exp, subtract };
+let ops = [
+  { name: "add", sign: "+" },
+  { name: "multiply", sign: "*" },
+  { name: "subtract", sign: "-" },
+  { name: "divide", sign: "/" },
+  { name: "exp", sign: "**" },
+  { name: "equal", sign: "==" },
+  { name: "not_equal", sign: "!=" },
+  { name: "greater_than", sign: ">" },
+  { name: "less_than", sign: "<" },
+  { name: "gte", sign: ">=" },
+  { name: "lte", sign: "<=" },
+];
+
+export { ops };

package/opcodes/jmp.js

@@ -1,9 +1,15 @@
 const jmp = (args, vm) => {
-  vm.pointers[vm.pointers.length - 1] += args.pointer;
+  vm.account.manager.tracker[vm.mgr_index].pointer += args.index;
 };
 
 const jmp_if = (args, vm) => {
-  if (args.passed) vm.pointers[vm.pointers.length - 1] += args.pointer;
+  if (args.passed)
+    vm.account.manager.tracker[vm.mgr_index].pointer += args.index;
 };
 
-export { jmp, jmp_if };
+const hold = (args, vm) => {
+  let track = vm.account.manager.tracker[vm.mgr_index];
+  track.hold = args.hold;
+};
+
+export { jmp, jmp_if, hold };

package/opcodes/std.js

@@ -0,0 +1,5 @@
+const stdout = (args) => {
+  console.log(args.op0);
+};
+
+export { stdout };

package/opcodes.js

@@ -1,23 +1,32 @@
-import { socket_send } from "./Socket";
-import { add, divide, equal, exp, multiply, subtract } from "./opcodes/add";
-import { jmp, jmp_if } from "./opcodes/jmp";
+// import { socket_send } from "./Socket";
+import { ops } from "./opcodes/add";
+import { hold, jmp, jmp_if } from "./opcodes/jmp";
+import { stdout } from "./opcodes/std";
 import { post_request } from "./utils/services";
 
 const opcodes = (initiator) => {
   let set = initiator.vm.set;
 
-  set("add", add);
-  set("equal", equal);
-  set("divide", divide);
-  set("subtract", subtract);
-  set("multiply", multiply);
-  set("exp", exp);
+  ops.map((op) => {
+    set(op.name, (args) => {
+      console.log(args, "EMpty?");
+      try {
+        let result = eval(`${args.op0} ${op.sign} ${args.op1}`);
+        return result;
+      } catch (e) {
+        console.log(e.message);
+      }
+    });
+  });
 
+  set("hold", hold);
   set("jmp", jmp);
   set("jmp_if", jmp_if);
 
   set("send", post_request);
-  set("socket_send", socket_send);
+  // set("socket_send", socket_send);
+
+  set("stdout", stdout);
 };
 
 export default opcodes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "godprotocol",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "A data mediator.",
   "main": "Index.js",
   "types": "index.d.ts",

package/utils/create_server.js

@@ -1,28 +1,34 @@
 import http from "http";
+import { manager } from "../Index";
 
-let PORT = 1900;
+let PORT = 1901,
+  domain;
+
+const create_server = (initiator, serve) => {
+  PORT = (serve && serve.port) || PORT;
 
-const create_server = (initiator) => {
   let server = http.createServer((req, res) => {
     let data = "";
 
     req.on("data", (chunk) => {
-      console.log("Received chunk");
       data += chunk;
     });
 
     req.on("end", () => {
       data = JSON.parse(data);
-      if (req.url === "/create_account" && req.method === "POST") {
-        initiator.create_account(data);
-        res.writeHead(200, { "Content-Type": "application/json" });
-        res.end(
-          JSON.stringify({ status: "success", message: "Account created" })
-        );
-      } else {
+
+      if (req.url === "/distribute") {
+        if (data.blocks) {
+          manager.web.store_chain(data);
+        } else if (data.chain) {
+          manager.web.store_block(data);
+        }
+        res.end();
+      } else if (req.url === "/create_account") {
+        let account = initiator.account(data.name, data.server);
+        res.end(JSON.stringify(account.stringify()));
+      } else if (req.url === "/load") {
         initiator.load(data);
-        res.writeHead(200, { "Content-Type": "application/json" });
-        res.end(JSON.stringify({ status: "success", message: "Data loaded" }));
       }
     });
 
@@ -33,6 +39,11 @@ const create_server = (initiator) => {
   });
 
   server.listen(PORT, () => {
+    initiator.add_server({
+      hostname: (serve && serve.domain) || domain || "127.0.0.1",
+      port: PORT,
+    });
+
     console.log(
       `\n...GOD PROTOCOL RUNNING :${PORT}\nYour Public_key: ${process.env.PUBLIC_KEY}`
     );

package/utils/hash.js

@@ -1,8 +1,3 @@
-import fs from "fs";
-import Num from "../Datatypes/Number";
-import Str from "../Datatypes/String";
-import Arr from "../Datatypes/Array";
-import Twain from "../Datatypes/Twain";
 const crypto = require("crypto");
 
 const hash = (data) => {
@@ -15,36 +10,4 @@ const hash = (data) => {
   return result;
 };
 
-let Buffs = new Array();
-
-const fs_buffer = (payload, buff_index) => {
-  try {
-    fs.writeFileSync(payload.addr, JSON.stringify(payload.data));
-
-    if (buff_index) Buffs.splice(buff_index - 1, 1);
-  } catch (e) {
-    !buff_index && Buffs.push({ hash: hash(JSON.stringify(payload)), payload });
-  }
-};
-
-const store = (obj) => {
-  let addr;
-
-  if (obj.type === "string") {
-    addr = new Str(obj.value.join("")).store();
-  } else if (obj.type === "number") {
-    addr = new Num(obj.value).store();
-  } else if (obj.type === "array") {
-    addr = new Arr(obj.value).store();
-  } else if (obj.type === "twain") {
-    addr = new Twain(obj.value).store();
-  }
-
-  return addr;
-};
-
-const load = (addr) => {
-  let obj;
-};
-
-export { hash, fs_buffer, store, Buffs, load };
+export { hash };

package/utils/services.js

@@ -1,5 +1,3 @@
-import { store } from "./hash";
-
 const http = require("http");
 
 const get_request = (payload, context) => {
@@ -27,7 +25,7 @@ const get_request = (payload, context) => {
   req.end();
 };
 
-const post_request = (payload, context) => {
+const post_request = (payload, cb) => {
   // let options = {
   //   hostname: 'example.com',
   //   port: 80,
@@ -38,23 +36,35 @@ const post_request = (payload, context) => {
   //     'Content-Length': Buffer.byteLength(postData),
   //   },
   // };
-  let initiator = context.get_context(0);
 
-  let req = http.request(payload.options, (res) => {
-    let data = "";
+  // console.log(payload);
 
-    res.on("data", (chunk) => {
-      data += chunk;
-    });
+  let req = http.request(
+    {
+      ...payload.options,
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Content-Length": Buffer.byteLength(payload.data),
+      },
+    },
+    (res) => {
+      let data = "";
 
-    res.on("end", () => {
-      store(data, "send", initiator);
-      console.log("Response:", data);
-    });
-  });
+      res.on("data", (chunk) => {
+        data += chunk;
+        cb && cb(chunk);
+      });
+
+      res.on("end", () => {
+        cb && cb(data);
+        // console.log("Response:", data);
+      });
+    }
+  );
 
   req.on("error", (e) => {
-    store({ error: true, message: e.message }, "send", initiator);
+    cb(e.message);
     console.error(`Problem with request: ${e.message}`);
   });
 

package/.keypair

@@ -1 +0,0 @@
-{"private_key":"51903accc9f7c5eaa76068a02380456df623b7a7a6e991a6168b17f5f13d35ca","public_key":"04ca9003f27e69ef18a79767e22604aef44ec187bf558d9c877e52a7621e3200f12755c996f5befe7c73e2e62e389cd006717e3319a9c28a917020beb74bcf64b9","public_key_compressed":"03ca9003f27e69ef18a79767e22604aef44ec187bf558d9c877e52a7621e3200f1"}

package/Datatypes/Array.js

@@ -1,33 +0,0 @@
-import fs from "fs";
-import { hash, load } from "../utils/hash";
-
-class Arr {
-  constructor(object, account) {
-    this.object = object;
-    this.account = account;
-  }
-
-  load = () => {
-    let obj = [];
-    this.object.map((o) => {
-      let blk = this.account.vm.web.blocks[o];
-      obj.push(load(blk.read_metadata()));
-    });
-    return obj;
-  };
-
-  store = () => {
-    let curr_hash = hash("[]");
-    this.object.map((o) => {
-      hash(curr_hash + hash(o));
-    });
-    this.path = `${this.account.path}/Datatypes/Array`;
-    curr_hash = hash(curr_hash);
-
-    fs.writeFileSync(`${this.path}/${curr_hash}`, JSON.stringify(this.object));
-
-    return this;
-  };
-}
-
-export default Arr;