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

Feat/rewards abci #3430

Merged
merged 15 commits into from
Dec 2, 2023
+6,377 −539
Merged

Feat/rewards abci #3430

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1dde1f6
feat: add abci logic
snobbee Nov 14, 2023
e19b32e
feat: epoch hook for CLP reward distribution
snobbee Nov 15, 2023
0f1a88b
feat: update clp cli for rewards params update
snobbee Nov 15, 2023
58d1c00
test: fix tests
snobbee Nov 15, 2023
a43d3dc
test: fix tests
snobbee Nov 23, 2023
4ccb602
test: fix lint
snobbee Nov 23, 2023
ab1786f
test: fix tests
snobbee Nov 23, 2023
4e6cbf1
test: fix sifgen
snobbee Nov 24, 2023
3430791
test: fix integration tests
snobbee Nov 25, 2023
a5570bc
test: fix
snobbee Nov 25, 2023
5e8e6e6
feat: use calc pool units
snobbee Nov 25, 2023
c267fcb
feat: keep track of reward distribution
snobbee Nov 25, 2023
22a4c41
feat: reward happens evey hour
snobbee Nov 26, 2023
2ebd543
feat: add pool reward accounting
snobbee Nov 26, 2023
bc8ab48
test: fix linter
snobbee Nov 26, 2023
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
Prev Previous commit
Next Next commit
test: fix tests
@snobbee
snobbee committed Nov 23, 2023
commit a43d3dc14c4008a1630eb9141c2d13c8da2ef34a
39 changes: 38 additions & 1 deletion integrationtest/output/results.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1,38 @@
{"accounts":{"sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd":[{"denom":"cusdc","amount":"999998975129996"},{"denom":"rowan","amount":"999999002243793715591658472"}]},"Pools":{"cusdc":{"external_asset":{"symbol":"cusdc"},"native_asset_balance":"997756206284408341528","external_asset_balance":"1024870004","pool_units":"1000000000000000000000","swap_price_native":"3.851417996402505993","swap_price_external":"0.259644629830901241","reward_period_native_distributed":"0","external_liabilities":"0","external_custody":"0","native_liabilities":"0","native_custody":"0","health":"0.995049498561352358","interest_rate":"0.400000000000000000","last_height_interest_rate_computed":5,"unsettled_external_liabilities":"0","unsettled_native_liabilities":"0","block_interest_native":"0","block_interest_external":"13699020"}},"LPs":{"\u0001cusdc_sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd":{"asset":{"symbol":"cusdc"},"liquidity_provider_units":"1000000000000000000000","liquidity_provider_address":"sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd"}}}
{
"accounts": {
"sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": [
{ "denom": "cusdc", "amount": "999998975129996" },
{ "denom": "rowan", "amount": "999999002243793715591658472" }
]
},
"Pools": {
"cusdc": {
"external_asset": { "symbol": "cusdc" },
"native_asset_balance": "997756206284408341528",
"external_asset_balance": "1024870004",
"pool_units": "1000000000000000000000",
"swap_price_native": "3.851417996402505993",
"swap_price_external": "0.259644629830901241",
"reward_period_native_distributed": "0",
"external_liabilities": "0",
"external_custody": "0",
"native_liabilities": "0",
"native_custody": "0",
"health": "0.995049498561352358",
"interest_rate": "0.400000000000000000",
"last_height_interest_rate_computed": 5,
"unsettled_external_liabilities": "0",
"unsettled_native_liabilities": "0",
"block_interest_native": "0",
"block_interest_external": "13699020"
}
},
"LPs": {
"\u0001cusdc_sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": {
"asset": { "symbol": "cusdc" },
"liquidity_provider_units": "1000000000000000000000",
"liquidity_provider_address": "sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd",
"last_updated_block": 0
}
}
}
93 changes: 47 additions & 46 deletions integrationtest/output/tc1.json
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,48 @@
{
"accounts": {
"sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": [
{
"denom": "cusdc",
"amount": "999998994370679"
},
{
"denom": "rowan",
"amount": "999999000005078262924594065"
}
]
},
"Pools": {
"cusdc": {
"external_asset": {
"symbol": "cusdc"
},
"native_asset_balance": "999994921737075405935",
"external_asset_balance": "1005629321",
"pool_units": "1000000000000000000000",
"swap_price_native": "0.987727340533795089",
"swap_price_external": "1.012425149089800862",
"reward_period_native_distributed": "0",
"external_liabilities": "0",
"external_custody": "0",
"native_liabilities": "0",
"native_custody": "0",
"health": "0.990098960118728966",
"interest_rate": "0.500000000000000000",
"last_height_interest_rate_computed": 5,
"unsettled_external_liabilities": "0",
"unsettled_native_liabilities": "2023304519940209643",
"block_interest_native": "0",
"block_interest_external": "4390203"
}
},
"LPs": {
"\u0001cusdc_sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": {
"asset": {
"symbol": "cusdc"
},
"liquidity_provider_units": "1000000000000000000000",
"liquidity_provider_address": "sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd"
}
}
}
"accounts": {
"sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": [
{
"denom": "cusdc",
"amount": "999998994370679"
},
{
"denom": "rowan",
"amount": "999999000005078262924594065"
}
]
},
"Pools": {
"cusdc": {
"external_asset": {
"symbol": "cusdc"
},
"native_asset_balance": "999994921737075405935",
"external_asset_balance": "1005629321",
"pool_units": "1000000000000000000000",
"swap_price_native": "0.987727340533795089",
"swap_price_external": "1.012425149089800862",
"reward_period_native_distributed": "0",
"external_liabilities": "0",
"external_custody": "0",
"native_liabilities": "0",
"native_custody": "0",
"health": "0.990098960118728966",
"interest_rate": "0.500000000000000000",
"last_height_interest_rate_computed": 5,
"unsettled_external_liabilities": "0",
"unsettled_native_liabilities": "2023304519940209643",
"block_interest_native": "0",
"block_interest_external": "4390203"
}
},
"LPs": {
"\u0001cusdc_sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": {
"asset": {
"symbol": "cusdc"
},
"liquidity_provider_units": "1000000000000000000000",
"liquidity_provider_address": "sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd",
"last_updated_block": 1
}
}
}
129 changes: 65 additions & 64 deletions integrationtest/output/tc2.json
View file
Original file line number Diff line number Diff line change
@@ -1,65 +1,66 @@
{
"accounts": {
"sif15ky9du8a2wlstz6fpx3p4mqpjyrm5cgqhns3lt": [
{
"denom": "atom",
"amount": "1000000000000000000"
},
{
"denom": "cusdc",
"amount": "1000000000000000000"
},
{
"denom": "rowan",
"amount": "999999500000000000000000000000"
}
],
"sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": [
{
"denom": "atom",
"amount": "998999999500000000"
},
{
"denom": "cusdc",
"amount": "1000000000000000000"
},
{
"denom": "rowan",
"amount": "999000014013414589440803461377"
}
]
},
"Pools": {
"atom": {
"external_asset": {
"symbol": "atom"
},
"native_asset_balance": "1000487089285600288982742163",
"external_asset_balance": "999004488135149",
"pool_units": "1000000000000000000000000000",
"swap_price_native": "1.000007907317368468",
"swap_price_external": "0.999992092745156704",
"reward_period_native_distributed": "2000000000000000000000",
"external_liabilities": "500000000",
"external_custody": "996011864851",
"native_liabilities": "500000000000000000000000",
"native_custody": "897299810270213796460",
"health": "0.999499996303992980",
"interest_rate": "0.200000000000000000",
"last_height_interest_rate_computed": 2,
"unsettled_external_liabilities": "0",
"unsettled_native_liabilities": "0",
"block_interest_native": "89729273457704882289",
"block_interest_external": "0"
}
},
"LPs": {
"\u0001atom_sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": {
"asset": {
"symbol": "atom"
},
"liquidity_provider_units": "1000000000000000000000000000",
"liquidity_provider_address": "sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd"
}
}
}
"accounts": {
"sif15ky9du8a2wlstz6fpx3p4mqpjyrm5cgqhns3lt": [
{
"denom": "atom",
"amount": "1000000000000000000"
},
{
"denom": "cusdc",
"amount": "1000000000000000000"
},
{
"denom": "rowan",
"amount": "999999500000000000000000000000"
}
],
"sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": [
{
"denom": "atom",
"amount": "998999999500000000"
},
{
"denom": "cusdc",
"amount": "1000000000000000000"
},
{
"denom": "rowan",
"amount": "999000014013414589440803461377"
}
]
},
"Pools": {
"atom": {
"external_asset": {
"symbol": "atom"
},
"native_asset_balance": "1000487089285600288982742163",
"external_asset_balance": "999004488135149",
"pool_units": "1000000000000000000000000000",
"swap_price_native": "1.000007907317368468",
"swap_price_external": "0.999992092745156704",
"reward_period_native_distributed": "2000000000000000000000",
"external_liabilities": "500000000",
"external_custody": "996011864851",
"native_liabilities": "500000000000000000000000",
"native_custody": "897299810270213796460",
"health": "0.999499996303992980",
"interest_rate": "0.200000000000000000",
"last_height_interest_rate_computed": 2,
"unsettled_external_liabilities": "0",
"unsettled_native_liabilities": "0",
"block_interest_native": "89729273457704882289",
"block_interest_external": "0"
}
},
"LPs": {
"\u0001atom_sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": {
"asset": {
"symbol": "atom"
},
"liquidity_provider_units": "1000000000000000000000000000",
"liquidity_provider_address": "sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd",
"last_updated_block": 0
}
}
}
216 changes: 109 additions & 107 deletions integrationtest/output/tc3.json
View file
Original file line number Diff line number Diff line change
@@ -1,108 +1,110 @@
{
"accounts": {
"sif15ky9du8a2wlstz6fpx3p4mqpjyrm5cgp29yyze": [
{
"denom": "atom",
"amount": "1000000000000000000"
},
{
"denom": "cusdc",
"amount": "1000000000000000000"
},
{
"denom": "rowan",
"amount": "999999500000000000000000000000"
}
],
"sif15ky9du8a2wlstz6fpx3p4mqpjyrm5cgqhns3lt": [
{
"denom": "atom",
"amount": "1000000000000000000"
},
{
"denom": "cusdc",
"amount": "999999995000000000"
},
{
"denom": "rowan",
"amount": "1000000000000000000000000000000"
}
],
"sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": [
{
"denom": "atom",
"amount": "999000019869683995"
},
{
"denom": "cusdc",
"amount": "998999999000000000"
},
{
"denom": "rowan",
"amount": "998000075438258362685196025756"
}
]
},
"Pools": {
"atom": {
"external_asset": {
"symbol": "atom"
},
"native_asset_balance": "1000465000271862905348776264",
"external_asset_balance": "999232805249606",
"pool_units": "1000000000000000000000000000",
"swap_price_native": "0.998253512801981415",
"swap_price_external": "1.001749542752037403",
"reward_period_native_distributed": "5000513370199634618000",
"external_liabilities": "0",
"external_custody": "747325066399",
"native_liabilities": "500000000000000000000000",
"native_custody": "0",
"health": "0.999500487522686271",
"interest_rate": "0.500000000000000000",
"last_height_interest_rate_computed": 5,
"unsettled_external_liabilities": "0",
"unsettled_native_liabilities": "0",
"block_interest_native": "0",
"block_interest_external": "223827155962"
},
"cusdc": {
"external_asset": {
"symbol": "cusdc"
},
"native_asset_balance": "999961984349043871787275403",
"external_asset_balance": "1000006000000000",
"pool_units": "1000000000000000000000000000",
"swap_price_native": "1.000044017032843971",
"swap_price_external": "0.999955984904569929",
"reward_period_native_distributed": "4999486629800365382000",
"external_liabilities": "6000000000",
"external_custody": "0",
"native_liabilities": "0",
"native_custody": "7577120730537667922577",
"health": "0.999994000071999136",
"interest_rate": "0.400000000000000000",
"last_height_interest_rate_computed": 5,
"unsettled_external_liabilities": "0",
"unsettled_native_liabilities": "0",
"block_interest_native": "2153417486774893264327",
"block_interest_external": "0"
}
},
"LPs": {
"\u0001atom_sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": {
"asset": {
"symbol": "atom"
},
"liquidity_provider_units": "1000000000000000000000000000",
"liquidity_provider_address": "sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd"
},
"\u0001cusdc_sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": {
"asset": {
"symbol": "cusdc"
},
"liquidity_provider_units": "1000000000000000000000000000",
"liquidity_provider_address": "sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd"
}
}
}
"accounts": {
"sif15ky9du8a2wlstz6fpx3p4mqpjyrm5cgp29yyze": [
{
"denom": "atom",
"amount": "1000000000000000000"
},
{
"denom": "cusdc",
"amount": "1000000000000000000"
},
{
"denom": "rowan",
"amount": "999999500000000000000000000000"
}
],
"sif15ky9du8a2wlstz6fpx3p4mqpjyrm5cgqhns3lt": [
{
"denom": "atom",
"amount": "1000000000000000000"
},
{
"denom": "cusdc",
"amount": "999999995000000000"
},
{
"denom": "rowan",
"amount": "1000000000000000000000000000000"
}
],
"sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": [
{
"denom": "atom",
"amount": "999000019869683995"
},
{
"denom": "cusdc",
"amount": "998999999000000000"
},
{
"denom": "rowan",
"amount": "998000075438258362685196025756"
}
]
},
"Pools": {
"atom": {
"external_asset": {
"symbol": "atom"
},
"native_asset_balance": "1000465000271862905348776264",
"external_asset_balance": "999232805249606",
"pool_units": "1000000000000000000000000000",
"swap_price_native": "0.998253512801981415",
"swap_price_external": "1.001749542752037403",
"reward_period_native_distributed": "5000513370199634618000",
"external_liabilities": "0",
"external_custody": "747325066399",
"native_liabilities": "500000000000000000000000",
"native_custody": "0",
"health": "0.999500487522686271",
"interest_rate": "0.500000000000000000",
"last_height_interest_rate_computed": 5,
"unsettled_external_liabilities": "0",
"unsettled_native_liabilities": "0",
"block_interest_native": "0",
"block_interest_external": "223827155962"
},
"cusdc": {
"external_asset": {
"symbol": "cusdc"
},
"native_asset_balance": "999961984349043871787275403",
"external_asset_balance": "1000006000000000",
"pool_units": "1000000000000000000000000000",
"swap_price_native": "1.000044017032843971",
"swap_price_external": "0.999955984904569929",
"reward_period_native_distributed": "4999486629800365382000",
"external_liabilities": "6000000000",
"external_custody": "0",
"native_liabilities": "0",
"native_custody": "7577120730537667922577",
"health": "0.999994000071999136",
"interest_rate": "0.400000000000000000",
"last_height_interest_rate_computed": 5,
"unsettled_external_liabilities": "0",
"unsettled_native_liabilities": "0",
"block_interest_native": "2153417486774893264327",
"block_interest_external": "0"
}
},
"LPs": {
"\u0001atom_sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": {
"asset": {
"symbol": "atom"
},
"liquidity_provider_units": "1000000000000000000000000000",
"liquidity_provider_address": "sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd",
"last_updated_block": 0
},
"\u0001cusdc_sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd": {
"asset": {
"symbol": "cusdc"
},
"liquidity_provider_units": "1000000000000000000000000000",
"liquidity_provider_address": "sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd",
"last_updated_block": 1
}
}
}