diff --git a/.pnp.cjs b/.pnp.cjs index bb344ac0..8d9716c8 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -204,7 +204,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ], [ "@finschia/finschia-proto", - "npm:1.0.0" + "npm:2.0.0-rc1" ], [ "@gar/promisify", @@ -3121,7 +3121,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@cosmjs/stargate", "npm:0.30.1"], ["@cosmjs/tendermint-rpc", "npm:0.30.1"], ["@cosmjs/utils", "npm:0.30.1"], - ["@finschia/finschia-proto", "npm:1.0.0"], + ["@finschia/finschia-proto", "npm:2.0.0-rc1"], ["@istanbuljs/nyc-config-typescript", "virtual:3f938e8b6d008ac7c4f429c55612c9826a29a057123d1f7e033c115c7e4faef2fa6717142b4eb614c9c2ce68e622b8f21afa701c01f12808c4bc214016991f99#npm:1.0.2"], ["@types/eslint-plugin-prettier", "npm:3.1.0"], ["@types/jasmine", "npm:3.10.3"], @@ -3170,10 +3170,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["@finschia/finschia-proto", [ - ["npm:1.0.0", { - "packageLocation": "./.yarn/cache/@finschia-finschia-proto-npm-1.0.0-86ffb39646-0833379018.zip/node_modules/@finschia/finschia-proto/", + ["npm:2.0.0-rc1", { + "packageLocation": "./.yarn/cache/@finschia-finschia-proto-npm-2.0.0-rc1-9eb645ec7e-69669eaa51.zip/node_modules/@finschia/finschia-proto/", "packageDependencies": [ - ["@finschia/finschia-proto", "npm:1.0.0"], + ["@finschia/finschia-proto", "npm:2.0.0-rc1"], ["long", "npm:4.0.0"], ["protobufjs", "npm:6.11.2"] ], diff --git a/.yarn/cache/@finschia-finschia-proto-npm-1.0.0-86ffb39646-0833379018.zip b/.yarn/cache/@finschia-finschia-proto-npm-1.0.0-86ffb39646-0833379018.zip deleted file mode 100644 index dbc7662c..00000000 --- a/.yarn/cache/@finschia-finschia-proto-npm-1.0.0-86ffb39646-0833379018.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87bf90ef5fd1b841e546b0be2b5684752c4ea36eae9116829b6e4579487e38b7 -size 1485275 diff --git a/.yarn/cache/@finschia-finschia-proto-npm-2.0.0-rc1-9eb645ec7e-69669eaa51.zip b/.yarn/cache/@finschia-finschia-proto-npm-2.0.0-rc1-9eb645ec7e-69669eaa51.zip new file mode 100644 index 00000000..e7f35dbb --- /dev/null +++ b/.yarn/cache/@finschia-finschia-proto-npm-2.0.0-rc1-9eb645ec7e-69669eaa51.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:145243fce52fd4c371af5250da850a1cfbcf805c4e054b2d158c839124441e30 +size 1486179 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1343ff85..3c7fc4a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- [\#93](https://github.com/Finschia/finschia-js/pull/93) remove UpdateParams in x/foundation + ### Deprecated ### Removed diff --git a/packages/finschia/package.json b/packages/finschia/package.json index 7f0fc2c4..e6b9709c 100644 --- a/packages/finschia/package.json +++ b/packages/finschia/package.json @@ -1,7 +1,7 @@ { "name": "@finschia/finschia", - "version": "0.8.0", - "description": "Utilities for FINSCHIA v1.0.0", + "version": "0.9.0-rc1", + "description": "Utilities for FINSCHIA v2.0.0", "contributors": [ "zemyblue ", "loin3 <55660267+loin3@users.noreply.github.com>", @@ -45,7 +45,7 @@ "@cosmjs/stargate": "^0.30.1", "@cosmjs/tendermint-rpc": "^0.30.1", "@cosmjs/utils": "^0.30.1", - "@finschia/finschia-proto": "^1.0.0", + "@finschia/finschia-proto": "^2.0.0-rc1", "cosmjs-types": "^0.7.1", "long": "^4.0.0", "pako": "^2.0.2", diff --git a/packages/finschia/src/index.ts b/packages/finschia/src/index.ts index 306e4e72..c737c4bf 100644 --- a/packages/finschia/src/index.ts +++ b/packages/finschia/src/index.ts @@ -71,7 +71,6 @@ export { isMsgSubmitProposalEncodeObject, isMsgUpdateDecisionPolicyEncodeObject, isMsgUpdateMembersEncodeObject, - isMsgUpdateParamsEncodeObject, isMsgVoteEncodeObject, isMsgWithdrawFromTreasuryEncodeObject, isMsgWithdrawProposalEncodeObject, @@ -85,7 +84,6 @@ export { MsgSubmitProposalEncodeObject, MsgUpdateDecisionPolicyEncodeObject, MsgUpdateMembersEncodeObject, - MsgUpdateParamsEncodeObject, MsgVoteEncodeObject, MsgWithdrawFromTreasuryEncodeObject, MsgWithdrawProposalEncodeObject, diff --git a/packages/finschia/src/modules/foundation/aminomessages.spec.ts b/packages/finschia/src/modules/foundation/aminomessages.spec.ts index a5ec3bde..8001ba20 100644 --- a/packages/finschia/src/modules/foundation/aminomessages.spec.ts +++ b/packages/finschia/src/modules/foundation/aminomessages.spec.ts @@ -3,8 +3,6 @@ import { Decimal } from "@cosmjs/math"; import { DirectSecp256k1HdWallet, Registry } from "@cosmjs/proto-signing"; import { AminoTypes, assertIsDeliverTxSuccess, coins, logs } from "@cosmjs/stargate"; import { sleep } from "@cosmjs/utils"; -import { Any } from "cosmjs-types/google/protobuf/any"; -import { Duration } from "cosmjs-types/google/protobuf/duration"; import { ReceiveFromTreasuryAuthorization } from "@finschia/finschia-proto/lbm/foundation/v1/authz"; import { PercentageDecisionPolicy, @@ -20,14 +18,14 @@ import { MsgRevoke, MsgUpdateDecisionPolicy, MsgUpdateMembers, - MsgUpdateParams, MsgVote, MsgWithdrawFromTreasury, MsgWithdrawProposal, } from "@finschia/finschia-proto/lbm/foundation/v1/tx"; import { CreateValidatorAuthorization } from "@finschia/finschia-proto/lbm/stakingplus/v1/authz"; +import { Any } from "cosmjs-types/google/protobuf/any"; +import { Duration } from "cosmjs-types/google/protobuf/duration"; import Long from "long"; -import { MsgUpdateParamsEncodeObject } from "src"; import { makeLinkPath } from "../../paths"; import { SigningFinschiaClient } from "../../signingfinschiaclient"; @@ -49,7 +47,6 @@ import { AminoMsgSubmitProposal, AminoMsgUpdateDecisionPolicy, AminoMsgUpdateMembers, - AminoMsgUpdateParams, AminoMsgVote, AminoMsgWithdrawFromTreasury, AminoMsgWithdrawProposal, @@ -66,6 +63,7 @@ import { MsgLeaveFoundationEncodeObject, MsgUpdateMembersEncodeObject, MsgVoteEncodeObject, + MsgWithdrawFromTreasuryEncodeObject, MsgWithdrawProposalEncodeObject, } from "./messages"; import { @@ -98,18 +96,22 @@ describe("Amino sign", () => { defaultSigningClientOptions, ); - const msgUpdateParams: MsgUpdateParamsEncodeObject = { - typeUrl: "/lbm.foundation.v1.MsgUpdateParams", + const msgWithdrawFromTreasury: MsgWithdrawFromTreasuryEncodeObject = { + typeUrl: "/lbm.foundation.v1.MsgWithdrawFromTreasury", value: { authority: authorityAddress, - params: { - foundationTax: Decimal.fromUserInput("0.1", 18).atomics, - }, + to: authorityAddress, + amount: [ + { + denom: "cony", + amount: "100000000000000", + }, + ], }, }; const msg = createMsgSubmitProposal( [faucet.address0], - [msgUpdateParams], + [msgWithdrawFromTreasury], "test", Exec.EXEC_UNSPECIFIED, ); @@ -207,33 +209,6 @@ describe("Amino sign", () => { assertIsDeliverTxSuccess(result); }); - it("MsgUpdateParams", async () => { - pendingWithoutSimapp(); - const wallet = await Secp256k1HdWallet.fromMnemonic(faucet.mnemonic, { - hdPaths: [makeLinkPath(0)], - prefix: simapp.prefix, - }); - const signingFinschiaClient = await SigningFinschiaClient.connectWithSigner( - simapp.tendermintUrl, - wallet, - defaultSigningClientOptions, - ); - - const msgUpdateParams: MsgUpdateParamsEncodeObject = { - typeUrl: "/lbm.foundation.v1.MsgUpdateParams", - value: { - authority: authorityAddress, - params: { - foundationTax: Decimal.fromUserInput("0.1", 18).atomics, - }, - }, - }; - - const msg = createMsgSubmitProposal([faucet.address0], [msgUpdateParams], "test", Exec.EXEC_UNSPECIFIED); - const result = await signingFinschiaClient.signAndBroadcast(faucet.address0, [msg], defaultFee); - assertIsDeliverTxSuccess(result); - }); - it("MsgFundTreasury", async () => { pendingWithoutSimapp(); const [client, tmClient] = await makeClientWithFoundation(simapp.tendermintUrl); @@ -470,30 +445,6 @@ describe("AminoTypes", () => { expect(aminoMsg).toEqual(expected); }); - it("MsgUpdateParams", () => { - const msg: MsgUpdateParams = { - authority: faucet.address0, - params: { - foundationTax: "0", - }, - }; - const aminoTypes = new AminoTypes(createFoundationAminoConverters()); - const aminoMsg = aminoTypes.toAmino({ - typeUrl: "/lbm.foundation.v1.MsgUpdateParams", - value: msg, - }); - const expected: AminoMsgUpdateParams = { - type: "lbm-sdk/MsgUpdateParams", - value: { - authority: faucet.address0, - params: { - foundation_tax: "0.000000000000000000", - }, - }, - }; - expect(aminoMsg).toEqual(expected); - }); - it("MsgFundTreasury", () => { const msg: MsgFundTreasury = { from: faucet.address0, @@ -824,30 +775,6 @@ describe("AminoTypes", () => { expect(msg).toEqual(expected); }); - it("MsgUpdateParams", () => { - const aminoMsg: AminoMsgUpdateParams = { - type: "lbm-sdk/MsgUpdateParams", - value: { - authority: faucet.address0, - params: { - foundation_tax: "0", - }, - }, - }; - const aminoTypes = new AminoTypes(createFoundationAminoConverters()); - const msg = aminoTypes.fromAmino(aminoMsg); - const expectedValue: MsgUpdateParams = { - authority: faucet.address0, - params: { - foundationTax: "0", - }, - }; - expect(msg).toEqual({ - typeUrl: "/lbm.foundation.v1.MsgUpdateParams", - value: expectedValue, - }); - }); - it("MsgFundTreasury", () => { const aminoMsg: AminoMsgFundTreasury = { type: "lbm-sdk/MsgFundTreasury", diff --git a/packages/finschia/src/modules/foundation/aminomessages.ts b/packages/finschia/src/modules/foundation/aminomessages.ts index 7c7380e7..454593bf 100644 --- a/packages/finschia/src/modules/foundation/aminomessages.ts +++ b/packages/finschia/src/modules/foundation/aminomessages.ts @@ -3,7 +3,6 @@ import { AminoMsg, Coin } from "@cosmjs/amino"; import { EncodeObject } from "@cosmjs/proto-signing"; import { AminoConverter, AminoConverters, AminoTypes } from "@cosmjs/stargate"; import { assertDefinedAndNotNull } from "@cosmjs/utils"; -import { Any } from "cosmjs-types/google/protobuf/any"; import { ReceiveFromTreasuryAuthorization } from "@finschia/finschia-proto/lbm/foundation/v1/authz"; import { PercentageDecisionPolicy, @@ -21,12 +20,12 @@ import { MsgSubmitProposal, MsgUpdateDecisionPolicy, MsgUpdateMembers, - MsgUpdateParams, MsgVote, MsgWithdrawFromTreasury, MsgWithdrawProposal, } from "@finschia/finschia-proto/lbm/foundation/v1/tx"; import { CreateValidatorAuthorization } from "@finschia/finschia-proto/lbm/stakingplus/v1/authz"; +import { Any } from "cosmjs-types/google/protobuf/any"; import Long from "long"; import { createDefaultRegistry, createDefaultTypesWithoutFoundation } from "../../types"; @@ -37,10 +36,6 @@ import { protoDurationToJson, } from "../../utils"; -interface Params { - foundation_tax: string; -} - interface DecisionPolicyWindows { voting_period: string; min_execution_period: string; @@ -51,24 +46,6 @@ interface MemberRequest { metadata?: string; } -export interface AminoMsgUpdateParams extends AminoMsg { - readonly type: "lbm-sdk/MsgUpdateParams"; - readonly value: { - /** authority is the address of the privileged account. */ - readonly authority: string; - /** - * params defines the x/foundation parameters to update. - * - * NOTE: All parameters must be supplied. - */ - readonly params?: Params; - }; -} - -export function isAminoMsgUpdateParams(msg: AminoMsg): msg is AminoMsgUpdateParams { - return msg.type === "lbm-sdk/MsgUpdateParams"; -} - export interface AminoMsgFundTreasury extends AminoMsg { readonly type: "lbm-sdk/MsgFundTreasury"; readonly value: { @@ -284,27 +261,6 @@ export function isAminoReceiveFromTreasuryAuthorization( export function createFoundationAminoConvertersWithoutSubmitProposal(): AminoConverters { return { - "/lbm.foundation.v1.MsgUpdateParams": { - aminoType: "lbm-sdk/MsgUpdateParams", - toAmino: ({ authority, params }: MsgUpdateParams): AminoMsgUpdateParams["value"] => { - assertDefinedAndNotNull(params); - return { - authority: authority, - params: { - foundation_tax: protoDecimalToJson(params.foundationTax), - }, - }; - }, - fromAmino: ({ authority, params }: AminoMsgUpdateParams["value"]): MsgUpdateParams => { - assertDefinedAndNotNull(params); - return { - authority: authority, - params: { - foundationTax: jsonDecimalToProto(params.foundation_tax), - }, - }; - }, - }, "/lbm.foundation.v1.MsgFundTreasury": { aminoType: "lbm-sdk/MsgFundTreasury", toAmino: ({ from, amount }: MsgFundTreasury): AminoMsgFundTreasury["value"] => { diff --git a/packages/finschia/src/modules/foundation/messages.ts b/packages/finschia/src/modules/foundation/messages.ts index 3a0df696..3dae3ff6 100644 --- a/packages/finschia/src/modules/foundation/messages.ts +++ b/packages/finschia/src/modules/foundation/messages.ts @@ -1,7 +1,5 @@ import { Decimal } from "@cosmjs/math"; import { EncodeObject, GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { Coin } from "cosmjs-types/cosmos/base/v1beta1/coin"; -import { Duration } from "cosmjs-types/google/protobuf/duration"; import { ReceiveFromTreasuryAuthorization } from "@finschia/finschia-proto/lbm/foundation/v1/authz"; import { DecisionPolicyWindows, @@ -20,16 +18,16 @@ import { MsgSubmitProposal, MsgUpdateDecisionPolicy, MsgUpdateMembers, - MsgUpdateParams, MsgVote, MsgWithdrawFromTreasury, MsgWithdrawProposal, } from "@finschia/finschia-proto/lbm/foundation/v1/tx"; +import { Coin } from "cosmjs-types/cosmos/base/v1beta1/coin"; +import { Duration } from "cosmjs-types/google/protobuf/duration"; import { longify } from "../../utils"; export const foundationTypes: ReadonlyArray<[string, GeneratedType]> = [ - ["/lbm.foundation.v1.MsgUpdateParams", MsgUpdateParams], ["/lbm.foundation.v1.MsgFundTreasury", MsgFundTreasury], ["/lbm.foundation.v1.MsgWithdrawFromTreasury", MsgWithdrawFromTreasury], ["/lbm.foundation.v1.MsgUpdateMembers", MsgUpdateMembers], @@ -47,15 +45,6 @@ export const foundationTypes: ReadonlyArray<[string, GeneratedType]> = [ ["/lbm.foundation.v1.PercentageDecisionPolicy", PercentageDecisionPolicy], ]; -export interface MsgUpdateParamsEncodeObject extends EncodeObject { - readonly typeUrl: "/lbm.foundation.v1.MsgUpdateParams"; - readonly value: Partial; -} - -export function isMsgUpdateParamsEncodeObject(object: EncodeObject): object is MsgUpdateParamsEncodeObject { - return (object as MsgUpdateParamsEncodeObject).typeUrl === "/lbm.foundation.v1.MsgUpdateParams"; -} - export interface MsgFundTreasuryEncodeObject extends EncodeObject { readonly typeUrl: "/lbm.foundation.v1.MsgFundTreasury"; readonly value: Partial; diff --git a/packages/finschia/src/modules/index.ts b/packages/finschia/src/modules/index.ts index cec91b09..6302f5f0 100644 --- a/packages/finschia/src/modules/index.ts +++ b/packages/finschia/src/modules/index.ts @@ -68,7 +68,6 @@ export { isMsgSubmitProposalEncodeObject, isMsgUpdateDecisionPolicyEncodeObject, isMsgUpdateMembersEncodeObject, - isMsgUpdateParamsEncodeObject, isMsgVoteEncodeObject, isMsgWithdrawFromTreasuryEncodeObject, isMsgWithdrawProposalEncodeObject, @@ -82,7 +81,6 @@ export { MsgSubmitProposalEncodeObject, MsgUpdateDecisionPolicyEncodeObject, MsgUpdateMembersEncodeObject, - MsgUpdateParamsEncodeObject, MsgVoteEncodeObject, MsgWithdrawFromTreasuryEncodeObject, MsgWithdrawProposalEncodeObject, diff --git a/scripts/finschia/env b/scripts/finschia/env index 2790e9a6..7c005c00 100644 --- a/scripts/finschia/env +++ b/scripts/finschia/env @@ -1,4 +1,4 @@ # Choose from https://hub.docker.com/r/finschia/finschianode/tags REPOSITORY="finschia/finschianode" -VERSION="1.0.0" +VERSION="2.0.0-rc2" CONTAINER_NAME="finschia-app" diff --git a/scripts/finschia/start.sh b/scripts/finschia/start.sh index b165e2a4..20d6979f 100755 --- a/scripts/finschia/start.sh +++ b/scripts/finschia/start.sh @@ -15,13 +15,13 @@ SCRIPT_DIR="$(realpath "$(dirname "$0")")" # shellcheck disable=SC1091 source "$SCRIPT_DIR"/env -TMP_DIR=$(mktemp -d "${TMPDIR:-/tmp}/lbmapp.XXXXXXXXX") +TMP_DIR=$(mktemp -d "${TMPDIR:-/tmp}/fnsa.XXXXXXXXX") chmod 777 "$TMP_DIR" echo "Using temporary dir $TMP_DIR" -LBM_LOGFILE="$TMP_DIR/lbm.log" +FINSCHIA_LOGFILE="$TMP_DIR/finschia.log" # Use a fresh volume for every start -docker volume rm -f lbmapp_data +docker volume rm -f fnsad_data docker run --rm \ --name "$CONTAINER_NAME" \ @@ -29,17 +29,17 @@ docker run --rm \ -p "$API_PORT_HOST":"$API_PORT_GUEST" \ -p "$GRPC_PORT_HOST":"$GRPC_PORT_GUEST" \ --mount type=bind,source="$SCRIPT_DIR/template",target=/template \ - --mount type=volume,source=lbmapp_data,target=/root \ + --mount type=volume,source=fnsad_data,target=/root \ "$REPOSITORY:$VERSION" \ /template/run_finschia.sh \ - >"$LBM_LOGFILE" 2>&1 & + >"$FINSCHIA_LOGFILE" 2>&1 & -echo "fnsad running on http://localhost:$TENDERMINT_PORT_HOST and logging into $LBM_LOGFILE" +echo "fnsad running on http://localhost:$TENDERMINT_PORT_HOST and logging into $FINSCHIA_LOGFILE" if [ -n "${CI:-}" ]; then # Give process some time to come alive. No idea why this helps. Needed for CI. sleep 0.5 # Follow the logs in CI's background job - tail -f "$LBM_LOGFILE" + tail -f "$FINSCHIA_LOGFILE" fi diff --git a/scripts/finschia/start_local.sh b/scripts/finschia/start_local.sh index 99cc53fd..109509f0 100755 --- a/scripts/finschia/start_local.sh +++ b/scripts/finschia/start_local.sh @@ -3,8 +3,8 @@ set -o errexit -o nounset -o pipefail command -v shellcheck >/dev/null && shellcheck "$0" SCRIPT_DIR="$(realpath "$(dirname "$0")")" -LBMAPP_DIR=".finschia" -CONFIG_DIR="${SCRIPT_DIR}/template/${LBMAPP_DIR}" +FINSCHIA_DIR=".finschia" +CONFIG_DIR="${SCRIPT_DIR}/template/${FINSCHIA_DIR}" echo "SCRIPT_DIR: ${SCRIPT_DIR}" echo "CONFIG_DIR: ${CONFIG_DIR}" @@ -13,4 +13,4 @@ if [ ! -x "$SCRIPT_DIR/test_chain_data" ]; then cp -R "${CONFIG_DIR}" "${SCRIPT_DIR}/test_chain_data" fi -fnsad start --trace --home "${SCRIPT_DIR}/test_chain_data/${LBMAPP_DIR}" +fnsad start --trace --home "${SCRIPT_DIR}/test_chain_data/${FINSCHIA_DIR}" diff --git a/scripts/finschia/template/.finschia/config/app.toml b/scripts/finschia/template/.finschia/config/app.toml index 9239b982..9a583c91 100644 --- a/scripts/finschia/template/.finschia/config/app.toml +++ b/scripts/finschia/template/.finschia/config/app.toml @@ -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 @@ -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 ### ############################################################################### diff --git a/scripts/finschia/template/.finschia/config/config.toml b/scripts/finschia/template/.finschia/config/config.toml index f732c1d5..d67c3b19 100644 --- a/scripts/finschia/template/.finschia/config/config.toml +++ b/scripts/finschia/template/.finschia/config/config.toml @@ -210,7 +210,7 @@ experimental_close_on_slow_client = false # How long to wait for a tx to be committed during /broadcast_tx_commit. # WARNING: Using a value larger than 'WriteTimeout' will result in increasing the # global HTTP write timeout, which applies to all connections and endpoints. -# See https://github.com/line/ostracon/issues/3435 +# See https://github.com/tendermint/tendermint/issues/3435 timeout_broadcast_tx_commit = "10s" # Maximum size of request body, in bytes @@ -353,7 +353,7 @@ max_tx_bytes = 1048576 # Maximum size of a batch of transactions to send to a peer # Including space needed by encoding (one varint per transaction). -# XXX: Unused due to https://github.com/line/ostracon/issues/5796 +# XXX: Unused due to https://github.com/tendermint/tendermint/issues/5796 max_batch_bytes = 0 ####################################################### diff --git a/scripts/finschia/template/.finschia/config/genesis.json b/scripts/finschia/template/.finschia/config/genesis.json index 8ab1579d..49eac373 100644 --- a/scripts/finschia/template/.finschia/config/genesis.json +++ b/scripts/finschia/template/.finschia/config/genesis.json @@ -462,7 +462,7 @@ "params": { "allowed_clients": [ "06-solomachine", - "99-ostracon" + "07-tendermint" ] }, "create_localhost": false, @@ -588,4 +588,4 @@ "inactive_contract_addresses": [] } } -} \ No newline at end of file +} diff --git a/scripts/finschia/template/setup.sh b/scripts/finschia/template/setup.sh index d51f420e..9149bfee 100755 --- a/scripts/finschia/template/setup.sh +++ b/scripts/finschia/template/setup.sh @@ -40,7 +40,7 @@ if [[ ${mode} == "testnet" ]] then if [[ $1 == "docker" ]] then - docker run -i -p 26656:26656 -p 26657:26657 -v ${HOME}/.finschia:/root/.finschia $REPOSITORY:$VERSION sh -c "export SIMD_TESTNET=true" + docker run -i -p 26656:26656 -p 26657:26657 -v ${HOME}/.finschia:/root/.finschia $REPOSITORY:$VERSION sh -c "export FNSAD_TESTNET=true" else export FNSAD_TESTNET=true fi diff --git a/scripts/simapp/template/setup.sh b/scripts/simapp/template/setup.sh index 152764de..0345edb1 100755 --- a/scripts/simapp/template/setup.sh +++ b/scripts/simapp/template/setup.sh @@ -42,7 +42,7 @@ then then docker run -i -p 26656:26656 -p 26657:26657 -v ${HOME}/.simapp:/root/.simapp $REPOSITORY:$VERSION sh -c "export SIMD_TESTNET=true" else - export LBM_TESTNET=true + export SIMD_TESTNET=true fi fi diff --git a/yarn.lock b/yarn.lock index 1794ebfa..92d48729 100644 --- a/yarn.lock +++ b/yarn.lock @@ -471,13 +471,13 @@ __metadata: languageName: node linkType: hard -"@finschia/finschia-proto@npm:^1.0.0": - version: 1.0.0 - resolution: "@finschia/finschia-proto@npm:1.0.0" +"@finschia/finschia-proto@npm:^2.0.0-rc1": + version: 2.0.0-rc1 + resolution: "@finschia/finschia-proto@npm:2.0.0-rc1" dependencies: long: ^4.0.0 protobufjs: ~6.11.2 - checksum: 083337901879072005ed6611dfaa8d737033506d71c3d7adb97f73c8620fbcb19e73de722837e37cddc65b88f0d864d2ec627017cc2481127c36b5276e39f442 + checksum: 69669eaa517a88b499e7f7696e44aec26e67cde5e0f0eb8dd02ebcb10f39551339bf9c2fa4c2c71915e60848545a7d73c4b3395aeccd184bd95599c8ec422ffc languageName: node linkType: hard @@ -494,7 +494,7 @@ __metadata: "@cosmjs/stargate": ^0.30.1 "@cosmjs/tendermint-rpc": ^0.30.1 "@cosmjs/utils": ^0.30.1 - "@finschia/finschia-proto": ^1.0.0 + "@finschia/finschia-proto": ^2.0.0-rc1 "@istanbuljs/nyc-config-typescript": ^1.0.1 "@types/eslint-plugin-prettier": ^3 "@types/jasmine": ^3.8