Skip to content

[ante] Add ante deps for gas meter setter #435

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

Merged
udpatil merged 5 commits into from
Nov 30, 2022
Merged

[ante] Add ante deps for gas meter setter #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0b99fa
[ante] Add ante deps for gas meter setter
udpatil Nov 28, 2022
3ada17b
[acl] Refactor identifier templates to use hex encoded strings
udpatil Nov 29, 2022
2a3f776
update go mod
udpatil Nov 30, 2022
9221776
some aclmapping fixes
udpatil Nov 30, 2022
332d78e
more aclmapping fixes
udpatil Nov 30, 2022
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
11 changes: 6 additions & 5 deletions aclmapping/bank/mappings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package aclbankmapping

import (
"encoding/hex"
"fmt"

sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down Expand Up @@ -29,8 +30,8 @@ func MsgSendDependencyGenerator(keeper aclkeeper.Keeper, ctx sdk.Context, msg sd
if !ok {
return []sdkacltypes.AccessOperation{}, ErrorInvalidMsgType
}
fromAddrIdentifier := string(banktypes.CreateAccountBalancesPrefixFromBech32(msgSend.FromAddress))
toAddrIdentifier := string(banktypes.CreateAccountBalancesPrefixFromBech32(msgSend.ToAddress))
fromAddrIdentifier := hex.EncodeToString(banktypes.CreateAccountBalancesPrefixFromBech32(msgSend.FromAddress))
toAddrIdentifier := hex.EncodeToString(banktypes.CreateAccountBalancesPrefixFromBech32(msgSend.ToAddress))

accessOperations := []sdkacltypes.AccessOperation{
// MsgSend also checks if the coin denom is enabled, but the information is from the params.
Expand Down Expand Up @@ -65,19 +66,19 @@ func MsgSendDependencyGenerator(keeper aclkeeper.Keeper, ctx sdk.Context, msg sd
{
AccessType: sdkacltypes.AccessType_READ,
ResourceType: sdkacltypes.ResourceType_KV_AUTH_ADDRESS_STORE,
IdentifierTemplate: string(authtypes.CreateAddressStoreKeyFromBech32(msgSend.ToAddress)),
IdentifierTemplate: hex.EncodeToString(authtypes.CreateAddressStoreKeyFromBech32(msgSend.ToAddress)),
},
{
AccessType: sdkacltypes.AccessType_WRITE,
ResourceType: sdkacltypes.ResourceType_KV_AUTH_ADDRESS_STORE,
IdentifierTemplate: string(authtypes.CreateAddressStoreKeyFromBech32(msgSend.ToAddress)),
IdentifierTemplate: hex.EncodeToString(authtypes.CreateAddressStoreKeyFromBech32(msgSend.ToAddress)),
},

// Gets Account Info for the sender
{
AccessType: sdkacltypes.AccessType_READ,
ResourceType: sdkacltypes.ResourceType_KV_AUTH_ADDRESS_STORE,
IdentifierTemplate: string(authtypes.CreateAddressStoreKeyFromBech32(msgSend.FromAddress)),
IdentifierTemplate: hex.EncodeToString(authtypes.CreateAddressStoreKeyFromBech32(msgSend.FromAddress)),
},

{
Expand Down
17 changes: 9 additions & 8 deletions aclmapping/dex/mappings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package acldexmapping

import (
"encoding/hex"
"fmt"

sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down Expand Up @@ -33,12 +34,12 @@ func GetDexMemReadWrite(contract string) []sdkacltypes.AccessOperation {
{
AccessType: sdkacltypes.AccessType_READ,
ResourceType: sdkacltypes.ResourceType_DexMem,
IdentifierTemplate: contract,
IdentifierTemplate: hex.EncodeToString([]byte(contract)),
},
{
AccessType: sdkacltypes.AccessType_WRITE,
ResourceType: sdkacltypes.ResourceType_DexMem,
IdentifierTemplate: contract,
IdentifierTemplate: hex.EncodeToString([]byte(contract)),
},
}
}
Expand All @@ -48,13 +49,13 @@ func GetLongShortOrderBookOps(contractAddr string, priceDenom string, assetDenom
{
AccessType: sdkacltypes.AccessType_READ,
ResourceType: sdkacltypes.ResourceType_KV_DEX_CONTRACT_LONGBOOK,
IdentifierTemplate: string(dextypes.OrderBookPrefix(true, contractAddr, priceDenom, assetDenom)),
IdentifierTemplate: hex.EncodeToString(dextypes.OrderBookPrefix(true, contractAddr, priceDenom, assetDenom)),
},

{
AccessType: sdkacltypes.AccessType_READ,
ResourceType: sdkacltypes.ResourceType_KV_DEX_CONTRACT_SHORTBOOK,
IdentifierTemplate: string(dextypes.OrderBookPrefix(false, contractAddr, priceDenom, assetDenom)),
IdentifierTemplate: hex.EncodeToString(dextypes.OrderBookPrefix(false, contractAddr, priceDenom, assetDenom)),
},
}
}
Expand All @@ -73,22 +74,22 @@ func DexPlaceOrdersDependencyGenerator(keeper aclkeeper.Keeper, ctx sdk.Context,
{
AccessType: sdkacltypes.AccessType_READ,
ResourceType: sdkacltypes.ResourceType_KV_DEX_NEXT_ORDER_ID,
IdentifierTemplate: string(dextypes.NextOrderIDPrefix(contractAddr)),
IdentifierTemplate: hex.EncodeToString(dextypes.NextOrderIDPrefix(contractAddr)),
},
{
AccessType: sdkacltypes.AccessType_WRITE,
ResourceType: sdkacltypes.ResourceType_KV_DEX_NEXT_ORDER_ID,
IdentifierTemplate: string(dextypes.NextOrderIDPrefix(contractAddr)),
IdentifierTemplate: hex.EncodeToString(dextypes.NextOrderIDPrefix(contractAddr)),
},
{
AccessType: sdkacltypes.AccessType_READ,
ResourceType: sdkacltypes.ResourceType_KV_DEX_PRICE_TICK_SIZE,
IdentifierTemplate: string(dextypes.PriceTickSizeKeyPrefix(contractAddr)),
IdentifierTemplate: hex.EncodeToString(dextypes.PriceTickSizeKeyPrefix(contractAddr)),
},
{
AccessType: sdkacltypes.AccessType_READ,
ResourceType: sdkacltypes.ResourceType_KV_DEX_QUANTITY_TICK_SIZE,
IdentifierTemplate: string(dextypes.QuantityTickSizeKeyPrefix(contractAddr)),
IdentifierTemplate: hex.EncodeToString(dextypes.QuantityTickSizeKeyPrefix(contractAddr)),
},
}...)

Expand Down
7 changes: 4 additions & 3 deletions aclmapping/oracle/mappings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package acloraclemapping

import (
"encoding/hex"
"fmt"

sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down Expand Up @@ -37,15 +38,15 @@ func MsgVoteDependencyGenerator(keeper aclkeeper.Keeper, ctx sdk.Context, msg sd
{
ResourceType: sdkacltypes.ResourceType_KV_ORACLE_FEEDERS,
AccessType: sdkacltypes.AccessType_READ,
IdentifierTemplate: string(oracletypes.GetFeederDelegationKey(valAddr)),
IdentifierTemplate: hex.EncodeToString(oracletypes.GetFeederDelegationKey(valAddr)),
},
// read validator from staking - READ
// validator is bonded check - READ
// (both covered by below)
{
ResourceType: sdkacltypes.ResourceType_KV_STAKING_VALIDATOR,
AccessType: sdkacltypes.AccessType_READ,
IdentifierTemplate: string(stakingtypes.GetValidatorKey(valAddr)),
IdentifierTemplate: hex.EncodeToString(stakingtypes.GetValidatorKey(valAddr)),
},

// get vote target (for all exchange rate tuples) -> blanket read on that prefix - READ
Expand All @@ -59,7 +60,7 @@ func MsgVoteDependencyGenerator(keeper aclkeeper.Keeper, ctx sdk.Context, msg sd
{
ResourceType: sdkacltypes.ResourceType_KV_ORACLE_AGGREGATE_VOTES,
AccessType: sdkacltypes.AccessType_WRITE,
IdentifierTemplate: string(oracletypes.GetAggregateExchangeRateVoteKey(valAddr)),
IdentifierTemplate: hex.EncodeToString(oracletypes.GetAggregateExchangeRateVoteKey(valAddr)),
},

// Last Operation should always be a commit
Expand Down
Loading