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.

Sign up for GitHub

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

Jump to bottom

Feature/samet tests #325

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Feature/samet tests #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
208df71
Update test_transactions.py
pi314x Nov 21, 2023
d58ad3b
Update test_transactions.py
pi314x Nov 21, 2023
3b6e1e7
Update test_transactions.py
pi314x Nov 21, 2023
eb5a742
Update test_transactions.py
pi314x Nov 22, 2023
1d9a063
Update test_transactions.py
pi314x Nov 22, 2023
00985e7
add samet fund and credit deal to operations.py
litepresence Dec 17, 2022
20a41e9
fix: finish implementation testing of more operations
xeroc Nov 23, 2023
de9c789
fix: merge problems and fixing unittests
xeroc Nov 23, 2023
a651abe
bump: requires graphene 1.6.1
xeroc Nov 23, 2023
e640dc3
fix: proper way of dealing with Optional
xeroc Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
320 changes: 320 additions & 0 deletions bitsharesbase/operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,6 +1231,326 @@ def __init__(self, *args, **kwargs):
)


class Samet_fund_create(GrapheneObject):
def __init__(self, *args, **kwargs):
if isArgsThisClass(self, args):
self.data = args[0].data
else:
if len(args) == 1 and len(kwargs) == 0:
kwargs = args[0]
super().__init__(
OrderedDict(
[
("fee", Asset(kwargs["fee"])),
("owner_account", ObjectId(kwargs["owner_account"], "account")),
("asset_type", ObjectId(kwargs["asset_type"], "asset")),
("balance", Int64(kwargs["balance"])),
("fee_rate", Uint32(kwargs["fee_rate"])),
("extensions", Set([])),
]
)
)


class Samet_fund_delete(GrapheneObject):
def __init__(self, *args, **kwargs):
if isArgsThisClass(self, args):
self.data = args[0].data
else:
if len(args) == 1 and len(kwargs) == 0:
kwargs = args[0]
super().__init__(
OrderedDict(
[
("fee", Asset(kwargs["fee"])),
("owner_account", ObjectId(kwargs["owner_account"], "account")),
("fund_id", ObjectId(kwargs["fund_id"], "samet_fund")),
("extensions", Set([])),
]
)
)


class Samet_fund_update(GrapheneObject):
def __init__(self, *args, **kwargs):
if isArgsThisClass(self, args):
self.data = args[0].data
else:
if len(args) == 1 and len(kwargs) == 0:
kwargs = args[0]
if "new_fee_rate" in kwargs:
new_fee_rate = Optional(Uint32(kwargs["new_fee_rate"]))
else:
new_fee_rate = Optional(None)
if "delta_amount" in kwargs:
delta_amount = Optional(Asset(kwargs["delta_amount"]))
else:
delta_amount = Optional(None)
super().__init__(
OrderedDict(
[
("fee", Asset(kwargs["fee"])),
("owner_account", ObjectId(kwargs["owner_account"], "account")),
("fund_id", ObjectId(kwargs["fund_id"], "samet_fund")),
("delta_amount", delta_amount),
("new_fee_rate", new_fee_rate),
("extensions", Set([])),
]
)
)


class Samet_fund_borrow(GrapheneObject):
def __init__(self, *args, **kwargs):
if isArgsThisClass(self, args):
self.data = args[0].data
else:
if len(args) == 1 and len(kwargs) == 0:
kwargs = args[0]
super().__init__(
OrderedDict(
[
("fee", Asset(kwargs["fee"])),
("borrower", ObjectId(kwargs["borrower"], "account")),
("fund_id", ObjectId(kwargs["fund_id"], "samet_fund")),
("borrow_amount", Asset(kwargs["borrow_amount"])),
("extensions", Set([])),
]
)
)


class Samet_fund_repay(GrapheneObject):
def __init__(self, *args, **kwargs):
if isArgsThisClass(self, args):
self.data = args[0].data
else:
if len(args) == 1 and len(kwargs) == 0:
kwargs = args[0]
super().__init__(
OrderedDict(
[
("fee", Asset(kwargs["fee"])),
("account", ObjectId(kwargs["account"], "account")),
("fund_id", ObjectId(kwargs["fund_id"], "samet_fund")),
("repay_amount", Asset(kwargs["repay_amount"])),
("fund_fee", Asset(kwargs["fund_fee"])),
("extensions", Set([])),
]
)
)


