fix: rebase errors

Author: mateuszjasiuk

apps/namadillo/src/App/Ibc/OsmosisSwap.tsx

@@ -1,10 +1,14 @@
-import { Asset, IBCTrace } from "@chain-registry/types";
+import { Asset } from "@chain-registry/types";
+import { IbcTransition } from "@chain-registry/types/assetlist.schema";
 import { Stack } from "@namada/components";
 import { AccountType, BparamsMsgValue } from "@namada/types";
 import { allDefaultAccountsAtom } from "atoms/accounts";
 import { namadaShieldedAssetsAtom } from "atoms/balance";
-import { chainParametersAtom } from "atoms/chain";
-import { findAssetsByChainId, ibcChannelsFamily } from "atoms/integrations";
+import {
+  getChainRegistryByChainId,
+  ibcChannelsFamily,
+  namadaRegistryChainAssetsMapAtom,
+} from "atoms/integrations";
 import { SwapResponse, SwapResponseError, SwapResponseOk } from "atoms/swaps";
 import { createOsmosisSwapTxAtom } from "atoms/transfer/atoms";
 import BigNumber from "bignumber.js";
@@ -13,7 +17,7 @@ import invariant from "invariant";
 import { useAtomValue } from "jotai";
 import { broadcastTransaction, signTx } from "lib/query";
 import { useCallback, useEffect, useState } from "react";
-import { AddressWithAssetAndAmount } from "types";
+import { NamadaAssetWithAmount } from "types";
 import { getSdkInstance } from "utils/sdk";
 
 const SLIPPAGE = 0.005;
@@ -28,15 +32,14 @@ export const OsmosisSwap: React.FC = () => {
     namadaShieldedAssetsAtom
   );
 
-  const chainParameters = useAtomValue(chainParametersAtom);
+  const chainAssetsMapAtom = useAtomValue(namadaRegistryChainAssetsMapAtom);
   const namadaAssets =
-    chainParameters.data ?
-      findAssetsByChainId(chainParameters.data.chainId)
-    : [];
+    chainAssetsMapAtom.isSuccess ? Object.values(chainAssetsMapAtom.data) : [];
+
   const osmosisAssets =
-    chainParameters.data ? findAssetsByChainId("osmosis-1") : [];
+    getChainRegistryByChainId("osmosis-1")?.assets.assets || [];
 
