Use caller instead of from address (#2030)

* - add sol init account

* - precompile + basic tests

* deposit precompile

* refactor test

* use caller instead of from address

* add amount field comment

* few tweaks

* roll back init-account changes

* remove unintended changes

* remove unintended changes - 2

* use caller in transfer

* init account precompile integration test

* deposit precompile integration test

* transfer precompile integration test

* self review

integration_test/confidential_transfers_module/deposit_test.yaml

@@ -140,3 +140,85 @@
     # Verify that the deposit was unsuccessful
     - type: eval
       expr: DEPOSIT_CODE == 18
+
+- name: Test depositing to confidential token account via precompile
+  inputs:
+    # Setup test account
+    - cmd: printf "12345678\n" | seid keys add ctprdeposit
+    - cmd: printf "12345678\n" | seid keys show -a admin
+      env: ADMIN_ADDR
+    - cmd: printf "12345678\n" | seid keys show -a ctprdeposit
+      env: TEST_PRECOMPILE_ADDR
+    - cmd: printf "12345678\n" | seid tx bank send $ADMIN_ADDR $TEST_PRECOMPILE_ADDR 10sei -b block --fees 2000usei --chain-id sei -y --output json | jq -r ".code"
+    - cmd: printf "12345678\n" | seid tx bank send $ADMIN_ADDR $TEST_PRECOMPILE_ADDR 20000uatom -b block --fees 2000usei --chain-id sei -y --output json | jq -r ".code"
+
+    # Initialize confidential token account for denom uatom for ctprdeposit
+    - cmd: printf "12345678\n" | seid tx ct init-account uatom --from ctprdeposit --fees 4000usei --chain-id sei -b block -y --output json | jq -r ".code"
+      env: INIT_ACCOUNT_CODE
+
+    # Query the initial account state
+    - cmd: printf "12345678\n" | seid q ct account uatom $TEST_PRECOMPILE_ADDR --decryptor ctprdeposit --output json
+      env: INITIAL_ACCOUNT_STATE
+    - cmd: echo $INITIAL_ACCOUNT_STATE | jq -r ".combined_pending_balance"
+      env: INITIAL_PENDING_BALANCE
+    - cmd: echo $INITIAL_ACCOUNT_STATE | jq -r ".pending_balance_credit_counter"
+      env: INITIAL_PENDING_BALANCE_COUNTER
+    - cmd: echo $INITIAL_ACCOUNT_STATE | jq -r ".decryptable_available_balance"
+      env: INITIAL_AVAILABLE_BALANCE
+
+    # Query the initial bank balance
+    - cmd: seid q bank balances $TEST_PRECOMPILE_ADDR --denom uatom --output json | jq -r ".amount"
+      env: INITIAL_BANK_BALANCE
+
+    # Deposit to the confidential token account via precompile
+    - cmd: |
+        printf "12345678\n" | seid tx evm call-contract --from ctprdeposit --fees=40000usei --gas=2000000 0x0000000000000000000000000000000000001010 -b block "$(printf "12345678\n" | seid q evm payload precompiles/confidentialtransfers/abi.json deposit uatom 2500)" | sed "s/.*: //"
+      env: TX_HASH
+    - cmd: sleep 2
+    # Query the Cosmos tx hash
+    - cmd: |
+        curl --location --request GET "localhost:8545/" --header "Content-Type: application/json" --data "{\"jsonrpc\":\"2.0\",\"method\":\"sei_getCosmosTx\",\"params\":[\"$TX_HASH\"],\"id\":788}" | jq -r ".result"
+      env: COSMOS_TX_HASH
+
+    # Query the Cosmos tx result
+    - cmd: seid q tx $COSMOS_TX_HASH --output json | jq -r ".code"
+      env: DEPOSIT_CODE
+
+    # Query the account to verify the new account state
+    - cmd: printf "12345678\n" | seid q ct account uatom $TEST_PRECOMPILE_ADDR --decryptor ctprdeposit --output json
+      env: FINAL_ACCOUNT_STATE
+    - cmd: echo $FINAL_ACCOUNT_STATE | jq -r ".combined_pending_balance"
+      env: FINAL_PENDING_BALANCE
+    - cmd: echo $FINAL_ACCOUNT_STATE | jq -r ".pending_balance_credit_counter"
+      env: FINAL_PENDING_BALANCE_COUNTER
+    - cmd: echo $FINAL_ACCOUNT_STATE | jq -r ".decryptable_available_balance"
+      env: FINAL_AVAILABLE_BALANCE
+
+    # Query the bank balance after deposit
+    - cmd: seid q bank balances $TEST_PRECOMPILE_ADDR --denom uatom --output json | jq -r ".amount"
+      env: FINAL_BANK_BALANCE
+
+  verifiers:
+    # Verify that the account exists after the instruction is executed.
+    - type: eval
+      expr: INIT_ACCOUNT_CODE == 0 or INIT_ACCOUNT_CODE == 38
+
+    # Verify that the deposit was successful
+    - type: eval
+      expr: DEPOSIT_CODE == 0
+
+    # Verify that the pending balance increased by the deposit amount
+    - type: eval
+      expr: FINAL_PENDING_BALANCE - INITIAL_PENDING_BALANCE == 2500
+
+    # Verify that the pending balance counter increased by 1
+    - type: eval
+      expr: FINAL_PENDING_BALANCE_COUNTER - INITIAL_PENDING_BALANCE_COUNTER == 1
+
+    # Verify that the available balance is untouched by this operation
+    - type: eval
+      expr: INITIAL_AVAILABLE_BALANCE == FINAL_AVAILABLE_BALANCE
+
+    # Verify that the bank balance decreased by the deposit amount
+    - type: eval
+      expr: INITIAL_BANK_BALANCE - FINAL_BANK_BALANCE == 2500

integration_test/confidential_transfers_module/initialize_account_test.yaml

@@ -58,4 +58,40 @@
   verifiers:
     # Verify that the account initialization was unsuccessful
     - type: eval
-      expr: INIT_ACCOUNT_CODE == 18
+      expr: INIT_ACCOUNT_CODE == 18
+
+- name: Test initializing confidential token account via precompile
+  inputs:
+    # Setup test account
+    - cmd: printf "12345678\n" | seid keys add ctpr
+    - cmd: printf "12345678\n" | seid keys show -a admin
+      env: ADMIN_ADDR
+    - cmd: printf "12345678\n" | seid keys show -a ctpr
+      env: TEST_PRECOMPILE_ADDR
+    - cmd: printf "12345678\n" | seid tx bank send $ADMIN_ADDR $TEST_PRECOMPILE_ADDR 10sei -b block --fees 2000usei --chain-id sei -y
+
+    - cmd: |
+        printf "12345678\n" | seid tx evm call-contract --from ctpr --fees=40000usei --gas=2000000 0x0000000000000000000000000000000000001010 -b block "$(printf "12345678\n" | seid q evm ct-init-account-payload precompiles/confidentialtransfers/abi.json "${TEST_PRECOMPILE_ADDR}" usei)" | sed "s/.*: //"
+      env: TX_HASH
+    - cmd: sleep 2
+    # Query the Cosmos tx hash
+    - cmd: |
+        curl --location --request GET "localhost:8545/" --header "Content-Type: application/json" --data "{\"jsonrpc\":\"2.0\",\"method\":\"sei_getCosmosTx\",\"params\":[\"$TX_HASH\"],\"id\":788}" | jq -r ".result"
+      env: COSMOS_TX_HASH
+
+    # Query the Cosmos tx result
+    - cmd: seid q tx $COSMOS_TX_HASH --output json | jq -r ".code"
+      env: COSMOS_TX_RESULT
+
+    # Query the account to verify it was set up
+    - cmd: seid q ct account usei $TEST_PRECOMPILE_ADDR --output json | jq -r ".pending_balance_credit_counter"
+      env: ACCOUNT_PENDING_BALANCE_COUNTER
+
+  verifiers:
+    # Verify that the account initialization was successful
+    - type: eval
+      expr: COSMOS_TX_RESULT == 0
+
+    # Verify that the account exists
+    - type: eval
+      expr: ACCOUNT_PENDING_BALANCE_COUNTER == 0

integration_test/confidential_transfers_module/transfer_test.yaml

@@ -195,4 +195,123 @@
 
     # Verify that the transfer was unsuccessful due to uninitialized account
     - type: eval
-      expr: TRANSFER_CODE != 0
+      expr: TRANSFER_CODE != 0
+
+- name: Test transferring from confidential token account via precompile
+  inputs:
+    # Setup test accounts
+    - cmd: printf "12345678\n" | seid keys add ctprsender
+    - cmd: printf "12345678\n" | seid keys add ctprrecipient
+    - cmd: printf "12345678\n" | seid keys show -a admin
+      env: ADMIN_ADDR
+    - cmd: printf "12345678\n" | seid keys show -a ctprsender
+      env: PRECOMPILE_SENDER_ADDR
+    - cmd: printf "12345678\n" | seid keys show -a ctprrecipient
+      env: PRECOMPILE_RECIPIENT_ADDR
+    - cmd: printf "12345678\n" | seid tx bank send $ADMIN_ADDR $PRECOMPILE_SENDER_ADDR 10sei -b block --fees 2000usei --chain-id sei -y --output json | jq -r ".code"
+    - cmd: printf "12345678\n" | seid tx bank send $ADMIN_ADDR $PRECOMPILE_SENDER_ADDR 100000000uatom -b block --fees 2000usei --chain-id sei -y --output json | jq -r ".code"
+    - cmd: printf "12345678\n" | seid tx bank send $ADMIN_ADDR $PRECOMPILE_RECIPIENT_ADDR 10sei -b block --fees 2000usei --chain-id sei -y --output json | jq -r ".code"
+    - cmd: printf "12345678\n" | seid tx bank send $ADMIN_ADDR $PRECOMPILE_RECIPIENT_ADDR 100000000uatom -b block --fees 2000usei --chain-id sei -y --output json | jq -r ".code"
+
+    # Set the transfer amount
+    - cmd: echo 500000
+      env: TRANSFER_AMOUNT
+
+    # Initialize confidential token accounts for denom uatom
+    - cmd: printf "12345678\n" | seid tx ct init-account uatom --from ctprsender --fees 4000usei --chain-id sei -b block -y --output json | jq -r ".code"
+      env: INIT_SENDER_ACCOUNT_CODE
+    - cmd: printf "12345678\n" | seid tx ct init-account uatom --from ctprrecipient --fees 4000usei --chain-id sei -b block -y --output json | jq -r ".code"
+      env: INIT_RECIPIENT_ACCOUNT_CODE
+
+    # Deposit to the sender confidential token account and apply the pending balance
+    - cmd: printf "12345678\n" | seid tx ct deposit ${TRANSFER_AMOUNT}uatom --from ctprsender --fees 4000usei --chain-id sei -b block -y --output json | jq -r ".code"
+      env: DEPOSIT_CODE
+    - cmd: printf "12345678\n" | seid tx ct apply-pending-balance uatom --from ctprsender --fees 4000usei --chain-id sei -b block -y --output json | jq -r ".code"
+      env: APPLY_PENDING_BALANCE_CODE
+
+    # Query the sender initial account state
+    - cmd: printf "12345678\n" | seid q ct account uatom $PRECOMPILE_SENDER_ADDR --decryptor ctprsender --output json
+      env: INITIAL_SENDER_ACCOUNT_STATE
+    - cmd: echo $INITIAL_SENDER_ACCOUNT_STATE | jq -r ".combined_pending_balance"
+      env: INITIAL_SENDER_PENDING_BALANCE
+    - cmd: echo $(( $(echo $INITIAL_SENDER_ACCOUNT_STATE | jq -r ".decryptable_available_balance") )) # Convert to integer
+      env: INITIAL_SENDER_AVAILABLE_BALANCE
+
+    # Query the recipient initial account state
+    - cmd: printf "12345678\n" | seid q ct account uatom $PRECOMPILE_RECIPIENT_ADDR --decryptor ctprrecipient --output json
+      env: INITIAL_RECIPIENT_ACCOUNT_STATE
+    - cmd: echo $INITIAL_RECIPIENT_ACCOUNT_STATE | jq -r ".combined_pending_balance"
+      env: INITIAL_RECIPIENT_PENDING_BALANCE
+    - cmd: echo $INITIAL_RECIPIENT_ACCOUNT_STATE | jq -r ".pending_balance_credit_counter"
+      env: INITIAL_RECIPIENT_PENDING_COUNTER
+    - cmd: echo $(( $(echo $INITIAL_RECIPIENT_ACCOUNT_STATE | jq -r ".decryptable_available_balance") )) # Convert to integer
+      env: INITIAL_RECIPIENT_AVAILABLE_BALANCE
+
+    # Transfer from the confidential token account via precompile
+    - cmd: |
+        printf "12345678\n" | seid tx evm call-contract --from ctprsender --fees=40000usei --gas=2000000 0x0000000000000000000000000000000000001010 -b block "$(printf "12345678\n" | seid q evm ct-transfer-payload precompiles/confidentialtransfers/abi.json ${PRECOMPILE_SENDER_ADDR} ${PRECOMPILE_RECIPIENT_ADDR} ${TRANSFER_AMOUNT}uatom)" | sed "s/.*: //"
+      env: TX_HASH
+    - cmd: sleep 2
+    # Query the Cosmos tx hash
+    - cmd: |
+        curl --location --request GET "localhost:8545/" --header "Content-Type: application/json" --data "{\"jsonrpc\":\"2.0\",\"method\":\"sei_getCosmosTx\",\"params\":[\"$TX_HASH\"],\"id\":788}" | jq -r ".result"
+      env: COSMOS_TX_HASH
+
+    # Query the Cosmos tx result
+    - cmd: seid q tx $COSMOS_TX_HASH --output json | jq -r ".code"
+      env: TRANSFER_CODE
+
+    # Query the sender account to verify the new account state
+    - cmd: printf "12345678\n" | seid q ct account uatom $PRECOMPILE_SENDER_ADDR --decryptor ctprsender --output json
+      env: FINAL_SENDER_ACCOUNT_STATE
+    - cmd: echo $FINAL_SENDER_ACCOUNT_STATE | jq -r ".combined_pending_balance"
+      env: FINAL_SENDER_PENDING_BALANCE
+    - cmd: echo $(( $(echo $FINAL_SENDER_ACCOUNT_STATE | jq -r ".decryptable_available_balance") )) # Convert to integer
+      env: FINAL_SENDER_AVAILABLE_BALANCE
+
+    # Query the recipient account to verify the new account state
+    - cmd: printf "12345678\n" | seid q ct account uatom $PRECOMPILE_RECIPIENT_ADDR --decryptor ctprrecipient --output json
+      env: FINAL_RECIPIENT_ACCOUNT_STATE
+    - cmd: echo $FINAL_RECIPIENT_ACCOUNT_STATE | jq -r ".combined_pending_balance"
+      env: FINAL_RECIPIENT_PENDING_BALANCE
+    - cmd: echo $FINAL_RECIPIENT_ACCOUNT_STATE | jq -r ".pending_balance_credit_counter"
+      env: FINAL_RECIPIENT_PENDING_COUNTER
+    - cmd: echo $(( $(echo $FINAL_RECIPIENT_ACCOUNT_STATE | jq -r ".decryptable_available_balance") )) # Convert to integer
+      env: FINAL_RECIPIENT_AVAILABLE_BALANCE
+
+  verifiers:
+    # Verify that the account exists after the instruction is executed.
+    - type: eval
+      expr: INIT_SENDER_ACCOUNT_CODE == 0 or INIT_SENDER_ACCOUNT_CODE == 38
+    - type: eval
+      expr: INIT_RECIPIENT_ACCOUNT_CODE == 0 or INIT_RECIPIENT_ACCOUNT_CODE == 38
+
+    # Verify that the deposit was successful
+    - type: eval
+      expr: DEPOSIT_CODE == 0
+
+    # Verify that the apply pending balance was successful
+    - type: eval
+      expr: APPLY_PENDING_BALANCE_CODE == 0
+
+    # Verify that the transfer was successful
+    - type: eval
+      expr: TRANSFER_CODE == 0
+
+    # Verify that the sender available balance decreased by the transfer amount
+    - type: eval
+      expr: INITIAL_SENDER_AVAILABLE_BALANCE - FINAL_SENDER_AVAILABLE_BALANCE == TRANSFER_AMOUNT
+
+    # Verify that the sender pending balance was left untouched
+    - type: eval
+      expr: INITIAL_SENDER_PENDING_BALANCE == FINAL_SENDER_PENDING_BALANCE
+
+    # Verify that the recipient available balance was untouched by the transfer
+    - type: eval
+      expr: FINAL_RECIPIENT_AVAILABLE_BALANCE - INITIAL_RECIPIENT_AVAILABLE_BALANCE == 0
+
+    # Verify that the recipients pending balance was increased by the transfer amount
+    - type: eval
+      expr: INITIAL_RECIPIENT_PENDING_BALANCE + TRANSFER_AMOUNT == FINAL_RECIPIENT_PENDING_BALANCE
+    - type: eval
+      expr: INITIAL_RECIPIENT_PENDING_COUNTER + 1 == FINAL_RECIPIENT_PENDING_COUNTER

precompiles/confidentialtransfers/CT.sol

@@ -20,7 +20,6 @@ interface ICT {
     ) external returns (bool success);
 
     function transfer(
-        string fromAddress,
         string toAddress,
         string denom,
         bytes fromAmountLo,
@@ -32,7 +31,6 @@ interface ICT {
     ) external returns (bool success);
 
     function transferWithAuditors(
-        string fromAddress,
         string toAddress,
         string denom,
         bytes fromAmountLo,
@@ -54,8 +52,8 @@ interface ICT {
         bytes transferAmountHiEqualityProof;
     }
 
+    // for usei denom amount should be treated as 6 decimal instead of 19 decimal
     function deposit(
-        string fromAddress,
         string denom,
         uint64 amount
     ) external returns (bool success);

precompiles/confidentialtransfers/abi.json

@@ -1 +1 @@
-[{"inputs":[{"internalType":"string","name":"fromAddress","type":"string"},{"internalType":"string","name":"toAddress","type":"string"},{"internalType":"string","name":"denom","type":"string"},{"internalType":"bytes","name":"fromAmountLo","type":"bytes"},{"internalType":"bytes","name":"fromAmountHi","type":"bytes"},{"internalType":"bytes","name":"toAmountLo","type":"bytes"},{"internalType":"bytes","name":"toAmountHi","type":"bytes"},{"internalType":"bytes","name":"remainingBalance","type":"bytes"},{"internalType":"string","name":"decryptableAvailableBalance","type":"string"},{"internalType":"bytes","name":"proofs","type":"bytes"}],"name":"transfer","outputs":[{"internalType":"bool","name":"success","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"fromAddress","type":"string"},{"internalType":"string","name":"toAddress","type":"string"},{"internalType":"string","name":"denom","type":"string"},{"internalType":"bytes","name":"fromAmountLo","type":"bytes"},{"internalType":"bytes","name":"fromAmountHi","type":"bytes"},{"internalType":"bytes","name":"toAmountLo","type":"bytes"},{"internalType":"bytes","name":"toAmountHi","type":"bytes"},{"internalType":"bytes","name":"remainingBalance","type":"bytes"},{"internalType":"string","name":"decryptableAvailableBalance","type":"string"},{"internalType":"bytes","name":"proofs","type":"bytes"},{"internalType":"struct Auditor[]","name":"auditors","type":"tuple[]","components":[{"internalType":"string","name":"auditorAddress","type":"string"},{"internalType":"bytes","name":"encryptedTransferAmountLo","type":"bytes"},{"internalType":"bytes","name":"encryptedTransferAmountHi","type":"bytes"},{"internalType":"bytes","name":"transferAmountLoValidityProof","type":"bytes"},{"internalType":"bytes","name":"transferAmountHiValidityProof","type":"bytes"},{"internalType":"bytes","name":"transferAmountLoEqualityProof","type":"bytes"},{"internalType":"bytes","name":"transferAmountHiEqualityProof","type":"bytes"}]}],"name":"transferWithAuditors","outputs":[{"internalType":"bool","name":"success","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"fromAddress","type":"string"},{"internalType":"string","name":"denom","type":"string"},{"internalType":"bytes","name":"publicKey","type":"bytes"},{"internalType":"string","name":"decryptableBalance","type":"string"},{"internalType":"bytes","name":"pendingBalanceLo","type":"bytes"},{"internalType":"bytes","name":"pendingBalanceHi","type":"bytes"},{"internalType":"bytes","name":"availableBalance","type":"bytes"},{"internalType":"bytes","name":"proofs","type":"bytes"}],"name":"initializeAccount","outputs":[{"internalType":"bool","name":"success","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"fromAddress","type":"string"},{"internalType":"string","name":"denom","type":"string"},{"internalType":"uint64","name":"amount","type":"uint64"}],"name":"deposit","outputs":[{"internalType":"bool","name":"success","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]
+[{"inputs":[{"internalType":"string","name":"toAddress","type":"string"},{"internalType":"string","name":"denom","type":"string"},{"internalType":"bytes","name":"fromAmountLo","type":"bytes"},{"internalType":"bytes","name":"fromAmountHi","type":"bytes"},{"internalType":"bytes","name":"toAmountLo","type":"bytes"},{"internalType":"bytes","name":"toAmountHi","type":"bytes"},{"internalType":"bytes","name":"remainingBalance","type":"bytes"},{"internalType":"string","name":"decryptableAvailableBalance","type":"string"},{"internalType":"bytes","name":"proofs","type":"bytes"}],"name":"transfer","outputs":[{"internalType":"bool","name":"success","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"toAddress","type":"string"},{"internalType":"string","name":"denom","type":"string"},{"internalType":"bytes","name":"fromAmountLo","type":"bytes"},{"internalType":"bytes","name":"fromAmountHi","type":"bytes"},{"internalType":"bytes","name":"toAmountLo","type":"bytes"},{"internalType":"bytes","name":"toAmountHi","type":"bytes"},{"internalType":"bytes","name":"remainingBalance","type":"bytes"},{"internalType":"string","name":"decryptableAvailableBalance","type":"string"},{"internalType":"bytes","name":"proofs","type":"bytes"},{"internalType":"struct Auditor[]","name":"auditors","type":"tuple[]","components":[{"internalType":"string","name":"auditorAddress","type":"string"},{"internalType":"bytes","name":"encryptedTransferAmountLo","type":"bytes"},{"internalType":"bytes","name":"encryptedTransferAmountHi","type":"bytes"},{"internalType":"bytes","name":"transferAmountLoValidityProof","type":"bytes"},{"internalType":"bytes","name":"transferAmountHiValidityProof","type":"bytes"},{"internalType":"bytes","name":"transferAmountLoEqualityProof","type":"bytes"},{"internalType":"bytes","name":"transferAmountHiEqualityProof","type":"bytes"}]}],"name":"transferWithAuditors","outputs":[{"internalType":"bool","name":"success","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"fromAddress","type":"string"},{"internalType":"string","name":"denom","type":"string"},{"internalType":"bytes","name":"publicKey","type":"bytes"},{"internalType":"string","name":"decryptableBalance","type":"string"},{"internalType":"bytes","name":"pendingBalanceLo","type":"bytes"},{"internalType":"bytes","name":"pendingBalanceHi","type":"bytes"},{"internalType":"bytes","name":"availableBalance","type":"bytes"},{"internalType":"bytes","name":"proofs","type":"bytes"}],"name":"initializeAccount","outputs":[{"internalType":"bool","name":"success","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"denom","type":"string"},{"internalType":"uint64","name":"amount","type":"uint64"}],"name":"deposit","outputs":[{"internalType":"bool","name":"success","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]