class Credit_offer_create(GrapheneObject):
def __init__(self, *args, **kwargs):
if isArgsThisClass(self, args):
self.data = args[0].data
else:
if len(args) == 1 and len(kwargs) == 0:
kwargs = args[0]
super().__init__(
OrderedDict(
[
("fee", Asset(kwargs["fee"])),
("owner_account", ObjectId(kwargs["owner_account"], "account")),
("asset_type", ObjectId(kwargs["asset_type"], "asset")),
("balance", Int64(kwargs["balance"])),
("fee_rate", Uint32(kwargs["fee_rate"])),
(
"max_duration_seconds",
Uint32(kwargs["max_duration_seconds"]),
),
("min_deal_amount", Int64(kwargs["min_deal_amount"])),
("enabled", Bool(kwargs["enabled"])),
("auto_disable_time", PointInTime(kwargs["auto_disable_time"])),
(
"acceptable_collateral",
Map(
[
[ObjectId(k[0], "asset"), Price(k[1])]
for k in kwargs["acceptable_collateral"]
]
),
),
(
"acceptable_borrowers",
Map(
[
[ObjectId(k[0], "account"), Int64(k[1])]
for k in kwargs["acceptable_borrowers"]
]
),
),
("extensions", Set([])),
]
)
)


class Credit_offer_delete(GrapheneObject):
def __init__(self, *args, **kwargs):
if isArgsThisClass(self, args):
self.data = args[0].data
else:
if len(args) == 1 and len(kwargs) == 0:
kwargs = args[0]
super().__init__(
OrderedDict(
[
("fee", Asset(kwargs["fee"])),
("owner_account", ObjectId(kwargs["owner_account"], "account")),
("offer_id", ObjectId(kwargs["offer_id"], "credit_offer")),
("extensions", Set([])),
]
)
)


class Credit_offer_update(GrapheneObject):
def __init__(self, *args, **kwargs):
if isArgsThisClass(self, args):
self.data = args[0].data
else:
if len(args) == 1 and len(kwargs) == 0:
kwargs = args[0]
if kwargs.get("min_deal_amount"):
min_deal_amount = Optional(Int64(kwargs["min_deal_amount"]))
else:
min_deal_amount = Optional(None)
if kwargs.get("enabled"):
enabled = Optional(Bool(kwargs["enabled"]))
else:
enabled = Optional(None)
if kwargs.get("auto_disable_time"):
auto_disable_time = Optional(PointInTime(kwargs["auto_disable_time"]))
else:
auto_disable_time = Optional(None)
if kwargs.get("acceptable_collateral"):
acceptable_collateral = Optional(
Map(
[
[ObjectId(k[0], "asset"), Price(k[1])]
for k in kwargs["acceptable_collateral"]
]
)
)
else:
acceptable_collateral = Optional(None)
if kwargs.get("acceptable_borrowers"):
acceptable_borrowers = Optional(
Map(
[
[ObjectId(k[0], "account"), Int64(k[1])]
for k in kwargs["acceptable_borrowers"]
]
)
)
else:
acceptable_borrowers = Optional(None)
if kwargs.get("max_duration_seconds"):
max_duration_seconds = Optional(
Uint32(kwargs.get("max_duration_seconds"))
)
else:
max_duration_seconds = Optional(None)
if kwargs.get("fee_rate"):
fee_rate = Optional(Uint32(kwargs.get("fee_rate")))
else:
fee_rate = Optional(None)
if kwargs.get("delta_amount"):
delta_amount = Optional(Asset(kwargs.get("delta_amount")))
else:
delta_amount = Optional(None)
super().__init__(
OrderedDict(
[
("fee", Asset(kwargs["fee"])),
("owner_account", ObjectId(kwargs["owner_account"], "account")),
("offer_id", ObjectId(kwargs["offer_id"], "credit_offer")),
("delta_amount", delta_amount),
("fee_rate", fee_rate),
("max_duration_seconds", max_duration_seconds),
("min_deal_amount", min_deal_amount),
("enabled", enabled),
("auto_disable_time", auto_disable_time),
("acceptable_collateral", acceptable_collateral),
("acceptable_borrowers", acceptable_borrowers),
("extensions", Set([])),
]
)
)


