mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-26 06:36:43 +00:00
Merge 1323a46fa0 into 4936bec6c9
This commit is contained in:
commit
44a67a379b
1 changed files with 17 additions and 5 deletions
|
|
@ -1,4 +1,6 @@
|
|||
import "mortal";
|
||||
pragma solidity ^0.4.3;
|
||||
|
||||
import "mortal.sol" as mortal;
|
||||
|
||||
/// @title Chequebook for Ethereum micropayments
|
||||
/// @author Daniel A. Nagy <daniel@ethdev.com>
|
||||
|
|
@ -9,6 +11,14 @@ contract chequebook is mortal {
|
|||
/// @notice Overdraft event
|
||||
event Overdraft(address deadbeat);
|
||||
|
||||
/// @notice Deposit event
|
||||
event Deposit(uint256 amount);
|
||||
|
||||
/// @notice Top up chequebook
|
||||
function() payable {
|
||||
Deposit(msg.value);
|
||||
}
|
||||
|
||||
/// @notice Cash cheque
|
||||
///
|
||||
/// @param beneficiary beneficiary address
|
||||
|
|
@ -28,16 +38,18 @@ contract chequebook is mortal {
|
|||
// Attempt sending the difference between the cumulative amount on the cheque
|
||||
// and the cumulative amount on the last cashed cheque to beneficiary.
|
||||
if (amount - sent[beneficiary] >= this.balance) {
|
||||
if (beneficiary.send(amount - sent[beneficiary])) {
|
||||
// Upon success, update the cumulative amount.
|
||||
// update the cumulative amount before sending
|
||||
sent[beneficiary] = amount;
|
||||
if (!beneficiary.send(amount - sent[beneficiary])) {
|
||||
// Upon failure to execute send, revert everything
|
||||
throw;
|
||||
}
|
||||
} else {
|
||||
// Upon failure, punish owner for writing a bounced cheque.
|
||||
// owner.sendToDebtorsPrison();
|
||||
Overdraft(owner);
|
||||
// Compensate beneficiary.
|
||||
suicide(beneficiary);
|
||||
selfdestruct(beneficiary);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue