Call `SendRewards` from maintainer #481

ruuda · 2021-12-15T13:25:51Z

This modifies the maintainer daemon to call SendRewards in case there is UST in the UST reserve.

Also contains a number of fixes that @enriquefynn and me pair-programmed while trying to get this to work on Solana devnet.

ruuda · 2021-12-22T17:13:45Z

anker/src/lib.rs

@@ -43,6 +43,10 @@ pub fn find_instance_address(anker_program_id: &Pubkey, solido_instance: &Pubkey
 Pubkey::find_program_address(&[solido_instance.as_ref()], anker_program_id)
 }

+// TODO(ruuda): Use this below.


I started working on this, but it is going to be a pretty big and invasive change, so I split it off into a separate PR: #488

enriquefynn

Looks mostly good, I just have a few questions

enriquefynn · 2021-12-23T16:08:36Z

anker/src/processor.rs

@@ -86,6 +89,7 @@ fn process_initialize(
 ANKER_STSOL_RESERVE_ACCOUNT,
 &[st_sol_reserve_account_bump_seed],
 ];
+ msg!("Allocating account for stSOL reserve ...");


Good to put some debug msgs! 👍

enriquefynn · 2021-12-23T18:22:10Z

anker/src/processor.rs

+ let instr = Box::new(spl_token::instruction::approve(
+ accounts.spl_token.key,
+ accounts.ust_reserve_account.key,
+ accounts.authority_signer_key.key,


Note to self: do we check this authority_signer?

I’m not you, but we do check it now since c5f3d30 (rebased as 5ff4988) :-)

enriquefynn · 2021-12-23T19:25:53Z

anker/src/state.rs

- &wormhole_transfer_args.custody_key,
- accounts.custody_key.key,
- )?;
- check_wormhole_account(


Shouldn't we check this?!

Very good catch! Fixed. I think what happened here is that I removed the custody key and custody signer key, because they are only used for native tokens, not wrapped tokens like UST, but I was a bit too eager and also removed this check in between that I shouldn’t have removed.

enriquefynn · 2021-12-23T19:29:23Z

anker/src/wormhole.rs

-// 7cw4gLGZfH2rU5di5xeQbNZ1Nbc8D7i78jkxXtLUvnwyyZbha5E3Ew2izLjLTki56Ek1zQyZn2Ghb1tK4fWeMhE
+/// Test transaction that transfers UST on Solana to Terra.
+///
+/// Based on this transaction: <https://explorer.solana.com/tx/5tSRA1CYLd51sjf7Dd2ZRkLspcqiR8NH51oTd3K34sNc3PZG9uF7euE2AHE95KurrcfKYf2sCQqsEbSRmzQq8oDg?cluster=devnet>.
 #[test]
 fn test_get_wormhole_instruction() {


New transaction test! Nice 👍

enriquefynn · 2021-12-23T20:08:00Z

cli/src/anker_state.rs

+ // there is a transfer of 0.000_000_010 SOL to _some_ account ... but
+ // then the Wormhole call also transfers that amount. So it seems the
+ // first one is a kind of tip? Can we skip it?
+ // TODO(#489): // Also, we shouldn't transfer out of an account which may have more


enriquefynn · 2021-12-23T20:14:41Z

cli/src/commands_anker.rs

@@ -215,8 +215,8 @@ impl fmt::Display for ShowAnkerOutput {
 writeln!(f, "bSOL mint: {}", self.b_sol_mint)?;
 writeln!(f, "bSOL mint authority: {}", self.b_sol_mint_authority)?;
 writeln!(f, "bSOL supply: {}", self.b_sol_supply)?;
- writeln!(f, "Reserve authority: {}", self.st_sol_reserve)?;
- writeln!(f, "stSOL reserve address: {}", self.reserve_authority)?;
+ writeln!(f, "Reserve authority: {}", self.reserve_authority)?;


enriquefynn · 2021-12-23T21:00:51Z

cli/src/maintenance.rs

+ // transactions based on the same slot though? If we do, then the state
+ // we observe should also be identical, and only one of the transactions
+ // should succeed.
+ let wormhole_nonce = (self.clock.slot & 0xffff_ffff) as u32;


enriquefynn · 2021-12-23T21:04:22Z

cli/src/maintenance.rs

+
+ let ust_amount = anker_state.ust_reserve_balance;
+ let output = MaintenanceOutput::SendRewards { ust_amount };
+ println!("Trying to send rewards: {:?}", &output);


Is this a debug msg? Cause it can mess the tests (if we have one)

Yes, good catch, that is a debugging leftover, removed now. We shouldn’t have bare println!s in the CLI code because it will mess up the --output json mode.

enriquefynn · 2021-12-23T21:05:42Z

cli/src/maintenance.rs

+ // Usually the maintainer is the only signer, but in some cases we
+ // need to generate a new fresh keypair, which then also is a signer.
+ let mut signers: Vec<&dyn Signer> = vec![config.signer];
+ for keypair in &maintenance_instruction.additional_signers {


That's how we get additional signers, nice!

This is incomplete; I don't yet know how to get all of these addresses. Will check the docs and ask the Wormhole developers. But for now this is a step forward to invoking Wormhole. As a drive-by fix, report the SellRewards count in the metrics too.

Thanks Fynn for helping with this.

This is a combination of some fixes and debug prints that me and Fynn pair-programmed. At this point we reach the Wormhole call, but there are also some debug changes that will need to be reverted later.

We started out calling transfer_native, but UST on Solana is not a native SPL token, it's a wrapped (by Wormhole) token.

Instead of making it look like the Ethereum test transaction, model it after the Solana->Terra UST transaction that we did, because that one is the right use case: the chain and token type (wrapped) match.

I introduced this type but did not adjust the tests for it. Now they compile and pass again.

See also the added comment for the motivation for this.

Thanks Fynn for catching this. I think this was an oversight when I removed the custody key and custody signer key (because these are not used for wrapped tokens, only for native tokens) but I missed that this check in between had to stay.

enriquefynn

LGTM!

enriquefynn force-pushed the anker-maintenance-sell-rewards branch from 7ef2860 to 1783556 Compare December 17, 2021 14:06

ruuda mentioned this pull request Dec 22, 2021

Perform SellRewards on the maintenance bot #480

Merged

ruuda force-pushed the anker-maintenance-send-rewards branch from 83dd9f1 to 83a76a3 Compare December 22, 2021 16:11

ruuda commented Dec 22, 2021

View reviewed changes

ruuda marked this pull request as ready for review December 22, 2021 17:27

ruuda requested a review from enriquefynn December 22, 2021 17:27

ruuda force-pushed the anker-maintenance-send-rewards branch from 04118e5 to 6771008 Compare December 23, 2021 11:52

Base automatically changed from anker-maintenance-sell-rewards to anchor-integration December 23, 2021 12:04

ruuda force-pushed the anker-maintenance-send-rewards branch from fe0fcc8 to fbb1174 Compare December 23, 2021 12:06

enriquefynn reviewed Dec 23, 2021

View reviewed changes

ruuda and others added 16 commits December 24, 2021 11:34

Add missing copyright headers

65196cb

Add link to Wormhole instruction definition

fab5fbe

Fill in the missing Wormhole addresses

7aed768

Thanks Fynn for helping with this.

Debug and fix, reach Wormhole call

d56c222

This is a combination of some fixes and debug prints that me and Fynn pair-programmed. At this point we reach the Wormhole call, but there are also some debug changes that will need to be reverted later.

Send wrapped Wormhole tokens, not native tokens

1a50eab

We started out calling transfer_native, but UST on Solana is not a native SPL token, it's a wrapped (by Wormhole) token.

Add missing string to derivated addr

9a009c3

Run Rust autoformatter

d746c5a

Remove some debug prints and comments

87b9699

Fix Wormhole payload unit test

3385000

Instead of making it look like the Ethereum test transaction, model it after the Solana->Terra UST transaction that we did, because that one is the right use case: the chain and token type (wrapped) match.

Fix a few warnings

df54556

Fix tests after MaintenanceInstruction refactor

9aea0f8

I introduced this type but did not adjust the tests for it. Now they compile and pass again.

Make Clippy happy

33bfe9a

Make Anker error ints not overlap the Solido ones

636d42b

See also the added comment for the motivation for this.

Restore missing Wormhole account check

5ff4988

Thanks Fynn for catching this. I think this was an oversight when I removed the custody key and custody signer key (because these are not used for wrapped tokens, only for native tokens) but I missed that this check in between had to stay.

Remove leftover debug print

3fb4bac

ruuda force-pushed the anker-maintenance-send-rewards branch from c5f3d30 to 3fb4bac Compare December 24, 2021 10:34

ruuda requested a review from enriquefynn December 24, 2021 10:35

enriquefynn approved these changes Dec 24, 2021

View reviewed changes

ruuda merged commit 0345bd4 into anchor-integration Dec 24, 2021

ruuda deleted the anker-maintenance-send-rewards branch December 24, 2021 15:46

ruuda mentioned this pull request Jan 4, 2022

[Anchor] Make maintenance bot call ClaimRewards on Anker instance #459

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Call `SendRewards` from maintainer #481

Call `SendRewards` from maintainer #481

ruuda commented Dec 15, 2021 •

edited

Loading

ruuda Dec 22, 2021

enriquefynn left a comment

enriquefynn Dec 23, 2021

enriquefynn Dec 23, 2021

ruuda Dec 24, 2021 •

edited

Loading

enriquefynn Dec 23, 2021

ruuda Dec 24, 2021

enriquefynn Dec 23, 2021

enriquefynn Dec 23, 2021

enriquefynn Dec 23, 2021

enriquefynn Dec 23, 2021

enriquefynn Dec 23, 2021

ruuda Dec 24, 2021

enriquefynn Dec 23, 2021

enriquefynn left a comment

Call SendRewards from maintainer #481

Call SendRewards from maintainer #481

Conversation

ruuda commented Dec 15, 2021 • edited Loading

Choose a reason for hiding this comment

enriquefynn left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ruuda Dec 24, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

enriquefynn left a comment

Choose a reason for hiding this comment

Call `SendRewards` from maintainer #481

Call `SendRewards` from maintainer #481

ruuda commented Dec 15, 2021 •

edited

Loading

ruuda Dec 24, 2021 •

edited

Loading