class Credit_offer_accept(GrapheneObject):
def __init__(self, *args, **kwargs):
if isArgsThisClass(self, args):
self.data = args[0].data
else:
if len(args) == 1 and len(kwargs) == 0:
kwargs = args[0]
super().__init__(
OrderedDict(
[
("fee", Asset(kwargs["fee"])),
("borrower", ObjectId(kwargs["borrower"], "account")),
("offer_id", ObjectId(kwargs["offer_id"], "credit_offer")),
("borrow_amount", Asset(kwargs["fee"])),
("collateral", Asset(kwargs["fee"])),
("max_fee_rate", Uint32(kwargs["max_fee_rate"])),
(
"min_duration_seconds",
Uint32(kwargs["min_duration_seconds"]),
),
("extensions", Set([])),
]
)
)


class Credit_deal_repay(GrapheneObject):
def __init__(self, *args, **kwargs):
if isArgsThisClass(self, args):
self.data = args[0].data
else:
if len(args) == 1 and len(kwargs) == 0:
kwargs = args[0]
super().__init__(
OrderedDict(
[
("fee", Asset(kwargs["fee"])),
("account", ObjectId(kwargs["account"], "account")),
("deal_id", ObjectId(kwargs["deal_id"], "credit_deal")),
("repay_amount", Asset(kwargs["fee"])),
("credit_fee", Asset(kwargs["fee"])),
("extensions", Set([])),
]
)
)


class Credit_deal_expired(GrapheneObject):
def __init__(self, *args, **kwargs):
if isArgsThisClass(self, args):
self.data = args[0].data
else:
if len(args) == 1 and len(kwargs) == 0:
kwargs = args[0]
super().__init__(
OrderedDict(
[
("fee", Asset(kwargs["fee"])),
("deal_id", ObjectId(kwargs["deal_id"], "credit_deal")),
("offer_id", ObjectId(kwargs["offer_id"], "credit_offer")),
("offer_owner", ObjectId(kwargs["offer_owner"], "account")),
("borrower", ObjectId(kwargs["borrower"], "account")),
("unpaid_amount", Asset(kwargs["fee"])),
("collateral", Asset(kwargs["fee"])),
("fee_rate", Uint32(kwargs["fee_rate"])),
]
)
)


class Liquidity_pool_update(GrapheneObject):
def __init__(self, *args, **kwargs):
if isArgsThisClass(self, args):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
graphenelib>=1.5.0,<2.0.0
graphenelib>=1.6.1,<2.0.0
Events==0.3
6 changes: 3 additions & 3 deletions tests/test_bitshares.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,14 @@ def test_create_asset(self):
self.assertEqual(op["symbol"], symbol)
self.assertEqual(op["precision"], precision)
self.assertEqual(
op["common_options"]["max_supply"], int(max_supply * 10 ** precision)
op["common_options"]["max_supply"], int(max_supply * 10**precision)
)
self.assertEqual(
op["common_options"]["market_fee_percent"], int(market_fee_percent * 100)
)
self.assertEqual(
op["common_options"]["max_market_fee"],
int(max_market_fee * 10 ** precision),
int(max_market_fee * 10**precision),
)
self.assertEqual(op["common_options"]["description"], description)
self.assertEqual(
Expand Down Expand Up @@ -211,7 +211,7 @@ def test_allow(self):
op = tx["operations"][0][1]
self.assertIn("owner", op)
self.assertIn(
["BTS55VCzsb47NZwWe5F3qyQKedX9iHBHMVVFSc96PDvV7wuj7W86n", "1"],
["BTS55VCzsb47NZwWe5F3qyQKedX9iHBHMVVFSc96PDvV7wuj7W86n", 1],
op["owner"]["key_auths"],
)
self.assertEqual(op["owner"]["weight_threshold"], 1)
Expand Down