From eb070849eaf07d7f23867960b715f85efe835664 Mon Sep 17 00:00:00 2001 From: BenjaminLu Date: Mon, 13 Mar 2023 16:32:01 +0800 Subject: [PATCH] Enable signing_url for the PMM protocol --- src/handler/newOrder.ts | 7 ++++++- src/signer/pmmv5.ts | 46 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/src/handler/newOrder.ts b/src/handler/newOrder.ts index 7b394ee..5c82aad 100644 --- a/src/handler/newOrder.ts +++ b/src/handler/newOrder.ts @@ -248,7 +248,12 @@ export const newOrder = async (ctx) => { signer, order, userAddr.toLowerCase(), - config.addressBookV5.PMM + chainID, + config.addressBookV5.PMM, + { + signingUrl, + salt, + } ) break case Protocol.RFQV1: diff --git a/src/signer/pmmv5.ts b/src/signer/pmmv5.ts index 3f2c143..1acb712 100644 --- a/src/signer/pmmv5.ts +++ b/src/signer/pmmv5.ts @@ -8,6 +8,7 @@ import { } from '0x-v2-order-utils' import * as ethUtils from 'ethereumjs-util' import { utils, Wallet } from 'ethers' +import axios from 'axios' import { BigNumber, orderBNToString } from '../utils' const EIP712_ORDER_SCHEMA = { @@ -113,8 +114,29 @@ async function signByMMPSigner( return signatureUtils.convertToSignatureWithType(walletSign, SignatureType.Wallet) } +export const forwardUnsignedOrder = async (signingUrl: string, orderInfo: any): Promise => { + const resp = await axios.post(signingUrl, orderInfo) + const body = resp.data + if (body.signature) { + return body.signature + } else { + throw new Error('Invalid signature') + } +} + // Move fee factor to salt field -export const buildSignedOrder = async (signer: Wallet, order, userAddr, pmm): Promise => { +export const buildSignedOrder = async ( + signer: Wallet, + order, + userAddr, + chainId, + pmm, + options?: { + signingUrl?: string + salt?: string + } +): Promise => { + const signingUrl = options ? options.signingUrl : undefined const feeFactor = order.feeFactor order.takerAddress = pmm.toLowerCase() order.senderAddress = pmm.toLowerCase() @@ -130,10 +152,24 @@ export const buildSignedOrder = async (signer: Wallet, order, userAddr, pmm): Pr console.log(`orderHash: ${orderHash}`) const orderSignDigest = orderHashUtils.getOrderHashHex(o) console.log(`orderSignDigest: ${orderSignDigest}`) - const makerWalletSignature = - signer.address.toLowerCase() == o.makerAddress.toLowerCase() - ? await signByEOA(orderSignDigest, signer) - : await signByMMPSigner(orderSignDigest, userAddr, feeFactor, signer) + let makerWalletSignature + if (!signingUrl) { + makerWalletSignature = + signer.address.toLowerCase() == o.makerAddress.toLowerCase() + ? await signByEOA(orderSignDigest, signer) + : await signByMMPSigner(orderSignDigest, userAddr, feeFactor, signer) + } else { + makerWalletSignature = await forwardUnsignedOrder(signingUrl, { + pmmOrder: o, + feeFactor: feeFactor, + orderHash: orderHash, + orderSignDigest: orderSignDigest, + userAddr: userAddr, + signer: signer.address, + chainId: chainId, + rfqAddr: pmm, + }) + } const signedOrder = { ...o,