Skip to content

Commit

Permalink
Merge pull request #1935 from steemit/1760-deprecate-create-with-dele…
Browse files Browse the repository at this point in the history 
…gation

Deprecate account_create_with_delegation
  • Loading branch information
Michael Vandeberg committed Jan 2, 2018
2 parents 96059d9 + 54f22cb commit 12ce215
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 160 deletions.
2 changes: 1 addition & 1 deletion libraries/chain/steem_evaluator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ void account_create_evaluator::do_apply( const account_create_operation& o )

void account_create_with_delegation_evaluator::do_apply( const account_create_with_delegation_operation& o )
{
FC_ASSERT( _db.has_hardfork( STEEM_HARDFORK_0_17__818 ), "Account creation with delegation is not enabled until hardfork 17" );
FC_ASSERT( !_db.has_hardfork( STEEM_HARDFORK_0_20__1760 ), "Account creation with delegation is deprecated as of Hardfork 20" );

const auto& creator = _db.get_account( o.creator );
const auto& props = _db.get_dynamic_global_properties();
Expand Down
1 change: 1 addition & 0 deletions libraries/protocol/hardfork.d/0_20.hf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#define STEEM_HARDFORK_0_20__409 (STEEM_HARDFORK_0_20)
#define STEEM_HARDFORK_0_20__1620 (STEEM_HARDFORK_0_20)
#define STEEM_HARDFORK_0_20__1760 (STEEM_HARDFORK_0_20)
#define STEEM_HARDFORK_0_20__1764 (STEEM_HARDFORK_0_20)
#define STEEM_HARDFORK_0_20__1765 (STEEM_HARDFORK_0_20)
#define STEEM_HARDFORK_0_20__1811 (STEEM_HARDFORK_0_20)
Expand Down
40 changes: 11 additions & 29 deletions tests/db_fixture/database_fixture.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,35 +280,17 @@ const account_object& database_fixture::account_create(
{
try
{
if( db->has_hardfork( STEEM_HARDFORK_0_17 ) )
{
account_create_with_delegation_operation op;
op.new_account_name = name;
op.creator = creator;
op.fee = asset( fee, STEEM_SYMBOL );
op.delegation = asset( 0, VESTS_SYMBOL );
op.owner = authority( 1, key, 1 );
op.active = authority( 1, key, 1 );
op.posting = authority( 1, post_key, 1 );
op.memo_key = key;
op.json_metadata = json_metadata;

trx.operations.push_back( op );
}
else
{
account_create_operation op;
op.new_account_name = name;
op.creator = creator;
op.fee = asset( fee, STEEM_SYMBOL );
op.owner = authority( 1, key, 1 );
op.active = authority( 1, key, 1 );
op.posting = authority( 1, post_key, 1 );
op.memo_key = key;
op.json_metadata = json_metadata;

trx.operations.push_back( op );
}
account_create_operation op;
op.new_account_name = name;
op.creator = creator;
op.fee = asset( fee, STEEM_SYMBOL );
op.owner = authority( 1, key, 1 );
op.active = authority( 1, key, 1 );
op.posting = authority( 1, post_key, 1 );
op.memo_key = key;
op.json_metadata = json_metadata;

trx.operations.push_back( op );

trx.set_expiration( db->head_block_time() + STEEM_MAX_TIME_UNTIL_EXPIRATION );
trx.sign( creator_key, db->get_chain_id() );
Expand Down
150 changes: 20 additions & 130 deletions tests/tests/operation_tests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3354,9 +3354,8 @@ BOOST_AUTO_TEST_CASE( account_recovery )

BOOST_TEST_MESSAGE( "Creating account bob with alice" );

account_create_with_delegation_operation acc_create;
account_create_operation acc_create;
acc_create.fee = ASSET( "10.000 TESTS" );
acc_create.delegation = ASSET( "0.000000 VESTS" );
acc_create.creator = "alice";
acc_create.new_account_name = "bob";
acc_create.owner = authority( 1, generate_private_key( "bob_owner" ).get_public_key(), 1 );
Expand Down Expand Up @@ -5916,55 +5915,23 @@ BOOST_AUTO_TEST_CASE( account_create_with_delegation_authorities )
{
BOOST_TEST_MESSAGE( "Testing: account_create_with_delegation_authorities" );

signed_transaction tx;
ACTORS( (alice) );
generate_blocks(1);
fund( "alice", ASSET("1000.000 TESTS") );
vest( "alice", ASSET("10000.000000 VESTS") );

private_key_type priv_key = generate_private_key( "temp_key" );

account_create_with_delegation_operation op;
op.fee = ASSET("0.000 TESTS");
op.delegation = asset(100, VESTS_SYMBOL);
op.creator = "alice";
op.new_account_name = "bob";
op.owner = authority( 1, priv_key.get_public_key(), 1 );
op.active = authority( 2, priv_key.get_public_key(), 2 );
op.memo_key = priv_key.get_public_key();
op.json_metadata = "{\"foo\":\"bar\"}";

tx.set_expiration( db->head_block_time() + STEEM_MAX_TIME_UNTIL_EXPIRATION );
tx.operations.push_back( op );

BOOST_TEST_MESSAGE( "--- Test failure when no signatures" );
STEEM_REQUIRE_THROW( db->push_transaction( tx, 0 ), tx_missing_active_auth );

BOOST_TEST_MESSAGE( "--- Test success with witness signature" );
tx.sign( alice_private_key, db->get_chain_id() );
db->push_transaction( tx, 0 );

BOOST_TEST_MESSAGE( "--- Test failure when duplicate signatures" );
tx.operations.clear();
tx.signatures.clear();
op.new_account_name = "sam";
tx.operations.push_back( op );
tx.sign( alice_private_key, db->get_chain_id() );
tx.sign( alice_private_key, db->get_chain_id() );
STEEM_REQUIRE_THROW( db->push_transaction( tx, 0 ), tx_duplicate_sig );

BOOST_TEST_MESSAGE( "--- Test failure when signed by an additional signature not in the creator's authority" );
tx.signatures.clear();
tx.sign( init_account_priv_key, db->get_chain_id() );
tx.sign( alice_private_key, db->get_chain_id() );
STEEM_REQUIRE_THROW( db->push_transaction( tx, 0 ), tx_irrelevant_sig );

BOOST_TEST_MESSAGE( "--- Test failure when signed by a signature not in the creator's authority" );
tx.signatures.clear();
tx.sign( init_account_priv_key, db->get_chain_id() );
STEEM_REQUIRE_THROW( db->push_transaction( tx, 0 ), tx_missing_active_auth );

validate_database();
account_create_with_delegation_operation op;
op.creator = "alice";

flat_set< account_name_type > auths;
flat_set< account_name_type > expected;

op.get_required_owner_authorities( auths );
BOOST_REQUIRE( auths == expected );

expected.insert( "alice" );
op.get_required_active_authorities( auths );
BOOST_REQUIRE( auths == expected );

expected.clear();
auths.clear();
op.get_required_posting_authorities( auths );
BOOST_REQUIRE( auths == expected );
}
FC_LOG_AND_RETHROW()

Expand Down Expand Up @@ -5997,10 +5964,8 @@ BOOST_AUTO_TEST_CASE( account_create_with_delegation_apply )

generate_block();

BOOST_TEST_MESSAGE( "--- Test failure when VESTS are powering down." );
withdraw_vesting_operation withdraw;
withdraw.account = "alice";
withdraw.vesting_shares = db->get_account( "alice" ).vesting_shares;
// This test passed pre HF20
BOOST_TEST_MESSAGE( "--- Test deprecation. " );
account_create_with_delegation_operation op;
op.fee = ASSET( "10.000 TESTS" );
op.delegation = ASSET( "100000000.000000 VESTS" );
Expand All @@ -6010,85 +5975,10 @@ BOOST_AUTO_TEST_CASE( account_create_with_delegation_apply )
op.active = authority( 2, priv_key.get_public_key(), 2 );
op.memo_key = priv_key.get_public_key();
op.json_metadata = "{\"foo\":\"bar\"}";
tx.operations.push_back( withdraw );
tx.operations.push_back( op );
tx.set_expiration( db->head_block_time() + STEEM_MAX_TIME_UNTIL_EXPIRATION );
tx.sign( alice_private_key, db->get_chain_id() );
STEEM_REQUIRE_THROW( db->push_transaction( tx, 0 ), fc::assert_exception );


BOOST_TEST_MESSAGE( "--- Test success under normal conditions. " );
tx.clear();
tx.operations.push_back( op );
tx.sign( alice_private_key, db->get_chain_id() );
db->push_transaction( tx, 0 );

const account_object& bob_acc = db->get_account( "bob" );
const account_object& alice_acc = db->get_account( "alice" );
BOOST_REQUIRE( alice_acc.delegated_vesting_shares == ASSET( "100000000.000000 VESTS" ) );
BOOST_REQUIRE( bob_acc.received_vesting_shares == ASSET( "100000000.000000 VESTS" ) );
BOOST_REQUIRE( bob_acc.effective_vesting_shares() == bob_acc.vesting_shares - bob_acc.delegated_vesting_shares + bob_acc.received_vesting_shares);

BOOST_TEST_MESSAGE( "--- Test delegator object integrety. " );
auto delegation = db->find< vesting_delegation_object, by_delegation >( boost::make_tuple( op.creator, op.new_account_name ) );

BOOST_REQUIRE( delegation != nullptr);
BOOST_REQUIRE( delegation->delegator == op.creator);
BOOST_REQUIRE( delegation->delegatee == op.new_account_name );
BOOST_REQUIRE( delegation->vesting_shares == ASSET( "100000000.000000 VESTS" ) );
BOOST_REQUIRE( delegation->min_delegation_time == db->head_block_time() + STEEM_CREATE_ACCOUNT_DELEGATION_TIME );
auto del_amt = delegation->vesting_shares;
auto exp_time = delegation->min_delegation_time;

generate_block();

BOOST_TEST_MESSAGE( "--- Test success using only STEEM to reach target delegation." );

tx.clear();
op.fee=asset( db->get_witness_schedule_object().median_props.account_creation_fee.amount * STEEM_CREATE_ACCOUNT_WITH_STEEM_MODIFIER * STEEM_CREATE_ACCOUNT_DELEGATION_RATIO, STEEM_SYMBOL );
op.delegation = asset(0, VESTS_SYMBOL);
op.new_account_name = "sam";
tx.set_expiration( db->head_block_time() + STEEM_MAX_TIME_UNTIL_EXPIRATION );
tx.operations.push_back( op );
tx.sign( alice_private_key, db->get_chain_id() );
db->push_transaction( tx, 0 );

BOOST_TEST_MESSAGE( "--- Test failure when insufficient funds to process transaction." );
tx.clear();
op.fee = ASSET( "10.000 TESTS" );
op.delegation = ASSET( "0.000000 VESTS" );
op.new_account_name = "pam";
tx.set_expiration( db->head_block_time() + STEEM_MAX_TIME_UNTIL_EXPIRATION );
tx.operations.push_back( op );
tx.sign( alice_private_key, db->get_chain_id() );

STEEM_REQUIRE_THROW( db->push_transaction( tx, 0 ), fc::exception );

BOOST_TEST_MESSAGE( "--- Test failure when insufficient fee fo reach target delegation." );
fund( "alice" , asset( db->get_witness_schedule_object().median_props.account_creation_fee.amount * STEEM_CREATE_ACCOUNT_WITH_STEEM_MODIFIER * STEEM_CREATE_ACCOUNT_DELEGATION_RATIO , STEEM_SYMBOL ));
STEEM_REQUIRE_THROW( db->push_transaction( tx, 0 ), fc::exception );

validate_database();


BOOST_TEST_MESSAGE( "--- Test removing delegation from new account" );
tx.clear();
delegate_vesting_shares_operation delegate;
delegate.delegator = "alice";
delegate.delegatee = "bob";
delegate.vesting_shares = ASSET( "0.000000 VESTS" );
tx.operations.push_back( delegate );
tx.sign( alice_private_key, db->get_chain_id() );
db->push_transaction( tx, 0 );

auto itr = db->get_index< vesting_delegation_expiration_index, by_id >().begin();
auto end = db->get_index< vesting_delegation_expiration_index, by_id >().end();

BOOST_REQUIRE( itr != end );
BOOST_REQUIRE( itr->delegator == "alice" );
BOOST_REQUIRE( itr->vesting_shares == del_amt );
BOOST_REQUIRE( itr->expiration == exp_time );
validate_database();
}
FC_LOG_AND_RETHROW()
}
Expand Down

0 comments on commit 12ce215

Please sign in to comment.