Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: take fee on to usdc #4801

Merged
merged 5 commits into from
Apr 26, 2024
Merged

Conversation

kylezs
Copy link
Contributor

@kylezs kylezs commented Apr 25, 2024

No description provided.

@kylezs kylezs requested review from ahasna, xtroleum, jerryafr and GabrielBuragev and removed request for a team April 25, 2024 14:56
@kylezs kylezs changed the base branch from main to release/1.3 April 25, 2024 14:56
Copy link

codecov bot commented Apr 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72%. Comparing base (340cf13) to head (c6c58be).

Additional details and impacted files
@@             Coverage Diff             @@
##           release/1.3   #4801   +/-   ##
===========================================
  Coverage           72%     72%           
===========================================
  Files              403     403           
  Lines            67348   67387   +39     
  Branches         67348   67387   +39     
===========================================
+ Hits             48684   48729   +45     
  Misses           16320   16320           
+ Partials          2344    2338    -6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Comment on lines 749 to 752
let stable_amount = *stable_amount;

if swap.to == STABLE_ASSET {
swap.final_output = Some(stable_amount);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let stable_amount = *stable_amount;
if swap.to == STABLE_ASSET {
swap.final_output = Some(stable_amount);
if swap.to == STABLE_ASSET {
swap.final_output = Some(*stable_amount);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does work, I tried it

Copy link
Contributor

@AlastairHolmes AlastairHolmes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one thing, looks good (As in it looks like it will work, good is different)

@martin-chainflip martin-chainflip merged commit 9efaaf4 into release/1.3 Apr 26, 2024
46 checks passed
@martin-chainflip martin-chainflip deleted the fix/take-fee-on-to-usdc branch April 26, 2024 07:52
kylezs added a commit that referenced this pull request Apr 26, 2024
* fix: take network fee from output amount when swapping to stable

* chore: set value directly

* chore: bump runtime version

* chore: clippy

* chore: cleaner
github-merge-queue bot pushed a commit that referenced this pull request Apr 26, 2024
* fix: take network fee from output amount when swapping to stable

* chore: set value directly

* chore: bump runtime version

* chore: clippy

* chore: cleaner
syan095 added a commit that referenced this pull request May 1, 2024
* origin/main:
  Arbitrum gas limit multiplier (#4781)
  fix: don't set code red on "agg-key set by gov-key" (#4813)
  fix: sign tx with correct key during rotation (#4794)
  chore: arbitrum witnesser permission (#4798)
  Solana (#4414)
  feat: try-runtime build step on dev ci (#4807)
  feat: optimistic build, streamlined ci-main (#4806)
  chore: log raw dispatch error (#4809)
  feat: allow for single binary CFE upgrades (#4634)
  fix: take fee on to usdc (#4801) (#4804)
  refactor: minor cleanup of retrier code and vault pallet (#4803)
  feat: cf_boost_pool_details rpc (#4780)

# Conflicts:
#	Cargo.lock
#	state-chain/chains/src/sol.rs
#	state-chain/chains/src/sol/program_instructions.rs
#	state-chain/chains/src/sol/sol_tx_building_blocks.rs
#	state-chain/chains/src/sol/token_instructions.rs
#	state-chain/runtime/src/safe_mode.rs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants