godprotocol 1.0.838 → 1.0.840

package/Index.js

@@ -8,16 +8,44 @@ import create_server from "./utils/create_server";
 //     initiator.assembler.run(
 //       `@/datastore/main
 
-// @/datastore/main/grey
-// >matter 'lola'
-// ;
+//       >object
+//       >keys []
+//       >entries {}
+//       >size 0
 
-//     >storage {}
+//       ./set
+//       >key
+//       >key_static getter key "static_value"
+//       >value
+//       >exists getter ../entries key
+//       jmp_not_void :proceed
+//       >../size add ../size 1
+//       >../keys setter ../keys -1 key
+
+//       :proceed
+//       >../entries setter ../entries key_static value
+//       ;
+
+//       ./get
+//       >key
+//       >value getter ../entries key
+//       ;
+
+//       ./remove
+//       >key
+//       >../entries delete ../entries key
+//       >../keys delete ../keys key
+//       >../size sub ../size 1
+//       ;
+
+//       ./get_keys
+//       >output ../keys
+//       ;
 
 //     ;`,
 //       {
 //         cb: (blks) => {
-//           console.log(!!blks, "did");
+//           console.log(blks, blks.length, "did");
 //         },
 //       }
 //     ),

package/Loader_sequence/main.js

@@ -65,6 +65,7 @@ class Loader {
     while (pos < line.length) {
       let char = line[pos].trim();
 
+      console.log(char);
       if (char === stop_char) return { tokens, pos };
 
       if (!char) {
@@ -76,7 +77,7 @@ class Loader {
       if (char === "\n") {
         line_number++;
         pos++;
-      } else if (char === "@") {
+      } else if (char === "@" || char === ".") {
         let acc = "";
         while (line[pos] && line[pos].trim()) {
           acc += line[pos];
@@ -110,7 +111,7 @@ class Loader {
         }
         pos++;
         push_token(acc, "string");
-      } else if (num_pattern.test(char)) {
+      } else if (num_pattern.test(char) || char === "-") {
         let acc = char;
         pos++;
         while (
@@ -281,6 +282,8 @@ class Loader {
     ]);
 
     tokens.slice(1).map((tok, i) => {
+      if (tok.type === "address") tok.value = this.resolve_addr(tok.value);
+
       if (tok.type === "address" && tok.value.match(this.marker_pattern)) {
         this.push_instruction([
           `link ${this.account.physical_address}/Datatypes/Number`,
@@ -470,6 +473,10 @@ class Loader {
     obj[index] = line.slice(1).join(":").trim();
   };
 
+  spawn = () => {
+    return new Loader(this.account);
+  };
+
   compile = (codes) => {
     let code_array = codes.split("\n");
 
@@ -494,7 +501,8 @@ class Loader {
       if (line === ";") this.pop();
       else if (this.is_routine) this.parse_routine(line);
       else if (line.startsWith("//")) this.parse_comment(line.slice(2).trim());
-      else if (line.startsWith(">@")) this.parse_assignment(line, true);
+      else if (line.startsWith(">@") || line.startsWith(">."))
+        this.parse_assignment(line, true);
       else if (line.startsWith(">")) this.parse_assignment(line);
       else this.parse_opcode(line);
 
@@ -534,6 +542,8 @@ class Loader {
       callback: cb,
     });
 
+    this.program_configs[0].main = this.repository.oracle.hash(codes);
+    console.log(this.program_configs);
     this.program_configs.map((config) => this.repository.add_program(config));
 
     this.program_configs = [];

package/Loader_sequence/repository.js

@@ -8,11 +8,12 @@ class Repository {
   }
 
   add_program = (config) => {
-    let code_hash = this.oracle.hash(config.codes);
+    let codes = config.codes.filter((line) => !!line.trim());
+    let code_hash = this.oracle.hash(codes);
     let code_exist = this.codes.readone({ hash: code_hash });
 
     let code = this.codes.write({
-      body: config.codes,
+      body: codes,
       hash: code_hash,
       _id: code_exist && code_exist._id,
     });

package/Objects/Account.js

@@ -131,7 +131,7 @@ class Account extends Filesystem {
     this.propagate(payload, "load");
 
     if (assemble) {
-      this.assembler.run(instructions, { cb: callback });
+      this.assembler.spawn().run(instructions, { cb: callback });
     } else {
       let pid = this.manage_buffer(callback);
 

package/Objects/Block.js

@@ -52,6 +52,7 @@ class Block {
     obj.timelapse = this.timelapse;
     obj.index = this.index;
     obj.hash = this.hash;
+    obj.previous_hash = this.previous_hash;
     obj.data = this.data;
     obj._id = this._id;
     obj.children = this.children.map((ch) => ch._id);

package/Objects/Chain.js

@@ -122,6 +122,8 @@ class Chain extends Explorer {
   };
 
   add_block = (block) => {
+    let recent_blk = this.get_latest_block();
+    block.previous_hash = recent_blk && recent_blk._id;
     this.blocks.push(block);
     this.height = this.blocks.length;
   };

package/Objects/Manager.js

@@ -15,7 +15,10 @@ class Manager {
     this.running = 0;
     this.tracks = new Object();
     this.web = new Blockweb(this);
-    this.oracle = new Oracle(this, { compression: this.compression });
+    this.oracle = new Oracle(this, {
+      compression: this.compression,
+      datastore: meta.datastore,
+    });
     this.servers = new Array();
   }
 

package/Objects/Oracle.js

@@ -10,7 +10,9 @@ class Oracle {
     this.fs = fs;
     this.mgr = mgr;
     this.datapaths = new Object();
-    this.gds = new GDS(process.env.DATASTORE || "godprotocol").sync({
+    this.gds = new GDS(
+      meta.datastore || process.env.DATASTORE || "godprotocol"
+    ).sync({
       manager: this.mgr,
     });
   }

package/package.json

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

package/utils/create_server.js

@@ -90,7 +90,7 @@ const create_server = async (app, settings) => {
 
   server.listen(port, () => {
     console.log(`\n...GOD PROTOCOL RUNNING :${port}`);
-    manager.add_server({ ...settings.server_details, port: PORT });
+    settings.manager.add_server({ ...settings.server_details, port: PORT });
   });
 };