Skip to content
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.

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

adding --broadcast option #10

Merged
merged 2 commits into from
Apr 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 38 additions & 18 deletions pacli/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def dtl(cls, card, subscribed=False):
@classmethod
def pack_cards_for_printing(cls):

assert len(cls.cards) > 0, {"error": "No cards found!"}
#assert len(cls.cards) > 0, {"error": "No cards found!"}

for i in cls.cards:
cls.card_table.append(
Expand Down Expand Up @@ -325,7 +325,7 @@ def deck_checksum(provider, deck_id):
print("\n", "Deck checksum is incorrect.")


def new_deck(provider, deck):
def new_deck(provider, deck, broadcast):
'''
Spawn a new PeerAssets deck.

Expand All @@ -349,12 +349,16 @@ def new_deck(provider, deck):
)
raw_deck_spawn = hexlify(raw_deck).decode()
signed = provider.signrawtransaction(raw_deck_spawn)
txid = provider.sendrawtransaction(signed["hex"])
print("\n", txid, "\n")

deck["asset_id"] = txid
d = pa.Deck(**deck)
pa.load_deck_p2th_into_local_node(provider, d) # subscribe to deck
if broadcast:
txid = provider.sendrawtransaction(signed["hex"])
print("\n", txid, "\n")

deck["asset_id"] = txid
d = pa.Deck(**deck)
pa.load_deck_p2th_into_local_node(provider, d) # subscribe to deck
else:
print("\nraw transaction:\n", signed["hex"], "\n")

def list_cards(provider, args):
'''
Expand Down Expand Up @@ -401,7 +405,7 @@ def export_cards(provider, args):
export_to_csv(cards, args[1])


def card_issue(provider, args):
def card_issue(provider, args, broadcast):
'''
Issue new cards of this deck.

Expand Down Expand Up @@ -441,11 +445,15 @@ def card_issue(provider, args):
).decode()

signed = provider.signrawtransaction(raw_ct)
txid = provider.sendrawtransaction(signed["hex"]) # send the tx
print("\n", txid, "\n")

if broadcast:
txid = provider.sendrawtransaction(signed["hex"]) # send the tx
print("\n", txid, "\n")
else:
print("\nraw transaction:\n", signed["hex"], "\n")

def card_burn(provider, args):

def card_burn(provider, args, broadcast):
'''
Burn cards of this deck.

Expand Down Expand Up @@ -479,9 +487,15 @@ def card_burn(provider, args):
).decode()

signed = provider.signrawtransaction(raw_cb)
print("\n", provider.sendrawtransaction(signed["hex"]), "\n") # send the tx

def card_transfer(provider, args):
if broadcast:
txid = provider.sendrawtransaction(signed["hex"]) # send the tx
print("\n", txid, "\n")
else:
print("\nraw transaction:\n", signed["hex"], "\n")


def card_transfer(provider, args, broadcast):
'''
Transfer cards to <receivers>

Expand Down Expand Up @@ -516,7 +530,12 @@ def card_transfer(provider, args):
).decode()

signed = provider.signrawtransaction(raw_ct)
print("\n", provider.sendrawtransaction(signed["hex"]), "\n") # send the tx

if broadcast:
txid = provider.sendrawtransaction(signed["hex"]) # send the tx
print("\n", txid, "\n")
else:
print("\nraw transaction:\n", signed["hex"], "\n")


def get_state(provider, deck):
Expand Down Expand Up @@ -613,6 +632,7 @@ def cli():
dest="command",
description='valid subcommands')

parser.add_argument("--broadcast", action="store_true", help="broadcast resulting transactions")
parser.add_argument("--newaddress", action="store_true",
help="generate a new address and import to wallet")
parser.add_argument("--status", action="store_true", help="show pacli status")
Expand Down Expand Up @@ -664,19 +684,19 @@ def main():
if args.info:
deck_info(provider, args.info)
if args.new:
new_deck(provider, args.new)
new_deck(provider, args.new, args.broadcast)
if args.checksum:
deck_checksum(provider, args.checksum)
if args.balances:
deck_balances(provider, args.balances)

if args.command == "card":
if args.issue:
card_issue(provider, args.issue)
card_issue(provider, args.issue, args.broadcast)
if args.burn:
card_burn(provider, args.burn)
card_burn(provider, args.burn, args.broadcast)
if args.transfer:
card_transfer(provider, args.transfer)
card_transfer(provider, args.transfer, args.broadcast)
if args.list:
list_cards(provider, args.list)
if args.export:
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
--no-binary secp256k1
pypeerassets>=0.1.1
terminaltables>=3.1.0
appdirs
appdirs