Skip to content

Commit

Permalink
提交测试版v1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@stev1988
stev1988 committed Jul 24, 2018
1 parent 21ae4d2 commit 7c6060f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 80 deletions.
80 changes: 6 additions & 74 deletions etbexchange/etbexchange.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@
* @copyright defined in eos/LICENSE.txt
*/

#include "ico.h"
#include "etbexchange.h"

namespace etb {

const int64_t expire_time = 2*60;//40 * 24 * 3600;//40天众筹期
const int64_t expire_time = 40 * 24 * 3600;//40天众筹期
const double ratio_max = 1.30;//倍数由1.30开始递减,第1天1.30,第2天1.29,...第29天1.01,第30天到第40天1.0
const double ratio_min = 1.00;
const int64_t days__per_year = 2;//365;
const int64_t second_per_day = 60;//24 * 3600;//每天解冻一点
const int64_t days__per_year = 365;
const int64_t second_per_day = 24 * 3600;//每天解冻一点
const int64_t reward_partner_base = 50000000;//奖励基线,为他人众筹超过5000EOS才有奖励
const double reward_partner_ratio = 0.05;//奖励代投伙伴5%
const double reward_team_ratio = 0.1;//奖励开发团队和社区10%
#define ETB_SYMBOL S(4,ETB)


void etbexchange::create()
{
require_auth( _self );
Expand All @@ -36,9 +35,6 @@ namespace etb {
});
}




void etbexchange::transfer( account_name from,
account_name to,
asset quantity,
Expand Down Expand Up @@ -95,33 +91,6 @@ namespace etb {
}
}

// void etbexchange::issue( account_name to, asset quantity, string memo )
// {
// auto sym_name = sym.name();
// stats statstable( _self, sym_name );
// auto existing = statstable.find( sym_name );
// eosio_assert( existing != statstable.end(), "token with symbol does not exist, create token before issue" );
// const auto& st = *existing;
//
//
//
// eosio_assert( quantity.is_valid(), "invalid quantity" );
// eosio_assert( quantity.amount > 0, "must issue positive quantity" );
//
// eosio_assert( quantity.symbol == st.supply.symbol, "symbol precision mismatch" );
// eosio_assert( quantity.amount <= st.max_supply.amount - st.supply.amount, "quantity exceeds available supply");
//
// statstable.modify( st, 0, [&]( auto& s ) {
// s.supply += quantity;
// });
//
// add_balance( st.creater, quantity, st.creater );
//
// if( to != st.creater ) {
// SEND_INLINE_ACTION( *this, transfer, {st.creater,N(active)}, {st.creater, to, quantity, memo} );
// }
// }

void etbexchange::issue( account_name from,
account_name to,
asset quantity)
Expand Down Expand Up @@ -156,7 +125,7 @@ namespace etb {
std::make_tuple(from, _self, quantity, std::string("send EOS"))
).send();

//倍数由1.30开始递减,第1天1.30,第2天1.29,...第29天1.01,第30天到第40天1.0
//倍数由1.30开始递减,第1天1.30,第2天1.29,...第29天1.01,第30天之后恒定为1.0
int64_t days = (now() - st.create_time) / second_per_day;
// print("now:",now(),"\n");
// print("issue time:",st.create_time, "\n");
Expand Down Expand Up @@ -210,9 +179,6 @@ namespace etb {
a.exchange_other = asset{0, S(4,EOS)};
a.reward = asset{0, ETB_SYMBOL};
}



});
} else {
owner_exchanges.modify( itr, 0, [&]( auto& a ) {
Expand Down Expand Up @@ -253,10 +219,7 @@ namespace etb {
});
}



max_supply.amount += to_quant.amount + reward_team.amount + reward_partner.amount;

max_supply.amount += to_quant.amount + reward_partner.amount + reward_team.amount;
statstable.modify( existing, 0, [&]( auto& a) {
a.max_supply = max_supply;
a.supply += to_quant;
Expand All @@ -267,31 +230,6 @@ namespace etb {
if( to != from ) {
SEND_INLINE_ACTION( *this, transfer, {from,N(active)}, {from, to, to_quant, std::string("issue ETB")} );
}


//转出ETB给接收者
// action(
// permission_level{ N(etbissue1111), N(active) },
// N(etbico111111), N(issue),
// std::make_tuple(to, to_quant, std::string("issue ETB"))
// ).send();
//
// //转出团队奖励,冻结在发币者账户
// action(
// permission_level{ N(etbissue1111), N(active) },
// N(etbico111111), N(issue),
// std::make_tuple(st.creater, reward_team, std::string("issue ETB"))
// ).send();
//
// //转出合伙人奖励,冻结在发币者账户
// if(reward_partner.amount > 0){
// action(
// permission_level{ N(etbissue1111), N(active) },
// N(etbico111111), N(issue),
// std::make_tuple(st.creater, reward_partner, std::string("issue ETB"))
// ).send();
// }

}

void etbexchange::claimrewards( const account_name& owner ){
Expand Down Expand Up @@ -331,12 +269,6 @@ namespace etb {

add_balance( owner, reward, owner );

// action(
// permission_level{ N(etbissue1111), N(active) },
// N(etbico111111), N(issue),
// std::make_tuple(owner, reward, std::string("claimedrewards"))
// ).send();

owner_exchanges.modify( itr, 0, [&]( auto& a ) {
a.claimedreward.amount += reward.amount;
a.last_claim_time = now();
Expand Down
10 changes: 4 additions & 6 deletions etbexchange/etbexchange.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Created by root1 on 18-7-19.
//

#ifndef EOSIO_ICO_H
#define EOSIO_ICO_H
#ifndef EOSIO_ETB_H
#define EOSIO_ETB_H


/**
Expand Down Expand Up @@ -52,7 +52,6 @@ namespace etb {
struct currency_stats {
asset supply;
asset max_supply;
// account_name creater;
uint64_t create_time;
uint64_t exchange_expire;
uint64_t primary_key()const { return supply.symbol.name(); }
Expand All @@ -73,7 +72,6 @@ namespace etb {
typedef eosio::multi_index<N(stat), currency_stats> stats;
typedef eosio::multi_index<N(exchanges), exchange_table> exchanges;

// void issue( account_name to, asset quantity, string memo );
void sub_balance( account_name owner, asset value );
void add_balance( account_name owner, asset value, account_name ram_payer );

Expand All @@ -87,9 +85,9 @@ namespace etb {
};


} /// namespace etb
}




#endif //EOSIO_ICO_H
#endif //EOSIO_ETB_H

0 comments on commit 7c6060f

Please sign in to comment.