From dea00811acf29c6b994b75c9431353001f5d1037 Mon Sep 17 00:00:00 2001 From: gregnuj Date: Tue, 23 May 2023 08:50:06 -0500 Subject: [PATCH 01/18] set version --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index c512695..27f78e1 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=2.4.0 +TERRA_VERSION=2.0.1 From 0cbcf4c2922bf0697440b22ff121f5f7c964a579 Mon Sep 17 00:00:00 2001 From: gregnuj Date: Tue, 23 May 2023 08:51:21 -0500 Subject: [PATCH 02/18] set version --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 27f78e1..ad9586f 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=2.0.1 +TERRA_VERSION=2.1.4 From 3fdfc0b47ed25692dde684d545cc0fd5d52099aa Mon Sep 17 00:00:00 2001 From: gregnuj Date: Tue, 23 May 2023 08:52:47 -0500 Subject: [PATCH 03/18] set version --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index ad9586f..e07efa7 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=2.1.4 +TERRA_VERSION=2.2.1 From 8da45d4e9ee4792d6e76803b8599e035f1442134 Mon Sep 17 00:00:00 2001 From: gregnuj Date: Tue, 23 May 2023 08:55:34 -0500 Subject: [PATCH 04/18] set version --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index e07efa7..79b4fd0 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=2.2.1 +TERRA_VERSION=2.3.1 From 6a37ca3ce3cd376842387f3f45f18b9728a68bc6 Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 25 May 2023 10:48:49 -0500 Subject: [PATCH 05/18] update 2.3 branch to version 2.3.2 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 79b4fd0..43f2ae2 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=2.3.1 +TERRA_VERSION=2.3.2 From 6b53723703e101b65777d087940bf90bcb8ff21c Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 10:51:49 -0500 Subject: [PATCH 06/18] allow classic release tag --- .github/workflows/release.yml | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f7849c1..bfa5c0e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,7 @@ on: tags: - 'v[0-9]+.[0-9]+.[0-9]+' # Push events to matching v*, i.e. v1.0, v20.15.10 - 'v[0-9]+.[0-9]+.[0-9]+-rc*' # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5 + - 'v[0-9]+.[0-9]+.[0-9]+-classic' # Push events to matching v*, i.e. v1.0-classic, v20.15.10-classic jobs: artifacts: diff --git a/Dockerfile b/Dockerfile index 5b7df00..b8a6b2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG TERRA_VERSION=2.3.1 +ARG TERRA_VERSION=1.1.0 FROM ghcr.io/terra-money/core:${TERRA_VERSION} From 44da7b222aa6c34bc5e0fa349c6af0e7d7826a46 Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 11:33:01 -0500 Subject: [PATCH 07/18] add nginx to container --- Dockerfile | 17 +++++++++++++++++ initdb.d/init.sql | 2 -- 2 files changed, 17 insertions(+), 2 deletions(-) delete mode 100644 initdb.d/init.sql diff --git a/Dockerfile b/Dockerfile index b8a6b2b..8f12833 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,21 @@ ARG TERRA_VERSION=1.1.0 FROM ghcr.io/terra-money/core:${TERRA_VERSION} +# Set up fo nginx +USER root + +COPY --chmod=644 nginx.conf /etc/nginx/nginx.conf +COPY --chmod=755 entrypoint.sh /usr/local/bin/entrypoint.sh + +RUN apk add --no-cache nginx && \ + adduser -D -g www www \ + mkdir -p www \ + chown -R www:www /var/lib/nginx \ + chown -R www:www /www + +# Setup for localterra +USER terra + COPY ./terra/genesis.json \ ./terra/priv_validator_key.json \ /app/config/ @@ -9,6 +24,8 @@ COPY ./terra/genesis.json \ RUN mkdir -p /app/data && \ echo '{"height": "0","round": 0,"step": 0}' > /app/data/priv_validator_state.json +ENTRYPOINT [ "entrypoint.sh" ] + CMD terrad start \ --api.enable true \ --api.enabled-unsafe-cors true \ diff --git a/initdb.d/init.sql b/initdb.d/init.sql deleted file mode 100644 index 7caba00..0000000 --- a/initdb.d/init.sql +++ /dev/null @@ -1,2 +0,0 @@ -CREATE DATABASE fcd; -CREATE DATABASE api; \ No newline at end of file From 7bb3ab627c0420baaf3ea7babe42db82c034556b Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 11:51:25 -0500 Subject: [PATCH 08/18] add nginx to container --- .env | 2 +- Dockerfile | 2 ++ docker-compose.yml | 1 + entrypoint.sh | 8 ++++++++ nginx.conf | 43 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 entrypoint.sh create mode 100644 nginx.conf diff --git a/.env b/.env index 43f2ae2..25b8579 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=2.3.2 +TERRA_VERSION=1.1.0 diff --git a/Dockerfile b/Dockerfile index 8f12833..3eee001 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,8 @@ RUN mkdir -p /app/data && \ ENTRYPOINT [ "entrypoint.sh" ] +EXPOSE 1317 8080 9090 9091 26656 26657 + CMD terrad start \ --api.enable true \ --api.enabled-unsafe-cors true \ diff --git a/docker-compose.yml b/docker-compose.yml index 97df613..49bb694 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,7 @@ services: - default ports: - "1317:1317" + - "8080:8080" - "9090:9090" - "9091:9091" - "26657:26657" diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000..c02d550 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +set -eux + +# Start the nginx process +nginx -g "daemon off" & + +exec $@ \ No newline at end of file diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 0000000..26482df --- /dev/null +++ b/nginx.conf @@ -0,0 +1,43 @@ +events {} +http { + include mime.types; + default_type application/octet-stream; + + server { + listen 8080; + location / { + proxy_pass http://127.0.0.1:1317; + + if ($request_method = 'OPTIONS') { + add_header 'Access-Control-Allow-Origin' '*'; + # + # Om nom nom cookies + # + add_header 'Access-Control-Allow-Credentials' 'true'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + # + # Custom headers and headers various browsers *should* be OK with but aren't + # + add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,baggage,sentry-trace'; + # + # Tell client that this pre-flight info is valid for 20 days + # + add_header 'Access-Control-Max-Age' 1728000; + add_header 'Content-Type' 'text/plain charset=UTF-8'; + add_header 'Content-Length' 0; + return 204; + } + if ($request_method = 'POST') { + add_header 'Access-Control-Allow-Credentials' 'true'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,baggage,sentry-trace'; + } + if ($request_method = 'GET') { + add_header 'Access-Control-Allow-Credentials' 'true'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,baggage,sentry-trace'; + } + } + } +} + From 9b4a94a2b5d475054627287ca7c31779936985d5 Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 12:44:16 -0500 Subject: [PATCH 09/18] adding nginx to container --- .env | 2 +- Dockerfile | 23 +++++++++++------------ entrypoint.sh | 4 ++-- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.env b/.env index 25b8579..27f78e1 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=1.1.0 +TERRA_VERSION=2.0.1 diff --git a/Dockerfile b/Dockerfile index 3eee001..ad29a1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG TERRA_VERSION=1.1.0 +ARG TERRA_VERSION=2.0.1 FROM ghcr.io/terra-money/core:${TERRA_VERSION} @@ -9,19 +9,18 @@ COPY --chmod=644 nginx.conf /etc/nginx/nginx.conf COPY --chmod=755 entrypoint.sh /usr/local/bin/entrypoint.sh RUN apk add --no-cache nginx && \ - adduser -D -g www www \ - mkdir -p www \ - chown -R www:www /var/lib/nginx \ - chown -R www:www /www + mkdir -p /var/lib/nginx/logs && \ + chown -R terra:terra /var/lib/nginx && \ + ln -sf /dev/stdout /var/lib/nginx/logs/access.log && \ + ln -sf /dev/stderr /var/lib/nginx/logs/error.log # Setup for localterra -USER terra - COPY ./terra/genesis.json \ ./terra/priv_validator_key.json \ /app/config/ -RUN mkdir -p /app/data && \ +RUN chown -R terra:terra /app && \ + mkdir -p /app/data && \ echo '{"height": "0","round": 0,"step": 0}' > /app/data/priv_validator_state.json ENTRYPOINT [ "entrypoint.sh" ] @@ -29,11 +28,11 @@ ENTRYPOINT [ "entrypoint.sh" ] EXPOSE 1317 8080 9090 9091 26656 26657 CMD terrad start \ - --api.enable true \ - --api.enabled-unsafe-cors true \ - --api.swagger true \ --home /app \ --minimum-gas-prices 0.015uluna \ --moniker localterra \ --p2p.upnp true \ - --rpc.laddr tcp://0.0.0.0:26657 \ No newline at end of file + --rpc.laddr tcp://0.0.0.0:26657 + #--api.enable true \ + #--api.enabled-unsafe-cors true \ + #--api.swagger true \ \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index c02d550..c2ced59 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,6 +3,6 @@ set -eux # Start the nginx process -nginx -g "daemon off" & +nginx -g "daemon off;" & -exec $@ \ No newline at end of file +exec "$@" \ No newline at end of file From 7339a478a449567241ae72e7a5b0ac8573fe397e Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 13:24:36 -0500 Subject: [PATCH 10/18] add nginx --- .env | 2 +- Dockerfile | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.env b/.env index 27f78e1..ad9586f 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=2.0.1 +TERRA_VERSION=2.1.4 diff --git a/Dockerfile b/Dockerfile index ad29a1b..00401a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG TERRA_VERSION=2.0.1 +ARG TERRA_VERSION=2.1.4 FROM ghcr.io/terra-money/core:${TERRA_VERSION} @@ -25,14 +25,25 @@ RUN chown -R terra:terra /app && \ ENTRYPOINT [ "entrypoint.sh" ] -EXPOSE 1317 8080 9090 9091 26656 26657 +# rest server +EXPOSE 1317 +# nginx +EXPOSE 8080 +# grpc +EXPOSE 9090 +# grpc-web +EXPOSE 9091 +# tendermint p2p +EXPOSE 26656 +# tendermint rpc +EXPOSE 26657 CMD terrad start \ --home /app \ --minimum-gas-prices 0.015uluna \ --moniker localterra \ --p2p.upnp true \ - --rpc.laddr tcp://0.0.0.0:26657 - #--api.enable true \ - #--api.enabled-unsafe-cors true \ - #--api.swagger true \ \ No newline at end of file + --rpc.laddr tcp://0.0.0.0:26657 + # --api.enable true \ + # --api.swagger true \ + # --api.enabled-unsafe-cors true \ No newline at end of file From 8339e10e82df46fa4c29cb8ca7dea13981de96bc Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 13:40:09 -0500 Subject: [PATCH 11/18] add dc purge script --- docker-compose-purge | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 docker-compose-purge diff --git a/docker-compose-purge b/docker-compose-purge new file mode 100755 index 0000000..8b2f6ee --- /dev/null +++ b/docker-compose-purge @@ -0,0 +1,4 @@ +#!/bin/sh + +docker-compose rm -f -s -v +docker volume rm localterra_terra \ No newline at end of file From cc221f969550cd60516b15c45431ed9c85d7b9fe Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 13:40:48 -0500 Subject: [PATCH 12/18] add dc reset script --- docker-compose-purge => docker-compose-reset | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker-compose-purge => docker-compose-reset (100%) diff --git a/docker-compose-purge b/docker-compose-reset similarity index 100% rename from docker-compose-purge rename to docker-compose-reset From f0126c3c2bc26af883fc90b53868228709c962ba Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 13:53:28 -0500 Subject: [PATCH 13/18] restore older version of genesis --- docker-compose-reset | 4 ++ terra/genesis.json | 90 ++------------------------------------------ 2 files changed, 7 insertions(+), 87 deletions(-) create mode 100755 docker-compose-reset diff --git a/docker-compose-reset b/docker-compose-reset new file mode 100755 index 0000000..8b2f6ee --- /dev/null +++ b/docker-compose-reset @@ -0,0 +1,4 @@ +#!/bin/sh + +docker-compose rm -f -s -v +docker volume rm localterra_terra \ No newline at end of file diff --git a/terra/genesis.json b/terra/genesis.json index 5c5532a..a9c0b19 100644 --- a/terra/genesis.json +++ b/terra/genesis.json @@ -22,19 +22,6 @@ }, "app_hash": "", "app_state": { - "alliance": { - "params": { - "reward_delay_time": "604800s", - "take_rate_claim_interval": "300s", - "last_take_rate_claim_time": "0001-01-01T00:00:00Z" - }, - "assets": [], - "validator_infos": [], - "reward_weight_change_snaphots": [], - "delegations": [], - "redelegations": [], - "undelegations": [] - }, "auth": { "params": { "max_memo_characters": "256", @@ -275,13 +262,6 @@ "feegrant": { "allowances": [] }, - "feeibc": { - "identified_fees": [], - "fee_enabled_channels": [], - "registered_payees": [], - "registered_counterparty_payees": [], - "forward_relayers": [] - }, "genutil": { "gen_txs": [ { @@ -387,10 +367,7 @@ "connection_genesis": { "connections": [], "client_connection_paths": [], - "next_connection_sequence": "0", - "params": { - "max_expected_time_per_block": "30000000000" - } + "next_connection_sequence": "0" }, "channel_genesis": { "channels": [], @@ -403,54 +380,6 @@ "next_channel_sequence": "0" } }, - "ibchooks": {}, - "interchainaccounts": { - "controller_genesis_state": { - "active_channels": [], - "interchain_accounts": [], - "ports": [], - "params": { - "controller_enabled": true - } - }, - "host_genesis_state": { - "active_channels": [], - "interchain_accounts": [], - "port": "icahost", - "params": { - "host_enabled": true, - "allow_messages": [ - "/cosmos.authz.v1beta1.MsgExec", - "/cosmos.authz.v1beta1.MsgGrant", - "/cosmos.authz.v1beta1.MsgRevoke", - "/cosmos.bank.v1beta1.MsgSend", - "/cosmos.bank.v1beta1.MsgMultiSend", - "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress", - "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission", - "/cosmos.distribution.v1beta1.MsgFundCommunityPool", - "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward", - "/cosmos.feegrant.v1beta1.MsgGrantAllowance", - "/cosmos.feegrant.v1beta1.MsgRevokeAllowance", - "/cosmos.gov.v1beta1.MsgVoteWeighted", - "/cosmos.gov.v1beta1.MsgSubmitProposal", - "/cosmos.gov.v1beta1.MsgDeposit", - "/cosmos.gov.v1beta1.MsgVote", - "/cosmos.staking.v1beta1.MsgEditValidator", - "/cosmos.staking.v1beta1.MsgDelegate", - "/cosmos.staking.v1beta1.MsgUndelegate", - "/cosmos.staking.v1beta1.MsgBeginRedelegate", - "/cosmos.staking.v1beta1.MsgCreateValidator", - "/cosmos.vesting.v1beta1.MsgCreateVestingAccount", - "/ibc.applications.transfer.v1.MsgTransfer", - "/cosmwasm.wasm.v1.MsgStoreCode", - "/cosmwasm.wasm.v1.MsgInstantiateContract", - "/cosmwasm.wasm.v1.MsgExecuteContract", - "/cosmwasm.wasm.v1.MsgMigrateContract" - ] - } - } - }, - "intertx": null, "mint": { "minter": { "inflation": "0.130000000000000000", @@ -483,8 +412,7 @@ "max_validators": 100, "max_entries": 7, "historical_entries": 10000, - "bond_denom": "uluna", - "min_commission_rate": "0.000000000000000000" + "bond_denom": "uluna" }, "last_total_power": "0", "last_validator_powers": [], @@ -494,17 +422,6 @@ "redelegations": [], "exported": false }, - "tokenfactory": { - "params": { - "denom_creation_fee": [ - { - "denom": "uluna", - "amount": "10000000" - } - ] - }, - "factory_denoms": [] - }, "transfer": { "port_id": "transfer", "denom_traces": [], @@ -519,8 +436,7 @@ "params": { "code_upload_access": { "permission": "Everybody", - "address": "", - "addresses": [] + "address": "" }, "instantiate_default_permission": "Everybody" }, From f096c365f8869d49be22d93fe0fc5bc1a9bf0d34 Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 14:36:37 -0500 Subject: [PATCH 14/18] add root->swagger redirect, enable api --- .env | 2 +- Dockerfile | 23 ++++++++++++++--------- nginx.conf | 1 + 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.env b/.env index ad9586f..e07efa7 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=2.1.4 +TERRA_VERSION=2.2.1 diff --git a/Dockerfile b/Dockerfile index 00401a5..e3376be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG TERRA_VERSION=2.1.4 +ARG TERRA_VERSION=2.2.1 FROM ghcr.io/terra-money/core:${TERRA_VERSION} @@ -15,14 +15,22 @@ RUN apk add --no-cache nginx && \ ln -sf /dev/stderr /var/lib/nginx/logs/error.log # Setup for localterra +RUN set -eux &&\ + mkdir -p /app/conifg && \ + mkdir -p /app/data && \ + chown -R terra:terra /app && \ + ln -s /app /terra/.terrad && \ + terrad init localterra --home /app --chain-id localterra && \ + echo '{"height": "0","round": 0,"step": 0}' > /app/data/priv_validator_state.json && \ + sed -e '/^\[api\]/,/\[rosetta\]/ s|^enable *=.*|enable = true|' \ + -e '/^\[api\]/,/\[rosetta\]/ s|^swagger *=.*|swagger = true|' \ + -e '/^\[api\]/,/\[rosetta\]/ s|^enabled-unsafe-cors *=.*|enabled-unsafe-cors = true|' \ + -i /app/config/app.toml + COPY ./terra/genesis.json \ ./terra/priv_validator_key.json \ /app/config/ -RUN chown -R terra:terra /app && \ - mkdir -p /app/data && \ - echo '{"height": "0","round": 0,"step": 0}' > /app/data/priv_validator_state.json - ENTRYPOINT [ "entrypoint.sh" ] # rest server @@ -43,7 +51,4 @@ CMD terrad start \ --minimum-gas-prices 0.015uluna \ --moniker localterra \ --p2p.upnp true \ - --rpc.laddr tcp://0.0.0.0:26657 - # --api.enable true \ - # --api.swagger true \ - # --api.enabled-unsafe-cors true \ No newline at end of file + --rpc.laddr tcp://0.0.0.0:26657 diff --git a/nginx.conf b/nginx.conf index 26482df..e6ade5d 100644 --- a/nginx.conf +++ b/nginx.conf @@ -6,6 +6,7 @@ http { server { listen 8080; location / { + rewrite ^/$ /swagger/? permanent; proxy_pass http://127.0.0.1:1317; if ($request_method = 'OPTIONS') { From 161e8412e3ec79aefec9e6407e9a00501aa2c19b Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 14:37:45 -0500 Subject: [PATCH 15/18] update version string --- .env | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index e07efa7..27f78e1 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=2.2.1 +TERRA_VERSION=2.0.1 diff --git a/Dockerfile b/Dockerfile index e3376be..17bd52c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG TERRA_VERSION=2.2.1 +ARG TERRA_VERSION=2.0.1 FROM ghcr.io/terra-money/core:${TERRA_VERSION} From 26a43dad76331d86c7c034850d88416329ed08b9 Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 14:41:00 -0500 Subject: [PATCH 16/18] update version --- .env | 2 +- Dockerfile | 2 +- docker-compose-reset | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 27f78e1..ad9586f 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=2.0.1 +TERRA_VERSION=2.1.4 diff --git a/Dockerfile b/Dockerfile index 17bd52c..392ba94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG TERRA_VERSION=2.0.1 +ARG TERRA_VERSION=2.1.4 FROM ghcr.io/terra-money/core:${TERRA_VERSION} diff --git a/docker-compose-reset b/docker-compose-reset index 8b2f6ee..729addb 100755 --- a/docker-compose-reset +++ b/docker-compose-reset @@ -1,4 +1,5 @@ #!/bin/sh docker-compose rm -f -s -v -docker volume rm localterra_terra \ No newline at end of file +docker volume rm localterra_terra +docker-compose build --no-cache \ No newline at end of file From 8c943249f308e1343e2dc031c1b5e6f9bbfd770b Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 14:42:18 -0500 Subject: [PATCH 17/18] update version --- .env | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index ad9586f..e07efa7 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=2.1.4 +TERRA_VERSION=2.2.1 diff --git a/Dockerfile b/Dockerfile index 392ba94..e3376be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG TERRA_VERSION=2.1.4 +ARG TERRA_VERSION=2.2.1 FROM ghcr.io/terra-money/core:${TERRA_VERSION} From cd43369ac0c3e7cf62c6aa7c2727f94c98cabb59 Mon Sep 17 00:00:00 2001 From: gregnuj Date: Thu, 8 Jun 2023 14:49:13 -0500 Subject: [PATCH 18/18] updated version and genesis --- .env | 2 +- Dockerfile | 8 +++-- terra/genesis.json | 90 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 93 insertions(+), 7 deletions(-) diff --git a/.env b/.env index e07efa7..43f2ae2 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ COMPOSE_PROJECT_NAME=localterra -TERRA_VERSION=2.2.1 +TERRA_VERSION=2.3.2 diff --git a/Dockerfile b/Dockerfile index e3376be..c8efee5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG TERRA_VERSION=2.2.1 +ARG TERRA_VERSION=2.3.2 FROM ghcr.io/terra-money/core:${TERRA_VERSION} @@ -19,7 +19,6 @@ RUN set -eux &&\ mkdir -p /app/conifg && \ mkdir -p /app/data && \ chown -R terra:terra /app && \ - ln -s /app /terra/.terrad && \ terrad init localterra --home /app --chain-id localterra && \ echo '{"height": "0","round": 0,"step": 0}' > /app/data/priv_validator_state.json && \ sed -e '/^\[api\]/,/\[rosetta\]/ s|^enable *=.*|enable = true|' \ @@ -51,4 +50,7 @@ CMD terrad start \ --minimum-gas-prices 0.015uluna \ --moniker localterra \ --p2p.upnp true \ - --rpc.laddr tcp://0.0.0.0:26657 + --rpc.laddr tcp://0.0.0.0:26657 \ + --api.enable true \ + --api.swagger true \ + --api.enabled-unsafe-cors true diff --git a/terra/genesis.json b/terra/genesis.json index a9c0b19..5c5532a 100644 --- a/terra/genesis.json +++ b/terra/genesis.json @@ -22,6 +22,19 @@ }, "app_hash": "", "app_state": { + "alliance": { + "params": { + "reward_delay_time": "604800s", + "take_rate_claim_interval": "300s", + "last_take_rate_claim_time": "0001-01-01T00:00:00Z" + }, + "assets": [], + "validator_infos": [], + "reward_weight_change_snaphots": [], + "delegations": [], + "redelegations": [], + "undelegations": [] + }, "auth": { "params": { "max_memo_characters": "256", @@ -262,6 +275,13 @@ "feegrant": { "allowances": [] }, + "feeibc": { + "identified_fees": [], + "fee_enabled_channels": [], + "registered_payees": [], + "registered_counterparty_payees": [], + "forward_relayers": [] + }, "genutil": { "gen_txs": [ { @@ -367,7 +387,10 @@ "connection_genesis": { "connections": [], "client_connection_paths": [], - "next_connection_sequence": "0" + "next_connection_sequence": "0", + "params": { + "max_expected_time_per_block": "30000000000" + } }, "channel_genesis": { "channels": [], @@ -380,6 +403,54 @@ "next_channel_sequence": "0" } }, + "ibchooks": {}, + "interchainaccounts": { + "controller_genesis_state": { + "active_channels": [], + "interchain_accounts": [], + "ports": [], + "params": { + "controller_enabled": true + } + }, + "host_genesis_state": { + "active_channels": [], + "interchain_accounts": [], + "port": "icahost", + "params": { + "host_enabled": true, + "allow_messages": [ + "/cosmos.authz.v1beta1.MsgExec", + "/cosmos.authz.v1beta1.MsgGrant", + "/cosmos.authz.v1beta1.MsgRevoke", + "/cosmos.bank.v1beta1.MsgSend", + "/cosmos.bank.v1beta1.MsgMultiSend", + "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress", + "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission", + "/cosmos.distribution.v1beta1.MsgFundCommunityPool", + "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward", + "/cosmos.feegrant.v1beta1.MsgGrantAllowance", + "/cosmos.feegrant.v1beta1.MsgRevokeAllowance", + "/cosmos.gov.v1beta1.MsgVoteWeighted", + "/cosmos.gov.v1beta1.MsgSubmitProposal", + "/cosmos.gov.v1beta1.MsgDeposit", + "/cosmos.gov.v1beta1.MsgVote", + "/cosmos.staking.v1beta1.MsgEditValidator", + "/cosmos.staking.v1beta1.MsgDelegate", + "/cosmos.staking.v1beta1.MsgUndelegate", + "/cosmos.staking.v1beta1.MsgBeginRedelegate", + "/cosmos.staking.v1beta1.MsgCreateValidator", + "/cosmos.vesting.v1beta1.MsgCreateVestingAccount", + "/ibc.applications.transfer.v1.MsgTransfer", + "/cosmwasm.wasm.v1.MsgStoreCode", + "/cosmwasm.wasm.v1.MsgInstantiateContract", + "/cosmwasm.wasm.v1.MsgExecuteContract", + "/cosmwasm.wasm.v1.MsgMigrateContract" + ] + } + } + }, + "intertx": null, "mint": { "minter": { "inflation": "0.130000000000000000", @@ -412,7 +483,8 @@ "max_validators": 100, "max_entries": 7, "historical_entries": 10000, - "bond_denom": "uluna" + "bond_denom": "uluna", + "min_commission_rate": "0.000000000000000000" }, "last_total_power": "0", "last_validator_powers": [], @@ -422,6 +494,17 @@ "redelegations": [], "exported": false }, + "tokenfactory": { + "params": { + "denom_creation_fee": [ + { + "denom": "uluna", + "amount": "10000000" + } + ] + }, + "factory_denoms": [] + }, "transfer": { "port_id": "transfer", "denom_traces": [], @@ -436,7 +519,8 @@ "params": { "code_upload_access": { "permission": "Everybody", - "address": "" + "address": "", + "addresses": [] }, "instantiate_default_permission": "Everybody" },