Skip to content
Snippets Groups Projects

Transfer wrapper bug fixes

Merged inso requested to merge Insoleet:master into master
1 file
+ 30
5
Compare changes
  • Side-by-side
  • Inline
+ 30
5
@@ -34,7 +34,7 @@ class Transaction(Wrapper):
@@ -34,7 +34,7 @@ class Transaction(Wrapper):
def __call__(self):
def __call__(self):
try:
try:
last_tx = hdc.transactions.sender.Last(self.pgp_fingerprint, self.server, self.port).get()
last_tx = hdc.transactions.sender.Last(self.pgp_fingerprint, server=self.server, port=self.port).get()
except ValueError:
except ValueError:
last_tx = None
last_tx = None
@@ -118,7 +118,7 @@ Comment:
@@ -118,7 +118,7 @@ Comment:
class Transfer(Transaction):
class Transfer(Transaction):
def __init__(self, pgp_fingerprint, recipient, coins, message='', keyid=None, server=None, port=None):
def __init__(self, pgp_fingerprint, recipient, coins, message='', keyid=None, server=None, port=None):
super().__init__('TRANSFER', pgp_fingerprint, message, keyid, server, port)
super().__init__('TRANSFER', pgp_fingerprint, message, keyid=keyid, server=server, port=port)
self.recipient = recipient
self.recipient = recipient
self.coins = coins
self.coins = coins
@@ -135,12 +135,37 @@ Coins:
@@ -135,12 +135,37 @@ Coins:
for coin in self.coins.split(','):
for coin in self.coins.split(','):
data = coin.split(':')
data = coin.split(':')
issuer = data[0]
issuer = data[0]
 
for number in data[1:]:
for number in data[1:]:
context_data.update(hdc.coins.View(issuer, int(number), self.server, self.port).get())
context_data.update(hdc.coins.View(issuer, int(number), self.server, self.port).get())
tx += '%(id)s, %(transaction)s\n' % context_data
tx += '%(id)s, %(transaction)s\n' % context_data
 
return tx
 
 
 
class RawTransfer(Transaction):
 
def __init__(self, pgp_fingerprint, recipient, coins, message='', keyid=None, server=None, port=None):
 
super().__init__('TRANSFER', pgp_fingerprint, message, keyid=keyid, server=server, port=port)
 
 
self.recipient = recipient
 
self.coins = coins
 
 
def get_message(self, context_data, tx=''):
 
context_data['recipient'] = self.recipient
 
 
tx += """\
 
Recipient: %(recipient)s
 
Type: %(type)s
 
Coins:
 
""" % context_data
 
 
for coin in self.coins:
 
data = coin.split('-')
 
context_data.update(hdc.coins.View(data[0], int(data[1]), self.server, self.port).get())
 
tx += '%(id)s, %(transaction)s\n' % context_data
return tx
return tx
 
class MonoTransaction(Transaction):
class MonoTransaction(Transaction):
def get_next_coin_number(self, coins):
def get_next_coin_number(self, coins):
number = 0
number = 0
@@ -172,7 +197,7 @@ Coins:
@@ -172,7 +197,7 @@ Coins:
class Issue(MonoTransaction):
class Issue(MonoTransaction):
def __init__(self, pgp_fingerprint, amendment, coins, message='', keyid=None, server=None, port=None):
def __init__(self, pgp_fingerprint, amendment, coins, message='', keyid=None, server=None, port=None):
super().__init__('ISSUANCE', pgp_fingerprint, message, keyid, server, port)
super().__init__('ISSUANCE', pgp_fingerprint, message, keyid=keyid, server=server, port=port)
self.amendment = amendment
self.amendment = amendment
self.coins = coins
self.coins = coins
@@ -189,7 +214,7 @@ class Issue(MonoTransaction):
@@ -189,7 +214,7 @@ class Issue(MonoTransaction):
class Fusion(MonoTransaction):
class Fusion(MonoTransaction):
def __init__(self, pgp_fingerprint, coins, message='', keyid=None, server=None, port=None):
def __init__(self, pgp_fingerprint, coins, message='', keyid=None, server=None, port=None):
super().__init__('FUSION', pgp_fingerprint, message, keyid, server, port)
super().__init__('FUSION', pgp_fingerprint, message, keyid=keyid, server=server, port=port)
self.coins = coins
self.coins = coins
@@ -206,7 +231,7 @@ class Fusion(MonoTransaction):
@@ -206,7 +231,7 @@ class Fusion(MonoTransaction):
class Divide(MonoTransaction):
class Divide(MonoTransaction):
def __init__(self, pgp_fingerprint, old_coins, new_coins, message='', keyid=None, server=None, port=None):
def __init__(self, pgp_fingerprint, old_coins, new_coins, message='', keyid=None, server=None, port=None):
super().__init__('DIVISION', pgp_fingerprint, message, keyid, server, port)
super().__init__('DIVISION', pgp_fingerprint, message, keyid=keyid, server=server, port=port)
self.old_coins = old_coins
self.old_coins = old_coins
self.new_coins = new_coins
self.new_coins = new_coins
Loading