-  const [from, setFrom] = useState<AddressWithAssetAndAmount | undefined>();
+  const [from, setFrom] = useState<NamadaAssetWithAmount | undefined>();
   const [to, setTo] = useState<Asset | undefined>();
   const [amount, setAmount] = useState<string>("");
   const [recipient, setRecipient] = useState<string>(
@@ -91,7 +94,7 @@ export const OsmosisSwap: React.FC = () => {
     if (from && to && amount) {
       call();
     }
-  }, [from?.originalAddress, to?.address, amount]);
+  }, [from?.asset.address, to?.address, amount]);
 
   const defaultAccounts = useAtomValue(allDefaultAccountsAtom);
   const shieldedAccount = defaultAccounts.data?.find(
@@ -111,7 +114,7 @@ export const OsmosisSwap: React.FC = () => {
     invariant(localRecoveryAddr, "No local recovery address");
     invariant(recipient, "No recipient");
 
-    const toTrace = to.traces?.find((t): t is IBCTrace => t.type === "ibc")
+    const toTrace = to.traces?.find((t): t is IbcTransition => t.type === "ibc")
       ?.chain.path;
     invariant(toTrace, "No IBC trace found for the to asset");
     invariant(quote.route[0], "No route found in the quote");
@@ -133,7 +136,7 @@ export const OsmosisSwap: React.FC = () => {
       // osmosis channel
       channelId: "channel-7",
       portId: "transfer",
-      token: from.originalAddress,
+      token: from.asset.address,
       source: shieldedAccount.pseudoExtendedKey!,
       gasSpendingKey: shieldedAccount.pseudoExtendedKey!,
       receiver: SWAP_CONTRACT_ADDRESS,
@@ -194,7 +197,7 @@ export const OsmosisSwap: React.FC = () => {
         >
           <option value=""></option>
           {Object.values(availableAssets || {}).map((al, idx) => (
-            <option key={`${al.asset.base}_${idx}`} value={al.originalAddress}>
+            <option key={`${al.asset.base}_${idx}`} value={al.asset.address}>
               {al.asset.symbol}
             </option>
           ))}

apps/namadillo/src/atoms/transfer/services.ts

@@ -340,7 +340,7 @@ export const createOsmosisSwapTx = async (
 
   return await workerBuildTxPair({
     rpcUrl,
-    token: transfer.token,
+    nativeToken: chain.nativeTokenAddress,
     buildTxFn: async (workerLink) => {
       const msgValue = new OsmosisSwapMsgValue({
         ...props[0],

packages/shared/lib/src/sdk/args.rs

@@ -7,6 +7,7 @@ use namada_sdk::args::{
 };
 use namada_sdk::borsh::{BorshDeserialize, BorshSerialize, BorshSerializeExt};
 use namada_sdk::collections::HashMap;
+use namada_sdk::dec::Dec;
 use namada_sdk::ibc::core::host::types::identifiers::{ChannelId, PortId};
 use namada_sdk::ibc::IbcShieldingData;
 use namada_sdk::masp::partial_deauthorize;
@@ -342,9 +343,6 @@ pub enum Slippage {
         /// actual trade price. This must be a decimal number in the range
         /// `[0, 100]`.
         slippage_percentage: String,
-        /// The time period (in seconds) over which the average price is
-        /// calculated
-        window_seconds: u64,
     },
 }
 
@@ -358,11 +356,14 @@ impl From<Slippage> for args::Slippage {
             }
             Slippage::Twap {
                 slippage_percentage,
-                window_seconds,
-            } => args::Slippage::Twap {
-                slippage_percentage,
-                window_seconds,
-            },
+            } => {
+                let slippage_percentage = Dec::from_str(&slippage_percentage)
+                    .expect("Slippage percentage to be valid decimal.");
+
+                args::Slippage::Twap {
+                    slippage_percentage,
+                }
+            }
         }
     }
 }
@@ -386,12 +387,13 @@ pub struct OsmosisSwapMsg {
     pub route: Option<Vec<OsmosisPoolHop>>,
     /// The route to take through Osmosis pools
     /// A REST rpc endpoint to Osmosis
-    pub osmosis_rest_rpc: String,
+    pub osmosis_lcd_rpc: String,
 }
 
 pub fn osmosis_swap_tx_args(
     osmosis_swap_msg: &[u8],
     tx_msg: &[u8],
+    native_token: Address,
 ) -> Result<(args::TxOsmosisSwap, Option<StoredBuildParams>), JsError> {
     let osmosis_swap_msg = OsmosisSwapMsg::try_from_slice(osmosis_swap_msg)?;
 
@@ -403,10 +405,11 @@ pub fn osmosis_swap_tx_args(
         slippage,
         local_recovery_addr,
         route,
-        osmosis_rest_rpc,
+        osmosis_lcd_rpc,
     } = osmosis_swap_msg;
 
-    let (ibc_transfer_args, bparams) = ibc_transfer_tx_args(&transfer.serialize_to_vec(), tx_msg)?;
+    let (ibc_transfer_args, bparams) =
+        ibc_transfer_tx_args(&transfer.serialize_to_vec(), tx_msg, native_token)?;
 
     let recipient = match Address::from_str(&recipient) {
         Ok(address) => Ok(Either::Left(address)),
@@ -428,10 +431,12 @@ pub fn osmosis_swap_tx_args(
         output_denom,
         recipient,
         overflow: Some(overflow),
-        slippage: slippage.into(),
+        slippage: Some(slippage.into()),
         local_recovery_addr,
         route,
-        osmosis_rest_rpc,
+        osmosis_lcd_rpc: Some(osmosis_lcd_rpc),
+        // TODO: not sure if needed
+        osmosis_sqs_rpc: None,
     };
 
     Ok((tx_osmosis_swap_args, bparams))

packages/shared/lib/src/sdk/mod.rs

@@ -902,26 +902,39 @@ impl Sdk {
         osmosis_swap_msg: &[u8],
         wrapper_tx_msg: &[u8],
     ) -> Result<JsValue, JsError> {
-        let (args, bparams) = args::osmosis_swap_tx_args(osmosis_swap_msg, wrapper_tx_msg)?;
+        let (args, bparams) = args::osmosis_swap_tx_args(
+            osmosis_swap_msg,
+            wrapper_tx_msg,
+            self.namada.native_token(),
+        )?;
 
-        let _ = &self.namada.shielded_mut().await.load().await?;
-        let tx = args.into_ibc_transfer(&self.namada).await?;
+        let _ = &self
+            .namada
+            .shielded_mut()
+            .await
+            .try_load(async |_| {})
+            .await;
+
+        // TODO: check if returning true is correct here
+        let tx = args
+            .into_ibc_transfer(&self.namada, |_route, _min_amount, _quote_amount| true)
+            .await?;
 
         let bparams = if let Some(bparams) = bparams {
             BuildParams::StoredBuildParams(bparams)
         } else {
             generate_rng_build_params()
         };
 
-
         let xfvks = match tx.source {
             TransferSource::Address(_) => vec![],
             TransferSource::ExtendedKey(pek) => vec![pek.to_viewing_key()],
         };
 
         let ((tx, signing_data, _), masp_signing_data) = match bparams {
             BuildParams::RngBuildParams(mut bparams) => {
-                let tx = build_ibc_transfer(&self.namada, &tx, &mut bparams).await?;
+                // TODO: replace flase
+                let tx = build_ibc_transfer(&self.namada, &tx, &mut bparams, false).await?;
                 let masp_signing_data = MaspSigningData::new(
                     bparams
                         .to_stored()
@@ -932,7 +945,8 @@ impl Sdk {
                 (tx, masp_signing_data)
             }
             BuildParams::StoredBuildParams(mut bparams) => {
-                let tx = build_ibc_transfer(&self.namada, &tx, &mut bparams).await?;
+                // TODO: replace flase
+                let tx = build_ibc_transfer(&self.namada, &tx, &mut bparams, false).await?;
                 let masp_signing_data = MaspSigningData::new(bparams, xfvks);
 
                 (tx, masp_signing_data)

packages/shared/lib/src/sdk/tx.rs

@@ -4,7 +4,6 @@ use std::str::FromStr;
 use gloo_utils::format::JsValueSerdeExt;
 use namada_sdk::borsh::{self, BorshDeserialize, BorshSerialize};
 use namada_sdk::collections::HashSet;
-use namada_sdk::collections::hash_set::IndexSet;
 use namada_sdk::masp_primitives::transaction::components::sapling::builder::StoredBuildParams;
 use namada_sdk::masp_primitives::transaction::components::sapling::fees::{InputView, OutputView};
 use namada_sdk::masp_primitives::zip32::ExtendedFullViewingKey;
@@ -105,10 +104,10 @@ impl SigningData {
             None => None,
         };
 
-        let mut public_keys = vec![];
+        let mut public_keys = HashSet::new();
         for pk in self.public_keys.clone() {
             let pk = PublicKey::from_str(&pk)?;
-            public_keys.push(pk);
+            public_keys.insert(pk);
         }
 
         let fee_payer = PublicKey::from_str(&self.fee_payer)?;