Skip to content

Commit

Permalink
Merge branch 'main' into add-server
Browse files Browse the repository at this point in the history
  • Loading branch information
MalteHerrmann committed Aug 6, 2024
2 parents 4f26f4c + d54f04b commit b114058
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bsr-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.35.1
# Push Evmos protos to the Buf Schema Registry
# Push evmOS protos to the Buf Schema Registry
- uses: bufbuild/buf-push-action@v1.2.0
with:
input: ./proto
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Lint
# Lint runs golangci-lint over the entire Evmos repository This workflow is
# Lint runs golangci-lint over the entire evmOS repository This workflow is
# run on every pull request and push to main The `golangci` will pass without
# running if no *.{go, mod, sum} files have been changed.
on:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -186,15 +186,15 @@ release:
###############################################################################

# Install the necessary dependencies, compile the solidity contracts found in the
# Evmos repository and then clean up the contracts data.
# evmOS repository and then clean up the contracts data.
contracts-all: contracts-compile contracts-clean

# Clean smart contract compilation artifacts, dependencies and cache files
contracts-clean:
@echo "Cleaning up the contracts directory..."
@python3 ./scripts/compile_smart_contracts/compile_smart_contracts.py --clean

# Compile the solidity contracts found in the Evmos repository.
# Compile the solidity contracts found in the evmOS repository.
contracts-compile:
@echo "Compiling smart contracts..."
@python3 ./scripts/compile_smart_contracts/compile_smart_contracts.py --compile
Expand Down
2 changes: 1 addition & 1 deletion crypto/codec/codec.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/evmos/os/crypto/ethsecp256k1"
)

// RegisterInterfaces register the Evmos key concrete types.
// RegisterInterfaces register the evmOS key concrete types.
func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
registry.RegisterImplementations((*cryptotypes.PubKey)(nil), &ethsecp256k1.PubKey{})
registry.RegisterImplementations((*cryptotypes.PrivKey)(nil), &ethsecp256k1.PrivKey{})
Expand Down
4 changes: 2 additions & 2 deletions crypto/ethsecp256k1/ethsecp256k1.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ const (
// Amino encoding names
const (
// PrivKeyName defines the amino encoding name for the EthSecp256k1 private key
PrivKeyName = "ethermint/PrivKeyEthSecp256k1"
PrivKeyName = "os/PrivKeyEthSecp256k1"
// PubKeyName defines the amino encoding name for the EthSecp256k1 public key
PubKeyName = "ethermint/PubKeyEthSecp256k1"
PubKeyName = "os/PubKeyEthSecp256k1"
)

// ----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion crypto/keyring/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var (
// SupportedAlgorithms defines the list of signing algorithms used on evmOS:
// - eth_secp256k1 (Ethereum)
SupportedAlgorithms = keyring.SigningAlgoList{hd.EthSecp256k1}
// SupportedAlgorithmsLedger defines the list of signing algorithms used on Evmos for the Ledger device:
// SupportedAlgorithmsLedger defines the list of signing algorithms used by evmOS for the Ledger device:
// - secp256k1 (in order to comply with Cosmos SDK)
// The Ledger derivation function is responsible for all signing and address generation.
SupportedAlgorithmsLedger = keyring.SigningAlgoList{hd.EthSecp256k1}
Expand Down
2 changes: 1 addition & 1 deletion encoding/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
enccodec "github.com/evmos/os/encoding/codec"
)

// MakeConfig creates an EncodingConfig for testing
// MakeConfig creates an EncodingConfig for the given basic module manager.
func MakeConfig(mb module.BasicManager) params.EncodingConfig {
cdc := amino.NewLegacyAmino()
interfaceRegistry := types.NewInterfaceRegistry()
Expand Down
2 changes: 1 addition & 1 deletion ethereum/eip712/preprocess.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func PreprocessLedgerTx(chainID string, keyType cosmoskr.KeyType, txBuilder clie
extensionBuilder.SetExtensionOptions(option)

// Set blank signature with Amino Sign Type
// (Regardless of input signMode, Evmos requires Amino signature type for Ledger)
// (Regardless of input signMode, evmOS requires Amino signature type for Ledger)
blankSig := signing.SingleSignatureData{
SignMode: signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
Signature: nil,
Expand Down

0 comments on commit b114058

Please sign in to comment.