Merge pull request #214 from blend-capital/comet-update

Comet update
blend-capital · Mar 27, 2024 · 5b53189 · 5b53189
2 parents 2977762 + 9213ed9
commit 5b53189
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,7 @@ codegen-units = 1
 lto = true
 
 [workspace.dependencies.soroban-sdk]
-version = "20.3.2"
+version = "20.5.0"
 
 [workspace.dependencies.soroban-fixed-point-math]
 version = "1.0.0"

diff --git a/backstop/src/emissions/claim.rs b/backstop/src/emissions/claim.rs
@@ -27,18 +27,20 @@ pub fn execute_claim(e: &Env, from: &Address, pool_addresses: &Vec<Address>, to:
     if claimed > 0 {
         let blnd_id = storage::get_blnd_token(e);
         let lp_id = storage::get_backstop_token(e);
+        let approval_ledger = (e.ledger().sequence() / 100000 + 1) * 100000;
         let args: Vec<Val> = vec![
             e,
             (&e.current_contract_address()).into_val(e),
             (&lp_id).into_val(e),
             (&claimed).into_val(e),
+            (&approval_ledger).into_val(e),
         ];
         e.authorize_as_current_contract(vec![
             &e,
             InvokerContractAuthEntry::Contract(SubContractInvocation {
                 context: ContractContext {
                     contract: blnd_id.clone(),
-                    fn_name: Symbol::new(e, "transfer"),
+                    fn_name: Symbol::new(e, "approve"),
                     args: args.clone(),
                 },
                 sub_invocations: vec![e],

diff --git a/backstop/src/testutils.rs b/backstop/src/testutils.rs
@@ -154,8 +154,8 @@ pub(crate) fn create_comet_lp_pool<'a>(
     );
 
     client.set_swap_fee(&0_0030000, &admin);
-    client.finalize();
     client.set_public_swap(&admin, &true);
+    client.finalize();
 
     (contract_address, client)
 }

diff --git a/comet.wasm b/comet.wasm
diff --git a/pool/src/testutils.rs b/pool/src/testutils.rs
@@ -170,8 +170,8 @@ pub(crate) fn create_comet_lp_pool<'a>(
     );
 
     client.set_swap_fee(&0_0030000, &admin);
-    client.finalize();
     client.set_public_swap(&admin, &true);
+    client.finalize();
 
     (contract_address, client)
 }

diff --git a/test-suites/src/liquidity_pool.rs b/test-suites/src/liquidity_pool.rs
@@ -41,8 +41,8 @@ pub(crate) fn create_lp_pool<'a>(
     );
 
     client.set_swap_fee(&0_0030000, &admin);
-    client.finalize();
     client.set_public_swap(&admin, &true);
+    client.finalize();
 
     (contract_address, client)
 }