antelopeql 1.1.1 → 2.0.0-rc.0

package/antelopeql.mjs

@@ -24,7 +24,7 @@ import serialize_transaction from "./serialize_transaction.mjs";
  * @property {String} [operationName] GraphQL operation name (query resolution).
  * @property {Function} [fetch] Custom fetch implementation.
  * @property {Array<String>} [contracts] List of Antelope smart contracts.
- * @property {Array<String>} [private_keys] List of private keys used to sign transactions.
+ * @property {async Function} [signTransaction] A function to sign the Antelope transaction.
  * @property {Headers} [headers] Headers to pass to the network request.
  * @property {AbortSignal} [signal] Abort controller signal.
  */
@@ -61,9 +61,9 @@ export default async function AntelopeQL({
   query,
   variableValues,
   operationName,
+  signTransaction,
   fetch,
   contracts = [],
-  private_keys = [],
   ABIs = [],
   rpc_url,
   headers,
@@ -127,7 +127,7 @@ export default async function AntelopeQL({
       rootValue: "",
       contextValue: {
         network: { rpc_url, fetch, ...fetchOptions },
-        private_keys
+        signTransaction
       },
       variableValues,
       operationName,

package/blockchain/get_required_keys.mjs

@@ -0,0 +1,11 @@
+// const { required_keys, ...errors } = await fetch(
+//   `${rpc_url}/v1/chain/get_required_keys`,
+//   {
+//     method: "POST",
+//     ...fetchOptions,
+//     body: JSON.stringify({
+//       available_keys,
+//       transaction
+//     })
+//   }
+// ).then((res) => res.json());

package/eosio_types/public_key_type.mjs

@@ -1,5 +1,3 @@
-import legacy_to_public_key from "eosio-ecc/legacy_to_public_key.mjs";
-import validate_public_key from "eosio-ecc/validate_public_key.mjs";
 import { GraphQLScalarType } from "graphql";
 
 const public_key_type = new GraphQLScalarType({
@@ -9,16 +7,19 @@ const public_key_type = new GraphQLScalarType({
   Public keys should begin with PUB_K1 (or EOS for legacy keys) and include base58 characters only.
   `,
   name: "public_key",
-  async serialize(legacy_key) {
-    if (!legacy_key.startsWith("EOS")) return legacy_key;
-
-    return legacy_to_public_key(legacy_key);
-  },
   async parseValue(public_key) {
     if (public_key == "") return "";
 
-    const { valid, message } = await validate_public_key(public_key);
-    if (!valid) throw new RangeError(message);
+    if (
+      !public_key.startsWith("PUB_K1_") &&
+      !public_key.startsWith("PUB_R1_") &&
+      !public_key.startsWith("PUB_WA_") &&
+      !public_key.startsWith("EOS")
+    )
+      throw new RangeError(
+        "Public keys must be either K1, R1, WA or legacy keys."
+      );
+
     return public_key;
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antelopeql",
-  "version": "1.1.1",
+  "version": "2.0.0-rc.0",
   "description": "A GraphQL implementation for interacting with Antelope based blockchains.",
   "repository": "github:pur3miish/antelopeql",
   "bugs": "https://github.com/pur3miish/antelopeql/issues",
@@ -92,8 +92,8 @@
   },
   "dependencies": {
     "base58-js": "^2.0.0",
-    "eosio-ecc": "^1.0.1",
-    "eosio-wasm-js": "^4.0.1",
-    "ripemd160-js": "*"
+    "eosio-wasm-js": "^4.1.0",
+    "ripemd160-js": "*",
+    "universal-sha256-js": "^2.0.0"
   }
 }

package/push_transaction.mjs

@@ -1,7 +1,5 @@
-import private_key_to_legacy from "eosio-ecc/private_key_to_legacy.mjs";
-import get_public_key from "eosio-ecc/public_key_from_private.mjs";
-import sign_packed_txn from "eosio-ecc/sign_packed_txn.mjs";
-import { GraphQLError, GraphQLNonNull } from "graphql";
+import { GraphQLNonNull } from "graphql";
+import sha256 from "universal-sha256-js/sha256.mjs";
 
 import configuration_type from "./graphql_input_types/configuration.mjs";
 import transaction_receipt from "./graphql_object_types/transaction_receipt.mjs";
@@ -20,51 +18,29 @@ const push_transaction = (actions, ast_list) => ({
       type: configuration_type
     }
   },
-  async resolve(_, args, { network, private_keys }) {
+  async resolve(_, args, { network, signTransaction }) {
     const { chain_id, transaction_header, transaction_body, transaction } =
       await mutation_resolver(args, network, ast_list);
 
-    const key_pairs = {};
-    for await (const key of private_keys) {
-      const PVT = await private_key_to_legacy(key);
-      const PUB = await get_public_key(PVT);
-      key_pairs[PUB] = PVT;
-    }
-    const available_keys = Object.keys(key_pairs);
-
-    const { fetch, rpc_url, ...fetchOptions } = network;
-
-    if (!available_keys.length)
-      throw new GraphQLError("No private keys found.");
+    const transaction_bytes = chain_id + transaction_header + transaction_body;
 
-    const { required_keys, ...errors } = await fetch(
-      `${rpc_url}/v1/chain/get_required_keys`,
-      {
-        method: "POST",
-        ...fetchOptions,
-        body: JSON.stringify({
-          available_keys,
-          transaction
-        })
-      }
-    ).then((res) => res.json());
-
-    if (errors.message)
-      throw new GraphQLError("No transaction sent", {
-        extensions: errors
-      });
-
-    const signatures = await Promise.all(
-      required_keys.map((pub) =>
-        sign_packed_txn({
-          chain_id,
-          transaction_body,
-          transaction_header,
-          wif_private_key: key_pairs[pub]
-        })
+    const hash_to_sign = await sha256(
+      Uint8Array.from(
+        transaction_bytes
+          .match(/[a-fA-F0-9]{2}/gmu)
+          .map((i) => Number(`0x${i}`))
       )
     );
 
+    const signatures = await signTransaction(hash_to_sign, {
+      serilaised_txn: {
+        chain_id,
+        transaction_header,
+        transaction_body
+      },
+      transaction
+    });
+
     return push_transaction_rpc(
       { transaction_body, transaction_header, signatures },
       network

package/push_transaction_rpc.mjs

@@ -17,6 +17,9 @@ export default async function push_transaction_rpc(
   network
 ) {
   const { fetch, rpc_url, ...fetchOptions } = network;
+
+  console.log(transaction_body);
+
   const pushed_txn_req = await fetch(`${rpc_url}/v1/chain/push_transaction`, {
     method: "POST",
     ...fetchOptions,
@@ -27,6 +30,7 @@ export default async function push_transaction_rpc(
       packed_trx: transaction_header + transaction_body
     })
   });
+
   const pushed_transaction = await pushed_txn_req.json();
   if (pushed_transaction.error)
     throw new GraphQLError(pushed_transaction.message, {

package/readme.md

@@ -24,24 +24,6 @@ For [Node.js](https://nodejs.org), to install [`AntelopeQL`](https://npm.im/ante
 npm install antelopeql graphql
 ```
 
-For [Deno.js](https://deno.land), to install [`AntelopeQL`](https://deno.land/x/antelopeql) add to your `deno.json` configuration file these imports:
-
-```json
-{
-  "imports": {
-    "universal-sha256-js/": "https://deno.land/x/sha256js/",
-    "universal-hmac-sha256-js/": "https://deno.land/x/hmacsha256/",
-    "universal-hmac-sha256-js/hmac-sha256-node.mjs": "https://deno.land/x/hmacsha256/hmac-sha256-deno.mjs",
-    "base58-js/": "https://deno.land/x/base58/",
-    "isomorphic-secp256k1-js/": "https://deno.land/x/secp256k1js/",
-    "ripemd160-js/": "https://deno.land/x/ripemd160js@v2.0.3/",
-    "eosio-wasm-js/": "https://deno.land/x/eosio_wasm_js/",
-    "eosio-ecc/": "https://deno.land/x/eosio_ecc/",
-    "graphql": "https://cdn.skypack.dev/graphql"
-  }
-}
-```
-
 ## Examples
 
 See the examples folder on how to run AntelopeQL as a [Node.js](https://nodejs.org) endpoint.
@@ -98,7 +80,8 @@ import fetch from "node-fetch";
 import AntelopeQL from "antelopeql/antelopeql.mjs";
 
 const { data } = await AntelopeQL({
-  query: /*GraphQL*/ `mutation{
+  query: /*GraphQL*/ `
+  mutation{
       push_transaction(actions: [{
         eosio_token:{
           transfer: {
@@ -117,7 +100,11 @@ const { data } = await AntelopeQL({
       }
     }`,
   contracts: ["eosio.token"],
-  private_keys: ["PVT_K1_…"], // legacy keys support.
+  signTransaction: async () => {
+    const private_keys = [...]  // your private keys
+    const signatures = generate_signature_function(...privatekeys) // your antelope digital signature provider
+    return  signatures // signaures must return array
+  }
   fetch,
   rpc_url: "https://eos.relocke.io", // eos blockchain.
   headers: {