astra-lightning 1.1.4 → 1.1.6

package/lnd_methods/invoices/create_invoice.d.ts

@@ -31,6 +31,9 @@ export type CreateInvoiceArgs = AuthenticatedLightningArgs<{
   asset_id?: string;
   peer_pubkey?: string;
   tpr?: any;
+  group_key?: string;
+  price_oracle_metadata?: string;
+
 }>;
 
 export type CreateInvoiceResult = {

package/lnd_methods/invoices/create_invoice.js

@@ -20,6 +20,10 @@ const { parse } = Date;
 const { round } = Math;
 const tokensAsMtok = (tokens) => (BigInt(tokens) * BigInt(1e3)).toString();
 const type = "default";
+const isDuplicateInvoiceError = (err = {}) => {
+  const message = err.details || err.message || String();
+  return typeof message === "string" && message.includes(invoiceExistsError);
+};
 
 /** Create a Lightning invoice.
 
@@ -81,7 +85,10 @@ module.exports = (args, cbk) => {
 
         // Check arguments
         validate: (cbk) => {
-          if (!!args.expires_at && new Date().toISOString() > args.expires_at) {
+          if (
+            !!args.expires_at &&
+            Math.floor(Date.now() / 1000) > Number(args.expires_at)
+          ) {
             return cbk([400, "ExpectedFutureDateForInvoiceExpiration"]);
           }
 
@@ -163,9 +170,10 @@ module.exports = (args, cbk) => {
           ({ addAddress, hints, mtokens, preimage }, cbk) => {
             const fallbackAddress = !addAddress ? String() : addAddress.address;
             const createdAt = new Date();
-            const expireAt = !args.expires_at ? null : parse(args.expires_at);
-
+            const expireAt = !args.expires_at ? null : Math.floor(args.expires_at*msPerSec);
+            
             const expiryMs = !expireAt ? null : expireAt - createdAt.getTime();
+     
             if (!args.asset_id) {
               return args.lnd.default.addInvoice(
                 {
@@ -183,7 +191,7 @@ module.exports = (args, cbk) => {
                   value_msat: mtokens,
                 },
                 (err, response) => {
-                  if (!!err && err.details === invoiceExistsError) {
+                  if (!!err && isDuplicateInvoiceError(err)) {
                     return cbk([409, "InvoiceWithGivenHashAlreadyExists"]);
                   }
 
@@ -228,6 +236,10 @@ module.exports = (args, cbk) => {
                 }
               );
             } else {
+              const expiry = !expiryMs
+                      ? defaultExpirySec
+                      : round(expiryMs / msPerSec)
+      
               return args.tpr.taproot_asset_channels.addInvoice(
                 {
                   asset_id: hexAsBuffer(args.asset_id),
@@ -236,9 +248,7 @@ module.exports = (args, cbk) => {
                   invoice_request: {
                     cltv_expiry: !args.cltv_delta ? undefined : args.cltv_delta,
                     description_hash: hexAsBuffer(args.description_hash),
-                    expiry: !expiryMs
-                      ? defaultExpirySec
-                      : round(expiryMs / msPerSec),
+                    expiry: expiry,
                     fallback_addr: fallbackAddress,
                     is_blinded: !!args.is_encrypting_routes,
                     memo: args.description,
@@ -246,12 +256,13 @@ module.exports = (args, cbk) => {
                     r_preimage: preimage || undefined,
                     route_hints: hints || undefined,
                   },
+                  group_key: args.group_key ? hexAsBuffer(args.group_key) : undefined,
+                  price_oracle_metadata: args.price_oracle_metadata,
                 },
                 (err, response) => {
-                  if (!!err && err.details === invoiceExistsError) {
+                  if (!!err && isDuplicateInvoiceError(err)) {
                     return cbk([409, "InvoiceWithGivenHashAlreadyExists"]);
                   }
-
                   if (!!err) {
                     return cbk([503, "AddInvoiceError", { err }]);
                   }

package/lnd_methods/offchain/pay_taproot_invoice.d.ts

@@ -7,6 +7,8 @@ export type PaymentTaprootInvoiceArgs = AuthenticatedLightningArgs<{
   asset_id: string;
   asset_amount: number;
   peer_pubkey: string;
+  price_oracle_metadata?: string;
+  group_key?: string;
   payment_request: {
     payment_request: string;
     fee_limit_sat: number;

package/lnd_methods/offchain/pay_taproot_invoice.js

@@ -43,6 +43,8 @@ module.exports = (args) => {
       asset_amount: args.asset_amount,
       peer_pubkey: hexAsBuffer(args.peer_pubkey),
       payment_request: args.payment_request,
+      price_oracle_metadata: args.price_oracle_metadata ? args.price_oracle_metadata : undefined,
+      group_key: args.group_key ? hexAsBuffer(args.group_key) : undefined,
     }
     const sub = args.tpr.taproot_asset_channels.sendPayment(callRequest);
     const ret = {

package/package.json

@@ -53,5 +53,5 @@
     "directory": "test/typescript"
   },
   "types": "index.d.ts",
-  "version": "1.1.4"
+  "version": "1.1.6"
 }

package/test.js

@@ -5,8 +5,15 @@ const {
   decodePaymentRequest,
   decodeAssetPayReq,
   createInvoice,
+  signMessage,
+  getIdentity,
+  subscribeToInvoices,
+  subscribeToPastPayments
 } = require("./index.js");
 const fs = require("fs");
+const crypto = require("crypto");
+const { createHash } = require("crypto");
+
 // const dayjs = require("dayjs");
 /* const LND_TLS_CERT =
   "/Users/wjl/Documents/gamichi/2024/astra/volumes/server/tls.cert";
@@ -22,17 +29,17 @@ const LND_SOCKET = "54.92.19.81:10109"; */
 // const invoice =
 //   "lnbcrt10u1p5q3r0zpp50v0asn72aav354e27cals6l7j76sln0pzzvxktgur2wmlkf44mfqdy0f3hxv6fmv9ehxet5f9zr5dtzvscnywtyx56rjcnyxcuxxctyxc6xvvnrxfjxyvf5xymnxvnpx5erxef5x56rvcf58ymrvvnrxvunqefcvvcngv3ex3skzdm98q6rkctdda6kuap6xycrqwscqzzsxqrrssrzjqg3zz9zaagxqxan9fqzr6k7yvf900uf26m0z7c2g0rf55raupqclpakyc0a4gzq2v5qqqqlgqqqqqqgq2qsp58qmfwjwdrvr9dzjs2esms3cpvvgff3g4hsunszne3v7wszwcq62s9qxpqysgqscq2e3sqa0pfe5yzjdnp8q4temjazdw6y77c49tpvnhz0d4kjux92tw3gy9vvrh68qqef594frdp2uqhvwjy0sd7ezdcanvlln2rusgpg5w96t";
 
-const LND_SOCKET = "127.0.0.1:8444";
 const LND_MACAROON =
-  "0201036c6e6402f801030a10cd485d60d65e48a8f253aeca1f20d5e51201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620d0b51747c52a6444a78c9e08947671f20362dfffc89404c10afb68d09e72a6e2";
+  "0201036c6e6402f801030a1020a1bf5a962e198f49d7d0cb5dacb7221201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e6572617465120472656164000006207db76ec2a58ad259d4a4a5d3c4cff4bbd48b8667dee0cfdbf7e0299303fae9c6";
 const LND_TPROOT_ASSET_MACAROON =
-  "0201047461706402d001030a10d5485d60d65e48a8f253aeca1f20d5e51201301a180a09616464726573736573120472656164120577726974651a150a06617373657473120472656164120577726974651a170a086368616e6e656c73120472656164120577726974651a150a066461656d6f6e120472656164120577726974651a130a046d696e74120472656164120577726974651a150a0670726f6f6673120472656164120577726974651a120a03726671120472656164120577726974651a170a08756e6976657273651204726561641205777269746500000620501385af6ee7b06d073829f55af1a69d6a3ecc4cfb59129c88c379a429f44440";
-const base64Cert =
-  "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNERENDQWJLZ0F3SUJBZ0lSQUo3Rys0QzdYWldMN3hzMzk3bjMyUGd3Q2dZSUtvWkl6ajBFQXdJd01ERWcKTUI0R0ExVUVDaE1YYkdsMFpDQmhkWFJ2WjJWdVpYSmhkR1ZrSUdObGNuUXhEREFLQmdOVkJBTVRBMkp2WWpBZQpGdzB5TlRFeU1ESXdNakEzTURoYUZ3MHlOekF4TWpjd01qQTNNRGhhTURBeElEQWVCZ05WQkFvVEYyeHBkR1FnCllYVjBiMmRsYm1WeVlYUmxaQ0JqWlhKME1Rd3dDZ1lEVlFRREV3TmliMkl3V1RBVEJnY3Foa2pPUFFJQkJnZ3EKaGtqT1BRTUJCd05DQUFTU3BKdmh6M1lXVG5jTFVNR3Rvb1poUHNTVmlwR09RTWszbHkyMGRqUUk2OXd1M2gyRAphdG5TVGRSOTBCT2FhWUlrZ1lXRWpWV3Era1VDSWxXdjliMmJvNEdzTUlHcE1BNEdBMVVkRHdFQi93UUVBd0lDCnBEQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFQQmdOVkhSTUJBZjhFQlRBREFRSC9NQjBHQTFVZERnUVcKQkJTaE9PZDArRmxSL0xzZ0t0MWROQktKQXBwSkREQlNCZ05WSFJFRVN6QkpnZ05pYjJLQ0NXeHZZMkZzYUc5egpkSUlFZFc1cGVJSUtkVzVwZUhCaFkydGxkSUlIWW5WbVkyOXVib2NFZndBQUFZY1FBQUFBQUFBQUFBQUFBQUFBCkFBQUFBWWNFckJNQUF6QUtCZ2dxaGtqT1BRUURBZ05JQURCRkFpRUExRm8xakg3Z0IzY2pBblNSaUNKbDF3a1kKZGYxYnZVd1JSSzl0V1NIclFlc0NJR2tKQWkxWk5hNm9DeXFpemNObXZORmpUWXJHY1BmRUxxTCtiSjAyZUIvbAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==";
-const assetId =
-  "b787a089e60451305c090b7b3604b7a107e13d0a955c8ed1043d874a448aa465";
-const invoice =
+  "0201047461706402d001030a1027a1bf5a962e198f49d7d0cb5dacb7221201301a180a09616464726573736573120472656164120577726974651a150a06617373657473120472656164120577726974651a170a086368616e6e656c73120472656164120577726974651a150a066461656d6f6e120472656164120577726974651a130a046d696e74120472656164120577726974651a150a0670726f6f6673120472656164120577726974651a120a03726671120472656164120577726974651a170a08756e69766572736512047265616412057772697465000006201bcecd78be5724f8127277b4b68fb65ce6cf2b502585d20318da22b3d473a20e";
+const LND_SOCKET = "regtest.lnfi.network:10019";
+const LND_TLS_CERT =
+  "/Users/jim/Documents/gamichi/2024/astra/packages/server/volumes/tls.cert";
+const base64Cert = fs.readFileSync(LND_TLS_CERT).toString("base64");
   "";
+const assetId ="f7ac99f2c068f1157c787012f50cb043437505c309c6d8685e135cd8481b1e9d";
+
 
 const { lnd } = authenticatedLndGrpc({
   cert: base64Cert,
@@ -45,6 +52,37 @@ const { lnd: tpr } = authenticatedLndGrpc({
   socket: LND_SOCKET,
 });
 
+const getPriceOrcaleMetadata = async ({
+  assetId,
+  transaction_type = "0",
+  amount = "1000",
+  request_id,
+}) => {
+  if (!request_id) {
+    throw new Error("request_id is required to build price_oracle_metadata");
+  }
+
+  const price_oracle_metadata = {
+    type: "bridge",
+    asset_id: assetId,
+    transaction_type,
+    amount,
+    request_id,
+  };
+
+  const messageToSign = Object.values(price_oracle_metadata).join("");
+  const { signature } = await signMessage({ lnd, message: messageToSign });
+  const public_key =
+    "02607b201503d39fe886cc13637f4dcfa45ea6a83d6b1f5ab8ce780e1157af1718";
+
+  return {
+    ...price_oracle_metadata,
+    public_key,
+    sign: signature,
+    raw_data: JSON.stringify(price_oracle_metadata)
+  };
+};
+
 const payWithTpr = async (invoice, assetId) => {
   // const provider = new ethers.JsonRpcProvider('https://eth-sepolia.g.alchemy.com/v2/ClvXGqSMvZ6nEb_G5ekJGsZwNdsp72oz');
   // const lspSigner = new ethers.Wallet('dd5862c69e641fb052092d34724ce62764186abf87474656f2b2149684dca754', provider);
@@ -57,7 +95,7 @@ const payWithTpr = async (invoice, assetId) => {
   //     request: invoice
   // })
 
-  const ret = await getChannels({ lnd }).catch((error) => console.log(error));
+  /* const ret = await getChannels({ lnd }).catch((error) => console.log(error));
 
   const filterChannels = ret.channels.filter(
     (channel) =>
@@ -102,23 +140,34 @@ const payWithTpr = async (invoice, assetId) => {
     throw new Error(
       `channelId: ${maxLocalBalanceChannel.channel_id} not enough balance`
     );
-  }
-  const peerPubkey = maxLocalBalanceChannel.partner_public_key;
+  } */
+  const peerPubkey = "03b24a4bf911ffd26ac1d5e5f2440a3c2f6974e4cc85d2ef54e17ee6d3717433d3";
+  
+
+  const decodedReq = await decodeAssetPayReq({ lnd, request: invoice }).then(res => res.destination);
+  const priceOracleMetadata = await getPriceOrcaleMetadata({
+    assetId,
+    transaction_type: "1",
+    amount: 0,
+    request_id: decodedReq.pay_req.payment_hash,
+  });
   const retPay = await payTaprootInvoice({
     lnd: lnd,
     tpr: tpr,
     asset_id: assetId,
-    asset_amount: 10,
+    asset_amount: decodedReq.asset_amount,
     peer_pubkey: peerPubkey,
     payment_request: {
       payment_request: invoice,
       fee_limit_sat: 1000,
       allow_self_payment: true,
       timeout_seconds: 60 * 5,
-      outgoing_chan_id: maxLocalBalanceChannel.channel_id,
+      outgoing_chan_id: "118422899869679616",
     },
+    price_oracle_metadata: priceOracleMetadata.raw_data,
   }).catch((e) => {
     console.log("error", e.message);
+    throw e;
   });
   console.log("ret", retPay);
 
@@ -175,20 +224,53 @@ const payWithTpr = async (invoice, assetId) => {
 // }
 // queryBalance();
 
+
+
 const addTapdInvoice = async () => {
+  const secret = crypto.randomBytes(32);
+  const preimage = secret.toString("hex");
+  const hash = createHash("sha256").update(secret).digest("hex");
+
+  /* 
+  "sign": "lncli.signmessage(type + asset_id+ transaction_type+ amount + request_id )"
+  {
+    "type": "bridge",
+    "asset_id": "9fe1643dd1ae81208fde67d1bce2b3a3a6cd158a868d3c6774eb075b4f032004",
+    "transaction_type": "0",  //0买 1卖
+    "amount": "4100",
+    "request_id": "hash(preimage)",
+    "public_key": "0261f6cc4cdc3b59c9910badebd6d0c34f7f9357320a349af906ecf750dda0bcc4",
+    "sign": "lncli.signmessage(type + asset_id+ transaction_type+ amount + request_id  )"
+}
+  */
+  const price_oracle_metadata = await getPriceOrcaleMetadata({
+    assetId,
+    transaction_type: "0",
+    amount: "1000",
+    request_id: hash,
+  });
+
+  console.log("price_oracle_metadata", price_oracle_metadata);
+
+  //return;
   const ret = await createInvoice({
     lnd,
     tpr,
-    mtokens: 1000,
+    mtokens: 1000000,
+    // expires_at:'1764839000',
+    peer_pubkey:"03b24a4bf911ffd26ac1d5e5f2440a3c2f6974e4cc85d2ef54e17ee6d3717433d3",
     asset_id: assetId,
+    price_oracle_metadata: JSON.stringify(price_oracle_metadata),
+    secret: preimage,
+ 
   }).catch((e) => {
-    console.error("Failed to create invoice:", e.message);
+    console.error("Failed to create invoice:", e);
   });
   console.log("🚀 ~ addTapdInvoice ~ ret:", ret);
 };
 
 const decodeTapdInvoice = async()=>{
-  const invoice ='lnbcrt1200u1p5ja2pgpp58ahjcpwgt9zcvda6cchnrl5wyr4r9vjg487qrxvlh7vd88rxnhssdqqcqzzsxqr23srzjqw7ng5fg7qnyr49nm9qtt6nvnwxfefpygrctxdmfx9uf8l0awcaura2jdhvguyylxuqqqqlgqqqqqqgq2qsp5g54dp5lug8dqne4pglj0j0tglv3rtawk76rlqmqcppavfy8dzr4q9qxpqysgqt9jde9vcwpc27ayzpv7q3j63nej52xfjeuhew65y22zvd0vjans9hz206sxf67n8zz6mr803d7skpcz762vqaj6mrf0uwlxtdtv6u9qpahal9g'
+  const invoice ='lnbcrt114742690p1p55hxxjpp584aulkj02vhaqujfv0lv5dtyuw4vrnk67uvx77q4y20md22sxz3sdqqcqzzsxqr23srzjqf7j7xl8rhpycc932pcy382w7f6d664vydks93nuwmtfxh00hft2da0glksvd4c3acqqqqlgqqqqqqgq2qsp5duc6ezxqyllkxqvevmr34d852nplfknk3jc2dvwktv2gh3pdrxus9qxpqysgqc67uh6vl2epzj32s0qf86v7hpygs3tps3ejy9uca78p2w0dgfjnzshlxpfmwws6xwecw0c7z47jvuglywhqg4tq260h7tv30sxkvxqgqpeufpe'
    const ret = await decodeAssetPayReq({
     asset_id: assetId,
     pay_req_string: invoice,
@@ -210,7 +292,7 @@ const getBestLndChannel = async (asset) => {
     return {channels: []};
   });
 
-  console.log("🚀 ~ getBestLndChannel ~ ret:", ret);
+  
 
   let filterChannels = [];
   let sortTprChannels = [];
@@ -257,6 +339,8 @@ const getBestLndChannel = async (asset) => {
       return hasLocal || hasFunding || hasRemote;
     });
 
+    console.log('filterChannels',filterChannels)
+
 
     sortTprChannels = filterChannels.sort((a, b) => {
       let aData;
@@ -337,7 +421,14 @@ const getBestLndChannel = async (asset) => {
 };
 
 const test = async () => {
-  await addTapdInvoice();
+  const ret = await getIdentity({ lnd });
+  console.log("🚀 ~ test ~ ret:", ret)
+  //getBestLndChannel({assetId, isBTC: false})
+  /* const sub = subscribeToInvoices({ lnd });
+   sub.on("invoice_updated",async(invoice)=>{
+    console.log('invoice',invoice)
+   }) */
+  //await addTapdInvoice();
   //await decodeTapdInvoice();
   //await listChannels();
   // const ret = await getBestLndChannel({
@@ -361,6 +452,11 @@ const test = async () => {
   //       },
   //     });
   // console.log("🚀 ~ test ~ retPay:", retPay)
+
+  /* const sub = subscribeToPastPayments({ lnd });
+  sub.on("payment", async (payment) => {
+    console.log('payment',payment)
+  }); */
   
 };
 test();