Skip to content

Commit

Permalink
Fix rebase errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Mauro Lacy committed Feb 5, 2025
1 parent 3a18661 commit 2ccaebb
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 32 deletions.
8 changes: 0 additions & 8 deletions contracts/btc-finality/schema/btc-finality.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,15 +231,7 @@
"additionalProperties": false
},
{
<<<<<<< HEAD
<<<<<<< HEAD
"description": "`WithdrawRewards` is a message sent by the Babylon contract on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\n`staker_addr` is the address to claim the rewards.",
=======
"description": "`WithdrawRewards` is a message sent by anyone on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\n`staker_addr` is both the address to claim and receive the rewards",
>>>>>>> 37fca3d (Update schemas)
=======
"description": "`WithdrawRewards` is a message sent by anyone on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\n`staker_addr` is both the address to claim and receive the rewards. It's a Babylon address. If rewards are to be sent to a Consumer address, the staker's equivalent address in that chain will be computed and used.",
>>>>>>> fbd3b31 (Update schema)
"type": "object",
"required": [
"withdraw_rewards"
Expand Down
8 changes: 0 additions & 8 deletions contracts/btc-finality/schema/raw/execute.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,7 @@
"additionalProperties": false
},
{
<<<<<<< HEAD
<<<<<<< HEAD
"description": "`WithdrawRewards` is a message sent by the Babylon contract on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\n`staker_addr` is the address to claim the rewards.",
=======
"description": "`WithdrawRewards` is a message sent by anyone on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\n`staker_addr` is both the address to claim and receive the rewards",
>>>>>>> 37fca3d (Update schemas)
=======
"description": "`WithdrawRewards` is a message sent by anyone on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\n`staker_addr` is both the address to claim and receive the rewards. It's a Babylon address. If rewards are to be sent to a Consumer address, the staker's equivalent address in that chain will be computed and used.",
>>>>>>> fbd3b31 (Update schema)
"type": "object",
"required": [
"withdraw_rewards"
Expand Down
8 changes: 0 additions & 8 deletions contracts/btc-staking/schema/btc-staking.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,15 +231,7 @@
"additionalProperties": false
},
{
<<<<<<< HEAD
<<<<<<< HEAD
"description": "`WithdrawRewards` is a message sent by the Babylon contract on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\n`staker_addr` is the address to claim the rewards.",
=======
"description": "`WithdrawRewards` is a message sent by anyone on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\n`staker_addr` is both the address to claim and receive the rewards",
>>>>>>> 37fca3d (Update schemas)
=======
"description": "`WithdrawRewards` is a message sent by anyone on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\n`staker_addr` is both the address to claim and receive the rewards. It's a Babylon address. If rewards are to be sent to a Consumer address, the staker's equivalent address in that chain will be computed and used.",
>>>>>>> fbd3b31 (Update schema)
"type": "object",
"required": [
"withdraw_rewards"
Expand Down
8 changes: 0 additions & 8 deletions contracts/btc-staking/schema/raw/execute.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,7 @@
"additionalProperties": false
},
{
<<<<<<< HEAD
<<<<<<< HEAD
"description": "`WithdrawRewards` is a message sent by the Babylon contract on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\n`staker_addr` is the address to claim the rewards.",
=======
"description": "`WithdrawRewards` is a message sent by anyone on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\n`staker_addr` is both the address to claim and receive the rewards",
>>>>>>> 37fca3d (Update schemas)
=======
"description": "`WithdrawRewards` is a message sent by anyone on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\n`staker_addr` is both the address to claim and receive the rewards. It's a Babylon address. If rewards are to be sent to a Consumer address, the staker's equivalent address in that chain will be computed and used.",
>>>>>>> fbd3b31 (Update schema)
"type": "object",
"required": [
"withdraw_rewards"
Expand Down

0 comments on commit 2ccaebb

Please sign in to comment.