antelopeql 2.0.0-rc.13 → 2.0.0-rc.15

package/blockchain/get_account.mjs

@@ -54,19 +54,6 @@ const require_auth_type = new GraphQLObjectType({
           })
         })
       )
-    },
-    waits: {
-      type: new GraphQLList(
-        new GraphQLObjectType({
-          name: "account_auth_waits_type",
-          description:
-            "specifies that a transaction will not be executed without a required delay",
-          fields: () => ({
-            wait_sec: { type: GraphQLInt },
-            weight: { type: GraphQLInt }
-          })
-        })
-      )
     }
   })
 });

package/blockchain/get_accounts_by_authorizers.mjs

@@ -72,9 +72,9 @@ const accounts_by_authorizers = {
       body: JSON.stringify({
         keys: await Promise.all(
           awaited_keys.map((x) =>
-            x.startsWith(symbol)
-              ? x
-              : legacy_from_public_key(public_key_from_wif(x), "EOS")
+            x.startsWith("PUB_K1")
+              ? legacy_from_public_key(public_key_from_wif(x), symbol)
+              : x
           )
         ),
         accounts,

package/build_graphql_fields_from_abis.mjs

@@ -78,7 +78,9 @@ export default function build_graphql_fields_from_abis(abi_list) {
     const name = account_name.replace(/\./gmu, "_");
     const AST = eosio_abi_to_graphql_ast(abi);
 
+    // console.log(AST.variant_block_signing_authority_v0);
     ast_list[name] = AST; // For use in serializing data in mutation resolver.
+
     const { query_fields, mutation_fields } = get_graphql_fields_from_AST(
       AST,
       abi,

package/eosio_abi_to_graphql_ast.mjs

@@ -66,31 +66,26 @@ function handleStructs(structs) {
  * @returns {Object} a GraphQL AST for a given smart contract.
  */
 export function eosio_abi_to_graphql_ast(abi) {
-  const { types, variants } = abi;
-
-  let structs = [
-    ...(variants?.length
-      ? variants.map(({ name, types }) => ({
-          name,
-          base: "",
-          fields: types.map((item) => ({ name: item, type: item + "$@" })) // @ indiacted a variant type and binary extention.
-        }))
-      : []),
-    ...abi.structs
-  ];
-
-  if (types?.length)
+  const { types, variants, structs } = abi;
+  const new_structs = structs;
+
+  if (variants?.length)
+    for (const { name, types: variant_types } of variants)
+      new_structs.push({
+        name,
+        base: "",
+        fields: variant_types.map((item) => ({ name: item, type: item + "$@" })) // @ indiacted a variant type and binary extention.
+      });
+
+  if (types?.length) {
     for (const { type: real_type, new_type_name } of types)
-      structs = structs.map(({ fields, ...struct }) => ({
-        ...struct,
-        fields: fields.map(({ name, type }) =>
-          type.match(new RegExp(`^${new_type_name}[?$]?([])?$`, "gmu"))
-            ? { name, type: type.replace(new_type_name, real_type) }
-            : { name, type }
-        )
-      }));
+      new_structs.push({
+        ...new_structs.find((x) => x.name == real_type),
+        name: new_type_name
+      });
+  }
 
-  const structs_ast = handleStructs(structs);
+  const structs_ast = handleStructs(new_structs);
 
   return Object.freeze(structs_ast);
 }
@@ -127,6 +122,7 @@ export function get_graphql_fields_from_AST(AST, ABI, account_name = "") {
 
   for (const table of tables) {
     let { name: table_name, type: table_type } = table;
+
     table_name = table_name.replace(/\./gmu, "_");
     const table_fields = AST[table_type];
 
@@ -144,7 +140,16 @@ export function get_graphql_fields_from_AST(AST, ABI, account_name = "") {
           if (!GQL_TYPES[type])
             GQL_TYPES[type] = new GraphQLObjectType({
               name: gql_account_name + type,
-              fields: buildQGL(AST[type])
+              fields: (() => {
+                if (AST[type]) {
+                  // console.log(AST);
+                  // console.log(type);
+                  // console.log(JSON.stringify(Object.keys(AST)));
+                  // console.log(type);
+                }
+
+                return buildQGL(AST[type]);
+              })()
             });
 
           acc = {
@@ -160,7 +165,7 @@ export function get_graphql_fields_from_AST(AST, ABI, account_name = "") {
       return acc;
     };
 
-    if (!queryTypes[table_type])
+    if (!queryTypes[table_type]) {
       queryTypes[table_type] = {
         type: new GraphQLList(
           new GraphQLObjectType({
@@ -176,6 +181,7 @@ export function get_graphql_fields_from_AST(AST, ABI, account_name = "") {
         },
         resolve
       };
+    }
 
     query_fields[table_name] = queryTypes[table_type];
   }

package/eosio_types/symbol_type.mjs

@@ -21,6 +21,7 @@ An eosio symbol is an all uppercase string of 7 or less characters from [A-Z].
       throw new Error(
         "Invalid symbol format, correct format is <precision,code>"
       );
+
     const [precision] = symbol.split(",");
 
     if (!(precision > -1 && precision < 18))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antelopeql",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "A GraphQL implementation for interacting with Antelope based blockchains.",
   "repository": "github:pur3miish/antelopeql",
   "bugs": "https://github.com/pur3miish/antelopeql/issues",