Playing with Vite + gRPC

Author: ricochet1k

1-create-asset-lock.js

@@ -1,18 +1,18 @@
 import Fs from "node:fs/promises";
 
 import DashHd from "dashhd";
-import * as DashHdUtils from "./dashhd-utils.js";
+import * as DashHdUtils from "./src/dashhd-utils.js";
 import DashKeys from "dashkeys";
-import * as DashTx from "dashtx/dashtx.js";
-import * as DashPlatform from "./dashplatform.js";
-import * as QRCode from "./_qr.js";
-import * as KeyUtils from "./key-utils.js";
+import * as DashTx from "dashtx";
+import * as DashPlatform from "./src/dashplatform.js";
+import * as QRCode from "./src/_qr.js";
+import * as KeyUtils from "./src/key-utils.js";
 
 import { createIdentityFromAssetLock } from "./2-create-identity-transition.js";
 
-import { loadWallet } from "./cli.js"
-import { deriveAllCreateIdentityKeys } from "./asset_lock.js"
-import { createPlatformAssetLock } from "./asset_lock.js"
+import { loadWallet } from "./src/cli.js"
+import { deriveAllCreateIdentityKeys } from "./src/asset_lock.js"
+import { createPlatformAssetLock } from "./src/asset_lock.js"
 // let DapiGrpc = require("@dashevo/dapi-grpc");
 // let WasmDpp = require("@dashevo/wasm-dpp");
 // let Dpp = WasmDpp.DashPlatformProtocol;
