@unchainedshop/plugins 3.1.15 → 4.0.0-rc.11

package/lib/payment/cryptopay/db/CryptopayTransactions.d.ts

@@ -5,9 +5,8 @@ export type CryptopayTransaction = {
     blockHeight: number;
     mostRecentBlockHeight: number;
     amount: mongodb.Decimal128;
-    currency: string;
+    currencyCode: string;
     decimals: number;
-    contract: string;
     orderPaymentId?: string;
 } & TimestampFields;
 export declare const CryptopayTransactionsCollection: (db: mongodb.Db) => mongodb.Collection<CryptopayTransaction>;

package/lib/payment/cryptopay/db/CryptopayTransactions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CryptopayTransactions.d.ts","sourceRoot":"","sources":["../../../../src/payment/cryptopay/db/CryptopayTransactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,+BAA+B,GAAI,IAAI,OAAO,CAAC,EAAE,6CAE7D,CAAC"}
+{"version":3,"file":"CryptopayTransactions.d.ts","sourceRoot":"","sources":["../../../../src/payment/cryptopay/db/CryptopayTransactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,+BAA+B,GAAI,IAAI,OAAO,CAAC,EAAE,6CAE7D,CAAC"}

package/lib/payment/cryptopay/db/CryptopayTransactions.js.map

@@ -1 +1 @@
-{"version":3,"file":"CryptopayTransactions.js","sourceRoot":"","sources":["../../../../src/payment/cryptopay/db/CryptopayTransactions.ts"],"names":[],"mappings":"AAcA,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,EAAc,EAAE,EAAE;IAChE,OAAO,EAAE,CAAC,UAAU,CAAuB,wBAAwB,CAAC,CAAC;AACvE,CAAC,CAAC"}
+{"version":3,"file":"CryptopayTransactions.js","sourceRoot":"","sources":["../../../../src/payment/cryptopay/db/CryptopayTransactions.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,EAAc,EAAE,EAAE;IAChE,OAAO,EAAE,CAAC,UAAU,CAAuB,wBAAwB,CAAC,CAAC;AACvE,CAAC,CAAC"}

package/lib/payment/cryptopay/handle-webhook.js

@@ -1,7 +1,7 @@
 import { createLogger } from '@unchainedshop/logger';
 import { OrderStatus } from '@unchainedshop/core-orders';
 const { CRYPTOPAY_SECRET, CRYPTOPAY_MAX_RATE_AGE = '360' } = process.env;
-const logger = createLogger('unchained:core-payment:cryptopay');
+const logger = createLogger('unchained:core-payment:cryptopay:handler');
 export default async function handleWebhook({ secret, wallet, price, ping, }, context) {
     const { modules, services } = context;
     if (secret !== CRYPTOPAY_SECRET) {

package/lib/payment/cryptopay/handle-webhook.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-webhook.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/handle-webhook.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handle-webhook.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/handle-webhook.ts"],"names":[],"mappings":"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"}

package/lib/payment/cryptopay/handler-express.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler-express.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/handler-express.ts"],"names":[],"mappings":"AAUA,QAAA,MAAM,gBAAgB,GAAU,QAAG,EAAE,QAAG,kBA6EvC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"handler-express.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/handler-express.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,gBAAgB,GAAU,QAAG,EAAE,QAAG,kBAgBvC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/lib/payment/cryptopay/handler-express.js

@@ -1,69 +1,16 @@
 import { createLogger } from '@unchainedshop/logger';
-import { OrderStatus } from '@unchainedshop/core-orders';
-const { CRYPTOPAY_SECRET, CRYPTOPAY_MAX_RATE_AGE = '360' } = process.env;
-const logger = createLogger('unchained:core-payment:cryptopay');
+import handleWebhook from './handle-webhook.js';
+const logger = createLogger('unchained:core-payment:cryptopay:handler');
 const cryptopayHandler = async (req, res) => {
-    const resolvedContext = req.unchainedContext;
-    const { modules, services } = resolvedContext;
     if (req.method === 'POST') {
         try {
-            const { secret, price, wallet, ping } = req.body;
-            if (secret !== CRYPTOPAY_SECRET) {
-                logger.warn(`Cryptopay Plugin: Invalid Cryptopay Secret provided`);
-                throw new Error('Secret invalid');
-            }
-            if (wallet) {
-                const { address, blockHeight, amount, contract, decimals, currency } = wallet;
-                const { orderPaymentId } = await modules.cryptopay.updateWalletAddress({
-                    addressId: address,
-                    blockHeight,
-                    amount,
-                    contract,
-                    decimals,
-                    currency,
-                });
-                const orderPayment = orderPaymentId &&
-                    (await modules.orders.payments.findOrderPayment({
-                        orderPaymentId,
-                    }));
-                if (orderPayment) {
-                    // Try to process order to next status
-                    // TODO: Not sure if it's correct to use processOrder here if status is PENDING!
-                    const order = await modules.orders.findOrder({ orderId: orderPayment.orderId });
-                    if (order.status === null) {
-                        await services.orders.checkoutOrder(order._id, {});
-                    }
-                    else if (order.status === OrderStatus.PENDING) {
-                        await services.orders.processOrder(order, {});
-                    }
-                    else {
-                        throw new Error('Already processed');
-                    }
-                }
-            }
-            if (price) {
-                const { baseCurrency, token, rate, timestamp } = price;
-                const timestampDate = new Date(timestamp);
-                const expiresAt = new Date(new Date().getTime() + parseInt(CRYPTOPAY_MAX_RATE_AGE, 10) * 1000);
-                const rateData = {
-                    baseCurrency,
-                    quoteCurrency: token,
-                    rate,
-                    expiresAt,
-                    timestamp: timestampDate,
-                };
-                logger.info(`update rate ${JSON.stringify(price)}, ${JSON.stringify(rateData)}`);
-                await resolvedContext.modules.products.prices.rates.updateRates([rateData]);
-            }
-            if (ping) {
-                const { blockHeight, currency } = ping;
-                await modules.cryptopay.updateMostRecentBlock(currency, blockHeight);
-            }
+            await handleWebhook(req.body, req.unchainedContext);
             res.writeHead(200);
             res.end(JSON.stringify({ success: true }));
             return;
         }
         catch (e) {
+            logger.error(e);
             res.writeHead(500);
             res.end(JSON.stringify({ success: false, error: e.message }));
             return;

package/lib/payment/cryptopay/handler-express.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler-express.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/handler-express.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handler-express.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/handler-express.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAEhD,MAAM,MAAM,GAAG,YAAY,CAAC,0CAA0C,CAAC,CAAC;AAExE,MAAM,gBAAgB,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC1C,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC;YACH,MAAM,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;YACpD,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACnB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAC3C,OAAO;QACT,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAChB,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACnB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC9D,OAAO;QACT,CAAC;IACH,CAAC;IACD,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACnB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AAC9C,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/lib/payment/cryptopay/handler-fastify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler-fastify.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/handler-fastify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAW7D,QAAA,MAAM,gBAAgB,EAAE,kBA2EvB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"handler-fastify.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/handler-fastify.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAI7D,QAAA,MAAM,gBAAgB,EAAE,kBAevB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/lib/payment/cryptopay/handler-fastify.js

@@ -1,66 +1,14 @@
 import { createLogger } from '@unchainedshop/logger';
-import { OrderStatus } from '@unchainedshop/core-orders';
-const { CRYPTOPAY_SECRET, CRYPTOPAY_MAX_RATE_AGE = '360' } = process.env;
-const logger = createLogger('unchained:core-payment:cryptopay');
+import handleWebhook from './handle-webhook.js';
+const logger = createLogger('unchained:core-payment:cryptopay:handler');
 const cryptopayHandler = async (req, reply) => {
-    const { modules, services } = req.unchainedContext;
     try {
-        const { secret, price, wallet, ping } = req.body;
-        if (secret !== CRYPTOPAY_SECRET) {
-            logger.warn(`Cryptopay Plugin: Invalid Cryptopay Secret provided`);
-            throw new Error('Secret invalid');
-        }
-        if (wallet) {
-            const { address, blockHeight, amount, contract, decimals, currency } = wallet;
-            const { orderPaymentId } = await modules.cryptopay.updateWalletAddress({
-                addressId: address,
-                blockHeight,
-                amount,
-                contract,
-                decimals,
-                currency,
-            });
-            const orderPayment = orderPaymentId &&
-                (await modules.orders.payments.findOrderPayment({
-                    orderPaymentId,
-                }));
-            if (orderPayment) {
-                // Try to process order to next status
-                // TODO: Not sure if it's correct to use processOrder here if status is PENDING!
-                const order = await modules.orders.findOrder({ orderId: orderPayment.orderId });
-                if (order.status === null) {
-                    await services.orders.checkoutOrder(order._id, {});
-                }
-                else if (order.status === OrderStatus.PENDING) {
-                    await services.orders.processOrder(order, {});
-                }
-                else {
-                    throw new Error('Already processed');
-                }
-            }
-        }
-        if (price) {
-            const { baseCurrency, token, rate, timestamp } = price;
-            const timestampDate = new Date(timestamp);
-            const expiresAt = new Date(new Date().getTime() + parseInt(CRYPTOPAY_MAX_RATE_AGE, 10) * 1000);
-            const rateData = {
-                baseCurrency,
-                quoteCurrency: token,
-                rate,
-                expiresAt,
-                timestamp: timestampDate,
-            };
-            logger.info(`update rate ${JSON.stringify(price)}, ${JSON.stringify(rateData)}`);
-            await modules.products.prices.rates.updateRates([rateData]);
-        }
-        if (ping) {
-            const { blockHeight, currency } = ping;
-            await modules.cryptopay.updateMostRecentBlock(currency, blockHeight);
-        }
+        await handleWebhook(req.body, req.unchainedContext);
         reply.status(200);
         return reply.send({ success: true });
     }
     catch (e) {
+        logger.error(e);
         reply.status(500);
         return reply.send({ success: false, error: e.message });
     }

package/lib/payment/cryptopay/handler-fastify.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler-fastify.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/handler-fastify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handler-fastify.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/handler-fastify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAGhD,MAAM,MAAM,GAAG,YAAY,CAAC,0CAA0C,CAAC,CAAC;AAExE,MAAM,gBAAgB,GAAuB,KAAK,EAChD,GAEC,EACD,KAAK,EACL,EAAE;IACF,IAAI,CAAC;QACH,MAAM,aAAa,CAAC,GAAG,CAAC,IAAW,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC3D,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACvC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChB,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1D,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/lib/payment/cryptopay/module.d.ts

@@ -2,23 +2,23 @@ import { CryptopayTransaction } from './db/CryptopayTransactions.js';
 declare const configureCryptopayModule: ({ db }: {
     db: any;
 }) => {
-    getWalletAddress: (addressId: string) => Promise<CryptopayTransaction>;
-    updateMostRecentBlock: (currency: string, blockHeight: number) => Promise<void>;
-    updateWalletAddress: ({ addressId, blockHeight, amount, contract, currency, decimals, }: {
-        addressId: string;
+    getWalletAddress: (address: string, contract?: string) => Promise<CryptopayTransaction>;
+    updateMostRecentBlock: (currencyCode: string, blockHeight: number) => Promise<void>;
+    updateWalletAddress: ({ address, blockHeight, amount, contract, currencyCode, decimals, }: {
+        address: string;
         blockHeight: number;
-        amount: string;
-        contract: string;
-        currency: string;
+        amount: string | number;
+        contract?: string;
+        currencyCode: string;
         decimals: number;
     }) => Promise<CryptopayTransaction>;
-    mapOrderPaymentToWalletAddress: ({ addressId, contract, currency, orderPaymentId, }: {
-        addressId: string;
-        contract: string;
-        currency: string;
+    mapOrderPaymentToWalletAddress: ({ address, contract, currencyCode, orderPaymentId, }: {
+        address: string;
+        contract?: string;
+        currencyCode: string;
         orderPaymentId: string;
     }) => Promise<CryptopayTransaction>;
-    getNextDerivationNumber: (currency: string) => Promise<number>;
+    getNextDerivationNumber: (currencyCode: string) => Promise<number>;
     getWalletAddressesByOrderPaymentId: (orderPaymentId: string) => Promise<CryptopayTransaction[]>;
 };
 declare const _default: {
@@ -26,29 +26,29 @@ declare const _default: {
         configure: ({ db }: {
             db: any;
         }) => {
-            getWalletAddress: (addressId: string) => Promise<CryptopayTransaction>;
-            updateMostRecentBlock: (currency: string, blockHeight: number) => Promise<void>;
-            updateWalletAddress: ({ addressId, blockHeight, amount, contract, currency, decimals, }: {
-                addressId: string;
+            getWalletAddress: (address: string, contract?: string) => Promise<CryptopayTransaction>;
+            updateMostRecentBlock: (currencyCode: string, blockHeight: number) => Promise<void>;
+            updateWalletAddress: ({ address, blockHeight, amount, contract, currencyCode, decimals, }: {
+                address: string;
                 blockHeight: number;
-                amount: string;
-                contract: string;
-                currency: string;
+                amount: string | number;
+                contract?: string;
+                currencyCode: string;
                 decimals: number;
             }) => Promise<CryptopayTransaction>;
-            mapOrderPaymentToWalletAddress: ({ addressId, contract, currency, orderPaymentId, }: {
-                addressId: string;
-                contract: string;
-                currency: string;
+            mapOrderPaymentToWalletAddress: ({ address, contract, currencyCode, orderPaymentId, }: {
+                address: string;
+                contract?: string;
+                currencyCode: string;
                 orderPaymentId: string;
             }) => Promise<CryptopayTransaction>;
-            getNextDerivationNumber: (currency: string) => Promise<number>;
+            getNextDerivationNumber: (currencyCode: string) => Promise<number>;
             getWalletAddressesByOrderPaymentId: (orderPaymentId: string) => Promise<CryptopayTransaction[]>;
         };
     };
 };
 export default _default;
-export type CryptopayModule = {
+export interface CryptopayModule {
     cryptopay: ReturnType<typeof configureCryptopayModule>;
-};
+}
 //# sourceMappingURL=module.d.ts.map

package/lib/payment/cryptopay/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAmC,MAAM,+BAA+B,CAAC;AAEtG,QAAA,MAAM,wBAAwB,GAAI;;CAAM;kCAGK,MAAM,KAAG,OAAO,CAAC,oBAAoB,CAAC;sCAIlC,MAAM,eAAe,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;6FAqEvF;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,KAAG,OAAO,CAAC,oBAAoB,CAAC;yFA1D9B;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,cAAc,EAAE,MAAM,CAAC;KACxB,KAAG,OAAO,CAAC,oBAAoB,CAAC;wCA2BgB,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC;yDAKvD,MAAM,KACrB,OAAO,CAAC,oBAAoB,EAAE,CAAC;CAsDnC,CAAC;;;;;;0CAlH2C,MAAM,KAAG,OAAO,CAAC,oBAAoB,CAAC;8CAIlC,MAAM,eAAe,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;qGAqEvF;gBACD,SAAS,EAAE,MAAM,CAAC;gBAClB,WAAW,EAAE,MAAM,CAAC;gBACpB,MAAM,EAAE,MAAM,CAAC;gBACf,QAAQ,EAAE,MAAM,CAAC;gBACjB,QAAQ,EAAE,MAAM,CAAC;gBACjB,QAAQ,EAAE,MAAM,CAAC;aAClB,KAAG,OAAO,CAAC,oBAAoB,CAAC;iGA1D9B;gBACD,SAAS,EAAE,MAAM,CAAC;gBAClB,QAAQ,EAAE,MAAM,CAAC;gBACjB,QAAQ,EAAE,MAAM,CAAC;gBACjB,cAAc,EAAE,MAAM,CAAC;aACxB,KAAG,OAAO,CAAC,oBAAoB,CAAC;gDA2BgB,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC;iEAKvD,MAAM,KACrB,OAAO,CAAC,oBAAoB,EAAE,CAAC;;;;AAwDpC,wBAIE;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;CACxD,CAAC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAmC,MAAM,+BAA+B,CAAC;AAEtG,QAAA,MAAM,wBAAwB,GAAI;;CAAM;gCAGG,MAAM,aAAa,MAAM,KAAG,OAAO,CAAC,oBAAoB,CAAC;0CAK/C,MAAM,eAAe,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;+FA0E3F;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;QACrB,QAAQ,EAAE,MAAM,CAAC;KAClB,KAAG,OAAO,CAAC,oBAAoB,CAAC;2FA/D9B;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,EAAE,MAAM,CAAC;KACxB,KAAG,OAAO,CAAC,oBAAoB,CAAC;4CAyBoB,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC;yDAK3D,MAAM,KACrB,OAAO,CAAC,oBAAoB,EAAE,CAAC;CA2DnC,CAAC;;;;;;wCAtHyC,MAAM,aAAa,MAAM,KAAG,OAAO,CAAC,oBAAoB,CAAC;kDAK/C,MAAM,eAAe,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;uGA0E3F;gBACD,OAAO,EAAE,MAAM,CAAC;gBAChB,WAAW,EAAE,MAAM,CAAC;gBACpB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;gBACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAClB,YAAY,EAAE,MAAM,CAAC;gBACrB,QAAQ,EAAE,MAAM,CAAC;aAClB,KAAG,OAAO,CAAC,oBAAoB,CAAC;mGA/D9B;gBACD,OAAO,EAAE,MAAM,CAAC;gBAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAClB,YAAY,EAAE,MAAM,CAAC;gBACrB,cAAc,EAAE,MAAM,CAAC;aACxB,KAAG,OAAO,CAAC,oBAAoB,CAAC;oDAyBoB,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC;iEAK3D,MAAM,KACrB,OAAO,CAAC,oBAAoB,EAAE,CAAC;;;;AA6DpC,wBAIE;AAEF,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;CACxD"}

package/lib/payment/cryptopay/module.js

@@ -2,27 +2,27 @@ import { mongodb } from '@unchainedshop/mongodb';
 import { CryptopayTransactionsCollection } from './db/CryptopayTransactions.js';
 const configureCryptopayModule = ({ db }) => {
     const CryptoTransactions = CryptopayTransactionsCollection(db);
-    const getWalletAddress = async (addressId) => {
-        return CryptoTransactions.findOne({ _id: addressId.toLowerCase() });
+    const getWalletAddress = async (address, contract) => {
+        const addressId = [address, contract].filter(Boolean).join(':');
+        return CryptoTransactions.findOne({ _id: addressId });
     };
-    const updateMostRecentBlock = async (currency, blockHeight) => {
+    const updateMostRecentBlock = async (currencyCode, blockHeight) => {
         await CryptoTransactions.updateMany({
-            currency,
+            currencyCode,
         }, {
             $set: {
                 mostRecentBlockHeight: blockHeight,
             },
         });
     };
-    const mapOrderPaymentToWalletAddress = async ({ addressId, contract, currency, orderPaymentId, }) => {
-        await CryptoTransactions.updateOne({
-            _id: addressId.toLowerCase(),
+    const mapOrderPaymentToWalletAddress = async ({ address, contract, currencyCode, orderPaymentId, }) => {
+        const addressId = [address, contract].filter(Boolean).join(':');
+        return CryptoTransactions.findOneAndUpdate({
+            _id: addressId,
         }, {
             $setOnInsert: {
-                _id: addressId.toLowerCase(),
-                contract,
-                currency,
-                decimals: null,
+                _id: addressId,
+                currencyCode,
                 mostRecentBlockHeight: 0,
                 blockHeight: 0,
                 amount: mongodb.Decimal128.fromString('0'),
@@ -32,36 +32,38 @@ const configureCryptopayModule = ({ db }) => {
                 orderPaymentId,
                 updated: new Date(),
             },
-        }, { upsert: true });
-        return CryptoTransactions.findOne({ _id: addressId.toLowerCase() });
+        }, { upsert: true, returnDocument: 'after' });
     };
-    const getNextDerivationNumber = async (currency) => {
-        return (await CryptoTransactions.countDocuments({ currency })) + 1;
+    const getNextDerivationNumber = async (currencyCode) => {
+        return (await CryptoTransactions.countDocuments({ currencyCode })) + 1;
     };
     const getWalletAddressesByOrderPaymentId = async (orderPaymentId) => {
         return CryptoTransactions.find({
             orderPaymentId,
+        }, {
+            sort: {
+                created: 1, // Sort by creation date, most recent first
+            },
         }).toArray();
     };
-    const updateWalletAddress = async ({ addressId, blockHeight, amount, contract, currency, decimals, }) => {
-        await CryptoTransactions.updateOne({
-            _id: addressId.toLowerCase(),
+    const updateWalletAddress = async ({ address, blockHeight, amount, contract, currencyCode, decimals, }) => {
+        const addressId = [address, contract].filter(Boolean).join(':');
+        return CryptoTransactions.findOneAndUpdate({
+            _id: addressId,
         }, {
             $setOnInsert: {
-                _id: addressId.toLowerCase(),
-                currency,
-                contract,
+                _id: addressId,
                 created: new Date(),
             },
             $set: {
+                currencyCode,
                 decimals,
                 blockHeight,
                 mostRecentBlockHeight: blockHeight,
-                amount: mongodb.Decimal128.fromString(amount),
+                amount: mongodb.Decimal128.fromString(typeof amount === 'number' ? `${amount}` : amount),
                 updated: new Date(),
             },
-        }, { upsert: true });
-        return CryptoTransactions.findOne({ _id: addressId.toLowerCase() });
+        }, { upsert: true, returnDocument: 'after' });
     };
     return {
         getWalletAddress,

package/lib/payment/cryptopay/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/module.ts"],"names":[],"mappings":"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"}

package/lib/payment/cryptopay/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,eAAe,EAKhB,MAAM,qBAAqB,CAAC;AAgD7B,QAAA,MAAM,SAAS,EAAE,eA6OhB,CAAC;AAIF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAKhB,MAAM,qBAAqB,CAAC;AAwB7B,QAAA,MAAM,SAAS,EAAE,eAsOhB,CAAC;AAIF,eAAe,SAAS,CAAC"}

package/lib/payment/cryptopay/plugin.js

@@ -1,45 +1,10 @@
-import { ethers } from 'ethers';
-import { BIP32Factory } from 'bip32';
-import bs58check from 'bs58check';
-import * as ecc from 'tiny-secp256k1';
-import { networks, payments } from 'bitcoinjs-lib';
-import { createLogger } from '@unchainedshop/logger';
 import { PaymentAdapter, PaymentDirector, PaymentError, OrderPricingSheet, } from '@unchainedshop/core';
+import { createLogger } from '@unchainedshop/logger';
+import deriveBtcAddress from './derive-btc-address.js';
+import deriveEthAddress from './derive-eth-address.js';
+import denoteAmount from './denote-amount.js';
 const logger = createLogger('unchained:core-payment:cryptopay');
 const { CRYPTOPAY_SECRET, CRYPTOPAY_BTC_XPUB, CRYPTOPAY_ETH_XPUB } = process.env;
-const resolvePath = (prefix) => {
-    if (prefix === 'x')
-        return `m/44'/0'`;
-    if (prefix === 'y')
-        return `m/49'/0'`;
-    if (prefix === 'z')
-        return `m/84'/0'`;
-    if (prefix === 't')
-        return `m/44'/1'`;
-    if (prefix === 'u')
-        return `m/49'/1'`;
-    if (prefix === 'v')
-        return `m/84'/1'`;
-    return `m`;
-};
-const resolveNetwork = (prefix) => {
-    if (['x', 'y', 'z'].includes(prefix))
-        return networks.bitcoin;
-    return networks.testnet;
-};
-function convertExtendedPublicKey(z) {
-    const derivationPath = resolvePath(z.slice(0, 1));
-    const network = resolveNetwork(z.slice(0, 1));
-    // https://github.com/satoshilabs/slips/blob/master/slip-0132.md
-    let data = bs58check.decode(z);
-    data = data.slice(4);
-    data = Buffer.concat([Buffer.from('0488b21e', 'hex'), data]);
-    return {
-        xpub: bs58check.encode(data),
-        network,
-        derivationPath,
-    };
-}
 var CryptopayCurrencies;
 (function (CryptopayCurrencies) {
     CryptopayCurrencies["BTC"] = "BTC";
@@ -59,7 +24,7 @@ const Cryptopay = {
             const originCurrencyObj = await modules.currencies.findCurrency({ isoCode: currencyCode });
             const updatedAddresses = await Promise.all(existingAddresses.map(async (addressData) => {
                 const targetCurrencyObj = await modules.currencies.findCurrency({
-                    isoCode: addressData.currency,
+                    isoCode: addressData.currencyCode,
                 });
                 if (!targetCurrencyObj?.isActive)
                     return null;
@@ -73,18 +38,18 @@ const Cryptopay = {
             return updatedAddresses.filter(Boolean);
         };
         const updateTransactionsWithOrderPaymentId = async (orderPaymentId, cryptoAddresses) => {
-            return Promise.all(cryptoAddresses.map(async ({ address, currency }) => modules.cryptopay.mapOrderPaymentToWalletAddress({
-                addressId: address,
-                contract: null,
-                currency,
-                orderPaymentId,
-            })));
+            for (const cryptoAddress of cryptoAddresses) {
+                const { address, currencyCode } = cryptoAddress;
+                await modules.cryptopay.mapOrderPaymentToWalletAddress({
+                    address,
+                    currencyCode,
+                    orderPaymentId,
+                });
+            }
         };
         const adapterActions = {
             ...PaymentAdapter.actions(config, context),
-            // eslint-disable-next-line
             configurationError() {
-                // eslint-disable-line
                 if (!CRYPTOPAY_SECRET) {
                     return PaymentError.INCOMPLETE_CONFIGURATION;
                 }
@@ -101,7 +66,7 @@ const Cryptopay = {
                     return true;
                 // if (
                 //   !Object.values(CryptopayCurrencies).includes(
-                //     context.order.currency as CryptopayCurrencies,
+                //     context.order.currencyCode as CryptopayCurrencies,
                 //   )
                 // )
                 //   return false;
@@ -112,42 +77,35 @@ const Cryptopay = {
             },
             sign: async () => {
                 const { orderPayment, order } = context;
+                if (!orderPayment)
+                    throw new Error('Payment Credential Registration is not yet supported for Cryptopay');
                 const existingAddresses = await modules.cryptopay.getWalletAddressesByOrderPaymentId(orderPayment._id);
                 if (existingAddresses.length) {
                     // Do not derive addresses a second time for order payment, return existing addresses
-                    const existingAddressesWithNewExpiration = await setConversionRates(order.currency, existingAddresses.map(({ _id, currency }) => ({
+                    const existingAddressesWithNewExpiration = await setConversionRates(order.currencyCode, existingAddresses.map(({ _id, currencyCode }) => ({
                         address: _id,
-                        currency,
+                        currencyCode,
                     })));
                     return JSON.stringify(existingAddressesWithNewExpiration);
                 }
                 const cryptoAddresses = [];
                 if (CRYPTOPAY_BTC_XPUB) {
-                    const { xpub, network } = convertExtendedPublicKey(CRYPTOPAY_BTC_XPUB);
-                    const bip32 = BIP32Factory(ecc);
-                    const hardenedMaster = bip32.fromBase58(xpub, network);
                     const btcDerivationNumber = await modules.cryptopay.getNextDerivationNumber(CryptopayCurrencies.BTC);
-                    const child = hardenedMaster.derivePath(`0/${btcDerivationNumber}`);
+                    const address = deriveBtcAddress(CRYPTOPAY_BTC_XPUB, btcDerivationNumber);
                     cryptoAddresses.push({
-                        currency: CryptopayCurrencies.BTC,
-                        address: payments.p2wpkh({
-                            pubkey: child.publicKey,
-                            network,
-                        }).address,
+                        currencyCode: CryptopayCurrencies.BTC,
+                        address,
                     });
                 }
                 if (CRYPTOPAY_ETH_XPUB) {
-                    // we neuter for security reasons, it's still quite complicated for most ethereum clients to show an appropriate
-                    // xpub, that's why
-                    const hdWallet = ethers.HDNodeWallet.fromExtendedKey(CRYPTOPAY_ETH_XPUB);
-                    const hardenedMaster = 'neuter' in hdWallet ? hdWallet.neuter() : hdWallet;
                     const ethDerivationNumber = await modules.cryptopay.getNextDerivationNumber(CryptopayCurrencies.ETH);
+                    const address = deriveEthAddress(CRYPTOPAY_ETH_XPUB, ethDerivationNumber);
                     cryptoAddresses.push({
-                        currency: CryptopayCurrencies.ETH,
-                        address: hardenedMaster.derivePath(`0/${ethDerivationNumber}`).address,
+                        currencyCode: CryptopayCurrencies.ETH,
+                        address,
                     });
                 }
-                const cryptoAddressesWithExpiration = await setConversionRates(order.currency, cryptoAddresses);
+                const cryptoAddressesWithExpiration = await setConversionRates(order.currencyCode, cryptoAddresses);
                 await updateTransactionsWithOrderPaymentId(orderPayment._id, cryptoAddresses);
                 return JSON.stringify(cryptoAddressesWithExpiration);
             },
@@ -157,17 +115,16 @@ const Cryptopay = {
                 const walletForOrderPayment = foundWalletsWithBalances.find((wallet) => BigInt(wallet.amount.toString()) > 0n);
                 const pricing = OrderPricingSheet({
                     calculation: order.calculation,
-                    currency: order.currency,
+                    currencyCode: order.currencyCode,
                 });
                 const totalAmount = BigInt(pricing?.total({ useNetPrice: false }).amount);
-                if (walletForOrderPayment.currency !== order.currency) {
+                if (walletForOrderPayment.currencyCode !== order.currencyCode) {
                     const baseCurrency = await modules.currencies.findCurrency({
-                        isoCode: walletForOrderPayment.currency,
+                        isoCode: walletForOrderPayment.currencyCode,
                     });
-                    const quoteCurrency = await modules.currencies.findCurrency({ isoCode: order.currency });
+                    const quoteCurrency = await modules.currencies.findCurrency({ isoCode: order.currencyCode });
                     const { /* min, */ max } = await modules.products.prices.rates.getRateRange(baseCurrency, quoteCurrency, order.confirmed || new Date());
-                    const convertedAmount = BigInt(walletForOrderPayment.amount.toString()) /
-                        10n ** (BigInt(walletForOrderPayment.decimals) - 9n);
+                    const convertedAmount = denoteAmount(walletForOrderPayment.amount.toString(), walletForOrderPayment.decimals);
                     // Add a Promille 🍻
                     // const minAmount = parseFloat(convertedAmount.toString()) * min * 0.999;
                     const maxAmount = parseFloat(convertedAmount.toString()) * max * 1.001;
@@ -180,9 +137,7 @@ const Cryptopay = {
                     logger.info(`Cryptopay Plugin: Wallet ${walletForOrderPayment._id} balance too low (yet): ${maxAmount} < ${totalAmount}`);
                 }
                 if (walletForOrderPayment) {
-                    // Hack: Downgrade to 8 decimals
-                    const convertedAmount = BigInt(walletForOrderPayment.amount.toString()) /
-                        10n ** (BigInt(walletForOrderPayment.decimals) - 9n); // All crypto native prices denoted with 8 decimals
+                    const convertedAmount = denoteAmount(walletForOrderPayment.amount.toString(), walletForOrderPayment.decimals);
                     if (convertedAmount && convertedAmount >= totalAmount) {
                         return {
                             transactionId: walletForOrderPayment._id,
@@ -190,9 +145,8 @@ const Cryptopay = {
                     }
                     logger.info(`Cryptopay Plugin: Wallet ${walletForOrderPayment._id} balance too low (yet): ${convertedAmount} < ${totalAmount}`);
                 }
-                logger.info(`Cryptopay Plugin: No confirmed payments found for currency ${order.currency} and addresses ${JSON.stringify(foundWalletsWithBalances)}`);
-                /*
-                TODO:
+                logger.info(`Cryptopay Plugin: No confirmed payments found for currency ${order.currencyCode} and addresses ${JSON.stringify(foundWalletsWithBalances)}`);
+                /* TODO: Crypto Handling
         
                 1. Check that generated crypto addresses are unique and no order payments share the same crypto address, only repeat when derivations completely exhausted.
                 2. When derivation path get's close to "exhaustedness" (95%), send a special e-mail alert to tell the user should generate a new xpub.