@thesingularitynetwork/darkswap-sdk 0.1.11 → 0.1.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. package/dist/index.esm.js +662 -609
  2. package/dist/index.esm.js.map +1 -1
  3. package/dist/index.js +662 -609
  4. package/dist/index.js.map +1 -1
  5. package/dist/index.umd.js +668 -609
  6. package/dist/index.umd.js.map +1 -1
  7. package/dist/types/src/index.d.ts +1 -0
  8. package/dist/types/src/proof/pro/orders/swapProof.d.ts +1 -0
  9. package/dist/types/src/proof/retail/depositOrderProof.d.ts +1 -1
  10. package/dist/types/src/proof/retail/swapProof.d.ts +0 -2
  11. package/dist/types/src/services/agent/index.d.ts +1 -0
  12. package/dist/types/src/services/agent/retailSwap.d.ts +25 -0
  13. package/dist/types/src/services/pro/index.d.ts +0 -1
  14. package/dist/types/src/services/pro/proSwap.d.ts +6 -1
  15. package/dist/types/src/services/pro/swapMessage.d.ts +2 -2
  16. package/dist/types/src/types.d.ts +2 -0
  17. package/dist/types/test/services/pro/proSwap.test.d.ts +1 -0
  18. package/dist/types/test/utils/helpers.d.ts +3 -0
  19. package/package.json +1 -1
  20. package/src/index.ts +1 -0
  21. package/src/proof/pro/orders/swapProof.ts +8 -11
  22. package/src/proof/retail/depositOrderProof.ts +6 -3
  23. package/src/proof/retail/swapProof.ts +5 -10
  24. package/src/services/agent/index.ts +1 -0
  25. package/src/services/agent/retailSwap.ts +116 -0
  26. package/src/services/pro/cancelOrder.ts +1 -1
  27. package/src/services/pro/createOrder.ts +2 -2
  28. package/src/services/pro/index.ts +1 -2
  29. package/src/services/pro/proSwap.ts +53 -16
  30. package/src/services/retail/depositAndCreateOrder.ts +1 -1
  31. package/src/types.ts +2 -0
  32. package/src/utils/swapUtils.ts +20 -5
  33. package/src/services/pro/swapMessage.ts +0 -13
package/src/types.ts CHANGED
@@ -65,9 +65,11 @@ export type BaseProofInput = {
65
65
  }
66
66
 
67
67
  export type DarkSwapMessage = {
68
+ address: string,
68
69
  orderNote: DarkSwapOrderNote,
69
70
  orderNullifier: string,
70
71
  inNote: DarkSwapNote,
72
+ feeAmount: bigint,
71
73
  publicKey: [Fr, Fr],
72
74
  signature: string,
73
75
  }
package/src/utils/swapUtils.ts CHANGED
@@ -3,21 +3,35 @@ import { DarkSwapMessage } from "../types";
3
3
 
4
4
  export function serializeDarkSwapMessage(swapMessage: DarkSwapMessage): string {
5
5
  return JSON.stringify({
6
- orderNote: swapMessage.orderNote,
7
- inNote: swapMessage.inNote,
8
- signature: swapMessage.signature,
9
- pubKey: [swapMessage.publicKey[0].toString(), swapMessage.publicKey[1].toString()],
6
+ address: swapMessage.address,
7
+ orderNote: {
8
+ rho: swapMessage.orderNote.rho.toString(),
9
+ amount: swapMessage.orderNote.amount.toString(),
10
+ asset: swapMessage.orderNote.asset,
11
+ note: swapMessage.orderNote.note.toString(),
12
+ feeRatio: swapMessage.orderNote.feeRatio.toString(),
13
+ },
10
14
  orderNullifier: swapMessage.orderNullifier,
15
+ inNote: {
16
+ rho: swapMessage.inNote.rho.toString(),
17
+ amount: swapMessage.inNote.amount.toString(),
18
+ asset: swapMessage.inNote.asset,
19
+ note: swapMessage.inNote.note.toString(),
20
+ },
21
+ feeAmount: swapMessage.feeAmount.toString(),
22
+ pubKey: [swapMessage.publicKey[0].toString(), swapMessage.publicKey[1].toString()],
23
+ signature: swapMessage.signature,
11
24
  });
12
25
  }
13
26
 
14
27
  function deserializePublicKey(publicKeyString: string[]): [Fr, Fr] {
15
- return [Fr.fromBuffer(Buffer.from(publicKeyString[0], 'hex')), Fr.fromBuffer(Buffer.from(publicKeyString[1], 'hex'))];
28
+ return [Fr.fromHexString(publicKeyString[0]), Fr.fromHexString(publicKeyString[1])];
16
29
  }
17
30
 
18
31
  export function deserializeDarkSwapMessage(serializedMessage: string): DarkSwapMessage {
19
32
  const message = JSON.parse(serializedMessage);
20
33
  return {
34
+ address: message.address,
21
35
  orderNote: {
22
36
  rho: BigInt(message.orderNote.rho),
23
37
  amount: BigInt(message.orderNote.amount),
@@ -25,6 +39,7 @@ export function deserializeDarkSwapMessage(serializedMessage: string): DarkSwapM
25
39
  note: BigInt(message.orderNote.note),
26
40
  feeRatio: BigInt(message.orderNote.feeRatio),
27
41
  },
42
+ feeAmount: BigInt(message.feeAmount),
28
43
  inNote: {
29
44
  rho: BigInt(message.inNote.rho),
30
45
  amount: BigInt(message.inNote.amount),
package/src/services/pro/swapMessage.ts DELETED
@@ -1,13 +0,0 @@
1
- import { DarkSwapMessage, DarkSwapNote, DarkSwapOrderNote, generateKeyPair } from "../..";
2
- import { generateRetailSwapMessage } from "../../proof/retail/depositOrderProof";
3
-
4
-
5
- export async function generateProSwapMessage(
6
- address: string,
7
- orderNote: DarkSwapOrderNote,
8
- swapInNote: DarkSwapNote,
9
- signature: string
10
- ): Promise<DarkSwapMessage> {
11
- const [pubKey, privKey] = await generateKeyPair(signature);
12
- return await generateRetailSwapMessage(address, orderNote, swapInNote, pubKey, privKey);
13
- }