@@ -50,39 +50,32 @@ async function main() {
 
   console.log("Asset WIF", assetWif, "(would be ephemeral, non-hd)");
 
+  console.log('regFundKey', await DashHd.toAddr(regFundKey.publicKey, {version: 'testnet'}));
+  console.log('topupKey', await DashHd.toAddr(topupKey.publicKey, {version: 'testnet'}));
+  console.log('assetKey', await DashHd.toAddr(assetKey.publicKey, {version: 'testnet'}));
+  console.log('masterKey', await DashHd.toAddr(masterKey.publicKey, {version: 'testnet'}));
+  console.log('otherKey', await DashHd.toAddr(otherKey.publicKey, {version: 'testnet'}));
+  console.log();
+
   let { identityIdHex, txidHex, assetProof } = await createPlatformAssetLock(
     hdOpts,
     regFundKey,
     topupKey, // TODO next change key from wallet
     assetInfo,
   );
 
-  let txlocksigHex;
-  let txCore;
-  if (assetProof.data.raw) {
-    txlocksigHex = assetProof.data.raw;
-  } else if (assetProof.data.vin) {
-    txCore = assetProof.data;
-  } else {
-    console.log(`DEBUG assetProof`);
-    console.log(assetProof);
-    throw new Error("internal error: no acceptable asset proof");
-  }
-
   console.log();
   console.log(`txidHex: `, txidHex);
   console.log(`identityIdHex:`, identityIdHex);
-  console.log(`txlocksigHex:`, txlocksigHex);
-  console.log(`txCore:`, txCore);
+  console.log(`assetProof:`, assetProof);
 
-  await Fs.writeFile('ready-to-thingy-dostuff.json', JSON.stringify({
+  await Fs.writeFile('ready-to-create-identity.json', JSON.stringify({
     assetKey,
     masterKey,
     otherKey,
     identityIdHex,
     txidHex,
-    txlocksigHex,
-    txCore,
+    assetProof,
   }, (key, val) => {
     if (val instanceof Uint8Array || val instanceof ArrayBuffer) {
       return {'@Uint8Array hex': DashTx.utils.bytesToHex(new Uint8Array(val))}
@@ -96,8 +89,7 @@ async function main() {
     otherKey,
     identityIdHex,
     txidHex,
-    txlocksigHex,
-    txCore,
+    assetProof,
   );
   // walletKey, coinType, identityIndex
 }

1.8.1/generated_bincode.d.ts

@@ -1,5 +1,5 @@
-import { BinCode, BinCodeable, VARIANTS } from "../bincode.ts";
-import { Option, FixedBytes, Hash, SocketAddr, Transaction } from "../bincode_types.ts";
+import { BinCode, BinCodeable, VARIANTS } from "../src/bincode.ts";
+import { Option, FixedBytes, Hash, SocketAddr, Transaction } from "../src/bincode_types.ts";
 declare module "./generated_bincode.js" {
 
 /**

1.8.1/generated_bincode.js

@@ -2,9 +2,9 @@ import {
   Bool, Bytes, Enum, VariantDiscriminant, FixedBytes, Lazy, Struct, StructTuple,
   Int128, Int16, Int32, Int64, Int8, Uint128, Uint16, Uint32, Uint64, Uint8, Float64,
   VarInt, VarUint, Vec, Tuple, Map, Option, String, Nothing, Range, NotSignable,
-  SocketAddr,
-} from "../bincode.ts"
-import { Transaction } from "../bincode_types.ts";
+  SocketAddr, DISCRIMINANT, VARIANT, ENUM,
+} from "../src/bincode.js"
+import { Transaction } from "../src/bincode_types.ts";
 export const Hash = Bytes; //FixedBytes(32)
 
 /** @type {*} */

2-create-identity-transition.js

@@ -1,17 +1,15 @@
 
 // import DashKeys from "dashkeys";
-import * as DashTx from "dashtx/dashtx.js";
+import * as DashTx from "dashtx";
 
-import * as Bincode from "./bincode.ts";
+import * as Bincode from "./src/bincode.ts";
 import * as DashBincode from "./1.8.1/generated_bincode.js";
-import * as KeyUtils from "./key-utils.js";
+import * as KeyUtils from "./src/key-utils.js";
 import baseX from "base-x";
 
 const BASE58 = `123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz`;
 let base58 = baseX(BASE58);
 
-let Thingy = {};
-
 /**
  * @typedef AssetLockChainProof
  * @prop {Number} core_chain_locked_height
@@ -26,29 +24,19 @@ let Thingy = {};
  * @param {import('dashhd').HDWallet} otherKey
  * @param {String} identityIdHex
  * @param {String} txidHex
- * @param {String} [txlocksigHex]
- * @param {import('dashtx').TxInfo} [txCore]
+ * @param {DashBincode.AssetLockProof} [assetProof]
  */
 export async function createIdentityFromAssetLock(
   assetKey,
   masterKey,
   otherKey,
   identityIdHex,
   txidHex,
-  txlocksigHex,
-  txCore,
+  assetLockProof,
 ) {
   // const INSTANT_ALP = 0;
   // const CHAIN_ALP = 1;
 
-  /** @type {DashBincode.AssetLockProof} */
-  let assetLockProof;
-  if (txlocksigHex) {
-    assetLockProof = await makeAssetLockInstantProof(txlocksigHex);
-  } else {
-    assetLockProof = await makeAssetLockChainProof(txidHex, txCore);
-  }
-
   if (!masterKey.privateKey) {
     throw new Error("'masterKey' is missing 'privateKey'");
   }
@@ -171,70 +159,6 @@ export async function createIdentityFromAssetLock(
   );
 };
 
-/** @param {HexString} txlocksigHex */
-async function makeAssetLockInstantProof(txlocksigHex) {
-  {
-    let len = txlocksigHex.length / 2;
-    console.log();
-    console.log(`Tx Lock Sig Hex (${len}):`);
-    console.log(txlocksigHex);
-  }
-
-  let vout = -1;
-  let instantLockTxHex = "";
-  let instantLockSigHex = "";
-  {
-    let txlocksig = DashTx.parseUnknown(txlocksigHex);
-    vout = 0;
-    //vout = txlocksig.extraPayload.outputs.findIndex(function (output) {
-    //  //@ts-expect-error
-    //  return output.script === "6a00";
-    //});
-    // console.log(txlocksig.extraPayload.outputs);
-    //@ts-expect-error
-    instantLockSigHex = txlocksig.sigHashTypeHex;
-    let isLen = instantLockSigHex.length / 2;
-    let len = txlocksigHex.length / 2;
-    len -= isLen;
-    instantLockTxHex = txlocksigHex.slice(0, len * 2);
-    console.log();
-    console.log(`Tx Hex (${len})`);
-    console.log(instantLockTxHex);
-    console.log();
-    console.log(`Tx Lock Sig Instant Lock Hex (${isLen})`);
-    //@ts-expect-error
-    console.log(txlocksig.sigHashTypeHex);
-  }
-
-  let assetLockInstantProof = DashBincode.RawInstantLockProof({
-    instant_lock: DashBincode.BinaryData(DashTx.utils.hexToBytes(instantLockSigHex)),
-    transaction: DashBincode.BinaryData(DashTx.utils.hexToBytes(instantLockTxHex)), // TODO this may need the proof, not the signed tx
-    output_index: vout,
-  });
-  return DashBincode.AssetLockProof.Instant(assetLockInstantProof);
-}
-
-/**
- * @param {HexString} txidHex
- * @param {any} txInfo - TODO CoreTx
- */
-async function makeAssetLockChainProof(txidHex, txInfo) {
-  //@ts-expect-error
-  let vout = txInfo.vout.findIndex(voutInfo =>
-     voutInfo.scriptPubKey?.hex === "6a00" // TODO match the burn
-  );
-
-  let assetLockChainProof = DashBincode.ChainAssetLockProof({
-    core_chain_locked_height: txInfo.height,
-    out_point: {
-      txid: DashBincode.Txid(DashTx.utils.hexToBytes(txidHex)),
-      vout: vout,
-    },
-  });
-
-  return DashBincode.AssetLockProof.Chain(assetLockChainProof);
-}
-
 /**
  * @param {Required<Pick<import('dashhd').HDXKey, "privateKey"|"publicKey">>} masterKey
  * @param {Required<Pick<import('dashhd').HDXKey, "privateKey"|"publicKey">>} otherKey

2.0.0/generated_bincode.d.ts

@@ -1,5 +1,5 @@
-import { BinCode, BinCodeable, VARIANTS } from "../bincode.ts";
-import { Option, FixedBytes, Hash, SocketAddr, Transaction } from "../bincode_types.ts";
+import { BinCode, BinCodeable, VARIANTS } from "../src/bincode.ts";
+import { Option, FixedBytes, Hash, SocketAddr, Transaction } from "../src/bincode_types.ts";
 declare module "./generated_bincode.js" {
 
 /**