godprotocol 1.0.798 → 1.0.831

package/framer.js

@@ -1,61 +1,56 @@
 import Frame from "./Objects/Frame";
 
-const framer = (initiator) => {
-  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,
+let obj = {
+  Opcodes: {
+    add: null,
+    equal: null,
+    multiply: null,
+    subtract: null,
+    divide: null,
+    exp: null,
+    equal: null,
 
-      send: null,
-      readonly: null,
-      socket_send: null,
+    send: null,
+    readonly: null,
+    socket_send: null,
 
-      jmp: null,
-      jmp_if: null,
-      hold: null,
+    jmp: null,
 
-      stdout: null,
-      stdin: null,
+    stdout: null,
+    stdin: null,
 
-      run: null,
-      load: null,
-      parse: null,
-      create_account: null,
+    run: null,
+    load: null,
+    parse: null,
+    create_account: null,
+  },
+  Datatypes: {
+    Number: null,
+    String: null,
+    Twain: null,
+    Array: null,
+  },
+  Objects: {
+    Blockchain: {
+      Chain: null,
+      Block: null,
     },
-    Datatypes: {
-      Number: null,
-      String: null,
-      Twain: null,
-      Array: null,
+    Folder: {
+      active_file: null,
+      folder: null,
+      file: null,
     },
-    Objects: {
-      Blockchain: {
-        Chain: null,
-        Block: null,
-      },
-      Folder: {
-        active_file: null,
-        folder: null,
-        file: null,
-      },
-      File: {
-        row: null,
-        parse: null,
-        column: null,
-        write: null,
-      },
+    File: {
+      row: null,
+      parse: null,
+      column: null,
+      write: null,
     },
-  });
+  },
+};
+
+const framer = (initiator) => {
+  let frame = new Frame(obj);
   frame.to_instruction();
   let instructions = frame.flatten_instructions();
 
@@ -63,3 +58,4 @@ const framer = (initiator) => {
 };
 
 export default framer;
+export { obj };

package/opcodes/add.js

@@ -5,11 +5,6 @@ let ops = [
   { 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/indices.js

@@ -0,0 +1,28 @@
+const getter = (args) => {
+  let base = args.op0;
+  if (typeof base === "number") return base;
+
+  if (typeof base === "string") return base[args.op1];
+
+  if (Array.isArray(base)) return base.slice(args.op1)[0];
+
+  return base[args.op1];
+};
+
+const setter = (args) => {
+  let base = args.op0;
+  if (typeof base === "number") return base;
+
+  if (typeof base === "string") {
+    base = `${base.slice(0, args.op2)}${args.op1}${base.slice(args.op2 + 1)}`;
+  } else {
+    if (Array.isArray(base)) {
+      if (args.op2 == null || args.op2 >= base.length) base.push(args.op1);
+      else base[args.op2] = args.op1;
+    } else base[args.op2] = args.op1;
+  }
+
+  return base;
+};
+
+export { setter, getter };

package/opcodes/jmp.js

@@ -1,15 +1,14 @@
-const jmp = (args, vm) => {
-  vm.account.manager.tracker[vm.mgr_index].pointer += args.index;
-};
+const jmp = (args, vm, meta) => {
+  meta = meta || {};
+  let { flag, inverse } = meta;
 
-const jmp_if = (args, vm) => {
-  if (args.passed)
-    vm.account.manager.tracker[vm.mgr_index].pointer += args.index;
-};
+  let condition;
+  if (flag) condition = vm.flags[flag];
+  if (inverse) condition = !!!condition;
 
-const hold = (args, vm) => {
-  let track = vm.account.manager.tracker[vm.mgr_index];
-  track.hold = args.hold;
+  if ((condition || !flag) && typeof args.op0 === "number") {
+    vm.track.pointer = args.op0;
+  }
 };
 
-export { jmp, jmp_if, hold };
+export { jmp };

package/opcodes/std.js

@@ -1,6 +1,8 @@
-const stdout = (args) => {
+const stdout = (args, vm) => {
   if (!args) return;
 
+  vm.account.stdout.push({ data: args, pid: vm.track.pid });
+
   for (let v in args) console.log(args[v]);
 };
 

package/opcodes.js

@@ -1,6 +1,7 @@
 // import { socket_send } from "./Socket";
 import { ops } from "./opcodes/add";
-import { hold, jmp, jmp_if } from "./opcodes/jmp";
+import { getter, setter } from "./opcodes/indices";
+import { jmp } from "./opcodes/jmp";
 import { stdout } from "./opcodes/std";
 import { post_request } from "./utils/services";
 
@@ -13,6 +14,10 @@ const opcodes = (account) => {
 
       try {
         let result = eval(`${args.op0} ${op.sign} ${args.op1}`);
+        if (op.sign === "==") {
+          account.vm.flags.equal = !!result;
+          return;
+        }
 
         return result;
       } catch (e) {
@@ -21,16 +26,25 @@ const opcodes = (account) => {
     });
   });
 
-  set("hold", hold);
+  Object.keys(account.vm.flags).map((flag) => {
+    set(`jmp_${flag}`, (args, vm) => jmp(args, vm, { flag }));
+    set(`jmp_not_${flag}`, (args, vm) =>
+      jmp(args, vm, { flag, inverse: true })
+    );
+  });
   set("jmp", jmp);
-  set("jmp_if", jmp_if);
+
+  set("setter", setter);
+  set("getter", getter);
 
   set("send", (data) => post_request(data, account.vm.stdin));
   // set("socket_send", socket_send);
 
   set("stdout", stdout);
 
-  ["run", "load", "parse", "create_account"].map((op) =>
+  set("add_server", (args, vm) => account.add_server(args && args.op0))[
+    ("run", "load", "parse", "create_account")
+  ].map((op) =>
     set(op, (arg) => arg && arg.op0 && account[op](arg && arg.op0))
   );
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "godprotocol",
-  "version": "1.0.798",
+  "version": "1.0.831",
   "description": "A data mediator.",
   "main": "Index.js",
   "types": "types/index.d.ts",
@@ -45,7 +45,8 @@
   "dependencies": {
     "crypto": "^1.0.1",
     "elliptic": "^6.5.5",
-    "fs": "^0.0.1-security"
+    "fs": "^0.0.1-security",
+    "generalised-datastore": "^1.7.85"
   },
   "publishConfig": {
     "ignore": [

package/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@types/*": ["types/*"]
+    }
+  }
+}

package/types/Oracle.d.ts

@@ -1,7 +1,7 @@
-import fs from "fs";
+// import fs from "fs";
 
 declare class Oracle {
-  fs: typeof fs;
+  // fs: typeof fs;
   mgr: any;
   datapaths: { [key: string]: { type: string; obj: any } };
 

package/types/index.d.ts

@@ -1,4 +1,4 @@
 export { default as Account } from "./Account";
 export { default as Virtual_machine } from "./Virtual_machine";
 export { default as Filesystem } from "./Filesystem";
-export { default as Loader_sequence } from "./Loader_sequence";
+export { default as Loader_sequence } from "../Loader_sequence/main";

package/.babelrc

@@ -1,3 +0,0 @@
-{
-  "presets": [["@babel/preset-env"]]
-}

package/build/Account.js

@@ -1,162 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-var _main = _interopRequireDefault(require("../Loader_sequence/main"));
-var _privacy = _interopRequireDefault(require("../utils/privacy"));
-var _Filesystem2 = _interopRequireDefault(require("./Filesystem"));
-var _Virtual_machine = _interopRequireDefault(require("./Virtual_machine"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
-function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
-function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
-function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
-function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var Account = /*#__PURE__*/function (_Filesystem) {
-  _inherits(Account, _Filesystem);
-  var _super = _createSuper(Account);
-  function Account(_name) {
-    var _this;
-    var _meta = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    _classCallCheck(this, Account);
-    _this = _super.call(this);
-    _defineProperty(_assertThisInitialized(_this), "get_account", function (name) {
-      return _this.manager.get_account(name) || _assertThisInitialized(_this);
-    });
-    _defineProperty(_assertThisInitialized(_this), "manage_buffer", function (callback) {
-      var call_session = "".concat(Date.now(), "-").concat(Math.random());
-      _this.mine_buffer[call_session] = {
-        blocks: [],
-        callback: callback
-      };
-      return call_session;
-    });
-    _defineProperty(_assertThisInitialized(_this), "buff", function (block, pid) {
-      var buffer = _this.mine_buffer[pid];
-      if (!buffer) return;
-      buffer.blocks.push(block.stringify());
-    });
-    _defineProperty(_assertThisInitialized(_this), "flush_buffer", function (pid) {
-      var buff = _this.mine_buffer[pid];
-      if (!buff) return;
-      buff.callback && _this.run_callback(buff.callback, buff.blocks);
-      delete _this.mine_buffer[pid];
-    });
-    _defineProperty(_assertThisInitialized(_this), "load", function (_ref) {
-      var program = _ref.program,
-        signature = _ref.signature,
-        callback = _ref.callback;
-      var instructions = program.instructions,
-        account = program.account;
-      account = _this.get_account(account);
-      if (!account.validate(program, signature)) return;
-      var pid = account.manage_buffer(callback);
-      _this.manager.push({
-        sequence: instructions,
-        account: account,
-        pid: pid
-      });
-    });
-    _defineProperty(_assertThisInitialized(_this), "parse", function (_ref2) {
-      var payload = _ref2.payload,
-        signature = _ref2.signature,
-        callback = _ref2.callback;
-      var physical_address = payload.physical_address,
-        account = payload.account,
-        query = payload.query;
-      account = _this.get_account(account);
-      if (!account.validate(payload, signature)) return;
-      var chain = account.manager.web.get(physical_address);
-      if (!chain) return _this.run_callback(callback, {
-        error: true,
-        error_message: "Address not found"
-      });
-      var data = query ? chain.explore(query) : chain;
-      _this.run_callback(callback, data && data.stringify());
-    });
-    _defineProperty(_assertThisInitialized(_this), "run", function (request) {
-      var payload = request.payload,
-        signature = request.signature,
-        callback = request.callback;
-      var physical_address = payload.physical_address,
-        account = payload.account,
-        query = payload.query;
-      account = _this.get_account(account);
-      if (!account.validate(payload, signature)) return;
-      var pid = account.manage_buffer(callback);
-      var context = physical_address ? _this.manager.web.get(physical_address) : account.vm.get_context();
-      if (!context) return account.flush_buffer(pid);
-      var blk = query ? context.explore(query) : context.get_latest_block();
-      if (blk && blk.metadata && blk.metadata.program) {
-        var program = _this.read(blk.metadata.program);
-        account.vm.contexts.push(context);
-        program.push("pop");
-        Array.isArray(program) && program.length && _this.manager.push({
-          sequence: program,
-          account: account,
-          pid: pid
-        });
-      } else account.flush_buffer(pid);
-    });
-    _defineProperty(_assertThisInitialized(_this), "run_callback", function (callback, payload) {
-      setTimeout(function () {
-        if (!callback) return;
-        if (typeof callback === "function") return callback(payload);
-        _this.vm.stdin(payload);
-        callback.payload && callback.payload.physical_address && _this.run(callback);
-      }, 0);
-    });
-    _defineProperty(_assertThisInitialized(_this), "validate", function (payload, signature) {
-      if (!_this["private"]) return true;
-      return (0, _privacy["default"])(_this.name, JSON.stringify(payload), signature);
-    });
-    _defineProperty(_assertThisInitialized(_this), "stringify", function (str) {
-      var obj = {};
-      obj.name = _this.name;
-      obj.hash = _this.hash;
-      obj.path = _this.path;
-      obj["private"] = _this["private"];
-      obj.chain = _this.chain.stringify();
-      obj.physical_address = _this.physical_address;
-      return str ? JSON.stringify(obj) : obj;
-    });
-    _defineProperty(_assertThisInitialized(_this), "create_account", function (payload) {
-      var name = payload.name,
-        meta = payload.meta;
-      return _this.manager.add_account(name, meta);
-    });
-    _defineProperty(_assertThisInitialized(_this), "endpoint", function (endpoint, payload) {
-      var method = _this[endpoint];
-      typeof method === "function" && method(payload);
-    });
-    _meta = _meta || {};
-    _this.name = _name;
-    _this["private"] = _meta["private"];
-    _this.manager = _meta.manager;
-    _this.account = _assertThisInitialized(_this);
-    if (!_this.manager) throw new Error("Manager instance missing.");
-    _this.name_hash();
-    _this.physical_address = "".concat(_this.base_address, "/").concat(_this.name);
-    _this.set_paths(_assertThisInitialized(_this));
-    _this.compiler = new _main["default"](_assertThisInitialized(_this));
-    _this.chain = _this.account_chain(_assertThisInitialized(_this));
-    _this.vm = new _Virtual_machine["default"](_this.chain);
-    _this.mine_buffer = {};
-    console.log("Account Instance: ".concat(_this.name));
-    return _this;
-  }
-  return _createClass(Account);
-}(_Filesystem2["default"]);
-var _default = Account;
-exports["default"] = _default;

package/build/Block.js

@@ -1,65 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-var _hash = require("../utils/hash");
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var Block = /*#__PURE__*/_createClass(function Block(chain) {
-  var _this = this;
-  _classCallCheck(this, Block);
-  _defineProperty(this, "generate_hash", function () {
-    _this.previous_hash = _this.chain.get_latest_block();
-    if (_this.previous_hash) _this.previous_hash = _this.previous_hash.hash;
-    _this.hash = (0, _hash.hash)(JSON.stringify(_this.data));
-  });
-  _defineProperty(this, "store", function (no_curs) {
-    var content = _this.chain.buffs.splice(-1)[0];
-    if (!no_curs) _this.cursor = _this.chain.cursors.splice(-1)[0];
-    if (!content) return;
-    var cursors = Object.keys(content).filter(function (c) {
-      return c.startsWith("{") && c.endsWith("}");
-    });
-    for (var c = 0; c < cursors.length; c++) {
-      var curs = cursors[c];
-      _this.metadata[curs.slice(1, -1)] = content[curs];
-      delete content[curs];
-    }
-    var datapath = _this.chain.account.save(content, _this.chain);
-    _this.datapath = datapath;
-  });
-  _defineProperty(this, "stringify", function (str) {
-    var obj = {};
-    obj.metadata = _this.metadata;
-    obj.datapath = _this.datapath;
-    obj.timelapse = _this.timelapse;
-    obj.index = _this.index;
-    obj.hash = _this.hash;
-    obj.data = _this.data;
-    obj.children = _this.children.map(function (ch) {
-      return new Object({
-        hash: ch.hash,
-        chain: ch.chain.hash
-      });
-    });
-    obj.chain = {
-      hash: _this.chain.hash,
-      physical_address: _this.chain.physical_address
-    };
-    return str ? JSON.stringify(obj) : obj;
-  });
-  this.chain = chain;
-  this.data = this.chain.txs;
-  this.metadata = {};
-  this.children = new Array();
-  this.index = this.chain.blocks.length;
-});
-var _default = Block;
-exports["default"] = _default;

package/build/Blockweb.js

@@ -1,36 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-var _Chain = _interopRequireDefault(require("./Chain"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var Blockweb = /*#__PURE__*/_createClass(function Blockweb(mgr) {
-  var _this = this;
-  _classCallCheck(this, Blockweb);
-  _defineProperty(this, "get", function (addr) {
-    var hash = _this.physical_addresses[addr];
-    var chain = _this.chains[hash];
-    return chain;
-  });
-  _defineProperty(this, "set", function (parent, name) {
-    var chain = new _Chain["default"](parent, name);
-    _this.chains[chain.hash] = chain;
-    _this.physical_addresses[chain.physical_address] = chain.hash;
-    _this.chains[chain.hash] = chain;
-    return chain;
-  });
-  this.mgr = mgr;
-  this.physical_addresses = new Object();
-  this.chains = new Object();
-});
-var _default = Blockweb;
-exports["default"] = _default;