fix: fee calculations

Author: anyxem

packages/sdk/src/mintlayer-connect-sdk.ts

@@ -1986,9 +1986,10 @@ class Client {
 
       const BINRepresentation = this.getTransactionBINrepresentation(JSONRepresentation, 1);
 
-      const transaction_size = BigInt(Math.ceil(BINRepresentation.transactionsize));
-      const feerate = BigInt('100000000000'); // TODO: Get the current feerate from the network
-      const nextPreciseFee = (transaction_size * feerate) / 1000n;
+      const transaction_size_in_bytes = BigInt(Math.ceil(BINRepresentation.transactionsize));
+      const fee_amount_per_kb = BigInt('100000000000'); // TODO: Get the current feerate from the network
+
+      const nextPreciseFee = ((fee_amount_per_kb * transaction_size_in_bytes) + BigInt(999)) / BigInt(1000)
 
       if (nextPreciseFee === preciseFee || nextPreciseFee === previousFee) {
         const transaction = encode_transaction(
@@ -2072,7 +2073,7 @@ class Client {
           return encode_input_for_fill_order(
             input.order_id,
             Amount.from_atoms(input.fill_atoms.toString()),
-            input.destination,
+            'tmt1q8vjp3lrvezlnkwhhv944f2vw2k9get4ty0fkyn3',
             BigInt(input.nonce.toString()),
             network,
           );
@@ -2130,6 +2131,8 @@ class Client {
 
     const inputsArray = [...inputCommands, ...inputsIds].filter((x): x is NonNullable<typeof x> => x !== undefined);
 
+    console.log('inputsArray', inputsArray);
+
     const outputsArrayItems = transactionJSONrepresentation.outputs.map((output) => {
       if (output.type === 'Transfer') {
         if (output.value.type === 'TokenV1') {
@@ -2261,6 +2264,7 @@ class Client {
       }
     });
     const outputsArray = outputsArrayItems.filter((x): x is NonNullable<typeof x> => x !== undefined);
+    console.log('outputsArray', outputsArray);
 
     const inputAddresses: string[] = (transactionJSONrepresentation.inputs as UtxoInput[])
       .filter(({ input }) => input.input_type === 'UTXO')
@@ -2271,6 +2275,14 @@ class Client {
       // @ts-ignore
       inputAddresses.push(transactionJSONrepresentation.outputs[0].destination);
     }
+    // @ts-ignore
+    if (transactionJSONrepresentation.inputs[0].input.input_type === 'AccountCommand') {
+      // @ts-ignore
+      if (transactionJSONrepresentation.inputs[0].input.destination) {
+        // @ts-ignore
+        inputAddresses.push(transactionJSONrepresentation.inputs[0].input.destination);
+      }
+    }
 
     const transactionsize = estimate_transaction_size(
       mergeUint8Arrays(inputsArray),
@@ -2279,6 +2291,8 @@ class Client {
       network,
     );
 
+    console.log('transactionsize', transactionsize);
+
     return {
       inputs: inputsArray,
       outputs: outputsArray,

packages/sdk/tests/orders.test.ts

@@ -234,10 +234,10 @@ test('fill order', async () => {
 
   expect(result.JSONRepresentation).toStrictEqual({
     "fee": {
-      "atoms": "30100000000",
-      "decimal": "0.301",
+      "atoms": "40400000000",
+      "decimal": "0.404",
     },
-    "id": "4bcaf078df908c0fa7fa73419289b5c4e2ea4f89a2f9a4ef877d8a04cc8650c5",
+    "id": "ee22e819eba9b30b3b3ecd21322b566d41973d346a922eb9a685121554ad3be1",
     "inputs": [
       {
         "input": {
@@ -288,8 +288,8 @@ test('fill order', async () => {
         "value": {
           "type": "Coin",
           "amount": {
-            "atoms": "1702175504300000",
-            "decimal": "17021.755043"
+            "atoms": "1702165204300000",
+            "decimal": "17021.652043"
           }
         },
         "destination": "tmt1qxrwc3gy2lgf4kvqwwfa388vn3cavgrqyyrgswe6"
@@ -310,6 +310,9 @@ test('fill order that fail on call', async () => {
   });
 
   const result = await spy.mock.results[0]?.value;
+
+  console.log(JSON.stringify(result, null, 2));
+
   expect(result.JSONRepresentation.fee.decimal).toBe('0.399');
 });
 
@@ -371,10 +374,10 @@ test('conclude order - snapshot', async () => {
 
   expect(result.JSONRepresentation).toStrictEqual({
     "fee": {
-      "atoms": "30200000000",
-      "decimal": "0.302",
+      "atoms": "40500000000",
+      "decimal": "0.405",
     },
-    "id": "bc6c7df6b4cb0f337b16cca4e3ed5c5105ae12c2c32d08f8d5186adbac5e5f22",
+    "id": "a0e027bed40136528b3c5462b198a7e9781fad6659ab6c0d22b8c2a499148964",
     "inputs": [
       {
         "input": {
@@ -435,8 +438,8 @@ test('conclude order - snapshot', async () => {
         "value": {
           "type": "Coin",
           "amount": {
-            "atoms": "1703175404300000",
-            "decimal": "17031.754043"
+            "atoms": "1703165104300000",
+            "decimal": "17031.651043"
           }
         },
         "destination": "tmt1qxrwc3gy2lgf4kvqwwfa388vn3cavgrqyyrgswe6"