Skip to content

Commit 3b48240

Browse files
troiantroian
committed
feat(aep-75): implement authz deposit within escrow module
Signed-off-by: Artur Troian <troian@users.noreply.github.com>
1 parent 353da27 commit 3b48240

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2033
-920
lines changed

‎app/app.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/gorilla/mux"
1313
"github.com/rakyll/statik/fs"
1414
"github.com/spf13/cast"
15+
emodule "pkg.akt.dev/go/node/escrow/module"
1516
"pkg.akt.dev/go/sdkutil"
1617

1718
abci "github.com/cometbft/cometbft/abci/types"
@@ -63,8 +64,7 @@ import (
6364
audittypes "pkg.akt.dev/go/node/audit/v1"
6465
certtypes "pkg.akt.dev/go/node/cert/v1"
6566
deploymenttypes "pkg.akt.dev/go/node/deployment/v1"
66-
escrowtypes "pkg.akt.dev/go/node/escrow/v1"
67-
markettypes "pkg.akt.dev/go/node/market/v1beta5"
67+
markettypes "pkg.akt.dev/go/node/market/v1"
6868
providertypes "pkg.akt.dev/go/node/provider/v1beta4"
6969
taketypes "pkg.akt.dev/go/node/take/v1"
7070

@@ -278,7 +278,7 @@ func orderBeginBlockers(_ []string) []string {
278278
authtypes.ModuleName,
279279
authz.ModuleName,
280280
taketypes.ModuleName,
281-
escrowtypes.ModuleName,
281+
emodule.ModuleName,
282282
minttypes.ModuleName,
283283
distrtypes.ModuleName,
284284
slashingtypes.ModuleName,
@@ -308,7 +308,7 @@ func OrderEndBlockers(_ []string) []string {
308308
authtypes.ModuleName,
309309
authz.ModuleName,
310310
taketypes.ModuleName,
311-
escrowtypes.ModuleName,
311+
emodule.ModuleName,
312312
minttypes.ModuleName,
313313
distrtypes.ModuleName,
314314
slashingtypes.ModuleName,

‎app/mac.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ import (
77
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
88
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
99
ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
10-
11-
escrowtypes "pkg.akt.dev/go/node/escrow/v1"
10+
emodule "pkg.akt.dev/go/node/escrow/module"
1211
)
1312

1413
func ModuleAccountPerms() map[string][]string {
1514
return map[string][]string{
1615
authtypes.FeeCollectorName: nil,
17-
escrowtypes.ModuleName: nil,
16+
emodule.ModuleName: nil,
1817
distrtypes.ModuleName: nil,
1918
minttypes.ModuleName: {authtypes.Minter},
2019
stakingtypes.BondedPoolName: {authtypes.Burner, authtypes.Staking},

‎app/modules.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ func appModules(
152152
escrow.NewAppModule(
153153
app.cdc,
154154
app.Keepers.Akash.Escrow,
155+
app.Keepers.Cosmos.Authz,
156+
app.Keepers.Cosmos.Bank,
155157
),
156158
deployment.NewAppModule(
157159
app.cdc,

‎app/sim_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
atypes "pkg.akt.dev/go/node/audit/v1"
4141
ctypes "pkg.akt.dev/go/node/cert/v1"
4242
dtypes "pkg.akt.dev/go/node/deployment/v1"
43-
mtypes "pkg.akt.dev/go/node/market/v1beta5"
43+
mtypes "pkg.akt.dev/go/node/market/v1"
4444
ptypes "pkg.akt.dev/go/node/provider/v1beta4"
4545
taketypes "pkg.akt.dev/go/node/take/v1"
4646
"pkg.akt.dev/go/sdkutil"

‎app/types/app.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ import (
5656
ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
5757
ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper"
5858
ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
59+
emodule "pkg.akt.dev/go/node/escrow/module"
5960

6061
atypes "pkg.akt.dev/go/node/audit/v1"
6162
ctypes "pkg.akt.dev/go/node/cert/v1"
6263
dtypes "pkg.akt.dev/go/node/deployment/v1"
6364
dv1beta "pkg.akt.dev/go/node/deployment/v1beta3"
64-
etypes "pkg.akt.dev/go/node/escrow/v1"
6565
agovtypes "pkg.akt.dev/go/node/gov/v1beta3"
6666
mtypes "pkg.akt.dev/go/node/market/v1beta4"
6767
ptypes "pkg.akt.dev/go/node/provider/v1beta4"
@@ -408,7 +408,7 @@ func (app *App) InitNormalKeepers(
408408

409409
app.Keepers.Akash.Escrow = ekeeper.NewKeeper(
410410
cdc,
411-
app.keys[etypes.StoreKey],
411+
app.keys[emodule.StoreKey],
412412
app.Keepers.Cosmos.Bank,
413413
app.Keepers.Akash.Take,
414414
app.Keepers.Cosmos.Authz,
@@ -526,7 +526,7 @@ func kvStoreKeys() []string {
526526
func akashKVStoreKeys() []string {
527527
return []string{
528528
ttypes.StoreKey,
529-
etypes.StoreKey,
529+
emodule.StoreKey,
530530
dtypes.StoreKey,
531531
mtypes.StoreKey,
532532
ptypes.StoreKey,

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ require (
4747
google.golang.org/grpc v1.74.2
4848
gopkg.in/yaml.v3 v3.0.1
4949
gotest.tools/v3 v3.5.2
50-
pkg.akt.dev/go v0.0.3-rc14
51-
pkg.akt.dev/go/cli v0.0.3-rc12
50+
pkg.akt.dev/go v0.0.3-rc15
51+
pkg.akt.dev/go/cli v0.0.3-rc13
5252
pkg.akt.dev/go/sdl v0.0.2-rc6
5353
)
5454

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3278,10 +3278,10 @@ nhooyr.io/websocket v1.8.11/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+
32783278
nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
32793279
pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA=
32803280
pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
3281-
pkg.akt.dev/go v0.0.3-rc14 h1:X1Gtp7UIBRVhIYRn5xgAnHlBI6Jl2EKBBq39dZtOzI8=
3282-
pkg.akt.dev/go v0.0.3-rc14/go.mod h1:TF85k1RuubGnnESQud3FYoDT4/SWWHlccJ/JPw7gDzo=
3283-
pkg.akt.dev/go/cli v0.0.3-rc12 h1:QLWqs5QSwjcOGLL1UNQvUSuDRXXyHRJ/EehVeKcR+Cw=
3284-
pkg.akt.dev/go/cli v0.0.3-rc12/go.mod h1:5DKQPIhu2nXNp+1LUJZu0Fziu6q4sOQLXMDoHL76d80=
3281+
pkg.akt.dev/go v0.0.3-rc15 h1:tGerlRilP0zS3hF/p1l63nFOw9d200hQo+Ai1JKZ+Ns=
3282+
pkg.akt.dev/go v0.0.3-rc15/go.mod h1:TF85k1RuubGnnESQud3FYoDT4/SWWHlccJ/JPw7gDzo=
3283+
pkg.akt.dev/go/cli v0.0.3-rc13 h1:6DgFfrIFLZ3Ii14rYvvH8CP2BaORcz93rjCk7OXnYq8=
3284+
pkg.akt.dev/go/cli v0.0.3-rc13/go.mod h1:hqpNxZAa4yqn6sODAQf/phzX4FQJ9FJIeUQGw4N7Mak=
32853285
pkg.akt.dev/go/sdl v0.0.2-rc6 h1:rlaiBL2xTl06Rq/MNePmMRyl6ucWweA5q4Mt9tZzwzM=
32863286
pkg.akt.dev/go/sdl v0.0.2-rc6/go.mod h1:OzXCY9NTPue1T0SZgqIIk1E83G1xEwxS4aCgCumF/cw=
32873287
pkg.akt.dev/specs v0.0.1 h1:OP0zil3Fr4kcCuybFqQ8LWgSlSP2Yn7306meWpu6/S4=

‎testutil/state/suite.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import (
1515
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
1616
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
1717
"github.com/stretchr/testify/mock"
18-
etypes "pkg.akt.dev/go/node/escrow/v1"
18+
emodule "pkg.akt.dev/go/node/escrow/module"
1919

2020
sdk "github.com/cosmos/cosmos-sdk/types"
2121
atypes "pkg.akt.dev/go/node/audit/v1"
2222
dtypes "pkg.akt.dev/go/node/deployment/v1"
23-
mtypes "pkg.akt.dev/go/node/market/v1beta5"
23+
mtypes "pkg.akt.dev/go/node/market/v1"
2424
ptypes "pkg.akt.dev/go/node/provider/v1beta4"
2525
ttypes "pkg.akt.dev/go/node/take/v1"
2626

@@ -142,7 +142,7 @@ func SetupTestSuiteWithKeepers(t testing.TB, keepers Keepers) *TestSuite {
142142
sb := collections.NewSchemaBuilder(storeService)
143143

144144
feepool := collections.NewItem(sb, types.FeePoolKey, "fee_pool", codec.CollValue[types.FeePool](cdc))
145-
keepers.Escrow = ekeeper.NewKeeper(cdc, app.GetKey(etypes.StoreKey), keepers.Bank, keepers.Take, keepers.Authz, feepool)
145+
keepers.Escrow = ekeeper.NewKeeper(cdc, app.GetKey(emodule.StoreKey), keepers.Bank, keepers.Take, keepers.Authz, feepool)
146146
}
147147
if keepers.Market == nil {
148148
keepers.Market = mkeeper.NewKeeper(cdc, app.GetKey(mtypes.StoreKey), keepers.Escrow, authtypes.NewModuleAddress(govtypes.ModuleName).String())

‎upgrades/software/v1.0.0/escrow.go‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"cosmossdk.io/store/prefix"
99
sdk "github.com/cosmos/cosmos-sdk/types"
1010
sdkmodule "github.com/cosmos/cosmos-sdk/types/module"
11-
etypes "pkg.akt.dev/go/node/escrow/v1"
11+
etypes "pkg.akt.dev/go/node/escrow/types/v1"
1212
"pkg.akt.dev/go/node/migrate"
1313

1414
utypes "pkg.akt.dev/node/upgrades/types"
@@ -46,10 +46,12 @@ func (m escrowMigrations) handler(ctx sdk.Context) error {
4646
var accountsOverdrawn uint64
4747

4848
for ; iter.Valid(); iter.Next() {
49-
nVal := migrate.AccountFromV1beta3(cdc, iter.Value())
49+
key := append(migrate.AccountV1beta3Prefix(), iter.Key()...)
50+
51+
nVal := migrate.AccountFromV1beta3(cdc, key, iter.Value())
5052
bz := cdc.MustMarshal(&nVal)
5153

52-
switch nVal.State {
54+
switch nVal.State.State {
5355
case etypes.StateOpen:
5456
accountsActive++
5557
case etypes.StateClosed:
@@ -60,10 +62,9 @@ func (m escrowMigrations) handler(ctx sdk.Context) error {
6062

6163
accountsTotal++
6264

63-
key := ekeeper.LegacyAccountKey(nVal.ID)
64-
oStore.Delete(iter.Key())
65+
oStore.Delete(key)
6566

66-
key = ekeeper.BuildAccountsKey(nVal.State, &nVal.ID)
67+
key = ekeeper.BuildAccountsKey(nVal.State.State, &nVal.ID)
6768
store.Set(key, bz)
6869
}
6970

@@ -80,10 +81,12 @@ func (m escrowMigrations) handler(ctx sdk.Context) error {
8081
var paymentsOverdrawn uint64
8182

8283
for ; iter.Valid(); iter.Next() {
83-
nVal := migrate.FractionalPaymentFromV1beta3(cdc, iter.Value())
84+
key := append(migrate.PaymentV1beta3Prefix(), iter.Key()...)
85+
86+
nVal := migrate.PaymentFromV1beta3(cdc, iter.Key(), iter.Value())
8487
bz := cdc.MustMarshal(&nVal)
8588

86-
switch nVal.State {
89+
switch nVal.State.State {
8790
case etypes.StateOpen:
8891
paymentsActive++
8992
case etypes.StateClosed:
@@ -94,10 +97,9 @@ func (m escrowMigrations) handler(ctx sdk.Context) error {
9497

9598
paymentsTotal++
9699

97-
key := ekeeper.LegacyPaymentKey(nVal.AccountID, nVal.PaymentID)
98-
oStore.Delete(iter.Key())
100+
oStore.Delete(key)
99101

100-
key = ekeeper.BuildPaymentsKey(nVal.State, &nVal.AccountID, nVal.PaymentID)
102+
key = ekeeper.BuildPaymentsKey(nVal.State.State, &nVal.ID)
101103
store.Set(key, bz)
102104
}
103105

‎upgrades/software/v1.0.0/init.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
av1 "pkg.akt.dev/go/node/audit/v1"
77
cv1 "pkg.akt.dev/go/node/cert/v1"
88
dv1 "pkg.akt.dev/go/node/deployment/v1"
9-
ev1 "pkg.akt.dev/go/node/escrow/v1"
10-
mv1 "pkg.akt.dev/go/node/market/v1beta5"
9+
emodule "pkg.akt.dev/go/node/escrow/module"
10+
mv1 "pkg.akt.dev/go/node/market/v1"
1111
pv1 "pkg.akt.dev/go/node/provider/v1beta4"
1212
tv1 "pkg.akt.dev/go/node/take/v1"
1313

@@ -20,7 +20,7 @@ func init() {
2020
utypes.RegisterMigration(av1.ModuleName, 2, newAuditMigration)
2121
utypes.RegisterMigration(cv1.ModuleName, 3, newCertsMigration)
2222
utypes.RegisterMigration(dv1.ModuleName, 4, newDeploymentsMigration)
23-
utypes.RegisterMigration(ev1.ModuleName, 2, newEscrowMigration)
23+
utypes.RegisterMigration(emodule.ModuleName, 2, newEscrowMigration)
2424
utypes.RegisterMigration(mv1.ModuleName, 6, newMarketMigration)
2525
utypes.RegisterMigration(pv1.ModuleName, 2, newProviderMigration)
2626
utypes.RegisterMigration(tv1.ModuleName, 2, newTakeMigration)

0 commit comments

Comments
 (0)