Skip to content

rm btc broadcast precompile return data, use decode precompile for txid #4

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 3, 2025
Merged

rm btc broadcast precompile return data, use decode precompile for txid #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3854966
rm btc broadcast precompile return data, use decode precompile for txid
PowVT Feb 3, 2025
1ee2391
fmt
PowVT Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions src/lib/CorsaBitcoin.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,9 @@ library CorsaBitcoin {
return returndata;
}

function broadcastBitcoinTx(bytes memory signedTx) internal returns (bytes32) {
(bool success, bytes memory returndata) =
BTC_PRECOMPILE.call(abi.encodePacked(BROADCAST_LEADING_BYTES, signedTx));
function broadcastBitcoinTx(bytes memory signedTx) internal {
(bool success,) = BTC_PRECOMPILE.call(abi.encodePacked(BROADCAST_LEADING_BYTES, signedTx));
if (!success) revert PrecompileCallFailed();

require(returndata.length == 32, "Invalid txid length");

bytes32 txid;
assembly {
txid := mload(add(returndata, 32))
}

return txid;
}

function createAndSignBitcoinTx(address signer, uint64 amount, uint64 blockHeight, string memory destinationAddress)
Expand Down
11 changes: 7 additions & 4 deletions src/uBTC.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ contract uBTC is WETH, Ownable {
_mint(msg.sender, amount);

// Broadcast signed btc tx
bytes32 txid = CorsaBitcoin.broadcastBitcoinTx(signedTx);
CorsaBitcoin.broadcastBitcoinTx(signedTx);

emit Deposit(txid, amount);
emit Deposit(btcTx.txid, amount);
}

function withdraw(uint64 amount, uint32 btcBlockHeight, string calldata dest) public {
Expand All @@ -102,10 +102,13 @@ contract uBTC is WETH, Ownable {
// Create Bitcoin transaction using the UTXOs
bytes memory signedTx = CorsaBitcoin.createAndSignBitcoinTx(address(this), amount, btcBlockHeight, dest);

// Decode signed bitcoin tx
CorsaBitcoin.BitcoinTx memory btcTx = CorsaBitcoin.decodeBitcoinTx(signedTx);

// Broadcast signed BTC tx
bytes32 txid = CorsaBitcoin.broadcastBitcoinTx(signedTx);
CorsaBitcoin.broadcastBitcoinTx(signedTx);

emit Withdraw(txid, amount);
emit Withdraw(btcTx.txid, amount);
}

function adminBurn(address wallet, uint256 amount) public onlyOwner {
Expand Down