diff --git a/steempy/steem.py b/steempy/steem.py index 2333822ca3c6079b0ccccc40e71073c29daddb86..96929d8b450daf525642877e03686135e966e276 100644 --- a/steempy/steem.py +++ b/steempy/steem.py @@ -466,7 +466,7 @@ class Steem(object): memo_pubkey = memo_key.get_public_key() active_privkey = active_key.get_private_key() posting_privkey = posting_key.get_private_key() - # owner_privkey = owner_key.get_private_key() + owner_privkey = owner_key.get_private_key() memo_privkey = memo_key.get_private_key() # store private keys if storekeys: diff --git a/steempy/transactionbuilder.py b/steempy/transactionbuilder.py index 696f549c5ec59bdbaf211de72fac8283af57288f..d7505ade4edef562c8ccf66e4148a17b1a31cadd 100644 --- a/steempy/transactionbuilder.py +++ b/steempy/transactionbuilder.py @@ -105,9 +105,9 @@ class TransactionBuilder(dict): account.clear_cache() account.refresh() if permission not in account: - account = Account(account, steem_instance=self.steem) + account = Account(account, steem_instance=self.steem) assert permission in account, "Could not access permission" - + required_treshold = account[permission]["weight_threshold"] if self.steem.wallet.locked(): diff --git a/steempybase/objects.py b/steempybase/objects.py index 690c496e6674f34996925260d34266700c815aa5..2763d560f0b3bf27ef73143cd3619698b936697c 100644 --- a/steempybase/objects.py +++ b/steempybase/objects.py @@ -98,11 +98,10 @@ class Operation(GPHOperation): def json(self): return json.loads(str(self)) - #return json.loads(str(json.dumps([self.name, self.op.toJson()]))) + # return json.loads(str(json.dumps([self.name, self.op.toJson()]))) def __bytes__(self): return bytes(Id(self.opId)) + bytes(self.op) - # return bytes(self.op) def __str__(self): return json.dumps([self.name.lower(), self.op.toJson()]) diff --git a/tests/test_transactions.py b/tests/test_transactions.py index 93323daf2a8f5f6109eed90af0c68d06f26d47c5..da48d5346a6c2b7d883c532755a51232769eea86 100644 --- a/tests/test_transactions.py +++ b/tests/test_transactions.py @@ -49,7 +49,6 @@ class Testcases(unittest.TestCase): if self.cm_unsigned != '': self.assertEqual(self.cm_unsigned, txWire_Unsigned) self.assertEqual(self.cm[:-130], txWire[:-130]) - if TEST_AGAINST_CLI_WALLET: from grapheneapi.grapheneapi import GrapheneAPI @@ -76,14 +75,14 @@ class Testcases(unittest.TestCase): "memo": "Fooo" }) self.op = [2, {'from': 'foo', 'to': 'baar', 'amount': '111.110 STEEM', 'memo': 'Fooo'}] - self.cm_op = ("") # ("03666f6f046261617206b201000000000003535445454d000004466f6f6f") + self.cm_op = ("") # ("03666f6f046261617206b201000000000003535445454d000004466f6f6f") self.cm = ("f68585abf4dce7c80457010203666f6f046261617206b201000000" "000003535445454d000004466f6f6f00012025416c234dd5ff15d8" "b45486833443c128002bcafa57269cada3ad213ef88adb5831f63a" "58d8b81bbdd92d494da01eeb13ee1786d02ce075228b25d7132f8f" "3e") self.cm_unsigned = ("f68585abf4dce7c80457010203666f6f046261617206b201" - "000000000003535445454d000004466f6f6f0000") + "000000000003535445454d000004466f6f6f0000") self.doit()