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

deps: apply the changes of finschia v2.0.0-rc5 #102

Merged
merged 6 commits into from
Aug 28, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- [\#93](https://github.com/Finschia/finschia-js/pull/93) remove UpdateParams in x/foundation
- [\#99](https://github.com/Finschia/finschia-js/pull/99) downgrade yarn3 to yarn1
- [\#102](https://github.com/Finschia/finschia-js/pull/102) bump up finschia-proto to v2.0.0-rc5 (apply the changes of finschia v2.0.0)

### Deprecated

Expand Down
2 changes: 1 addition & 1 deletion packages/finschia/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@cosmjs/stargate": "^0.31.0",
"@cosmjs/tendermint-rpc": "^0.31.0",
"@cosmjs/utils": "^0.31.0",
"@finschia/finschia-proto": "^2.0.0-rc1",
"@finschia/finschia-proto": "^2.0.0-rc5",
"cosmjs-types": "^0.8.0",
"long": "^4.0.0",
"pako": "^2.0.2",
Expand Down
2 changes: 1 addition & 1 deletion scripts/finschia/env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Choose from https://hub.docker.com/r/finschia/finschianode/tags
REPOSITORY="finschia/finschianode"
VERSION="2.0.0-rc2"
VERSION="2.0.0-rc5"
CONTAINER_NAME="finschia-app"
47 changes: 47 additions & 0 deletions scripts/finschia/template/.finschia/config/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,14 @@ priv_validator_state_file = "data/priv_validator_state.json"

# TCP or UNIX socket address for Ostracon to listen on for
# connections from an external PrivValidator process
# example) tcp://0.0.0.0:26659
priv_validator_laddr = ""

# Validator's remote address to allow a connection
# ostracon only allow a connection from this address
# example) 127.0.0.1
priv_validator_raddr = "127.0.0.1"

# Path to the JSON file containing the private key to use for node authentication in the p2p protocol
node_key_file = "config/node_key.json"

Expand Down Expand Up @@ -216,6 +222,9 @@ timeout_broadcast_tx_commit = "10s"
# Maximum size of request body, in bytes
max_body_bytes = 1000000

# Maximum number of requests in a request body
max_batch_request_num = 10

# Maximum size of request header, in bytes
max_header_bytes = 1048576

Expand Down Expand Up @@ -327,6 +336,11 @@ statesync_recv_buf_size = 1000
#######################################################
[mempool]

# Mempool version to use:
# 1) "v0" - (default) FIFO mempool.
# 2) "v1" - prioritized mempool.
version = "v0"

recheck = true
broadcast = true
wal_dir = ""
Expand Down Expand Up @@ -356,6 +370,22 @@ max_tx_bytes = 1048576
# XXX: Unused due to https://github.com/tendermint/tendermint/issues/5796
max_batch_bytes = 0

# ttl-duration, if non-zero, defines the maximum amount of time a transaction
# can exist for in the mempool.
#
# Note, if ttl-num-blocks is also defined, a transaction will be removed if it
# has existed in the mempool at least ttl-num-blocks number of blocks or if it's
# insertion time into the mempool is beyond ttl-duration.
ttl-duration = "0s"

# ttl-num-blocks, if non-zero, defines the maximum number of blocks a transaction
# can exist for in the mempool.
#
# Note, if ttl-duration is also defined, a transaction will be removed if it
# has existed in the mempool at least ttl-num-blocks number of blocks or if
# it's insertion time into the mempool is beyond ttl-duration.
ttl-num-blocks = 0

#######################################################
### State Sync Configuration Options ###
#######################################################
Expand Down Expand Up @@ -447,6 +477,17 @@ max_txs = 0
peer_gossip_sleep_duration = "100ms"
peer_query_maj23_sleep_duration = "2s"

#######################################################
### Storage Configuration Options ###
#######################################################
[storage]

# Set to true to discard ABCI responses from the state store, which can save a
# considerable amount of disk space. Set to false to ensure ABCI responses are
# persisted. ABCI responses are required for /block_results RPC queries, and to
# reindex events in the command-line tool.
discard_abci_responses = false

#######################################################
### Transaction Indexer Configuration Options ###
#######################################################
Expand All @@ -461,8 +502,14 @@ peer_query_maj23_sleep_duration = "2s"
# 1) "null"
# 2) "kv" (default) - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend).
# - When "kv" is chosen "tx.height" and "tx.hash" will always be indexed.
# 3) "psql" - the indexer services backed by PostgreSQL.
# When "kv" or "psql" is chosen "tx.height" and "tx.hash" will always be indexed.
indexer = "kv"

# The PostgreSQL connection configuration, the connection format:
# postgresql://<user>:<password>@<host>:<port>/<db>?<opts>
psql-conn = ""

#######################################################
### Instrumentation Configuration Options ###
#######################################################
Expand Down
6 changes: 3 additions & 3 deletions scripts/with-ibc/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3"

services:
finschia-app:
image: "finschia/finschianode:1.1.0"
image: "finschia/finschianode:2.0.0-rc3"
ports:
- "26658:26657"
- "1317:1317"
Expand All @@ -15,7 +15,7 @@ services:
- host.docker.internal:host-gateway

finschia2-app:
image: "finschia/finschianode:1.1.0"
image: "finschia/finschianode:2.0.0-rc3"
ports:
- "26558:26657"
- "1318:1317"
Expand All @@ -28,7 +28,7 @@ services:
- host.docker.internal:host-gateway

relayer:
image: "ghcr.io/cosmos/relayer:v2.2.0"
image: "ghcr.io/cosmos/relayer:v2.4.1"
depends_on:
- finschia2-app
- finschia-app
Expand Down
2 changes: 1 addition & 1 deletion scripts/with-ibc/finschia/env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Choose from https://hub.docker.com/r/finschia/finschianode/tags
REPOSITORY="finschia/finschianode"
VERSION="1.0.0-dynamiclink2"
VERSION="2.0.0-rc5"
CONTAINER_NAME="finschia-app"
47 changes: 47 additions & 0 deletions scripts/with-ibc/finschia/template/.finschia/config/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,14 @@ priv_validator_state_file = "data/priv_validator_state.json"

# TCP or UNIX socket address for Ostracon to listen on for
# connections from an external PrivValidator process
# example) tcp://0.0.0.0:26659
priv_validator_laddr = ""

# Validator's remote address to allow a connection
# ostracon only allow a connection from this address
# example) 127.0.0.1
priv_validator_raddr = "127.0.0.1"

# Path to the JSON file containing the private key to use for node authentication in the p2p protocol
node_key_file = "config/node_key.json"

Expand Down Expand Up @@ -216,6 +222,9 @@ timeout_broadcast_tx_commit = "10s"
# Maximum size of request body, in bytes
max_body_bytes = 1000000

# Maximum number of requests in a request body
max_batch_request_num = 10

# Maximum size of request header, in bytes
max_header_bytes = 1048576

Expand Down Expand Up @@ -327,6 +336,11 @@ statesync_recv_buf_size = 1000
#######################################################
[mempool]

# Mempool version to use:
# 1) "v0" - (default) FIFO mempool.
# 2) "v1" - prioritized mempool.
version = "v0"

recheck = true
broadcast = true
wal_dir = ""
Expand Down Expand Up @@ -356,6 +370,22 @@ max_tx_bytes = 1048576
# XXX: Unused due to https://github.com/tendermint/tendermint/issues/5796
max_batch_bytes = 0

# ttl-duration, if non-zero, defines the maximum amount of time a transaction
# can exist for in the mempool.
#
# Note, if ttl-num-blocks is also defined, a transaction will be removed if it
# has existed in the mempool at least ttl-num-blocks number of blocks or if it's
# insertion time into the mempool is beyond ttl-duration.
ttl-duration = "0s"

# ttl-num-blocks, if non-zero, defines the maximum number of blocks a transaction
# can exist for in the mempool.
#
# Note, if ttl-duration is also defined, a transaction will be removed if it
# has existed in the mempool at least ttl-num-blocks number of blocks or if
# it's insertion time into the mempool is beyond ttl-duration.
ttl-num-blocks = 0

#######################################################
### State Sync Configuration Options ###
#######################################################
Expand Down Expand Up @@ -447,6 +477,17 @@ max_txs = 0
peer_gossip_sleep_duration = "100ms"
peer_query_maj23_sleep_duration = "2s"

#######################################################
### Storage Configuration Options ###
#######################################################
[storage]

# Set to true to discard ABCI responses from the state store, which can save a
# considerable amount of disk space. Set to false to ensure ABCI responses are
# persisted. ABCI responses are required for /block_results RPC queries, and to
# reindex events in the command-line tool.
discard_abci_responses = false

#######################################################
### Transaction Indexer Configuration Options ###
#######################################################
Expand All @@ -461,8 +502,14 @@ peer_query_maj23_sleep_duration = "2s"
# 1) "null"
# 2) "kv" (default) - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend).
# - When "kv" is chosen "tx.height" and "tx.hash" will always be indexed.
# 3) "psql" - the indexer services backed by PostgreSQL.
# When "kv" or "psql" is chosen "tx.height" and "tx.hash" will always be indexed.
indexer = "kv"

# The PostgreSQL connection configuration, the connection format:
# postgresql://<user>:<password>@<host>:<port>/<db>?<opts>
psql-conn = ""

#######################################################
### Instrumentation Configuration Options ###
#######################################################
Expand Down
2 changes: 1 addition & 1 deletion scripts/with-ibc/finschia2/env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Choose from https://hub.docker.com/r/finschia/finschianode/tags
REPOSITORY="finschia/finschianode"
VERSION="1.0.0-dynamiclink2"
VERSION="2.0.0-rc5"
CONTAINER_NAME="finschia2-app"
12 changes: 10 additions & 2 deletions scripts/with-ibc/finschia2/template/.finschia/config/app.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ inter-block-cache-size = 104857600
# So be careful that all iavl cache size are difference from this iavl cache size value.
iavl-cache-size = 524288

# IAVLDisableFastNode enables or disables the fast node feature of IAVL.
# IAVLDisableFastNode enables or disables the fast node feature of IAVL.
# Default is true.
iavl-disable-fastnode = true

Expand Down Expand Up @@ -183,6 +183,14 @@ enable = true
# Address defines the gRPC server address to bind to.
address = "0.0.0.0:9090"

# MaxRecvMsgSize defines the max message size in bytes the server can receive.
# The default value is 10MB.
max-recv-msg-size = "10485760"

# MaxSendMsgSize defines the max message size in bytes the server can send.
# The default value is math.MaxInt32.
max-send-msg-size = "2147483647"

###############################################################################
### gRPC Web Configuration ###
###############################################################################
Expand Down Expand Up @@ -219,4 +227,4 @@ snapshot-keep-recent = 2
query_gas_limit = 300000
# This is the number of wasm vm instances we keep cached in memory for speed-up
# Warning: this is currently unstable and may lead to crashes, best to keep for 0 unless testing locally
lru_size = 0
lru_size = 0
47 changes: 47 additions & 0 deletions scripts/with-ibc/finschia2/template/.finschia/config/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,14 @@ priv_validator_state_file = "data/priv_validator_state.json"

# TCP or UNIX socket address for Ostracon to listen on for
# connections from an external PrivValidator process
# example) tcp://0.0.0.0:26659
priv_validator_laddr = ""

# Validator's remote address to allow a connection
# ostracon only allow a connection from this address
# example) 127.0.0.1
priv_validator_raddr = "127.0.0.1"

# Path to the JSON file containing the private key to use for node authentication in the p2p protocol
node_key_file = "config/node_key.json"

Expand Down Expand Up @@ -216,6 +222,9 @@ timeout_broadcast_tx_commit = "10s"
# Maximum size of request body, in bytes
max_body_bytes = 1000000

# Maximum number of requests in a request body
max_batch_request_num = 10

# Maximum size of request header, in bytes
max_header_bytes = 1048576

Expand Down Expand Up @@ -327,6 +336,11 @@ statesync_recv_buf_size = 1000
#######################################################
[mempool]

# Mempool version to use:
# 1) "v0" - (default) FIFO mempool.
# 2) "v1" - prioritized mempool.
version = "v0"

recheck = true
broadcast = true
wal_dir = ""
Expand Down Expand Up @@ -356,6 +370,22 @@ max_tx_bytes = 1048576
# XXX: Unused due to https://github.com/tendermint/tendermint/issues/5796
max_batch_bytes = 0

# ttl-duration, if non-zero, defines the maximum amount of time a transaction
# can exist for in the mempool.
#
# Note, if ttl-num-blocks is also defined, a transaction will be removed if it
# has existed in the mempool at least ttl-num-blocks number of blocks or if it's
# insertion time into the mempool is beyond ttl-duration.
ttl-duration = "0s"

# ttl-num-blocks, if non-zero, defines the maximum number of blocks a transaction
# can exist for in the mempool.
#
# Note, if ttl-duration is also defined, a transaction will be removed if it
# has existed in the mempool at least ttl-num-blocks number of blocks or if
# it's insertion time into the mempool is beyond ttl-duration.
ttl-num-blocks = 0

#######################################################
### State Sync Configuration Options ###
#######################################################
Expand Down Expand Up @@ -447,6 +477,17 @@ max_txs = 0
peer_gossip_sleep_duration = "100ms"
peer_query_maj23_sleep_duration = "2s"

#######################################################
### Storage Configuration Options ###
#######################################################
[storage]

# Set to true to discard ABCI responses from the state store, which can save a
# considerable amount of disk space. Set to false to ensure ABCI responses are
# persisted. ABCI responses are required for /block_results RPC queries, and to
# reindex events in the command-line tool.
discard_abci_responses = false

#######################################################
### Transaction Indexer Configuration Options ###
#######################################################
Expand All @@ -461,8 +502,14 @@ peer_query_maj23_sleep_duration = "2s"
# 1) "null"
# 2) "kv" (default) - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend).
# - When "kv" is chosen "tx.height" and "tx.hash" will always be indexed.
# 3) "psql" - the indexer services backed by PostgreSQL.
# When "kv" or "psql" is chosen "tx.height" and "tx.hash" will always be indexed.
indexer = "kv"

# The PostgreSQL connection configuration, the connection format:
# postgresql://<user>:<password>@<host>:<port>/<db>?<opts>
psql-conn = ""

#######################################################
### Instrumentation Configuration Options ###
#######################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -571,4 +571,4 @@
"inactive_contract_addresses": []
}
}
}
}
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -393,10 +393,10 @@
minimatch "^3.0.4"
strip-json-comments "^3.1.1"

"@finschia/finschia-proto@^2.0.0-rc1":
version "2.0.0-rc1"
resolved "https://registry.yarnpkg.com/@finschia/finschia-proto/-/finschia-proto-2.0.0-rc1.tgz#9b3e9646b757cdd4632e7f744d5ea8c8bfe7744b"
integrity sha512-2XHjKECxuku/QA51kE536X8K7TBs11YIuBuzoaQb6Y7d1qnsLteXvUJSP7ogA+qjLaoTi0OudvdYcq9eAvlKHQ==
"@finschia/finschia-proto@^2.0.0-rc5":
version "2.0.0-rc5"
resolved "https://registry.yarnpkg.com/@finschia/finschia-proto/-/finschia-proto-2.0.0-rc5.tgz#6b2b2e21598a7129c9c3ede64f31fb527f26aeda"
integrity sha512-UCwcmN6yCvkGdKOXwu/Dt3pGMSPOotXsHtTbmZjuJ457oijVTkAqUWnYKA9bITeRGI4FM00i4aJmGngj2hULzQ==
dependencies:
long "^4.0.0"
protobufjs "~6.11.2"
Expand Down