Skip to content

Commit

Permalink
#4
Browse files Browse the repository at this point in the history
  • Loading branch information
@kernel1983
kernel1983 committed Oct 22, 2024
1 parent 35a00fd commit 38bfedd
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 18 deletions.
30 changes: 17 additions & 13 deletions contracts/holder.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ pragma solidity ^0.8.20;
interface IERC20 {
function transfer(address _to, uint256 _value) external returns (bool success);
function transferFrom(address sender, address recipient, uint256 amount) external returns (bool);
//function balanceOf(address account) external view returns (uint256);
function balanceOf(address account) external view returns (uint256);
}

contract ShareHolder {
uint256 constant total_shares = 10**20;
uint256 constant TOTAL_SHARES = 10**20;

address public operator;
mapping(address => address) public operator_votes;
Expand Down Expand Up @@ -59,16 +59,16 @@ contract ShareHolder {

constructor(address _token_address) {
operator = msg.sender;
shares[msg.sender] = total_shares;
shares[msg.sender] = TOTAL_SHARES;
holders[next_holder_no] = msg.sender;
emit SharesIssued(msg.sender, total_shares);
emit SharesIssued(msg.sender, TOTAL_SHARES);
token = IERC20(_token_address);
last_redistribute_timestamp = block.timestamp;
fee = 0;
}

function get_shares(address _holder) public view returns (uint256) {
return shares[_holder] * (total_shares - total_finance_shares) / total_shares;
return shares[_holder] * (TOTAL_SHARES - total_finance_shares) / TOTAL_SHARES;
}

function pay_to(address _user, uint256 _amount) public {
Expand Down Expand Up @@ -96,14 +96,18 @@ contract ShareHolder {
require(can_dividend, "can dividend required");
can_dividend = false;

uint256 to_dividend = token.balanceOf(address(this));
// console.log(to_dividend);
for (uint256 i = 1; i < next_holder_no+1; i++) {
// console.log(i);
address holder = holders[i];
// console.log(holder);
// console.log(shares[holders[i]]);
// console.log(shares[holders[i]] * (total_shares - total_finance_shares) / total_finance_shares);
// console.log(shares[holder]);
// console.log(TOTAL_SHARES - total_finance_shares);
// console.log(to_dividend * shares[holder] * (TOTAL_SHARES - total_finance_shares) / TOTAL_SHARES / TOTAL_SHARES);
token.transfer(holder, to_dividend * shares[holder] * (TOTAL_SHARES - total_finance_shares) / TOTAL_SHARES / TOTAL_SHARES);
}
// console.log(total_shares);
// console.log(TOTAL_SHARES);
// console.log(total_finance_shares);

for (uint256 i = 1; i < next_finance_investor_no+1; i++) {
Expand All @@ -130,8 +134,8 @@ contract ShareHolder {
for (uint256 i = 1; i < next_holder_no+1; i++) {
// console.log(i);
// console.log(shares[holders[i]]);
// console.log(shares[holders[i]] * (total_shares - total_contribution) / total_shares);
shares[holders[i]] = shares[holders[i]] * (total_shares - total_contribution) / total_shares;
// console.log(shares[holders[i]] * (TOTAL_SHARES - total_contribution) / TOTAL_SHARES);
shares[holders[i]] = shares[holders[i]] * (TOTAL_SHARES - total_contribution) / TOTAL_SHARES;
}

for (uint256 i = 0; i < contributions.length; i++) {
Expand Down Expand Up @@ -164,7 +168,7 @@ contract ShareHolder {
uint256 share = shares[holder];
vote_shares += share;
// console.log(vote_shares);
if(vote_shares > total_shares/2){
if(vote_shares > TOTAL_SHARES/2){
operator = _operator;
break;
}
Expand All @@ -183,7 +187,7 @@ contract ShareHolder {
// console.log(holder);
if(dilution_shares_votes[holder] == _amount){
voting_shares += shares[holder];
if(voting_shares > total_shares/2){
if(voting_shares > TOTAL_SHARES/2){
dilution_shares = _amount;
break;
}
Expand All @@ -203,7 +207,7 @@ contract ShareHolder {
// console.log(holder);
if(pay_to_limit_votes[holder] == _amount){
voting_shares += shares[holder];
if(voting_shares > total_shares/2){
if(voting_shares > TOTAL_SHARES/2){
pay_to_limit = _amount;
break;
}
Expand Down
6 changes: 3 additions & 3 deletions contracts/payment.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ contract BulletPay {
IERC20 public token;
IHolder public holder;
address public operator;
uint256 public total;
// uint256 public total;
uint256 public next_topup_id;

struct Topup {
Expand Down Expand Up @@ -45,7 +45,7 @@ contract BulletPay {
});
require(token.transferFrom(msg.sender, address(this), _amount), "transfer failed");
emit TopupCreated(next_topup_id, _spender, _amount);
total += _amount;
// total += _amount;
next_topup_id++;
}

Expand Down Expand Up @@ -74,7 +74,7 @@ contract BulletPay {
uint256 fee = holder.fee();
require(token.transfer(_to_address, _amount - fee), "transfer to address failed");
require(token.transfer(address(holder), fee), "transfer to holder failed");
total -= _amount;
// total -= _amount;
// console.logAddress(signer);
// console.log(remaining_balance);

Expand Down
4 changes: 2 additions & 2 deletions tests/test_payment.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def test_topup():
mock_token.approve(bulletpay.address, 100* 10**6, {'from': a[0], 'gas_price': 1950000000})
bulletpay.topup(100* 10**6, a[1], {'from': a[0], 'gas_price': 1950000000})
assert mock_token.balanceOf(bulletpay) == 100* 10**6
assert bulletpay.total() == 100* 10**6
# assert bulletpay.total() == 100* 10**6

def test_pay_to():
# Deploy Erc20
Expand All @@ -64,7 +64,7 @@ def test_pay_to():
mock_token.approve(bulletpay.address, TOPUP_AMOUNT, {'from': a[0], 'gas_price': 1950000000})
bulletpay.topup(TOPUP_AMOUNT, SPENDER_ADDEESS, {'from': a[0], 'gas_price': 1950000000})
assert mock_token.balanceOf(bulletpay) == 100* 10**6
assert bulletpay.total() == 100* 10**6
# assert bulletpay.total() == 100* 10**6

hash1 = web3.Web3.solidity_keccak(['address', 'uint256'], [TO_ADDRESS, PAYMENT_AMOUNT])
# print(hash1.hex())
Expand Down

0 comments on commit 38bfedd

Please sign in to comment.