File structure improvements

src/crypt/getDomainData.ts

@@ -0,0 +1,15 @@
+import { SupportedChainId } from '../types';
+import eip712DomainData from '../config/eip712DomainData.json';
+import eip712DomainSchema from '../config/schemas/eip712DomainSchema';
+
+const EIP712Domain = eip712DomainSchema.parse(eip712DomainData);
+
+/**
+ * See {@link https://eips.ethereum.org/EIPS/eip-712#definition-of-domainseparator}
+ */
+const getDomainData = (chainId: SupportedChainId) => ({
+  ...EIP712Domain,
+  chainId,
+});
+
+export default getDomainData;

src/crypt/hashOrder.ts

@@ -0,0 +1,35 @@
+import { ethers } from 'ethers';
+import { Order } from '../types';
+
+const hashOrder = (order: Order) => ethers.utils.solidityKeccak256(
+  [
+    'uint8',
+    'address',
+    'address',
+    'address',
+    'address',
+    'address',
+    'uint64',
+    'uint64',
+    'uint64',
+    'uint64',
+    'uint64',
+    'uint8',
+  ],
+  [
+    '0x03',
+    order.senderAddress,
+    order.matcherAddress,
+    order.baseAsset,
+    order.quoteAsset,
+    order.matcherFeeAsset,
+    order.amount,
+    order.price,
+    order.matcherFee,
+    order.nonce,
+    order.expiration,
+    order.buySide ? '0x01' : '0x00',
+  ],
+);
+
+export default hashOrder;

src/crypt/index.ts

@@ -0,0 +1,4 @@
+export { default as signCancelOrder } from './signCancelOrder';
+export { default as signCancelOrderPersonal } from './signCancelOrderPersonal';
+export { default as signOrder } from './signOrder';
+export { default as signOrderPersonal } from './signOrderPersonal';

src/crypt/signCancelOrder.ts

@@ -0,0 +1,49 @@
+/* eslint-disable no-underscore-dangle */
+import { TypedDataSigner } from '@ethersproject/abstract-signer';
+import { ethers } from 'ethers';
+import { joinSignature, splitSignature } from 'ethers/lib/utils';
+import CANCEL_ORDER_TYPES from '../constants/cancelOrderTypes';
+import { CancelOrderRequest, SignedCancelOrderRequest, SupportedChainId } from '../types';
+import getDomainData from './getDomainData';
+import signCancelOrderPersonal from './signCancelOrderPersonal';
+
+type SignerWithTypedDataSign = ethers.Signer & TypedDataSigner;
+
+const signCancelOrder = async (
+  senderAddress: string,
+  id: string,
+  usePersonalSign: boolean,
+  signer: ethers.Signer,
+  chainId: SupportedChainId,
+) => {
+  const cancelOrderRequest: CancelOrderRequest = {
+    id,
+    senderAddress,
+    isPersonalSign: usePersonalSign,
+  };
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  const typedDataSigner = signer as SignerWithTypedDataSign;
+
+  const signature = usePersonalSign
+    ? await signCancelOrderPersonal(cancelOrderRequest, signer)
+  // https://docs.ethers.io/v5/api/signer/#Signer-signTypedData
+    : await typedDataSigner._signTypedData(
+      getDomainData(chainId),
+      CANCEL_ORDER_TYPES,
+      cancelOrderRequest,
+    );
+
+  // https://github.com/poap-xyz/poap-fun/pull/62#issue-928290265
+  // "Signature's v was always send as 27 or 28, but from Ledger was 0 or 1"
+  const fixedSignature = joinSignature(splitSignature(signature));
+
+  if (!fixedSignature) throw new Error("Can't sign order cancel");
+
+  const signedCancelOrderReqeust: SignedCancelOrderRequest = {
+    ...cancelOrderRequest,
+    signature: fixedSignature,
+  };
+  return signedCancelOrderReqeust;
+};
+
+export default signCancelOrder;

src/crypt/signCancelOrderPersonal.ts

@@ -0,0 +1,20 @@
+import { ethers } from 'ethers';
+import { arrayify, joinSignature, splitSignature } from 'ethers/lib/utils';
+import { CancelOrderRequest } from '../types';
+
+export const signCancelOrderPersonal = async (
+  cancelOrderRequest: CancelOrderRequest,
+  signer: ethers.Signer,
+) => {
+  const types = ['string', 'string', 'address'];
+  const message = ethers.utils.solidityKeccak256(
+    types,
+    ['cancelOrder', cancelOrderRequest.id, cancelOrderRequest.senderAddress],
+  );
+  const signature = await signer.signMessage(arrayify(message));
+
+  // NOTE: metamask broke sig.v value and we fix it in next line
+  return joinSignature(splitSignature(signature));
+};
+
+export default signCancelOrderPersonal;

src/crypt/signOrder.ts

@@ -0,0 +1,87 @@
+/* eslint-disable no-underscore-dangle */
+import { TypedDataSigner } from '@ethersproject/abstract-signer';
+import BigNumber from 'bignumber.js';
+import { ethers } from 'ethers';
+import { joinSignature, splitSignature } from 'ethers/lib/utils';
+import { INTERNAL_ORION_PRECISION } from '../constants';
+import ORDER_TYPES from '../constants/orderTypes';
+import { Order, SignedOrder, SupportedChainId } from '../types';
+import normalizeNumber from '../utils/normalizeNumber';
+import getDomainData from './getDomainData';
+import hashOrder from './hashOrder';
+import signOrderPersonal from './signOrderPersonal';
+
+const DEFAULT_EXPIRATION = 29 * 24 * 60 * 60 * 1000; // 29 days
+
+type SignerWithTypedDataSign = ethers.Signer & TypedDataSigner;
+
+export const signOrder = async (
+  baseAssetAddr: string,
+  quoteAssetAddr: string,
+  side: 'BUY' | 'SELL',
+  price: BigNumber.Value,
+  amount: BigNumber.Value,
+  matcherFee: BigNumber.Value,
+  senderAddress: string,
+  matcherAddress: string,
+  orionFeeAssetAddr: string,
+  usePersonalSign: boolean,
+  signer: ethers.Signer,
+  chainId: SupportedChainId,
+) => {
+  const nonce = Date.now();
+  const expiration = nonce + DEFAULT_EXPIRATION;
+
+  const order: Order = {
+    senderAddress,
+    matcherAddress,
+    baseAsset: baseAssetAddr,
+    quoteAsset: quoteAssetAddr,
+    matcherFeeAsset: orionFeeAssetAddr,
+    amount: normalizeNumber(
+      amount,
+      INTERNAL_ORION_PRECISION,
+      BigNumber.ROUND_FLOOR,
+    ).toNumber(),
+    price: normalizeNumber(
+      price,
+      INTERNAL_ORION_PRECISION,
+      BigNumber.ROUND_FLOOR,
+    ).toNumber(),
+    matcherFee: normalizeNumber(
+      matcherFee,
+      INTERNAL_ORION_PRECISION,
+      BigNumber.ROUND_CEIL, // ROUND_CEIL because we don't want get "not enough fee" error
+    ).toNumber(),
+    nonce,
+    expiration,
+    buySide: side === 'BUY' ? 1 : 0,
+    isPersonalSign: usePersonalSign,
+  };
+
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  const typedDataSigner = signer as SignerWithTypedDataSign;
+
+  const signature = usePersonalSign
+    ? await signOrderPersonal(order, signer)
+    : await typedDataSigner._signTypedData(
+      getDomainData(chainId),
+      ORDER_TYPES,
+      order,
+    );
+
+  // https://github.com/poap-xyz/poap-fun/pull/62#issue-928290265
+  // "Signature's v was always send as 27 or 28, but from Ledger was 0 or 1"
+  const fixedSignature = joinSignature(splitSignature(signature));
+
+  if (!fixedSignature) throw new Error("Can't sign order");
+
+  const signedOrder: SignedOrder = {
+    ...order,
+    id: hashOrder(order),
+    signature: fixedSignature,
+  };
+  return signedOrder;
+};
+
+export default signOrder;

src/crypt/signOrderPersonal.ts

@@ -0,0 +1,33 @@
+import { ethers } from 'ethers';
+import { Order } from '../types';
+
+const { arrayify, joinSignature, splitSignature } = ethers.utils;
+
+const signOrderPersonal = async (order: Order, signer: ethers.Signer) => {
+  const message = ethers.utils.solidityKeccak256(
+    [
+      'string', 'address', 'address', 'address', 'address',
+      'address', 'uint64', 'uint64', 'uint64', 'uint64', 'uint64', 'uint8',
+    ],
+    [
+      'order',
+      order.senderAddress,
+      order.matcherAddress,
+      order.baseAsset,
+      order.quoteAsset,
+      order.matcherFeeAsset,
+      order.amount,
+      order.price,
+      order.matcherFee,
+      order.nonce,
+      order.expiration,
+      order.buySide,
+    ],
+  );
+  const signature = await signer.signMessage(arrayify(message));
+
+  // NOTE: metamask broke sig.v value and we fix it in next line
+  return joinSignature(splitSignature(signature));
+};
+
+export default signOrderPersonal;