@thesingularitynetwork/darkswap-sdk 0.1.28 → 0.1.30

package/dist/darkswap-sdk.cjs.development.js

@@ -9838,7 +9838,7 @@ function generateRetailSwapProof(_x) {
 }
 function _generateRetailSwapProof() {
   _generateRetailSwapProof = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(param) {
-    var aliceFeeAmount, bobFeeAmount, aliceOrderNoteNullifier, aliceInNoteFooter, bobOrderNoteNullifier, bobInNoteFooter, aliceAddressMod, bobAddressMod, inputs, proof;
+    var aliceOrderNoteNullifier, aliceInNoteFooter, bobOrderNoteNullifier, bobInNoteFooter, aliceAddressMod, bobAddressMod, inputs, proof;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -9854,14 +9854,12 @@ function _generateRetailSwapProof() {
           }
           throw new DarkSwapProofError("Invalid note amount");
         case 2:
-          if (!(param.aliceMessage.orderNote.amount != param.bobMessage.inNote.amount || param.bobMessage.orderNote.amount != param.aliceMessage.inNote.amount)) {
+          if (!(param.aliceMessage.orderNote.amount != param.bobMessage.inNote.amount + param.bobMessage.feeAmount || param.bobMessage.orderNote.amount != param.aliceMessage.inNote.amount + param.aliceMessage.feeAmount)) {
             _context.n = 3;
             break;
           }
           throw new DarkSwapProofError("Invalid order amount");
         case 3:
-          aliceFeeAmount = param.aliceMessage.inNote.amount * param.aliceMessage.orderNote.feeRatio / FEE_RATIO_PRECISION;
-          bobFeeAmount = param.bobMessage.inNote.amount * param.bobMessage.orderNote.feeRatio / FEE_RATIO_PRECISION;
           aliceOrderNoteNullifier = calcNullifier(param.aliceMessage.orderNote.rho, param.aliceMessage.publicKey);
           aliceInNoteFooter = getNoteFooter(param.aliceMessage.inNote.rho, param.aliceMessage.publicKey);
           bobOrderNoteNullifier = calcNullifier(param.bobMessage.orderNote.rho, param.bobMessage.publicKey);
@@ -9881,10 +9879,10 @@ function _generateRetailSwapProof() {
             alice_out_note: bn_to_0xhex(param.aliceMessage.orderNote.note),
             alice_out_nullifier: bn_to_0xhex(aliceOrderNoteNullifier),
             alice_fee_ratio: bn_to_0xhex(param.aliceMessage.orderNote.feeRatio),
-            alice_fee_amount: bn_to_0xhex(aliceFeeAmount),
+            alice_fee_amount: bn_to_0xhex(param.aliceMessage.feeAmount),
             alice_in_rho: bn_to_0xhex(param.aliceMessage.inNote.rho),
             alice_in_asset: bn_to_0xhex(encodeAddress(param.aliceMessage.inNote.asset)),
-            alice_in_amount: bn_to_0xhex(param.aliceMessage.inNote.amount),
+            alice_in_amount: bn_to_0xhex(param.aliceMessage.inNote.amount + param.aliceMessage.feeAmount),
             alice_in_note: bn_to_0xhex(param.aliceMessage.inNote.note),
             alice_in_note_footer: bn_to_0xhex(aliceInNoteFooter),
             alice_pub_key: [param.aliceMessage.publicKey[0].toString(), param.aliceMessage.publicKey[1].toString()],
@@ -9898,7 +9896,7 @@ function _generateRetailSwapProof() {
             bob_out_rho: bn_to_0xhex(param.bobMessage.orderNote.rho),
             bob_out_nullifier: bn_to_0xhex(bobOrderNoteNullifier),
             bob_fee_ratio: bn_to_0xhex(param.bobMessage.orderNote.feeRatio),
-            bob_fee_amount: bn_to_0xhex(bobFeeAmount),
+            bob_fee_amount: bn_to_0xhex(param.bobMessage.feeAmount),
             bob_in_note: bn_to_0xhex(param.bobMessage.inNote.note),
             bob_in_rho: bn_to_0xhex(param.bobMessage.inNote.rho),
             bob_in_note_footer: bn_to_0xhex(bobInNoteFooter),