Problem (Fix #949): deposit amount fee calculation is not correct

chain-abci/src/enclave_bridge/mock.rs

@@ -31,6 +31,14 @@ pub fn handle_enc_dec(_req: &RequestQuery, resp: &mut ResponseQuery, _storage: &
     resp.code = 1;
 }
 
+fn pad_payload(payload: &[u8]) -> Vec<u8> {
+    // https://tools.ietf.org/html/rfc8452
+    let mut result = Vec::with_capacity(payload.len() + 16);
+    result.extend_from_slice(payload);
+    result.extend_from_slice(&[0; 16]);
+    result
+}
+
 /// temporary mock
 #[cfg(feature = "mock-enc-dec")]
 pub fn handle_enc_dec(_req: &RequestQuery, resp: &mut ResponseQuery, storage: &Storage) {
@@ -53,7 +61,7 @@ pub fn handle_enc_dec(_req: &RequestQuery, resp: &mut ResponseQuery, storage: &S
                                 key_from: 0,
                                 txid: tx.id(),
                                 init_vector: [0u8; 12],
-                                txpayload: plain.encode(),
+                                txpayload: pad_payload(&plain.encode()),
                             },
                         }),
                     };
@@ -68,7 +76,7 @@ pub fn handle_enc_dec(_req: &RequestQuery, resp: &mut ResponseQuery, storage: &S
                                 key_from: 0,
                                 txid: maintx.id(),
                                 init_vector: [0u8; 12],
-                                txpayload: plain.encode(),
+                                txpayload: pad_payload(&plain.encode()),
                             },
                         }),
                     };
@@ -84,7 +92,7 @@ pub fn handle_enc_dec(_req: &RequestQuery, resp: &mut ResponseQuery, storage: &S
                                 key_from: 0,
                                 txid: tx.id(),
                                 init_vector: [0u8; 12],
-                                txpayload: plain.encode(),
+                                txpayload: pad_payload(&plain.encode()),
                             },
                         }),
                     };

client-core/src/signer/dummy_signer.rs

@@ -22,10 +22,8 @@ pub struct DummySigner();
 impl DummySigner {
     /// pad payload to the multiples of 128bits
     fn pad_payload(&self, plain_txaux: PlainTxAux) -> Vec<u8> {
-        let unit = 16_usize;
-        let plain_payload_len = plain_txaux.encode().len();
-        // PKCS7 padding -- if the len is multiple of the block length, it'll still be padded
-        vec![0; plain_payload_len + unit - plain_payload_len % unit]
+        // https://tools.ietf.org/html/rfc8452
+        vec![0; plain_txaux.encode().len() + 16]
     }
 
     /// Creates a mock merkletree
@@ -81,9 +79,9 @@ impl DummySigner {
         TxAux::EnclaveTx(tx_enclave_aux)
     }
 
-    /// Mock the txaux for withdraw transactions
+    /// Mock the txaux for deposit transactions
     pub fn mock_txaux_for_deposit(&self, input_len: usize) -> Result<TxAux> {
-        let total_pubkeys_len = 2;
+        let total_pubkeys_len = 1;
         let witness = self.schnorr_sign_inputs_len(total_pubkeys_len, input_len)?;
         let plain_payload = PlainTxAux::DepositStakeTx(witness);
         let padded_payload = self.pad_payload(plain_payload);

integration-tests/multinode/join_cluster.json

@@ -10,7 +10,7 @@
             "mnemonic": "must sunny destroy cousin ladder survey wrong employ illness thing divert under ready purpose elegant",
             "validator_seed": "9f06b6bb885d0143092aad7a6df2f1cae7690fcbfa1edb8727542372085ade8b",
             "node_seed": "208ff2032ea90646cecee2b21de3488593f8c3a0b9c78ab02bfbf9aa15ab35b4",
-            "bonded_coin": 100000000000000000,
+            "bonded_coin": 100000000010000000,
             "unbonded_coin": 0,
             "base_port": 26650
         },
@@ -39,12 +39,12 @@
         {
             "op": "replace",
             "path": "/initial_fee_policy/base_fee",
-            "value": "0.0"
+            "value": "1.1"
         },
         {
             "op": "replace",
             "path": "/initial_fee_policy/per_byte_fee",
-            "value": "0.0"
+            "value": "1.25"
         }
     ],
     "tendermint_config_patch": [

integration-tests/multinode/join_test.py

@@ -41,7 +41,15 @@
 
 print('Withdraw unbonded', bonded_staking)
 transfer = rpc.address.list(enckey=enckey, type='transfer')[0]
-txid = rpc.staking.withdraw_all_unbonded(bonded_staking, transfer, enckey=enckey)
+txid = rpc.staking.withdraw_all_unbonded(
+    bonded_staking, transfer, enckey=enckey,
+    # test fee calculation
+    view_keys=[
+        rpc.wallet.view_key(enckey=enckey),
+        # view key of node1
+        RPC(BASE_PORT+10).wallet.view_key(enckey=enckey),
+    ]
+)
 
 print('Wait for transaction', txid)
 wait_for_tx(rpc, txid)

integration-tests/pytests/test_small.py

@@ -0,0 +1,16 @@
+import pytest
+from chainrpc import RPC
+from .common import wait_for_tx
+
+rpc = RPC()
+
+
+@pytest.mark.withfee
+def test_deposit_amount(addresses):
+    'execute a deposit amount to self, check staking state change'
+    bonded1 = int(rpc.staking.state(addresses.unbonded_staking)['bonded'])
+    txid = rpc.staking.deposit_amount(addresses.unbonded_staking, 100000000)
+    wait_for_tx(rpc, txid)
+    rpc.wallet.sync()
+    bonded2 = int(rpc.staking.state(addresses.unbonded_staking)['bonded'])
+    assert bonded1 + 100000000 == bonded2

integration-tests/zero_fee_cluster.json

@@ -15,7 +15,7 @@
             "node_seed": "95356c3c5791cdd1601087c6448aa2a3b1f6f01ecce89b601194e0d6f27fdd7b",
             "bonded_coin": 500000000000000000,
             "unbonded_coin": 500000000000000000,
-            "base_port": 16650
+            "base_port": 26650
         }
     ],
     "chain_config_patch": [