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

Fix some typos #962

Merged
merged 1 commit into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ func NewStrideApp(
app.AccountKeeper, app.BankKeeper, app.DistrKeeper, app.StakingKeeper,
)

// Register Gov (must be registerd after stakeibc)
// Register Gov (must be registered after stakeibc)
govRouter := govtypesv1beta1.NewRouter()
govRouter.AddRoute(govtypes.RouterKey, govtypesv1beta1.ProposalHandler).
AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v14/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ func MigrateAccount2(ctx sdk.Context, ak authkeeper.AccountKeeper) error {
if account == nil {
return nil
}
// change the start_time to Sept 4, 2022. The ugprade goes live on or after Sept 4, 2023, so the first year vest is still enforced
// change the start_time to Sept 4, 2022. The upgrade goes live on or after Sept 4, 2023, so the first year vest is still enforced
// (the account was previously set to start on Sept 4, 2023)
account.(*vesting.ContinuousVestingAccount).StartTime = VestingStartTimeAccount2
// NOTE: we shouldn't have to update delegated_vesting on the BaseAccount. That's because,
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v15/upgrades_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type UpdateRedemptionRateBounds struct {
func (s *UpgradeTestSuite) TestUpgrade() {
dummyUpgradeHeight := int64(5)

// Setup the store before the ugprade
// Setup the store before the upgrade
checkRedemptionRatesAfterUpgrade := s.SetupRedemptionRatesBeforeUpgrade()
checkQueriesAfterUpgrade := s.SetupQueriesBeforeUpgrade()

Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v16/upgrades_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func TestKeeperTestSuite(t *testing.T) {
func (s *UpgradeTestSuite) TestUpgrade() {
dummyUpgradeHeight := int64(5)

// Setup the store before the ugprade
// Setup the store before the upgrade
checkCosmosHubAfterUpgrade := s.SetupHostZonesBeforeUpgrade()

// Run the upgrade to set the bounds and clear pending queries
Expand Down
2 changes: 1 addition & 1 deletion dockernet/scripts/ratelimit/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ setup_channel_value() {
print_header "INITIALIZING CHANNEL VALUE"

# IBC Transfer
echo "Transfering for channel value..."
echo "Transferring for channel value..."
echo ">>> uatom"
$GAIA_MAIN_CMD tx ibc-transfer transfer transfer channel-0 $(STRIDE_ADDRESS) ${INITIAL_CHANNEL_VALUE}uatom --from ${GAIA_VAL_PREFIX}1 -y | TRIM_TX
sleep 3
Expand Down
14 changes: 7 additions & 7 deletions dockernet/scripts/ratelimit/test_denoms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ source ${CURRENT_DIR}/common.sh
# 1. Send native
# 2. Send non-native (one hop away)
# 3. Send non-native (two hops away)
# 4. Recieve sink (one hop away)
# 5. Recieve sink (two hops away)
# 4. Receive sink (one hop away)
# 5. Receive sink (two hops away)
# 6. Receive source native
# 7. Recieve source non-native
# 7. Receive source non-native
#
# For each case, we'll simply need to try the transfer and check if the flow updated,
# if the flow didn't update along with expectations, that means either the denom or channel was wrong
Expand Down Expand Up @@ -44,7 +44,7 @@ test_denom_ustrd() {
##############################################
# ujuno from Juno to Stride, then back to Juno
##############################################
__test_denom_receive_packet_non_native() { # recieve sink (one hop)
__test_denom_receive_packet_non_native() { # receive sink (one hop)
# ujuno sent from Juno to Stride
# Expected Denom: ibc/EFF323CC632EC4F747C61BCE238A758EFDB7699C3226565F7C20DA06509D59A5
# Expected Channel: channel-1
Expand Down Expand Up @@ -78,7 +78,7 @@ __test_denom_send_packet_native_sttoken() { # send native
check_transfer_status STRIDE OSMO channel-2 channel-2 10000000 stujuno stujuno true
}

__test_denom_recieve_packet_native_sttoken() { # receive source native
__test_denom_receive_packet_native_sttoken() { # receive source native
# stujuno sent from Osmosis to Stride
# Expected Denom: stujuno
# Expected Channel: channel-2
Expand All @@ -91,7 +91,7 @@ test_denom_sttoken() {
wait_until_epoch_end

__test_denom_send_packet_native_sttoken
__test_denom_recieve_packet_native_sttoken
__test_denom_receive_packet_native_sttoken
}

########################################################################
Expand Down Expand Up @@ -122,7 +122,7 @@ __test_denom_send_packet_non_native_two_hops() { # send non-native (two hops)
check_transfer_status STRIDE JUNO channel-1 channel-1 10000000 $traveler_juno_on_stride $traveler_juno_on_stride true
}

__test_denom_receive_packet_source_non_native() { # recieve source non-native
__test_denom_receive_packet_source_non_native() { # receive source non-native
# ujuno (through Osmosis, then Stride) sent from Juno to Stride
# Expected Denom: ibc/CD369927BBCE5198E0DC0D1A341C2F1DE51B1228BFD0633430055A39F58D229C
# (transfer/channel-2(juno)/transfer/channel-5(osmo)/ujuno)
Expand Down
4 changes: 2 additions & 2 deletions dockernet/tests/integration_tests.bats
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ setup_file() {
# check that the tokens were transferred to the sender account
end_balance=$($HOST_MAIN_CMD q bank balances $HOST_RECEIVER_ADDRESS --denom $HOST_DENOM | GETBAL)

# check that the undelegated tokens were transfered to the sender account
# check that the undelegated tokens were transferred to the sender account
diff_positive=$(($end_balance > $start_balance))
assert_equal "$diff_positive" "1"
}
Expand All @@ -331,7 +331,7 @@ setup_file() {
$STRIDE_MAIN_CMD tx distribution withdraw-all-rewards --from ${STRIDE_VAL_PREFIX}2 -y
WAIT_FOR_BLOCK $STRIDE_LOGS 2

# confirm they've recieved stTokens
# confirm they've received stTokens
sttoken_balance=$($STRIDE_MAIN_CMD q bank balances $val_address --denom st$HOST_DENOM | GETBAL)
rewards_accumulated=$(($sttoken_balance > 0))
assert_equal "$rewards_accumulated" "1"
Expand Down
4 changes: 2 additions & 2 deletions scripts/local-to-mainnet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* The fleet must be up and running for the host since we need the websocket endpoint

## Setup
* Ensure you have dockernet setup properly including all submodules up to date and the `STRIDE_ADMIN_MNEMONIC` enviornment variable set
* Ensure you have dockernet setup properly including all submodules up to date and the `STRIDE_ADMIN_MNEMONIC` environment variable set
* Fund three hot wallets and set the mnemonics as environment variables (`HOT_WALLET_1_MNEMONIC`, `HOT_WALLET_2_MNEMONIC`, `HOT_WALLET_3_MNEMONIC`)
* They all must have a non-zero balance on the host
* Wallet #1 should have enough to fund each liquid stake (~5 native token per attempt)
Expand All @@ -23,4 +23,4 @@ make start-local-to-main

## Walk through Flow
* Step through the commands in `local-to-mainnet/commands.sh` one by one and copy them into the terminal
* In the future, we can automate this more but since this interacts with mainnet, I think it's safer to run these manually for now
* In the future, we can automate this more but since this interacts with mainnet, I think it's safer to run these manually for now
2 changes: 1 addition & 1 deletion scripts/local-to-mainnet/commands.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ docker-compose -f scripts/local-to-mainnet/docker-compose.yml logs -f relayer |
# IBC Transfer from HOST to stride (from relayer account)
build/gaiad tx ibc-transfer transfer transfer $transfer_channel stride1u20df3trc2c2zdhm8qvh2hdjx9ewh00sv6eyy8 4000000uatom --from hot --chain-id cosmoshub-4 -y --keyring-backend test --node http://HOST_ENDPOINT:26657 --fees 150000uatom

# Confirm funds were recieved on stride and get IBC denom
# Confirm funds were received on stride and get IBC denom
build/strided --home scripts/state/stride1 q bank balances stride1u20df3trc2c2zdhm8qvh2hdjx9ewh00sv6eyy8

# Register host zone
Expand Down
2 changes: 1 addition & 1 deletion scripts/local-to-mainnet/templates/commands.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ DOCKER_COMPOSE logs -f relayer | sed -r -u "s/\x1B\[([0-9]{1,3}(;[0-9]{1,2})?)?[
# IBC Transfer from HOST to stride (from relayer account)
HOST_BINARY tx ibc-transfer transfer transfer $transfer_channel stride1u20df3trc2c2zdhm8qvh2hdjx9ewh00sv6eyy8 4000000HOST_DENOM --from hot --chain-id HOST_CHAIN_ID -y --keyring-backend test --node http://HOST_ENDPOINT:26657 --fees 150000HOST_DENOM

# Confirm funds were recieved on stride and get IBC denom
# Confirm funds were received on stride and get IBC denom
build/strided --home STRIDE_HOME q bank balances stride1u20df3trc2c2zdhm8qvh2hdjx9ewh00sv6eyy8

# Register host zone
Expand Down
Loading