Remove non-essential fields from ERC20 transfer structs

.changelog/unreleased/features/1290-token-whitelist.md

@@ -0,0 +1,2 @@
+- Implement Ethereum token whitelist.
+  ([\#1290](https://github.com/anoma/namada/issues/1290))

.changelog/unreleased/features/1781-cap-wnam.md

@@ -0,0 +1,2 @@
+- Control the flow of NAM over the Ethereum bridge
+  ([\#1781](https://github.com/anoma/namada/pull/1781))

.changelog/unreleased/features/1789-update-ethbridge-rs.md

@@ -0,0 +1,2 @@
+- Update ethbridge-rs to v0.22.0
+  ([\#1789](https://github.com/anoma/namada/pull/1789))

Cargo.toml

@@ -66,6 +66,12 @@ directories = "4.0.1"
 ed25519-consensus = "1.2.0"
 escargot = "0.5.7"
 ethabi = "18.0.0"
+ethbridge-bridge-contract = {git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.22.0"}
+ethbridge-bridge-events = {git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.22.0"}
+ethbridge-events = {git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.22.0"}
+ethbridge-governance-contract = {git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.22.0"}
+ethbridge-governance-events = {git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.22.0"}
+ethbridge-structs = { git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.22.0" }
 ethers = "2.0.0"
 expectrl = "0.7.0"
 eyre = "0.6.5"

apps/Cargo.toml

@@ -87,9 +87,9 @@ derivative.workspace = true
 directories.workspace = true
 ed25519-consensus.workspace = true
 ethabi.workspace = true
-ethbridge-bridge-events = {git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.18.0"}
-ethbridge-events = {git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.18.0"}
-ethbridge-governance-events = {git = "https://github.com/heliaxdev/ethbridge-rs", tag = "v0.18.0"}
+ethbridge-bridge-events.workspace = true
+ethbridge-events.workspace = true
+ethbridge-governance-events.workspace = true
 eyre.workspace = true
 fd-lock.workspace = true
 ferveo-common.workspace = true

apps/src/lib/cli.rs

@@ -2513,6 +2513,7 @@ pub mod args {
     pub const NET_ADDRESS: Arg<SocketAddr> = arg("net-address");
     pub const NAMADA_START_TIME: ArgOpt<DateTimeUtc> = arg_opt("time");
     pub const NO_CONVERSIONS: ArgFlag = flag("no-conversions");
+    pub const NUT: ArgFlag = flag("nut");
     pub const OUT_FILE_PATH_OPT: ArgOpt<PathBuf> = arg_opt("out-file-path");
     pub const OUTPUT_FOLDER_PATH: ArgOpt<PathBuf> =
         arg_opt("output-folder-path");
@@ -2787,6 +2788,7 @@ pub mod args {
     impl CliToSdk<EthereumBridgePool<SdkTypes>> for EthereumBridgePool<CliTypes> {
         fn to_sdk(self, ctx: &mut Context) -> EthereumBridgePool<SdkTypes> {
             EthereumBridgePool::<SdkTypes> {
+                nut: self.nut,
                 tx: self.tx.to_sdk(ctx),
                 asset: self.asset,
                 recipient: self.recipient,
@@ -2809,6 +2811,7 @@ pub mod args {
             let fee_amount = FEE_AMOUNT.parse(matches).amount;
             let fee_payer = FEE_PAYER.parse(matches);
             let code_path = PathBuf::from(TX_BRIDGE_POOL_WASM);
+            let nut = NUT.parse(matches);
             Self {
                 tx,
                 asset,
@@ -2818,6 +2821,7 @@ pub mod args {
                 fee_amount,
                 fee_payer,
                 code_path,
+                nut,
             }
         }
 
@@ -2852,6 +2856,10 @@ pub mod args {
                         "The Namada address of the account paying the fee.",
                     ),
                 )
+                .arg(NUT.def().help(
+                    "Add Non Usable Tokens (NUTs) to the Bridge pool. These \
+                     are usually obtained from invalid transfers to Namada.",
+                ))
         }
     }
 

apps/src/lib/config/genesis.rs

@@ -909,10 +909,13 @@ pub fn genesis(
 }
 #[cfg(any(test, feature = "dev"))]
 pub fn genesis(num_validators: u64) -> Genesis {
-    use namada::ledger::eth_bridge::{Contracts, UpgradeableContract};
+    use namada::ledger::eth_bridge::{
+        Contracts, Erc20WhitelistEntry, UpgradeableContract,
+    };
     use namada::types::address::{
         self, apfel, btc, dot, eth, kartoffel, nam, schnitzel, wnam,
     };
+    use namada::types::ethereum_events::testing::DAI_ERC20_ETH_ADDRESS;
     use namada::types::ethereum_events::EthAddress;
 
     use crate::wallet;
@@ -1115,6 +1118,13 @@ pub fn genesis(num_validators: u64) -> Genesis {
         gov_params: GovernanceParameters::default(),
         pgf_params: PgfParameters::default(),
         ethereum_bridge_params: Some(EthereumBridgeConfig {
+            erc20_whitelist: vec![Erc20WhitelistEntry {
+                token_address: DAI_ERC20_ETH_ADDRESS,
+                token_cap: token::DenominatedAmount {
+                    amount: token::Amount::max(),
+                    denom: 18.into(),
+                },
+            }],
             eth_start_height: Default::default(),
             min_confirmations: Default::default(),
             contracts: Contracts {

apps/src/lib/node/ledger/ethereum_oracle/events.rs

@@ -7,16 +7,16 @@ pub mod eth_events {
     };
     use ethbridge_events::{DynEventCodec, Events as RawEvents};
     use ethbridge_governance_events::{
-        GovernanceEvents, NewContractFilter, UpdateBridgeWhitelistFilter,
-        UpgradedContractFilter, ValidatorSetUpdateFilter,
+        GovernanceEvents, NewContractFilter, UpgradedContractFilter,
+        ValidatorSetUpdateFilter,
     };
     use namada::core::types::ethereum_structs;
     use namada::eth_bridge::ethers::contract::EthEvent;
     use namada::types::address::Address;
     use namada::types::ethereum_events::{
-        EthAddress, EthereumEvent, TokenWhitelist, TransferToEthereum,
-        TransferToNamada, Uint,
+        EthAddress, EthereumEvent, TransferToEthereum, TransferToNamada, Uint,
     };
+    use namada::types::hash::Hash;
     use namada::types::keccak::KeccakHash;
     use namada::types::token::Amount;
     use num256::Uint256;
@@ -106,31 +106,6 @@ pub mod eth_events {
                         NewContractFilter::name().into(),
                     ));
                 }
-                RawEvents::Governance(
-                    GovernanceEvents::UpdateBridgeWhitelistFilter(
-                        UpdateBridgeWhitelistFilter {
-                            nonce,
-                            tokens,
-                            token_cap,
-                        },
-                    ),
-                ) => {
-                    let mut whitelist = vec![];
-
-                    for (token, cap) in
-                        tokens.into_iter().zip(token_cap.into_iter())
-                    {
-                        whitelist.push(TokenWhitelist {
-                            token: token.parse_eth_address()?,
-                            cap: cap.parse_amount()?,
-                        });
-                    }
-
-                    EthereumEvent::UpdateBridgeWhitelist {
-                        nonce: nonce.parse_uint256()?,
-                        whitelist,
-                    }
-                }
                 RawEvents::Governance(
                     GovernanceEvents::UpgradedContractFilter(
                         UpgradedContractFilter { name: _, addr: _ },
@@ -178,24 +153,33 @@ pub mod eth_events {
         };
     }
 
-    /// Trait to add parsing methods to foreign types.
-    trait Parse: Sized {
-        parse_method! { parse_eth_address -> EthAddress }
-        parse_method! { parse_address -> Address }
-        parse_method! { parse_amount -> Amount }
-        parse_method! { parse_u32 -> u32 }
-        parse_method! { parse_uint256 -> Uint }
-        parse_method! { parse_bool -> bool }
-        parse_method! { parse_string -> String }
-        parse_method! { parse_keccak -> KeccakHash }
-        parse_method! { parse_amount_array -> Vec<Amount> }
-        parse_method! { parse_eth_address_array -> Vec<EthAddress> }
-        parse_method! { parse_address_array -> Vec<Address> }
-        parse_method! { parse_string_array -> Vec<String> }
-        parse_method! { parse_transfer_to_namada_array -> Vec<TransferToNamada> }
-        parse_method! { parse_transfer_to_namada -> TransferToNamada }
-        parse_method! { parse_transfer_to_eth_array -> Vec<TransferToEthereum> }
-        parse_method! { parse_transfer_to_eth -> TransferToEthereum }
+    macro_rules! trait_parse_def {
+        ($($name:ident -> $type:ty;)*) => {
+            /// Trait to add parsing methods to foreign types.
+            trait Parse: Sized {
+                $( parse_method!($name -> $type); )*
+            }
+        }
+    }
+
+    trait_parse_def! {
+        parse_address -> Address;
+        parse_address_array -> Vec<Address>;
+        parse_amount -> Amount;
+        parse_amount_array -> Vec<Amount>;
+        parse_bool -> bool;
+        parse_eth_address -> EthAddress;
+        parse_eth_address_array -> Vec<EthAddress>;
+        parse_hash -> Hash;
+        parse_keccak -> KeccakHash;
+        parse_string -> String;
+        parse_string_array -> Vec<String>;
+        parse_transfer_to_eth -> TransferToEthereum;
+        parse_transfer_to_eth_array -> Vec<TransferToEthereum>;
+        parse_transfer_to_namada -> TransferToNamada;
+        parse_transfer_to_namada_array -> Vec<TransferToNamada>;
+        parse_u32 -> u32;
+        parse_uint256 -> Uint;
     }
 
     impl Parse for ethabi::Address {
@@ -217,7 +201,13 @@ pub mod eth_events {
 
     impl Parse for ethabi::Uint {
         fn parse_amount(self) -> Result<Amount> {
-            Ok(Amount::from(self.as_u64()))
+            let uint = {
+                use namada::core::types::uint::Uint as NamadaUint;
+                let mut num_buf = [0; 32];
+                self.to_little_endian(&mut num_buf);
+                NamadaUint::from_little_endian(&num_buf)
+            };
+            Amount::from_uint(uint, 0).map_err(|e| Error::Decode(e.to_string()))
         }
 
         fn parse_u32(self) -> Result<u32> {
@@ -239,6 +229,10 @@ pub mod eth_events {
         fn parse_keccak(self) -> Result<KeccakHash> {
             Ok(KeccakHash(self))
         }
+
+        fn parse_hash(self) -> Result<Hash> {
+            Ok(Hash(self))
+        }
     }
 
     impl Parse for Vec<ethabi::Uint> {
@@ -298,17 +292,13 @@ pub mod eth_events {
         fn parse_transfer_to_eth(self) -> Result<TransferToEthereum> {
             let asset = self.from.parse_eth_address()?;
             let receiver = self.to.parse_eth_address()?;
-            let sender = self.sender.parse_address()?;
             let amount = self.amount.parse_amount()?;
-            let gas_payer = self.fee_from.parse_address()?;
-            let gas_amount = self.fee.parse_amount()?;
+            let checksum = self.namada_data_digest.parse_hash()?;
             Ok(TransferToEthereum {
                 asset,
                 amount,
-                sender,
                 receiver,
-                gas_amount,
-                gas_payer,
+                checksum,
             })
         }
     }
@@ -332,7 +322,7 @@ pub mod eth_events {
         use ethabi::ethereum_types::{H160, U256};
         use ethbridge_events::{
             TRANSFER_TO_ERC_CODEC, TRANSFER_TO_NAMADA_CODEC,
-            UPDATE_BRIDGE_WHITELIST_CODEC, VALIDATOR_SET_UPDATE_CODEC,
+            VALIDATOR_SET_UPDATE_CODEC,
         };
         use namada::eth_bridge::ethers::abi::AbiEncode;
 
@@ -526,10 +516,8 @@ pub mod eth_events {
                     ethereum_structs::Erc20Transfer {
                         from: H160([1; 20]),
                         to: H160([2; 20]),
-                        sender: address.clone(),
                         amount: 0u64.into(),
-                        fee_from: address.clone(),
-                        fee: 0u64.into(),
+                        namada_data_digest: [0; 32],
                     };
                     2
                 ],
@@ -542,11 +530,6 @@ pub mod eth_events {
                 bridge_validator_set_hash: [1; 32],
                 governance_validator_set_hash: [2; 32],
             };
-            let whitelist = UpdateBridgeWhitelistFilter {
-                nonce: 0u64.into(),
-                tokens: vec![H160([0; 20]); 2],
-                token_cap: vec![0u64.into(); 2],
-            };
             assert_eq!(
                 {
                     let decoded: TransferToNamadaFilter =
@@ -582,18 +565,6 @@ pub mod eth_events {
                 },
                 update
             );
-            assert_eq!(
-                {
-                    let decoded: UpdateBridgeWhitelistFilter =
-                        UPDATE_BRIDGE_WHITELIST_CODEC
-                            .decode(&get_log(whitelist.clone().encode()))
-                            .expect("Test failed")
-                            .try_into()
-                            .expect("Test failed");
-                    decoded
-                },
-                whitelist
-            );
         }
 
         /// Return an Ethereum events log, from the given encoded event