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

refactor!: refactor order / metadata / reward calculate #24

Closed
wants to merge 43 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
7a33518
feat: refund uncompleted order
mattstweb Jan 31, 2023
43f916a
use block height to calculate reward
SterlynLee Feb 24, 2023
1a70ff1
remove reset_store
SterlynLee Feb 24, 2023
b957a8c
Merge branch 'dev_phase2' of github.com:SaoNetwork/sao-consensus into…
SterlynLee Feb 24, 2023
b6137a1
Merge branch 'matt/refund-expired-order' of github.com:SaoNetwork/sao…
SterlynLee Feb 24, 2023
1b9dab8
order settlement
SterlynLee Feb 24, 2023
7a6660c
old order settlement in UpdateMeta
SterlynLee Feb 24, 2023
5503f29
orderFinish issue
SterlynLee Feb 24, 2023
0a3588d
remove finished/terminated/canceled/expired order
SterlynLee Feb 27, 2023
4ea73a1
migrate for worker, add ignore list in random sp
SterlynLee Feb 27, 2023
5ecdcb2
fix pledge total storage issue
SterlynLee Feb 27, 2023
3cfc2e1
fix abic issue
SterlynLee Feb 27, 2023
40829df
recorrect file name
SterlynLee Feb 28, 2023
aa04e9c
Merge branch 'dev_phase2' of github.com:SaoNetwork/sao-consensus into…
SterlynLee Feb 28, 2023
7780e6b
worker claim
SterlynLee Feb 28, 2023
054df24
fix market issue, add reward debug log
SterlynLee Mar 2, 2023
0e38212
fix expired order issue
SterlynLee Mar 3, 2023
46cbdf4
add creator check for store/renew
SterlynLee Mar 6, 2023
a37df5f
refactor
SterlynLee Mar 7, 2023
736f904
refund complete order gas
SterlynLee Mar 9, 2023
5774f05
Merge branch 'testnet0' of github.com:SaoNetwork/sao-consensus into s…
SterlynLee Mar 9, 2023
a2e2694
add migrating status for order, uniform order status constant
SterlynLee Mar 10, 2023
469083f
fix update meta
SterlynLee Mar 10, 2023
6187840
renew duration issue
SterlynLee Mar 13, 2023
f114587
revert refund gas
SterlynLee Mar 14, 2023
937a502
refactor metadata, move new meta from MsgComplete to MsgStore
SterlynLee Mar 15, 2023
b89b6dd
Merge branch 'testnet1' of github.com:SaoNetwork/sao-consensus into s…
SterlynLee Mar 16, 2023
043418d
move expired order to model module
SterlynLee Mar 16, 2023
903b90a
Merge remote-tracking branch 'origin/testnet1' into st/dev_phase2_reward
SterlynLee Mar 17, 2023
bf92b85
fix
SterlynLee Mar 17, 2023
878bb0f
order status issue
SterlynLee Mar 17, 2023
1f8c41d
add order finish event
SterlynLee Mar 17, 2023
25ecd48
fix key did generate
SterlynLee Mar 20, 2023
927511c
Merge remote-tracking branch 'origin/st/dev_phase3_metadata' into dev…
SterlynLee Mar 21, 2023
4c6cea3
cleanup
SterlynLee Mar 21, 2023
58a08ed
duration issue
SterlynLee Mar 21, 2023
415ac5f
order expire issue
SterlynLee Mar 21, 2023
c43df73
rollback meta if order is expired/canceled
SterlynLee Mar 21, 2023
decb83a
fix ut
SterlynLee Mar 21, 2023
cc13ad9
fix compile error
SterlynLee Mar 21, 2023
17e87ce
revert creator check in store/renew
SterlynLee Mar 22, 2023
bf227ea
Merge remote-tracking branch 'origin/develop' into st/dev_phase3_meta…
SterlynLee Mar 22, 2023
63fcae2
refactor: refactor order / reward / metadata
SterlynLee Mar 22, 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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<a name="unreleased"></a>
## [Unreleased]

### Features
- refund uncompleted order

### Code Refactoring
- refactor order / reward / metadata


<a name="v0.1.3"></a>
## [v0.1.3](https://github.com/SAONetwork/sao-consensus/compare/v0.1.2...v0.1.3) (2023-03-15)
Expand Down
22 changes: 12 additions & 10 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -543,11 +543,22 @@ func New(
)
orderModule := ordermodule.NewAppModule(appCodec, app.OrderKeeper, app.AccountKeeper, app.BankKeeper)

app.MarketKeeper = *marketmodulekeeper.NewKeeper(
app.BankKeeper,
app.OrderKeeper,
appCodec,
keys[marketmoduletypes.StoreKey],
keys[marketmoduletypes.MemStoreKey],
app.GetSubspace(marketmoduletypes.ModuleName),
)
marketModule := marketmodule.NewAppModule(appCodec, app.MarketKeeper, app.AccountKeeper, app.BankKeeper)

app.NodeKeeper = *nodemodulekeeper.NewKeeper(
app.AccountKeeper,
app.BankKeeper,
app.OrderKeeper,
app.StakingKeeper,
app.MarketKeeper,
appCodec,
keys[nodemoduletypes.StoreKey],
keys[nodemoduletypes.MemStoreKey],
Expand All @@ -561,23 +572,14 @@ func New(
app.DidKeeper,
app.BankKeeper,
app.NodeKeeper,
app.MarketKeeper,
appCodec,
keys[modelmoduletypes.StoreKey],
keys[modelmoduletypes.MemStoreKey],
app.GetSubspace(modelmoduletypes.ModuleName),
)
modelModule := modelmodule.NewAppModule(appCodec, app.ModelKeeper, app.AccountKeeper, app.BankKeeper)

app.MarketKeeper = *marketmodulekeeper.NewKeeper(
app.BankKeeper,
app.OrderKeeper,
appCodec,
keys[marketmoduletypes.StoreKey],
keys[marketmoduletypes.MemStoreKey],
app.GetSubspace(marketmoduletypes.ModuleName),
)
marketModule := marketmodule.NewAppModule(appCodec, app.MarketKeeper, app.AccountKeeper, app.BankKeeper)

// this line is used by starport scaffolding # stargate/app/keeperDefinition

app.SaoKeeper = *saomodulekeeper.NewKeeper(
Expand Down
Loading