diff --git a/package-lock.json b/package-lock.json index 86bde8d..d74a5e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,6 @@ "bip39": "^3.0.4", "jscrypto": "^1.0.3", "keccak256": "^1.0.6", - "long": "^5.2.0", "ripemd160": "^2.0.2", "secp256k1": "^5.0.0", "semver": "^7.6.3", diff --git a/package.json b/package.json index bee4bc0..6fb6885 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,6 @@ "bip39": "^3.0.4", "jscrypto": "^1.0.3", "keccak256": "^1.0.6", - "long": "^5.2.0", "ripemd160": "^2.0.2", "secp256k1": "^5.0.0", "semver": "^7.6.3", diff --git a/src/core/Coin.ts b/src/core/Coin.ts index ce3b86e..7e24a6a 100644 --- a/src/core/Coin.ts +++ b/src/core/Coin.ts @@ -32,7 +32,7 @@ export class Coin extends JSONSerializable { * Turns the Coin into an Integer coin. */ public toIntCoin(): Coin { - return new Coin(this.denom, num(this.amount).toFixed(0)) + return new Coin(this.denom, num(this.amount).toFixed()) } /** diff --git a/src/core/Duration.ts b/src/core/Duration.ts index 8c8e664..0096e4a 100644 --- a/src/core/Duration.ts +++ b/src/core/Duration.ts @@ -1,5 +1,4 @@ import { Duration as Duration_pb } from '@initia/initia.proto/google/protobuf/duration' -import Long from 'long' /** * A Duration represents a signed, fixed-length span of time represented @@ -20,14 +19,14 @@ import Long from 'long' * microsecond should be expressed in JSON format as "3.000001s". */ export class Duration { - public seconds: Long + public seconds: number public nanos: number constructor(seconds: number, nanos = 0) { const [sec, nano] = (nanos / Math.pow(10, 9) + seconds) .toFixed(9) .split('.') - this.seconds = Long.fromString(sec) + this.seconds = parseInt(sec) this.nanos = parseInt(nano) } @@ -37,7 +36,7 @@ export class Duration { } public toString(): string { - return `${this.nanos / Math.pow(10, 9) + this.seconds.toNumber()}s` + return `${this.nanos / Math.pow(10, 9) + this.seconds}s` } public static fromAmino(amino: Duration.Amino): Duration { @@ -61,7 +60,10 @@ export class Duration { } public toProto(): Duration.Proto { - return { seconds: this.seconds, nanos: this.nanos } + return Duration_pb.fromPartial({ + seconds: this.seconds, + nanos: this.nanos, + }) } } diff --git a/src/core/auction/AuctionParams.ts b/src/core/auction/AuctionParams.ts index b8b5f3f..3825671 100644 --- a/src/core/auction/AuctionParams.ts +++ b/src/core/auction/AuctionParams.ts @@ -61,7 +61,7 @@ export class AuctionParams extends JSONSerializable< return { type: 'block-sdk/x/auction/Params', value: { - max_bundle_size: max_bundle_size.toString(), + max_bundle_size: max_bundle_size.toFixed(), escrow_account_address, reserve_fee: reserve_fee.toAmino(), min_bid_increment: min_bid_increment.toAmino(), @@ -103,7 +103,7 @@ export class AuctionParams extends JSONSerializable< return { '@type': '/sdk.auction.v1.Params', - max_bundle_size: max_bundle_size.toString(), + max_bundle_size: max_bundle_size.toFixed(), escrow_account_address, reserve_fee: reserve_fee.toData(), min_bid_increment: min_bid_increment.toData(), diff --git a/src/core/auth/AuthParams.ts b/src/core/auth/AuthParams.ts index a9baf80..abbc76b 100644 --- a/src/core/auth/AuthParams.ts +++ b/src/core/auth/AuthParams.ts @@ -1,6 +1,5 @@ import { JSONSerializable } from '../../util/json' import { Params as Params_pb } from '@initia/initia.proto/cosmos/auth/v1beta1/auth' -import Long from 'long' export class AuthParams extends JSONSerializable< AuthParams.Amino, @@ -56,11 +55,11 @@ export class AuthParams extends JSONSerializable< return { type: 'cosmos-sdk/x/auth/Params', value: { - max_memo_characters: max_memo_characters.toString(), - tx_sig_limit: tx_sig_limit.toString(), - tx_size_cost_per_byte: tx_size_cost_per_byte.toString(), - sig_verify_cost_ed25519: sig_verify_cost_ed25519.toString(), - sig_verify_cost_secp256k1: sig_verify_cost_secp256k1.toString(), + max_memo_characters: max_memo_characters.toFixed(), + tx_sig_limit: tx_sig_limit.toFixed(), + tx_size_cost_per_byte: tx_size_cost_per_byte.toFixed(), + sig_verify_cost_ed25519: sig_verify_cost_ed25519.toFixed(), + sig_verify_cost_secp256k1: sig_verify_cost_secp256k1.toFixed(), }, } } @@ -94,11 +93,11 @@ export class AuthParams extends JSONSerializable< return { '@type': '/cosmos.auth.v1beta1.Params', - max_memo_characters: max_memo_characters.toString(), - tx_sig_limit: tx_sig_limit.toString(), - tx_size_cost_per_byte: tx_size_cost_per_byte.toString(), - sig_verify_cost_ed25519: sig_verify_cost_ed25519.toString(), - sig_verify_cost_secp256k1: sig_verify_cost_secp256k1.toString(), + max_memo_characters: max_memo_characters.toFixed(), + tx_sig_limit: tx_sig_limit.toFixed(), + tx_size_cost_per_byte: tx_size_cost_per_byte.toFixed(), + sig_verify_cost_ed25519: sig_verify_cost_ed25519.toFixed(), + sig_verify_cost_secp256k1: sig_verify_cost_secp256k1.toFixed(), } } @@ -122,11 +121,11 @@ export class AuthParams extends JSONSerializable< } = this return Params_pb.fromPartial({ - maxMemoCharacters: Long.fromNumber(max_memo_characters), - txSigLimit: Long.fromNumber(tx_sig_limit), - txSizeCostPerByte: Long.fromNumber(tx_size_cost_per_byte), - sigVerifyCostEd25519: Long.fromNumber(sig_verify_cost_ed25519), - sigVerifyCostSecp256k1: Long.fromNumber(sig_verify_cost_secp256k1), + maxMemoCharacters: max_memo_characters, + txSigLimit: tx_sig_limit, + txSizeCostPerByte: tx_size_cost_per_byte, + sigVerifyCostEd25519: sig_verify_cost_ed25519, + sigVerifyCostSecp256k1: sig_verify_cost_secp256k1, }) } } diff --git a/src/core/auth/BaseAccount.ts b/src/core/auth/BaseAccount.ts index b0a0eac..6fea041 100644 --- a/src/core/auth/BaseAccount.ts +++ b/src/core/auth/BaseAccount.ts @@ -3,7 +3,6 @@ import { JSONSerializable } from '../../util/json' import { AccAddress } from '../bech32' import { BaseAccount as BaseAccount_pb } from '@initia/initia.proto/cosmos/auth/v1beta1/auth' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' /** * Stores information about an account fetched from the blockchain. @@ -96,8 +95,8 @@ export class BaseAccount extends JSONSerializable< return BaseAccount_pb.fromPartial({ address, pubKey: public_key?.packAny(), - accountNumber: Long.fromNumber(account_number), - sequence: Long.fromNumber(sequence), + accountNumber: account_number, + sequence, }) } diff --git a/src/core/bank/DenomUnit.ts b/src/core/bank/DenomUnit.ts index f8462b2..824bffe 100644 --- a/src/core/bank/DenomUnit.ts +++ b/src/core/bank/DenomUnit.ts @@ -29,7 +29,7 @@ export class DenomUnit extends JSONSerializable< const { denom, exponent, aliases } = this return { denom, - exponent: exponent.toString(), + exponent: exponent.toFixed(), aliases, } } @@ -43,7 +43,7 @@ export class DenomUnit extends JSONSerializable< const { denom, exponent, aliases } = this return { denom, - exponent: exponent.toString(), + exponent: exponent.toFixed(), aliases, } } diff --git a/src/core/celestia/Blob.ts b/src/core/celestia/Blob.ts index d0bdc9d..e171d7c 100644 --- a/src/core/celestia/Blob.ts +++ b/src/core/celestia/Blob.ts @@ -40,8 +40,8 @@ export class Blob extends JSONSerializable { return { namespace_id, data, - share_version: share_version.toString(), - namespace_version: namespace_version.toString(), + share_version: share_version.toFixed(), + namespace_version: namespace_version.toFixed(), } } diff --git a/src/core/celestia/msgs/MsgPayForBlobs.ts b/src/core/celestia/msgs/MsgPayForBlobs.ts index fc6ff14..5da8776 100644 --- a/src/core/celestia/msgs/MsgPayForBlobs.ts +++ b/src/core/celestia/msgs/MsgPayForBlobs.ts @@ -63,9 +63,9 @@ export class MsgPayForBlobs extends JSONSerializable< '@type': '/celestia.blob.v1.MsgPayForBlobs', signer, namespaces, - blob_sizes: blob_sizes.map((size) => size.toString()), + blob_sizes: blob_sizes.map((size) => size.toFixed()), share_commitments, - share_versions: share_versions.map((version) => version.toString()), + share_versions: share_versions.map((version) => version.toFixed()), } } diff --git a/src/core/consensus/ABCIParams.ts b/src/core/consensus/ABCIParams.ts index 9e7d43e..aadf00c 100644 --- a/src/core/consensus/ABCIParams.ts +++ b/src/core/consensus/ABCIParams.ts @@ -1,6 +1,5 @@ import { JSONSerializable } from '../../util/json' import { ABCIParams as ABCIParams_pb } from '@initia/initia.proto/tendermint/types/params' -import Long from 'long' export class ABCIParams extends JSONSerializable< ABCIParams.Amino, @@ -21,7 +20,7 @@ export class ABCIParams extends JSONSerializable< public toAmino(): ABCIParams.Amino { return { vote_extensions_enable_height: - this.vote_extensions_enable_height.toString(), + this.vote_extensions_enable_height.toFixed(), } } @@ -32,7 +31,7 @@ export class ABCIParams extends JSONSerializable< public toData(): ABCIParams.Data { return { vote_extensions_enable_height: - this.vote_extensions_enable_height.toString(), + this.vote_extensions_enable_height.toFixed(), } } @@ -42,9 +41,7 @@ export class ABCIParams extends JSONSerializable< public toProto(): ABCIParams.Proto { return ABCIParams_pb.fromPartial({ - voteExtensionsEnableHeight: Long.fromNumber( - this.vote_extensions_enable_height - ), + voteExtensionsEnableHeight: this.vote_extensions_enable_height, }) } } diff --git a/src/core/consensus/BlockParams.ts b/src/core/consensus/BlockParams.ts index 53b8bd8..aa401c1 100644 --- a/src/core/consensus/BlockParams.ts +++ b/src/core/consensus/BlockParams.ts @@ -1,6 +1,5 @@ import { JSONSerializable } from '../../util/json' import { BlockParams as BlockParams_pb } from '@initia/initia.proto/tendermint/types/params' -import Long from 'long' export class BlockParams extends JSONSerializable< BlockParams.Amino, @@ -26,8 +25,8 @@ export class BlockParams extends JSONSerializable< public toAmino(): BlockParams.Amino { const { max_bytes, max_gas } = this return { - max_bytes: max_bytes.toString(), - max_gas: max_gas.toString(), + max_bytes: max_bytes.toFixed(), + max_gas: max_gas.toFixed(), } } @@ -39,8 +38,8 @@ export class BlockParams extends JSONSerializable< public toData(): BlockParams.Data { const { max_bytes, max_gas } = this return { - max_bytes: max_bytes.toString(), - max_gas: max_gas.toString(), + max_bytes: max_bytes.toFixed(), + max_gas: max_gas.toFixed(), } } @@ -51,8 +50,8 @@ export class BlockParams extends JSONSerializable< public toProto(): BlockParams.Proto { const { max_bytes, max_gas } = this return BlockParams_pb.fromPartial({ - maxBytes: Long.fromNumber(max_bytes), - maxGas: Long.fromNumber(max_gas), + maxBytes: max_bytes, + maxGas: max_gas, }) } } diff --git a/src/core/consensus/EvidenceParams.ts b/src/core/consensus/EvidenceParams.ts index 50913a9..6bf590c 100644 --- a/src/core/consensus/EvidenceParams.ts +++ b/src/core/consensus/EvidenceParams.ts @@ -1,7 +1,6 @@ import { JSONSerializable } from '../../util/json' import { Duration } from '../Duration' import { EvidenceParams as EvidenceParams_pb } from '@initia/initia.proto/tendermint/types/params' -import Long from 'long' export class EvidenceParams extends JSONSerializable< EvidenceParams.Amino, @@ -33,9 +32,9 @@ export class EvidenceParams extends JSONSerializable< public toAmino(): EvidenceParams.Amino { const { max_age_num_blocks, max_age_duration, max_bytes } = this return { - max_age_num_blocks: max_age_num_blocks.toString(), + max_age_num_blocks: max_age_num_blocks.toFixed(), max_age_duration: max_age_duration.toAmino(), - max_bytes: max_bytes.toString(), + max_bytes: max_bytes.toFixed(), } } @@ -51,9 +50,9 @@ export class EvidenceParams extends JSONSerializable< public toData(): EvidenceParams.Data { const { max_age_num_blocks, max_age_duration, max_bytes } = this return { - max_age_num_blocks: max_age_num_blocks.toString(), + max_age_num_blocks: max_age_num_blocks.toFixed(), max_age_duration: max_age_duration.toData(), - max_bytes: max_bytes.toString(), + max_bytes: max_bytes.toFixed(), } } @@ -68,9 +67,9 @@ export class EvidenceParams extends JSONSerializable< public toProto(): EvidenceParams.Proto { const { max_age_num_blocks, max_age_duration, max_bytes } = this return EvidenceParams_pb.fromPartial({ - maxAgeNumBlocks: Long.fromNumber(max_age_num_blocks), + maxAgeNumBlocks: max_age_num_blocks, maxAgeDuration: max_age_duration.toProto(), - maxBytes: Long.fromNumber(max_bytes), + maxBytes: max_bytes, }) } } diff --git a/src/core/evidence/Equivocation.ts b/src/core/evidence/Equivocation.ts index d73245e..d340f4c 100644 --- a/src/core/evidence/Equivocation.ts +++ b/src/core/evidence/Equivocation.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../util/json' import { ValConsAddress } from '../bech32' import { Equivocation as Equivocation_pb } from '@initia/initia.proto/cosmos/evidence/v1beta1/evidence' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class Equivocation extends JSONSerializable< Equivocation.Amino, @@ -43,9 +42,9 @@ export class Equivocation extends JSONSerializable< return { type: 'cosmos-sdk/Equivocation', value: { - height: height.toString(), + height: height.toFixed(), time: time.toISOString(), - power: power.toString(), + power: power.toFixed(), consensus_address, }, } @@ -67,9 +66,9 @@ export class Equivocation extends JSONSerializable< return { '@type': '/cosmos.evidence.v1beta1.Equivocation', - height: height.toString(), + height: height.toFixed(), time: time.toISOString(), - power: power.toString(), + power: power.toFixed(), consensus_address, } } @@ -87,9 +86,9 @@ export class Equivocation extends JSONSerializable< const { height, time, power, consensus_address } = this return Equivocation_pb.fromPartial({ - height: Long.fromNumber(height), + height, time, - power: Long.fromNumber(power), + power, consensusAddress: consensus_address, }) } diff --git a/src/core/evm/EvmParams.ts b/src/core/evm/EvmParams.ts index 00cd2eb..8c6ec88 100644 --- a/src/core/evm/EvmParams.ts +++ b/src/core/evm/EvmParams.ts @@ -49,7 +49,7 @@ export class EvmParams extends JSONSerializable< fee_denom, } = this return { - extra_eips: extra_eips.map((eip) => eip.toString()), + extra_eips: extra_eips.map((eip) => eip.toFixed()), allowed_publishers, allow_custom_erc20, allowed_custom_erc20s, @@ -83,7 +83,7 @@ export class EvmParams extends JSONSerializable< fee_denom, } = this return { - extra_eips: extra_eips.map((eip) => eip.toString()), + extra_eips: extra_eips.map((eip) => eip.toFixed()), allowed_publishers, allow_custom_erc20, allowed_custom_erc20s, diff --git a/src/core/evm/msgs/MsgCreate2.ts b/src/core/evm/msgs/MsgCreate2.ts index c89ac30..462c58d 100644 --- a/src/core/evm/msgs/MsgCreate2.ts +++ b/src/core/evm/msgs/MsgCreate2.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgCreate2 as MsgCreate2_pb } from '@initia/initia.proto/minievm/evm/v1/tx' -import Long from 'long' export class MsgCreate2 extends JSONSerializable< MsgCreate2.Amino, @@ -39,7 +38,7 @@ export class MsgCreate2 extends JSONSerializable< value: { sender, code, - salt: salt.toString(), + salt: salt.toFixed(), value, }, } @@ -56,7 +55,7 @@ export class MsgCreate2 extends JSONSerializable< '@type': '/minievm.evm.v1.MsgCreate2', sender, code, - salt: salt.toString(), + salt: salt.toFixed(), value, } } @@ -75,7 +74,7 @@ export class MsgCreate2 extends JSONSerializable< return MsgCreate2_pb.fromPartial({ sender, code, - salt: Long.fromNumber(salt), + salt, value, }) } diff --git a/src/core/gov/Deposit.ts b/src/core/gov/Deposit.ts index cfdc9bc..b3d80c7 100644 --- a/src/core/gov/Deposit.ts +++ b/src/core/gov/Deposit.ts @@ -2,7 +2,6 @@ import { Coins } from '../Coins' import { JSONSerializable } from '../../util/json' import { AccAddress } from '../bech32' import { Deposit as Deposit_pb } from '@initia/initia.proto/cosmos/gov/v1/gov' -import Long from 'long' /** * Defines an amount deposited by an account address to an active proposal @@ -39,7 +38,7 @@ export class Deposit extends JSONSerializable< public toAmino(): Deposit.Amino { const { proposal_id, depositor, amount } = this return { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), depositor, amount: amount.toAmino(), } @@ -53,7 +52,7 @@ export class Deposit extends JSONSerializable< public toData(): Deposit.Data { const { proposal_id, depositor, amount } = this return { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), depositor, amount: amount.toData(), } @@ -70,7 +69,7 @@ export class Deposit extends JSONSerializable< public toProto(): Deposit.Proto { const { proposal_id, depositor, amount } = this return Deposit_pb.fromPartial({ - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, depositor: depositor, amount: amount.toProto(), }) diff --git a/src/core/gov/TallyResult.ts b/src/core/gov/TallyResult.ts index e90f7a0..22151d4 100644 --- a/src/core/gov/TallyResult.ts +++ b/src/core/gov/TallyResult.ts @@ -1,7 +1,6 @@ import { JSONSerializable } from '../../util/json' import { TallyResult as V1TallyResult_pb } from '@initia/initia.proto/cosmos/gov/v1/gov' import { TallyResult as TallyResult_pb } from '@initia/initia.proto/initia/gov/v1/gov' -import Long from 'long' export class TallyResult extends JSONSerializable< TallyResult.Amino, @@ -46,7 +45,7 @@ export class TallyResult extends JSONSerializable< v1_tally_result, } = this return { - tally_height: tally_height.toString(), + tally_height: tally_height.toFixed(), total_staking_power, total_vesting_power, v1_tally_result, @@ -76,7 +75,7 @@ export class TallyResult extends JSONSerializable< v1_tally_result, } = this return { - tally_height: tally_height.toString(), + tally_height: tally_height.toFixed(), total_staking_power, total_vesting_power, v1_tally_result, @@ -105,7 +104,7 @@ export class TallyResult extends JSONSerializable< v1_tally_result, } = this return TallyResult_pb.fromPartial({ - tallyHeight: Long.fromNumber(tally_height), + tallyHeight: tally_height, totalStakingPower: total_staking_power, totalVestingPower: total_vesting_power, v1TallyResult: V1TallyResult_pb.fromPartial({ diff --git a/src/core/gov/Vote.ts b/src/core/gov/Vote.ts index 930a8cf..158a518 100644 --- a/src/core/gov/Vote.ts +++ b/src/core/gov/Vote.ts @@ -5,8 +5,7 @@ import { VoteOption, WeightedVoteOption as WeightedVoteOption_pb, } from '@initia/initia.proto/cosmos/gov/v1/gov' -import { num } from '../num' -import Long from 'long' + /** * Defines a vote on a governance proposal */ @@ -39,7 +38,7 @@ export class Vote extends JSONSerializable { public toAmino(): Vote.Amino { const { proposal_id, voter, options, metadata } = this return { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), voter, options: options.map((v) => v.toAmino()), metadata, @@ -59,7 +58,7 @@ export class Vote extends JSONSerializable { public toData(): Vote.Data { const { proposal_id, voter, options, metadata } = this return { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), voter, options: options.map((v) => v.toData()), metadata, @@ -79,7 +78,7 @@ export class Vote extends JSONSerializable { const { proposal_id, voter, options, metadata } = this return Vote_pb.fromPartial({ options: options.map((o) => o.toProto()), - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, voter, metadata, }) @@ -112,50 +111,48 @@ export class WeightedVoteOption extends JSONSerializable< WeightedVoteOption.Data, WeightedVoteOption.Proto > { - public weight: string constructor( public option: VoteOption, - weight: number | string + public weight: number ) { super() - this.weight = num(weight).toString() } public static fromAmino(data: WeightedVoteOption.Amino): WeightedVoteOption { const { option, weight } = data - return new WeightedVoteOption(option, weight) + return new WeightedVoteOption(option, parseFloat(weight)) } public toAmino(): WeightedVoteOption.Amino { const { option, weight } = this return { option, - weight, + weight: weight.toString(), } } public static fromData(data: WeightedVoteOption.Data): WeightedVoteOption { const { option, weight } = data - return new WeightedVoteOption(option, weight) + return new WeightedVoteOption(option, parseFloat(weight)) } public toData(): WeightedVoteOption.Data { const { option, weight } = this return { option, - weight, + weight: weight.toString(), } } public static fromProto(proto: WeightedVoteOption.Proto): WeightedVoteOption { - return new WeightedVoteOption(proto.option, proto.weight) + return new WeightedVoteOption(proto.option, parseFloat(proto.weight)) } public toProto(): WeightedVoteOption.Proto { const { option, weight } = this return WeightedVoteOption_pb.fromPartial({ option, - weight, + weight: weight.toString(), }) } } diff --git a/src/core/gov/msgs/MsgCancelProposal.ts b/src/core/gov/msgs/MsgCancelProposal.ts index 89c147c..b17625b 100644 --- a/src/core/gov/msgs/MsgCancelProposal.ts +++ b/src/core/gov/msgs/MsgCancelProposal.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgCancelProposal as MsgCancelProposal_pb } from '@initia/initia.proto/cosmos/gov/v1/tx' -import Long from 'long' export class MsgCancelProposal extends JSONSerializable< MsgCancelProposal.Amino, @@ -32,7 +31,7 @@ export class MsgCancelProposal extends JSONSerializable< return { type: 'cosmos-sdk/v1/MsgCancelProposal', value: { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), proposer, }, } @@ -47,7 +46,7 @@ export class MsgCancelProposal extends JSONSerializable< const { proposal_id, proposer } = this return { '@type': '/cosmos.gov.v1.MsgCancelProposal', - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), proposer, } } @@ -59,7 +58,7 @@ export class MsgCancelProposal extends JSONSerializable< public toProto(): MsgCancelProposal.Proto { const { proposal_id, proposer } = this return MsgCancelProposal_pb.fromPartial({ - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, proposer, }) } diff --git a/src/core/gov/msgs/MsgDeposit.ts b/src/core/gov/msgs/MsgDeposit.ts index be82705..9b6f820 100644 --- a/src/core/gov/msgs/MsgDeposit.ts +++ b/src/core/gov/msgs/MsgDeposit.ts @@ -3,7 +3,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgDeposit as MsgDeposit_pb } from '@initia/initia.proto/cosmos/gov/v1/tx' -import Long from 'long' /** * Defines a message to submit a deposit to an existing proposal @@ -44,7 +43,7 @@ export class MsgDeposit extends JSONSerializable< return { type: 'cosmos-sdk/v1/MsgDeposit', value: { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), depositor, amount: amount.toAmino(), }, @@ -64,7 +63,7 @@ export class MsgDeposit extends JSONSerializable< const { proposal_id, depositor, amount } = this return { '@type': '/cosmos.gov.v1.MsgDeposit', - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), depositor, amount: amount.toData(), } @@ -83,7 +82,7 @@ export class MsgDeposit extends JSONSerializable< return MsgDeposit_pb.fromPartial({ amount: amount.toProto(), depositor, - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, }) } diff --git a/src/core/gov/msgs/MsgDepositLegacy.ts b/src/core/gov/msgs/MsgDepositLegacy.ts index 7115483..37f0fbf 100644 --- a/src/core/gov/msgs/MsgDepositLegacy.ts +++ b/src/core/gov/msgs/MsgDepositLegacy.ts @@ -3,7 +3,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgDeposit as MsgDeposit_pb } from '@initia/initia.proto/cosmos/gov/v1beta1/tx' -import Long from 'long' /** * Add a deposit for a proposal @@ -44,7 +43,7 @@ export class MsgDepositLegacy extends JSONSerializable< return { type: 'cosmos-sdk/MsgDeposit', value: { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), depositor, amount: amount.toAmino(), }, @@ -64,7 +63,7 @@ export class MsgDepositLegacy extends JSONSerializable< const { proposal_id, depositor, amount } = this return { '@type': '/cosmos.gov.v1beta1.MsgDeposit', - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), depositor, amount: amount.toData(), } @@ -83,7 +82,7 @@ export class MsgDepositLegacy extends JSONSerializable< return MsgDeposit_pb.fromPartial({ amount: amount.toProto(), depositor, - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, }) } diff --git a/src/core/gov/msgs/MsgVote.ts b/src/core/gov/msgs/MsgVote.ts index 002860e..ea2a49c 100644 --- a/src/core/gov/msgs/MsgVote.ts +++ b/src/core/gov/msgs/MsgVote.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgVote as MsgVote_pb } from '@initia/initia.proto/cosmos/gov/v1/tx' import { VoteOption } from '@initia/initia.proto/cosmos/gov/v1/gov' -import Long from 'long' /** * Defines a message to cast a vote @@ -40,7 +39,7 @@ export class MsgVote extends JSONSerializable< return { type: 'cosmos-sdk/v1/MsgVote', value: { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), voter, option, metadata: metadata && metadata !== '' ? metadata : undefined, @@ -57,7 +56,7 @@ export class MsgVote extends JSONSerializable< const { proposal_id, voter, option, metadata } = this return { '@type': '/cosmos.gov.v1.MsgVote', - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), voter, option, metadata, @@ -76,7 +75,7 @@ export class MsgVote extends JSONSerializable< public toProto(): MsgVote.Proto { const { proposal_id, voter, option, metadata } = this return MsgVote_pb.fromPartial({ - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, voter, option, metadata, diff --git a/src/core/gov/msgs/MsgVoteLegacy.ts b/src/core/gov/msgs/MsgVoteLegacy.ts index 8bab77e..c58100a 100644 --- a/src/core/gov/msgs/MsgVoteLegacy.ts +++ b/src/core/gov/msgs/MsgVoteLegacy.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgVote as MsgVote_pb } from '@initia/initia.proto/cosmos/gov/v1beta1/tx' import { VoteOption } from '@initia/initia.proto/cosmos/gov/v1beta1/gov' -import Long from 'long' /** * Vote for a proposal @@ -72,7 +71,7 @@ export class MsgVoteLegacy extends JSONSerializable< const { proposal_id, voter, option } = this return MsgVote_pb.fromPartial({ option, - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, voter, }) } diff --git a/src/core/gov/msgs/MsgVoteWeighted.ts b/src/core/gov/msgs/MsgVoteWeighted.ts index 2f9134d..5f39448 100644 --- a/src/core/gov/msgs/MsgVoteWeighted.ts +++ b/src/core/gov/msgs/MsgVoteWeighted.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../../bech32' import { WeightedVoteOption } from '../Vote' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgVoteWeighted as MsgVoteWeighted_pb } from '@initia/initia.proto/cosmos/gov/v1/tx' -import Long from 'long' /** * Defines a message to cast a vote @@ -87,7 +86,7 @@ export class MsgVoteWeighted extends JSONSerializable< const { proposal_id, voter, options, metadata } = this return MsgVoteWeighted_pb.fromPartial({ options: options.map((o) => o.toProto()), - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, voter, metadata, }) diff --git a/src/core/gov/msgs/MsgVoteWeightedLegacy.ts b/src/core/gov/msgs/MsgVoteWeightedLegacy.ts index 4318fb8..be882c3 100644 --- a/src/core/gov/msgs/MsgVoteWeightedLegacy.ts +++ b/src/core/gov/msgs/MsgVoteWeightedLegacy.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../../bech32' import { WeightedVoteOption } from '../Vote' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgVoteWeighted as MsgVoteWeighted_pb } from '@initia/initia.proto/cosmos/gov/v1beta1/tx' -import Long from 'long' /** * Weighted vote for a proposal @@ -86,7 +85,7 @@ export class MsgVoteWeightedLegacy extends JSONSerializable< const { proposal_id, voter, options } = this return MsgVoteWeighted_pb.fromPartial({ options: options.map((o) => o.toProto()), - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, voter, }) } diff --git a/src/core/gov/proposals/Proposal.ts b/src/core/gov/proposals/Proposal.ts index 628d7ec..345d9a6 100644 --- a/src/core/gov/proposals/Proposal.ts +++ b/src/core/gov/proposals/Proposal.ts @@ -9,7 +9,6 @@ import { proposalStatusToJSON, } from '@initia/initia.proto/cosmos/gov/v1/gov' import { Proposal as Proposal_pb } from '@initia/initia.proto/initia/gov/v1/gov' -import Long from 'long' /** * Defines the core field members of a governance proposal @@ -133,7 +132,7 @@ export class Proposal extends JSONSerializable< } = this return { - id: id.toString(), + id: id.toFixed(), messages: messages.map((msg): Msg.Amino => msg.toAmino()), status: proposalStatusToJSON(status), final_tally_result: final_tally_result.toAmino(), @@ -221,7 +220,7 @@ export class Proposal extends JSONSerializable< } = this return { - id: id.toString(), + id: id.toFixed(), messages: messages.map((msg) => msg.toData()), status: proposalStatusToJSON(status), final_tally_result: final_tally_result.toData(), @@ -288,7 +287,7 @@ export class Proposal extends JSONSerializable< } = this return Proposal_pb.fromPartial({ - id: Long.fromNumber(id), + id, messages: messages.map((msg) => msg.packAny()), status, finalTallyResult: final_tally_result.toProto(), diff --git a/src/core/group/GroupInfo.ts b/src/core/group/GroupInfo.ts index c64e778..c8b6b01 100644 --- a/src/core/group/GroupInfo.ts +++ b/src/core/group/GroupInfo.ts @@ -1,7 +1,6 @@ import { JSONSerializable } from '../../util/json' import { AccAddress } from '../bech32' import { GroupInfo as GroupInfo_pb } from '@initia/initia.proto/cosmos/group/v1/types' -import Long from 'long' export class GroupInfo extends JSONSerializable< GroupInfo.Amino, @@ -42,10 +41,10 @@ export class GroupInfo extends JSONSerializable< public toAmino(): GroupInfo.Amino { const { id, admin, metadata, version, total_weight, created_at } = this return { - id: id.toString(), + id: id.toFixed(), admin, metadata, - version: version.toString(), + version: version.toFixed(), total_weight, created_at: created_at.toISOString(), } @@ -66,10 +65,10 @@ export class GroupInfo extends JSONSerializable< public toData(): GroupInfo.Data { const { id, admin, metadata, version, total_weight, created_at } = this return { - id: id.toString(), + id: id.toFixed(), admin, metadata, - version: version.toString(), + version: version.toFixed(), total_weight, created_at: created_at.toISOString(), } @@ -89,10 +88,10 @@ export class GroupInfo extends JSONSerializable< public toProto(): GroupInfo.Proto { const { id, admin, metadata, version, total_weight, created_at } = this return GroupInfo_pb.fromPartial({ - id: Long.fromNumber(id), + id, admin, metadata, - version: Long.fromNumber(version), + version, totalWeight: total_weight, createdAt: created_at, }) diff --git a/src/core/group/GroupMember.ts b/src/core/group/GroupMember.ts index 5906cb2..697a184 100644 --- a/src/core/group/GroupMember.ts +++ b/src/core/group/GroupMember.ts @@ -5,7 +5,6 @@ import { Member as Member_pb, MemberRequest as MemberRequest_pb, } from '@initia/initia.proto/cosmos/group/v1/types' -import Long from 'long' export class GroupMember extends JSONSerializable< GroupMember.Amino, @@ -31,7 +30,7 @@ export class GroupMember extends JSONSerializable< public toAmino(): GroupMember.Amino { const { group_id, member } = this return { - group_id: group_id.toString(), + group_id: group_id.toFixed(), member: member.toAmino(), } } @@ -44,7 +43,7 @@ export class GroupMember extends JSONSerializable< public toData(): GroupMember.Data { const { group_id, member } = this return { - group_id: group_id.toString(), + group_id: group_id.toFixed(), member: member.toData(), } } @@ -59,7 +58,7 @@ export class GroupMember extends JSONSerializable< public toProto(): GroupMember.Proto { const { group_id, member } = this return GroupMember_pb.fromPartial({ - groupId: Long.fromNumber(group_id), + groupId: group_id, member: member.toProto(), }) } diff --git a/src/core/group/GroupPolicyInfo.ts b/src/core/group/GroupPolicyInfo.ts index a3eedc3..20fa23f 100644 --- a/src/core/group/GroupPolicyInfo.ts +++ b/src/core/group/GroupPolicyInfo.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../bech32' import { DecisionPolicy } from './policies' import { Any } from '@initia/initia.proto/google/protobuf/any' import { GroupPolicyInfo as GroupPolicyInfo_pb } from '@initia/initia.proto/cosmos/group/v1/types' -import Long from 'long' export class GroupPolicyInfo extends JSONSerializable< GroupPolicyInfo.Amino, @@ -66,10 +65,10 @@ export class GroupPolicyInfo extends JSONSerializable< return { address, - group_id: group_id.toString(), + group_id: group_id.toFixed(), admin, metadata, - version: version.toString(), + version: version.toFixed(), decision_policy: decision_policy.toAmino(), created_at: created_at.toISOString(), } @@ -110,10 +109,10 @@ export class GroupPolicyInfo extends JSONSerializable< return { address, - group_id: group_id.toString(), + group_id: group_id.toFixed(), admin, metadata, - version: version.toString(), + version: version.toFixed(), decision_policy: decision_policy.toData(), created_at: created_at.toISOString(), } @@ -144,10 +143,10 @@ export class GroupPolicyInfo extends JSONSerializable< return GroupPolicyInfo_pb.fromPartial({ address, - groupId: Long.fromNumber(group_id), + groupId: group_id, admin, metadata, - version: Long.fromNumber(version), + version, decisionPolicy: decision_policy.packAny(), createdAt: created_at, }) diff --git a/src/core/group/GroupProposal.ts b/src/core/group/GroupProposal.ts index 66993b3..a812eee 100644 --- a/src/core/group/GroupProposal.ts +++ b/src/core/group/GroupProposal.ts @@ -12,7 +12,6 @@ import { proposalExecutorResultFromJSON, proposalExecutorResultToJSON, } from '@initia/initia.proto/cosmos/group/v1/types' -import Long from 'long' /** * A group proposal consists of a set of `sdk.Msg`s that will be executed if the proposal @@ -87,12 +86,12 @@ export class GroupProposal extends JSONSerializable< parseInt(group_policy_version), proposalStatusFromJSON(status), { - yes_count: num(final_tally_result.yes_count ?? 0).toFixed(0), - no_count: num(final_tally_result.no_count ?? 0).toFixed(0), - abstain_count: num(final_tally_result.abstain_count ?? 0).toFixed(0), + yes_count: num(final_tally_result.yes_count ?? 0).toFixed(), + no_count: num(final_tally_result.no_count ?? 0).toFixed(), + abstain_count: num(final_tally_result.abstain_count ?? 0).toFixed(), no_with_veto_count: num( final_tally_result.no_with_veto_count ?? 0 - ).toFixed(0), + ).toFixed(), }, new Date(voting_period_end), proposalExecutorResultFromJSON(executor_result), @@ -121,13 +120,13 @@ export class GroupProposal extends JSONSerializable< } = this return { - id: id.toString(), + id: id.toFixed(), group_policy_address, metadata, proposers, submit_time: submit_time.toISOString(), - group_version: group_version.toString(), - group_policy_version: group_policy_version.toString(), + group_version: group_version.toFixed(), + group_policy_version: group_policy_version.toFixed(), status: proposalStatusToJSON(status), final_tally_result: { yes_count: num(final_tally_result.yes_count).toFixed(), @@ -173,12 +172,12 @@ export class GroupProposal extends JSONSerializable< parseInt(group_policy_version), proposalStatusFromJSON(status), { - yes_count: num(final_tally_result.yes_count ?? 0).toFixed(0), - no_count: num(final_tally_result.no_count ?? 0).toFixed(0), - abstain_count: num(final_tally_result.abstain_count ?? 0).toFixed(0), + yes_count: num(final_tally_result.yes_count ?? 0).toFixed(), + no_count: num(final_tally_result.no_count ?? 0).toFixed(), + abstain_count: num(final_tally_result.abstain_count ?? 0).toFixed(), no_with_veto_count: num( final_tally_result.no_with_veto_count ?? 0 - ).toFixed(0), + ).toFixed(), }, new Date(voting_period_end), proposalExecutorResultFromJSON(executor_result), @@ -207,13 +206,13 @@ export class GroupProposal extends JSONSerializable< } = this return { - id: id.toString(), + id: id.toFixed(), group_policy_address, metadata, proposers, submit_time: submit_time.toISOString(), - group_version: group_version.toString(), - group_policy_version: group_policy_version.toString(), + group_version: group_version.toFixed(), + group_policy_version: group_policy_version.toFixed(), status: proposalStatusToJSON(status), final_tally_result: { yes_count: num(final_tally_result.yes_count).toFixed(), @@ -242,12 +241,12 @@ export class GroupProposal extends JSONSerializable< data.groupPolicyVersion.toNumber(), data.status, { - yes_count: num(data.finalTallyResult?.yesCount ?? 0).toFixed(0), - no_count: num(data.finalTallyResult?.noCount ?? 0).toFixed(0), - abstain_count: num(data.finalTallyResult?.abstainCount ?? 0).toFixed(0), + yes_count: num(data.finalTallyResult?.yesCount ?? 0).toFixed(), + no_count: num(data.finalTallyResult?.noCount ?? 0).toFixed(), + abstain_count: num(data.finalTallyResult?.abstainCount ?? 0).toFixed(), no_with_veto_count: num( data.finalTallyResult?.noWithVetoCount ?? 0 - ).toFixed(0), + ).toFixed(), }, data.votingPeriodEnd as Date, data.executorResult, @@ -278,21 +277,21 @@ export class GroupProposal extends JSONSerializable< let ftr: TallyResult | undefined if (final_tally_result) { ftr = TallyResult.fromPartial({ - yesCount: final_tally_result.yes_count.toString(), - noCount: final_tally_result.no_count.toString(), - abstainCount: final_tally_result.abstain_count.toString(), - noWithVetoCount: final_tally_result.no_with_veto_count.toString(), + yesCount: final_tally_result.yes_count, + noCount: final_tally_result.no_count, + abstainCount: final_tally_result.abstain_count, + noWithVetoCount: final_tally_result.no_with_veto_count, }) } return Proposal_pb.fromPartial({ - id: Long.fromNumber(id), + id, groupPolicyAddress: group_policy_address, metadata, proposers, submitTime: submit_time, - groupVersion: Long.fromNumber(group_version), - groupPolicyVersion: Long.fromNumber(group_policy_version), + groupVersion: group_version, + groupPolicyVersion: group_policy_version, status, finalTallyResult: ftr, votingPeriodEnd: voting_period_end, diff --git a/src/core/group/GroupVote.ts b/src/core/group/GroupVote.ts index 4fb5cd8..58003f2 100644 --- a/src/core/group/GroupVote.ts +++ b/src/core/group/GroupVote.ts @@ -6,7 +6,6 @@ import { voteOptionFromJSON, voteOptionToJSON, } from '@initia/initia.proto/cosmos/group/v1/types' -import Long from 'long' export class GroupVote extends JSONSerializable< GroupVote.Amino, @@ -44,7 +43,7 @@ export class GroupVote extends JSONSerializable< public toAmino(): GroupVote.Amino { const { proposal_id, voter, option, metadata, submit_time } = this return { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), voter, option: voteOptionToJSON(option), metadata, @@ -66,7 +65,7 @@ export class GroupVote extends JSONSerializable< public toData(): GroupVote.Data { const { proposal_id, voter, option, metadata, submit_time } = this return { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), voter, option: voteOptionToJSON(option), metadata, @@ -87,7 +86,7 @@ export class GroupVote extends JSONSerializable< public toProto(): GroupVote.Proto { const { proposal_id, voter, option, metadata, submit_time } = this return Vote_pb.fromPartial({ - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, voter, option, metadata, diff --git a/src/core/group/msgs/MsgCreateGroupPolicy.ts b/src/core/group/msgs/MsgCreateGroupPolicy.ts index 3725e77..288160b 100644 --- a/src/core/group/msgs/MsgCreateGroupPolicy.ts +++ b/src/core/group/msgs/MsgCreateGroupPolicy.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../../bech32' import { DecisionPolicy } from '../policies' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgCreateGroupPolicy as MsgCreateGroupPolicy_pb } from '@initia/initia.proto/cosmos/group/v1/tx' -import Long from 'long' export class MsgCreateGroupPolicy extends JSONSerializable< MsgCreateGroupPolicy.Amino, @@ -45,7 +44,7 @@ export class MsgCreateGroupPolicy extends JSONSerializable< type: 'cosmos-sdk/MsgCreateGroupPolicy', value: { admin, - group_id: group_id.toString(), + group_id: group_id.toFixed(), metadata, decision_policy: decision_policy.toAmino(), }, @@ -69,7 +68,7 @@ export class MsgCreateGroupPolicy extends JSONSerializable< return { '@type': '/cosmos.group.v1.MsgCreateGroupPolicy', admin, - group_id: group_id.toString(), + group_id: group_id.toFixed(), metadata, decision_policy: decision_policy.toData(), } @@ -90,7 +89,7 @@ export class MsgCreateGroupPolicy extends JSONSerializable< const { admin, group_id, metadata, decision_policy } = this return MsgCreateGroupPolicy_pb.fromPartial({ admin, - groupId: Long.fromNumber(group_id), + groupId: group_id, metadata, decisionPolicy: decision_policy.packAny(), }) diff --git a/src/core/group/msgs/MsgGroupExec.ts b/src/core/group/msgs/MsgGroupExec.ts index bcd5360..54e46b8 100644 --- a/src/core/group/msgs/MsgGroupExec.ts +++ b/src/core/group/msgs/MsgGroupExec.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgExec as MsgExec_pb } from '@initia/initia.proto/cosmos/group/v1/tx' -import Long from 'long' export class MsgGroupExec extends JSONSerializable< MsgGroupExec.Amino, @@ -32,7 +31,7 @@ export class MsgGroupExec extends JSONSerializable< return { type: 'cosmos-sdk/group/MsgExec', value: { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), executor, }, } @@ -47,7 +46,7 @@ export class MsgGroupExec extends JSONSerializable< const { proposal_id, executor } = this return { '@type': '/cosmos.group.v1.MsgExec', - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), executor, } } @@ -59,7 +58,7 @@ export class MsgGroupExec extends JSONSerializable< public toProto(): MsgGroupExec.Proto { const { proposal_id, executor } = this return MsgExec_pb.fromPartial({ - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, executor, }) } diff --git a/src/core/group/msgs/MsgGroupVote.ts b/src/core/group/msgs/MsgGroupVote.ts index bc3fc84..1b19a9f 100644 --- a/src/core/group/msgs/MsgGroupVote.ts +++ b/src/core/group/msgs/MsgGroupVote.ts @@ -12,7 +12,6 @@ import { voteOptionFromJSON, voteOptionToJSON, } from '@initia/initia.proto/cosmos/group/v1/types' -import Long from 'long' export class MsgGroupVote extends JSONSerializable< MsgGroupVote.Amino, @@ -56,7 +55,7 @@ export class MsgGroupVote extends JSONSerializable< return { type: 'cosmos-sdk/group/MsgVote', value: { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), voter, option: voteOptionToJSON(option), metadata, @@ -82,7 +81,7 @@ export class MsgGroupVote extends JSONSerializable< return { '@type': '/cosmos.group.v1.MsgVote', - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), voter, option: voteOptionToJSON(option), metadata, @@ -104,7 +103,7 @@ export class MsgGroupVote extends JSONSerializable< const { proposal_id, voter, option, metadata, exec } = this return MsgVote_pb.fromPartial({ - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, voter, option, metadata, diff --git a/src/core/group/msgs/MsgLeaveGroup.ts b/src/core/group/msgs/MsgLeaveGroup.ts index b4f7d61..eee7f7a 100644 --- a/src/core/group/msgs/MsgLeaveGroup.ts +++ b/src/core/group/msgs/MsgLeaveGroup.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgLeaveGroup as MsgLeaveGroup_pb } from '@initia/initia.proto/cosmos/group/v1/tx' -import Long from 'long' export class MsgLeaveGroup extends JSONSerializable< MsgLeaveGroup.Amino, @@ -33,7 +32,7 @@ export class MsgLeaveGroup extends JSONSerializable< type: 'cosmos-sdk/group/MsgLeaveGroup', value: { address: address, - group_id: group_id.toString(), + group_id: group_id.toFixed(), }, } } @@ -48,7 +47,7 @@ export class MsgLeaveGroup extends JSONSerializable< return { '@type': '/cosmos.group.v1.MsgLeaveGroup', address, - group_id: group_id.toString(), + group_id: group_id.toFixed(), } } @@ -60,7 +59,7 @@ export class MsgLeaveGroup extends JSONSerializable< const { address, group_id } = this return MsgLeaveGroup_pb.fromPartial({ address, - groupId: Long.fromNumber(group_id), + groupId: group_id, }) } diff --git a/src/core/group/msgs/MsgUpdateGroupAdmin.ts b/src/core/group/msgs/MsgUpdateGroupAdmin.ts index 7fe1643..c1c2bda 100644 --- a/src/core/group/msgs/MsgUpdateGroupAdmin.ts +++ b/src/core/group/msgs/MsgUpdateGroupAdmin.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgUpdateGroupAdmin as MsgUpdateGroupAdmin_pb } from '@initia/initia.proto/cosmos/group/v1/tx' -import Long from 'long' export class MsgUpdateGroupAdmin extends JSONSerializable< MsgUpdateGroupAdmin.Amino, @@ -37,7 +36,7 @@ export class MsgUpdateGroupAdmin extends JSONSerializable< type: 'cosmos-sdk/MsgUpdateGroupAdmin', value: { admin, - group_id: group_id.toString(), + group_id: group_id.toFixed(), new_admin, }, } @@ -53,7 +52,7 @@ export class MsgUpdateGroupAdmin extends JSONSerializable< return { '@type': '/cosmos.group.v1.MsgUpdateGroupAdmin', admin, - group_id: group_id.toString(), + group_id: group_id.toFixed(), new_admin, } } @@ -72,7 +71,7 @@ export class MsgUpdateGroupAdmin extends JSONSerializable< const { admin, group_id, new_admin } = this return MsgUpdateGroupAdmin_pb.fromPartial({ admin, - groupId: Long.fromNumber(group_id), + groupId: group_id, newAdmin: new_admin, }) } diff --git a/src/core/group/msgs/MsgUpdateGroupMembers.ts b/src/core/group/msgs/MsgUpdateGroupMembers.ts index 55a76dc..c214a26 100644 --- a/src/core/group/msgs/MsgUpdateGroupMembers.ts +++ b/src/core/group/msgs/MsgUpdateGroupMembers.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MemberRequest } from '../GroupMember' import { MsgUpdateGroupMembers as MsgUpdateGroupMembers_pb } from '@initia/initia.proto/cosmos/group/v1/tx' -import Long from 'long' export class MsgUpdateGroupMembers extends JSONSerializable< MsgUpdateGroupMembers.Amino, @@ -42,7 +41,7 @@ export class MsgUpdateGroupMembers extends JSONSerializable< type: 'cosmos-sdk/MsgUpdateGroupMembers', value: { admin, - group_id: group_id.toString(), + group_id: group_id.toFixed(), member_updates: member_updates.map((d) => d.toAmino()), }, } @@ -64,7 +63,7 @@ export class MsgUpdateGroupMembers extends JSONSerializable< return { '@type': '/cosmos.group.v1.MsgUpdateGroupMembers', admin, - group_id: group_id.toString(), + group_id: group_id.toFixed(), member_updates: member_updates.map((d) => d.toData()), } } @@ -83,7 +82,7 @@ export class MsgUpdateGroupMembers extends JSONSerializable< const { admin, group_id, member_updates } = this return MsgUpdateGroupMembers_pb.fromPartial({ admin, - groupId: Long.fromNumber(group_id), + groupId: group_id, memberUpdates: member_updates.map((d) => d.toProto()), }) } diff --git a/src/core/group/msgs/MsgUpdateGroupMetadata.ts b/src/core/group/msgs/MsgUpdateGroupMetadata.ts index b8b60a0..9b9c8c7 100644 --- a/src/core/group/msgs/MsgUpdateGroupMetadata.ts +++ b/src/core/group/msgs/MsgUpdateGroupMetadata.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgUpdateGroupMetadata as MsgUpdateGroupMetadata_pb } from '@initia/initia.proto/cosmos/group/v1/tx' -import Long from 'long' export class MsgUpdateGroupMetadata extends JSONSerializable< MsgUpdateGroupMetadata.Amino, @@ -37,7 +36,7 @@ export class MsgUpdateGroupMetadata extends JSONSerializable< type: 'cosmos-sdk/MsgUpdateGroupMetadata', value: { admin, - group_id: group_id.toString(), + group_id: group_id.toFixed(), metadata, }, } @@ -55,7 +54,7 @@ export class MsgUpdateGroupMetadata extends JSONSerializable< return { '@type': '/cosmos.group.v1.MsgUpdateGroupMetadata', admin, - group_id: group_id.toString(), + group_id: group_id.toFixed(), metadata, } } @@ -74,7 +73,7 @@ export class MsgUpdateGroupMetadata extends JSONSerializable< const { admin, group_id, metadata } = this return MsgUpdateGroupMetadata_pb.fromPartial({ admin, - groupId: Long.fromNumber(group_id), + groupId: group_id, metadata, }) } diff --git a/src/core/group/msgs/MsgWithdrawProposal.ts b/src/core/group/msgs/MsgWithdrawProposal.ts index 64a4c6e..a1f3f0e 100644 --- a/src/core/group/msgs/MsgWithdrawProposal.ts +++ b/src/core/group/msgs/MsgWithdrawProposal.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgWithdrawProposal as MsgWithdrawProposal_pb } from '@initia/initia.proto/cosmos/group/v1/tx' -import Long from 'long' export class MsgWithdrawProposal extends JSONSerializable< MsgWithdrawProposal.Amino, @@ -34,7 +33,7 @@ export class MsgWithdrawProposal extends JSONSerializable< return { type: 'cosmos-sdk/group/MsgWithdrawProposal', value: { - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), address, }, } @@ -49,7 +48,7 @@ export class MsgWithdrawProposal extends JSONSerializable< const { proposal_id, address } = this return { '@type': '/cosmos.group.v1.MsgWithdrawProposal', - proposal_id: proposal_id.toString(), + proposal_id: proposal_id.toFixed(), address, } } @@ -63,7 +62,7 @@ export class MsgWithdrawProposal extends JSONSerializable< public toProto(): MsgWithdrawProposal.Proto { const { proposal_id, address } = this return MsgWithdrawProposal_pb.fromPartial({ - proposalId: Long.fromNumber(proposal_id), + proposalId: proposal_id, address, }) } diff --git a/src/core/ibc/applications/nft-transfer/msgs/MsgNftTransfer.ts b/src/core/ibc/applications/nft-transfer/msgs/MsgNftTransfer.ts index cea663d..a57b231 100644 --- a/src/core/ibc/applications/nft-transfer/msgs/MsgNftTransfer.ts +++ b/src/core/ibc/applications/nft-transfer/msgs/MsgNftTransfer.ts @@ -1,6 +1,5 @@ import { JSONSerializable } from '../../../../../util/json' import { AccAddress } from '../../../../bech32' -import Long from 'long' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgTransfer as MsgTransfer_pb } from '@initia/initia.proto/ibc/applications/nft_transfer/v1/tx' import { Height } from '../../../core/client/Height' @@ -223,7 +222,7 @@ export class MsgNftTransfer extends JSONSerializable< sender, receiver, timeoutHeight: timeout_height?.toProto(), - timeoutTimestamp: Long.fromString(timeout_timestamp ?? '0'), + timeoutTimestamp: timeout_timestamp, memo, }) } diff --git a/src/core/ibc/applications/transfer/msgs/MsgTransfer.ts b/src/core/ibc/applications/transfer/msgs/MsgTransfer.ts index b1be2c5..d68dbdc 100644 --- a/src/core/ibc/applications/transfer/msgs/MsgTransfer.ts +++ b/src/core/ibc/applications/transfer/msgs/MsgTransfer.ts @@ -1,7 +1,6 @@ import { JSONSerializable } from '../../../../../util/json' import { AccAddress } from '../../../../bech32' import { Coin } from '../../../../Coin' -import Long from 'long' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgTransfer as MsgTransfer_pb } from '@initia/initia.proto/ibc/applications/transfer/v1/tx' import { Height } from '../../../core/client/Height' @@ -209,7 +208,7 @@ export class MsgTransfer extends JSONSerializable< sender, receiver, timeoutHeight: timeout_height?.toProto(), - timeoutTimestamp: Long.fromString(timeout_timestamp ?? '0'), + timeoutTimestamp: timeout_timestamp, memo, }) } diff --git a/src/core/ibc/core/channel/Packet.ts b/src/core/ibc/core/channel/Packet.ts index 52c1a5f..b8fd880 100644 --- a/src/core/ibc/core/channel/Packet.ts +++ b/src/core/ibc/core/channel/Packet.ts @@ -1,5 +1,4 @@ import { Packet as Packet_pb } from '@initia/initia.proto/ibc/core/channel/v1/channel' -import Long from 'long' import { JSONSerializable } from '../../../../util/json' import { Height } from '../client/Height' @@ -145,14 +144,14 @@ export class Packet extends JSONSerializable< timeout_timestamp, } = this return Packet_pb.fromPartial({ - sequence: Long.fromNumber(sequence), + sequence, sourcePort: source_port, sourceChannel: source_channel, destinationPort: destination_port, destinationChannel: destination_channel, data: Buffer.from(data, 'base64'), timeoutHeight: timeout_height?.toProto(), - timeoutTimestamp: Long.fromString(timeout_timestamp), + timeoutTimestamp: timeout_timestamp, }) } } diff --git a/src/core/ibc/core/channel/PacketId.ts b/src/core/ibc/core/channel/PacketId.ts index 5ab71b6..aa67588 100644 --- a/src/core/ibc/core/channel/PacketId.ts +++ b/src/core/ibc/core/channel/PacketId.ts @@ -1,6 +1,5 @@ import { PacketId as PacketId_pb } from '@initia/initia.proto/ibc/core/channel/v1/channel' import { JSONSerializable } from '../../../../util/json' -import Long from 'long' /** * PacketId is an identifer for a unique Packet @@ -68,7 +67,7 @@ export class PacketId extends JSONSerializable< return PacketId_pb.fromPartial({ portId: port_id, channelId: channel_id, - sequence: Long.fromNumber(sequence), + sequence, }) } } diff --git a/src/core/ibc/core/channel/Timeout.ts b/src/core/ibc/core/channel/Timeout.ts index c2821ab..9405e14 100644 --- a/src/core/ibc/core/channel/Timeout.ts +++ b/src/core/ibc/core/channel/Timeout.ts @@ -1,7 +1,6 @@ import { JSONSerializable } from '../../../../util/json' import { Timeout as Timeout_pb } from '@initia/initia.proto/ibc/core/channel/v1/channel' import { Height } from '../client' -import Long from 'long' export class Timeout extends JSONSerializable< Timeout.Amino, @@ -28,7 +27,7 @@ export class Timeout extends JSONSerializable< const { height, timestamp } = this return { height: height.toAmino(), - timestamp: timestamp.toString(), + timestamp: timestamp.toFixed(), } } @@ -41,7 +40,7 @@ export class Timeout extends JSONSerializable< const { height, timestamp } = this return { height: height.toData(), - timestamp: timestamp.toString(), + timestamp: timestamp.toFixed(), } } @@ -56,7 +55,7 @@ export class Timeout extends JSONSerializable< const { height, timestamp } = this return Timeout_pb.fromPartial({ height: height.toProto(), - timestamp: Long.fromNumber(timestamp), + timestamp, }) } } diff --git a/src/core/ibc/core/channel/msgs/MsgTimeout.ts b/src/core/ibc/core/channel/msgs/MsgTimeout.ts index a1fcec7..2455090 100644 --- a/src/core/ibc/core/channel/msgs/MsgTimeout.ts +++ b/src/core/ibc/core/channel/msgs/MsgTimeout.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../../../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgTimeout as MsgTimeout_pb } from '@initia/initia.proto/ibc/core/channel/v1/tx' import { Packet, Height } from '../../../core' -import Long from 'long' /** * MsgTimeout receives timed-out packet @@ -96,7 +95,7 @@ export class MsgTimeout extends JSONSerializable< packet: packet?.toProto(), proofUnreceived: Buffer.from(proof_unreceived, 'base64'), proofHeight: proof_height?.toProto(), - nextSequenceRecv: Long.fromNumber(next_sequence_recv), + nextSequenceRecv: next_sequence_recv, signer, }) } diff --git a/src/core/ibc/core/channel/msgs/MsgTimeoutClose.ts b/src/core/ibc/core/channel/msgs/MsgTimeoutClose.ts index 67eccfa..ee9bff2 100644 --- a/src/core/ibc/core/channel/msgs/MsgTimeoutClose.ts +++ b/src/core/ibc/core/channel/msgs/MsgTimeoutClose.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../../../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgTimeoutOnClose as MsgTimeoutOnClose_pb } from '@initia/initia.proto/ibc/core/channel/v1/tx' import { Packet, Height } from '../../../core' -import Long from 'long' /** * MsgTimeoutOnClose timed-out packet upon counterparty channel closure. @@ -105,7 +104,7 @@ export class MsgTimeoutOnClose extends JSONSerializable< proofUnreceived: Buffer.from(proof_unreceived, 'base64'), proofClose: Buffer.from(proof_close, 'base64'), proofHeight: proof_height?.toProto(), - nextSequenceRecv: Long.fromNumber(next_sequence_recv), + nextSequenceRecv: next_sequence_recv, signer, }) } diff --git a/src/core/ibc/core/client/Height.ts b/src/core/ibc/core/client/Height.ts index 5e0a78e..401099a 100644 --- a/src/core/ibc/core/client/Height.ts +++ b/src/core/ibc/core/client/Height.ts @@ -1,5 +1,4 @@ import { Height as Height_pb } from '@initia/initia.proto/ibc/core/client/v1/client' -import Long from 'long' import { JSONSerializable } from '../../../../util/json' /** @@ -73,8 +72,8 @@ export class Height extends JSONSerializable< public toProto(): Height.Proto { const { revision_number, revision_height } = this return Height_pb.fromPartial({ - revisionNumber: Long.fromNumber(revision_number), - revisionHeight: Long.fromNumber(revision_height), + revisionNumber: revision_number, + revisionHeight: revision_height, }) } } diff --git a/src/core/ibc/core/client/msgs/tendermint/crypto.ts b/src/core/ibc/core/client/msgs/tendermint/crypto.ts index 7dffb70..4d08171 100644 --- a/src/core/ibc/core/client/msgs/tendermint/crypto.ts +++ b/src/core/ibc/core/client/msgs/tendermint/crypto.ts @@ -1,7 +1,6 @@ import { JSONSerializable } from '../../../../../../util/json' import { Proof as Proof_pb } from '@initia/initia.proto/tendermint/crypto/proof' import { PublicKey as PublicKey_pb } from '@initia/initia.proto/tendermint/crypto/keys' -import Long from 'long' export class Proof extends JSONSerializable { /** @@ -56,8 +55,8 @@ export class Proof extends JSONSerializable { public toProto(): Proof.Proto { const { total, index, leaf_hash, aunts } = this return Proof_pb.fromPartial({ - total: Long.fromNumber(total), - index: Long.fromNumber(index), + total, + index, leafHash: Buffer.from(leaf_hash, 'base64'), aunts: aunts.map((aunt) => Buffer.from(aunt, 'base64')), }) diff --git a/src/core/ibc/core/client/msgs/tendermint/types.ts b/src/core/ibc/core/client/msgs/tendermint/types.ts index 86689e5..717eae6 100644 --- a/src/core/ibc/core/client/msgs/tendermint/types.ts +++ b/src/core/ibc/core/client/msgs/tendermint/types.ts @@ -16,7 +16,6 @@ import { } from '@initia/initia.proto/tendermint/types/validator' import { Consensus } from './version' import { PublicKey } from './crypto' -import Long from 'long' /** Header defines the structure of a Tendermint block header. */ export class Header extends JSONSerializable { @@ -27,7 +26,7 @@ export class Header extends JSONSerializable { constructor( public version: Consensus | undefined, public chain_id: string, - public height: string, + public height: number, public time: Date | undefined, public last_block_id: BlockID | undefined, public last_commit_hash: string, @@ -72,7 +71,7 @@ export class Header extends JSONSerializable { return new Header( version ? Consensus.fromData(version) : undefined, chain_id, - height, + parseInt(height), time ? new Date(time) : undefined, last_block_id ? BlockID.fromData(last_block_id) : undefined, last_commit_hash, @@ -107,7 +106,7 @@ export class Header extends JSONSerializable { const res: Header.Data = { version: version?.toData(), chain_id, - height, + height: height.toFixed(), time: time?.toISOString().replace(/\.000Z$/, 'Z'), last_block_id: last_block_id?.toData(), last_commit_hash, @@ -143,7 +142,7 @@ export class Header extends JSONSerializable { return new Header( version ? Consensus.fromProto(version) : undefined, chainId, - height.toString(), + height.toNumber(), time, lastBlockId ? BlockID.fromProto(lastBlockId) : undefined, Buffer.from(lastCommitHash).toString('base64'), @@ -178,7 +177,7 @@ export class Header extends JSONSerializable { return Header_pb.fromPartial({ version: version?.toProto(), chainId: chain_id, - height: Long.fromString(height), + height, time, lastBlockId: last_block_id?.toProto(), lastCommitHash: Buffer.from(last_commit_hash, 'base64'), @@ -402,7 +401,7 @@ export class PartSetHeader extends JSONSerializable< public toProto(): PartSetHeader.Proto { const { total, hash } = this return PartSetHeader_pb.fromPartial({ - total: total, + total, hash: Buffer.from(hash, 'base64'), }) } @@ -426,7 +425,7 @@ export class Commit extends JSONSerializable { * @param signatures */ constructor( - public height: Long, + public height: number, public round: number, public block_id: BlockID | undefined, public signatures: CommitSig[] @@ -446,7 +445,7 @@ export class Commit extends JSONSerializable { public static fromData(data: Commit.Data): Commit { const { height, round, block_id, signatures } = data return new Commit( - Long.fromString(height), + parseInt(height), parseInt(round), block_id ? BlockID.fromData(block_id) : undefined, signatures.map((sig) => CommitSig.fromData(sig)) @@ -456,7 +455,7 @@ export class Commit extends JSONSerializable { public toData(): Commit.Data { const { height, round, block_id, signatures } = this const res: Commit.Data = { - height: height.toString(), + height: height.toFixed(), round: round.toFixed(), block_id: block_id?.toData(), signatures: signatures.map((sig) => sig.toData()), @@ -467,7 +466,7 @@ export class Commit extends JSONSerializable { public static fromProto(proto: Commit.Proto): Commit { const { height, round, blockId, signatures } = proto return new Commit( - height, + height.toNumber(), round, blockId ? BlockID.fromProto(blockId) : undefined, signatures.map((sig) => CommitSig.fromProto(sig)) @@ -594,7 +593,7 @@ export class ValidatorSet extends JSONSerializable< constructor( public validators: Validator[], public proposer: Validator | undefined, - public total_voting_power: Long + public total_voting_power: number ) { super() } @@ -613,7 +612,7 @@ export class ValidatorSet extends JSONSerializable< return new ValidatorSet( validators.map((val) => Validator.fromData(val)), proposer ? Validator.fromData(proposer) : undefined, - Long.fromString(total_voting_power) + parseInt(total_voting_power) ) } @@ -622,7 +621,7 @@ export class ValidatorSet extends JSONSerializable< const res: ValidatorSet.Data = { validators: validators.map((val) => val.toData()), proposer: proposer?.toData(), - total_voting_power: total_voting_power.toString(), + total_voting_power: total_voting_power.toFixed(), } return res } @@ -632,7 +631,7 @@ export class ValidatorSet extends JSONSerializable< return new ValidatorSet( validators.map((val) => Validator.fromProto(val)), proposer ? Validator.fromProto(proposer) : undefined, - totalVotingPower + totalVotingPower.toNumber() ) } @@ -670,8 +669,8 @@ export class Validator extends JSONSerializable< constructor( public address: string, // not AccAddress in case of opposite chain is not cosmos-sdk based public pub_key: PublicKey | undefined, - public voting_power: Long, - public proposer_priority: Long + public voting_power: number, + public proposer_priority: number ) { super() } @@ -690,8 +689,8 @@ export class Validator extends JSONSerializable< return new Validator( address, pub_key ? PublicKey.fromData(pub_key) : undefined, - Long.fromString(voting_power), - Long.fromString(proposer_priority) + parseInt(voting_power), + parseInt(proposer_priority) ) } @@ -700,8 +699,8 @@ export class Validator extends JSONSerializable< const res: Validator.Data = { address, pub_key: pub_key?.toData(), - voting_power: voting_power.toString(), - proposer_priority: proposer_priority.toString(), + voting_power: voting_power.toFixed(), + proposer_priority: proposer_priority.toFixed(), } return res } @@ -711,8 +710,8 @@ export class Validator extends JSONSerializable< return new Validator( Buffer.from(address).toString('base64'), pubKey ? PublicKey.fromProto(pubKey) : undefined, - votingPower, - proposerPriority + votingPower.toNumber(), + proposerPriority.toNumber() ) } diff --git a/src/core/ibc/core/client/msgs/tendermint/version.ts b/src/core/ibc/core/client/msgs/tendermint/version.ts index de631d6..f25edaf 100644 --- a/src/core/ibc/core/client/msgs/tendermint/version.ts +++ b/src/core/ibc/core/client/msgs/tendermint/version.ts @@ -3,7 +3,6 @@ import { Consensus as Consensus_pb, App as App_pb, } from '@initia/initia.proto/tendermint/version/types' -import Long from 'long' /** * Consensus captures the consensus rules for processing a block in the blockchain, @@ -56,8 +55,8 @@ export class Consensus extends JSONSerializable< public toProto(): Consensus.Proto { const { block, app } = this return Consensus_pb.fromPartial({ - block: Long.fromNumber(block), - app: Long.fromNumber(app), + block, + app, }) } } @@ -106,7 +105,7 @@ export class App extends JSONSerializable { const { protocol, software } = this const res: App.Data = { protocol: protocol.toFixed(), - software: software, + software, } return res } @@ -118,8 +117,8 @@ export class App extends JSONSerializable { public toProto(): App.Proto { const { protocol, software } = this return App_pb.fromPartial({ - protocol: Long.fromNumber(protocol), - software: software, + protocol, + software, }) } } diff --git a/src/core/ibc/core/connection/IbcConnectionParams.ts b/src/core/ibc/core/connection/IbcConnectionParams.ts index c76ccd5..e0a59f3 100644 --- a/src/core/ibc/core/connection/IbcConnectionParams.ts +++ b/src/core/ibc/core/connection/IbcConnectionParams.ts @@ -1,6 +1,5 @@ import { JSONSerializable } from '../../../../util/json' import { Params as Params_pb } from '@initia/initia.proto/ibc/core/connection/v1/connection' -import Long from 'long' export class IbcConnectionParams extends JSONSerializable< IbcConnectionParams.Amino, @@ -24,7 +23,7 @@ export class IbcConnectionParams extends JSONSerializable< public toAmino(): IbcConnectionParams.Amino { const { max_expected_time_per_block } = this return { - max_expected_time_per_block: max_expected_time_per_block.toString(), + max_expected_time_per_block: max_expected_time_per_block.toFixed(), } } @@ -36,7 +35,7 @@ export class IbcConnectionParams extends JSONSerializable< public toData(): IbcConnectionParams.Data { const { max_expected_time_per_block } = this return { - max_expected_time_per_block: max_expected_time_per_block.toString(), + max_expected_time_per_block: max_expected_time_per_block.toFixed(), } } @@ -49,7 +48,7 @@ export class IbcConnectionParams extends JSONSerializable< public toProto(): IbcConnectionParams.Proto { const { max_expected_time_per_block } = this return Params_pb.fromPartial({ - maxExpectedTimePerBlock: Long.fromNumber(max_expected_time_per_block), + maxExpectedTimePerBlock: max_expected_time_per_block, }) } } diff --git a/src/core/ibc/core/connection/IdentifiedConnection.ts b/src/core/ibc/core/connection/IdentifiedConnection.ts index 2bc0a1a..dedd936 100644 --- a/src/core/ibc/core/connection/IdentifiedConnection.ts +++ b/src/core/ibc/core/connection/IdentifiedConnection.ts @@ -7,7 +7,6 @@ import { stateToJSON, } from '@initia/initia.proto/ibc/core/connection/v1/connection' import { ConnectionCounterparty } from './ConnectionCounterparty' -import Long from 'long' export { State, stateFromJSON, stateToJSON } @@ -115,7 +114,7 @@ export class IdentifiedConnection extends JSONSerializable< versions: versions.map((v) => v.toProto()), state, counterparty: counterparty?.toProto(), - delayPeriod: Long.fromNumber(delay_period), + delayPeriod: delay_period, }) } } diff --git a/src/core/ibc/core/connection/msgs/MsgConnectionOpenInit.ts b/src/core/ibc/core/connection/msgs/MsgConnectionOpenInit.ts index 69c63fb..a1cb2e5 100644 --- a/src/core/ibc/core/connection/msgs/MsgConnectionOpenInit.ts +++ b/src/core/ibc/core/connection/msgs/MsgConnectionOpenInit.ts @@ -4,7 +4,6 @@ import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgConnectionOpenInit as MsgConnectionOpenInit_pb } from '@initia/initia.proto/ibc/core/connection/v1/tx' import { ConnectionCounterparty } from '../ConnectionCounterparty' import { IbcVersion } from '../IbcVersion' -import Long from 'long' /** * MsgConnectionOpenInit defines the msg sent by an account on Chain A to initialize a connection with Chain B. @@ -85,7 +84,7 @@ export class MsgConnectionOpenInit extends JSONSerializable< clientId: client_id, counterparty: counterparty.toProto(), version: version?.toProto(), - delayPeriod: Long.fromNumber(delay_period), + delayPeriod: delay_period, signer, }) } diff --git a/src/core/ibc/core/connection/msgs/MsgConnectionOpenTry.ts b/src/core/ibc/core/connection/msgs/MsgConnectionOpenTry.ts index 33bab99..52df2c7 100644 --- a/src/core/ibc/core/connection/msgs/MsgConnectionOpenTry.ts +++ b/src/core/ibc/core/connection/msgs/MsgConnectionOpenTry.ts @@ -5,7 +5,6 @@ import { MsgConnectionOpenTry as MsgConnectionOpenTry_pb } from '@initia/initia. import { ConnectionCounterparty } from '../ConnectionCounterparty' import { IbcVersion } from '../IbcVersion' import { Height } from '../../client' -import Long from 'long' /** * MsgConnectionOpenTry defines a msg sent by a Relayer to try to open a connection on Chain B. @@ -154,7 +153,7 @@ export class MsgConnectionOpenTry extends JSONSerializable< clientId: client_id, clientState: client_state, counterparty: counterparty?.toProto(), - delayPeriod: Long.fromNumber(delay_period), + delayPeriod: delay_period, counterpartyVersions: counterparty_versions.map((cv) => cv.toProto()), proofHeight: proof_height?.toProto(), proofInit: Buffer.from(proof_init, 'base64'), diff --git a/src/core/marketmap/Ticker.ts b/src/core/marketmap/Ticker.ts index 52b8125..b4e1b73 100644 --- a/src/core/marketmap/Ticker.ts +++ b/src/core/marketmap/Ticker.ts @@ -1,7 +1,6 @@ import { JSONSerializable } from '../../util/json' import { CurrencyPair } from '../oracle' import { Ticker as Ticker_pb } from '@initia/initia.proto/connect/marketmap/v2/market' -import Long from 'long' export class Ticker extends JSONSerializable< Ticker.Amino, @@ -52,8 +51,8 @@ export class Ticker extends JSONSerializable< } = this return { currency_pair: currency_pair.toAmino(), - decimals: decimals.toString(), - min_provider_count: min_provider_count.toString(), + decimals: decimals.toFixed(), + min_provider_count: min_provider_count.toFixed(), enabled, metadata_JSON, } @@ -86,8 +85,8 @@ export class Ticker extends JSONSerializable< } = this return { currency_pair: currency_pair.toData(), - decimals: decimals.toString(), - min_provider_count: min_provider_count.toString(), + decimals: decimals.toFixed(), + min_provider_count: min_provider_count.toFixed(), enabled, metadata_JSON, } @@ -113,8 +112,8 @@ export class Ticker extends JSONSerializable< } = this return Ticker_pb.fromPartial({ currencyPair: currency_pair, - decimals: Long.fromNumber(decimals), - minProviderCount: Long.fromNumber(min_provider_count), + decimals, + minProviderCount: min_provider_count, enabled, metadataJSON: metadata_JSON, }) diff --git a/src/core/mstaking/MstakingParams.ts b/src/core/mstaking/MstakingParams.ts index 3005c59..fd6492d 100644 --- a/src/core/mstaking/MstakingParams.ts +++ b/src/core/mstaking/MstakingParams.ts @@ -1,7 +1,6 @@ import { JSONSerializable } from '../../util/json' import { Duration } from '../Duration' import { Params as Params_pb } from '@initia/initia.proto/initia/mstaking/v1/staking' -import Long from 'long' export class MstakingParams extends JSONSerializable< MstakingParams.Amino, @@ -70,7 +69,7 @@ export class MstakingParams extends JSONSerializable< max_entries, historical_entries, bond_denoms, - min_voting_power: min_voting_power.toString(), + min_voting_power: min_voting_power.toFixed(), min_commission_rate, }, } @@ -114,7 +113,7 @@ export class MstakingParams extends JSONSerializable< max_entries, historical_entries, bond_denoms, - min_voting_power: min_voting_power.toString(), + min_voting_power: min_voting_power.toFixed(), min_commission_rate, } } @@ -147,7 +146,7 @@ export class MstakingParams extends JSONSerializable< maxEntries: max_entries, historicalEntries: historical_entries, bondDenoms: bond_denoms, - minVotingPower: Long.fromNumber(min_voting_power), + minVotingPower: min_voting_power, minCommissionRate: min_commission_rate, }) } diff --git a/src/core/mstaking/Redelegation.ts b/src/core/mstaking/Redelegation.ts index 974bd2f..4629c4f 100644 --- a/src/core/mstaking/Redelegation.ts +++ b/src/core/mstaking/Redelegation.ts @@ -7,7 +7,6 @@ import { RedelegationEntry as RedelegationEntry_pb, RedelegationEntryResponse as RedelegationEntryResponse_pb, } from '@initia/initia.proto/initia/mstaking/v1/staking' -import Long from 'long' /** * A redelegation is when a delegator decides to stop mstaking with one validator and @@ -267,7 +266,7 @@ export namespace Redelegation { balance: balance.toProto(), redelegationEntry: RedelegationEntry_pb.fromPartial({ completionTime: completion_time, - creationHeight: Long.fromNumber(creation_height), + creationHeight: creation_height, initialBalance: initial_balance.toProto(), sharesDst: shares_dst.toProto(), }), diff --git a/src/core/mstaking/UnbondingDelegation.ts b/src/core/mstaking/UnbondingDelegation.ts index 3a9f1a6..507e290 100644 --- a/src/core/mstaking/UnbondingDelegation.ts +++ b/src/core/mstaking/UnbondingDelegation.ts @@ -5,7 +5,6 @@ import { UnbondingDelegation as UnbondingDelegation_pb, UnbondingDelegationEntry as UnbondingDelegationEntry_pb, } from '@initia/initia.proto/initia/mstaking/v1/staking' -import Long from 'long' /** * When a delegator decides to take out their funds from the mstaking pool, they must @@ -176,7 +175,7 @@ export namespace UnbondingDelegation { return UnbondingDelegationEntry_pb.fromPartial({ balance: balance.toProto(), completionTime: completion_time, - creationHeight: Long.fromNumber(creation_height), + creationHeight: creation_height, initialBalance: initial_balance.toProto(), }) } diff --git a/src/core/mstaking/Validator.spec.ts b/src/core/mstaking/Validator.spec.ts index fd17564..a0e9d1e 100644 --- a/src/core/mstaking/Validator.spec.ts +++ b/src/core/mstaking/Validator.spec.ts @@ -86,9 +86,9 @@ describe('Validator', () => { unbonding_time: new Date('1970-01-01T00:00:00Z'), commission: { commission_rates: { - rate: '0.1', - max_rate: '0.2', - max_change_rate: '0.01', + rate: '0.100000000000000000', + max_rate: '0.200000000000000000', + max_change_rate: '0.010000000000000000', }, update_time: new Date('2023-01-26T06:28:02.349271477Z'), }, diff --git a/src/core/mstaking/Validator.ts b/src/core/mstaking/Validator.ts index 365b074..861b8de 100644 --- a/src/core/mstaking/Validator.ts +++ b/src/core/mstaking/Validator.ts @@ -1,6 +1,5 @@ import { JSONSerializable } from '../../util/json' import { Coins } from '../Coins' -import { num } from '../num' import { ValAddress } from '../bech32' import { ValConsPublicKey } from '../PublicKey' import { @@ -10,7 +9,6 @@ import { CommissionRates as CommissionRates_pb, BondStatus, } from '@initia/initia.proto/initia/mstaking/v1/staking' -import Long from 'long' import { Any } from '@initia/initia.proto/google/protobuf/any' /** @@ -153,7 +151,7 @@ export class Validator extends JSONSerializable< tokens: tokens.toProto(), delegatorShares: delegator_shares.toProto(), description: description.toProto(), - unbondingHeight: Long.fromNumber(unbonding_height), + unbondingHeight: unbonding_height, unbondingTime: unbonding_time, commission: commission.toProto(), votingPowers: voting_powers.toProto(), @@ -339,9 +337,6 @@ export namespace Validator { public max_change_rate: string ) { super() - this.rate = num(rate).toString() - this.max_rate = num(max_rate).toString() - this.max_change_rate = num(max_change_rate).toString() } public static fromAmino(data: CommissionRates.Amino): CommissionRates { diff --git a/src/core/mstaking/msgs/MsgCancelUnbondingDelegation.ts b/src/core/mstaking/msgs/MsgCancelUnbondingDelegation.ts index 02ce598..312a140 100644 --- a/src/core/mstaking/msgs/MsgCancelUnbondingDelegation.ts +++ b/src/core/mstaking/msgs/MsgCancelUnbondingDelegation.ts @@ -3,7 +3,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress, ValAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgCancelUnbondingDelegation as MsgCancelUnbondingDelegation_pb } from '@initia/initia.proto/initia/mstaking/v1/tx' -import Long from 'long' export class MsgCancelUnbondingDelegation extends JSONSerializable< MsgCancelUnbondingDelegation.Amino, @@ -50,7 +49,7 @@ export class MsgCancelUnbondingDelegation extends JSONSerializable< delegator_address, validator_address, amount: amount.toAmino(), - creation_height: creation_height.toString(), + creation_height: creation_height.toFixed(), }, } } @@ -76,7 +75,7 @@ export class MsgCancelUnbondingDelegation extends JSONSerializable< delegator_address, validator_address, amount: amount.toData(), - creation_height: creation_height.toString(), + creation_height: creation_height.toFixed(), } } @@ -98,7 +97,7 @@ export class MsgCancelUnbondingDelegation extends JSONSerializable< amount: amount.toProto(), delegatorAddress: delegator_address, validatorAddress: validator_address, - creationHeight: Long.fromNumber(creation_height), + creationHeight: creation_height, }) } diff --git a/src/core/mstaking/msgs/MsgEditValidator.ts b/src/core/mstaking/msgs/MsgEditValidator.ts index 9b1498d..42eb435 100644 --- a/src/core/mstaking/msgs/MsgEditValidator.ts +++ b/src/core/mstaking/msgs/MsgEditValidator.ts @@ -53,6 +53,25 @@ export class MsgEditValidator extends JSONSerializable< } } + public static fromData(data: MsgEditValidator.Data): MsgEditValidator { + const { description, validator_address, commission_rate } = data + return new MsgEditValidator( + Validator.Description.fromData(description), + validator_address, + commission_rate + ) + } + + public toData(): MsgEditValidator.Data { + const { description, validator_address, commission_rate } = this + return { + '@type': '/initia.mstaking.v1.MsgEditValidator', + description, + validator_address, + commission_rate, + } + } + public static fromProto(data: MsgEditValidator.Proto): MsgEditValidator { return new MsgEditValidator( Validator.Description.fromProto( @@ -67,7 +86,7 @@ export class MsgEditValidator extends JSONSerializable< const { description, validator_address, commission_rate } = this return MsgEditValidator_pb.fromPartial({ description: description.toProto(), - commissionRate: commission_rate?.toString() ?? '', + commissionRate: commission_rate, validatorAddress: validator_address, }) } @@ -82,25 +101,6 @@ export class MsgEditValidator extends JSONSerializable< public static unpackAny(msgAny: Any): MsgEditValidator { return MsgEditValidator.fromProto(MsgEditValidator_pb.decode(msgAny.value)) } - - public static fromData(data: MsgEditValidator.Data): MsgEditValidator { - const { description, validator_address, commission_rate } = data - return new MsgEditValidator( - Validator.Description.fromData(description), - validator_address, - commission_rate - ) - } - - public toData(): MsgEditValidator.Data { - const { description, validator_address, commission_rate } = this - return { - '@type': '/initia.mstaking.v1.MsgEditValidator', - description, - validator_address, - commission_rate, - } - } } export namespace MsgEditValidator { diff --git a/src/core/opchild/BridgeInfo.ts b/src/core/opchild/BridgeInfo.ts index 08722ec..a4539ea 100644 --- a/src/core/opchild/BridgeInfo.ts +++ b/src/core/opchild/BridgeInfo.ts @@ -1,7 +1,6 @@ import { JSONSerializable } from '../../util/json' import { BridgeInfo as BridgeInfo_pb } from '@initia/opinit.proto/opinit/opchild/v1/types' import { BridgeConfig } from '../ophost' -import Long from 'long' export class BridgeInfo extends JSONSerializable< BridgeInfo.Amino, @@ -41,7 +40,7 @@ export class BridgeInfo extends JSONSerializable< const { bridge_id, bridge_addr, l1_chain_id, l1_client_id, bridge_config } = this return { - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), bridge_addr, l1_chain_id, l1_client_id, @@ -65,7 +64,7 @@ export class BridgeInfo extends JSONSerializable< const { bridge_id, bridge_addr, l1_chain_id, l1_client_id, bridge_config } = this return { - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), bridge_addr, l1_chain_id, l1_client_id, @@ -87,7 +86,7 @@ export class BridgeInfo extends JSONSerializable< const { bridge_id, bridge_addr, l1_chain_id, l1_client_id, bridge_config } = this return BridgeInfo_pb.fromPartial({ - bridgeId: Long.fromNumber(bridge_id), + bridgeId: bridge_id, bridgeAddr: bridge_addr, l1ChainId: l1_chain_id, l1ClientId: l1_client_id, diff --git a/src/core/opchild/OpValidator.ts b/src/core/opchild/OpValidator.ts index e130cc3..5fa19fa 100644 --- a/src/core/opchild/OpValidator.ts +++ b/src/core/opchild/OpValidator.ts @@ -3,7 +3,6 @@ import { ValAddress } from '../bech32' import { ValConsPublicKey } from '../PublicKey' import { Validator as Validator_pb } from '@initia/opinit.proto/opinit/opchild/v1/types' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class OpValidator extends JSONSerializable< OpValidator.Amino, @@ -41,7 +40,7 @@ export class OpValidator extends JSONSerializable< moniker, operator_address, consensus_pubkey: consensus_pubkey.toAmino(), - cons_power: cons_power.toString(), + cons_power: cons_power.toFixed(), } } @@ -61,7 +60,7 @@ export class OpValidator extends JSONSerializable< moniker, operator_address, consensus_pubkey: consensus_pubkey.toData(), - cons_power: cons_power.toString(), + cons_power: cons_power.toFixed(), } } @@ -80,7 +79,7 @@ export class OpValidator extends JSONSerializable< moniker, operatorAddress: operator_address, consensusPubkey: consensus_pubkey.packAny(), - consPower: Long.fromNumber(cons_power), + consPower: cons_power, }) } } diff --git a/src/core/opchild/msgs/MsgFinalizeTokenDeposit.ts b/src/core/opchild/msgs/MsgFinalizeTokenDeposit.ts index 1a54117..35a1612 100644 --- a/src/core/opchild/msgs/MsgFinalizeTokenDeposit.ts +++ b/src/core/opchild/msgs/MsgFinalizeTokenDeposit.ts @@ -4,7 +4,6 @@ import { Coin } from '../../Coin' import { Denom } from '../../Denom' import { MsgFinalizeTokenDeposit as MsgFinalizeTokenDeposit_pb } from '@initia/opinit.proto/opinit/opchild/v1/tx' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class MsgFinalizeTokenDeposit extends JSONSerializable< MsgFinalizeTokenDeposit.Amino, @@ -62,8 +61,8 @@ export class MsgFinalizeTokenDeposit extends JSONSerializable< from, to, amount: amount.toAmino(), - sequence: sequence.toString(), - height: height.toString(), + sequence: sequence.toFixed(), + height: height.toFixed(), base_denom, data, }, @@ -96,8 +95,8 @@ export class MsgFinalizeTokenDeposit extends JSONSerializable< from, to, amount: amount.toData(), - sequence: sequence.toString(), - height: height.toString(), + sequence: sequence.toFixed(), + height: height.toFixed(), base_denom, data, } @@ -128,8 +127,8 @@ export class MsgFinalizeTokenDeposit extends JSONSerializable< from, to, amount: amount.toProto(), - sequence: Long.fromNumber(sequence), - height: Long.fromNumber(height), + sequence, + height, baseDenom: base_denom, data: data ? Buffer.from(data, 'base64') : undefined, }) diff --git a/src/core/opchild/msgs/MsgUpdateOracle.ts b/src/core/opchild/msgs/MsgUpdateOracle.ts index 9b8d71a..c2dc86c 100644 --- a/src/core/opchild/msgs/MsgUpdateOracle.ts +++ b/src/core/opchild/msgs/MsgUpdateOracle.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { MsgUpdateOracle as MsgUpdateOracle_pb } from '@initia/opinit.proto/opinit/opchild/v1/tx' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class MsgUpdateOracle extends JSONSerializable< MsgUpdateOracle.Amino, @@ -36,7 +35,7 @@ export class MsgUpdateOracle extends JSONSerializable< type: 'opchild/MsgUpdateOracle', value: { sender, - height: height.toString(), + height: height.toFixed(), data, }, } @@ -51,7 +50,7 @@ export class MsgUpdateOracle extends JSONSerializable< return { '@type': '/opinit.opchild.v1.MsgUpdateOracle', sender, - height: height.toString(), + height: height.toFixed(), data, } } @@ -68,7 +67,7 @@ export class MsgUpdateOracle extends JSONSerializable< const { sender, height, data } = this return MsgUpdateOracle_pb.fromPartial({ sender, - height: Long.fromNumber(height), + height, data: Buffer.from(data, 'base64'), }) } diff --git a/src/core/ophost/BridgeConfig.ts b/src/core/ophost/BridgeConfig.ts index 3caeefb..6a3a582 100644 --- a/src/core/ophost/BridgeConfig.ts +++ b/src/core/ophost/BridgeConfig.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../bech32' import { Duration } from '../Duration' import { BridgeConfig as BridgeConfig_pb } from '@initia/opinit.proto/opinit/ophost/v1/types' import { BatchInfo } from './BatchInfo' -import Long from 'long' export class BridgeConfig extends JSONSerializable< BridgeConfig.Amino, @@ -75,7 +74,7 @@ export class BridgeConfig extends JSONSerializable< batch_info: batch_info.toAmino(), submission_interval: submission_interval.toAmino(), finalization_period: finalization_period.toAmino(), - submission_start_height: submission_start_height.toString(), + submission_start_height: submission_start_height.toFixed(), oracle_enabled, metadata, } @@ -123,7 +122,7 @@ export class BridgeConfig extends JSONSerializable< batch_info: batch_info.toData(), submission_interval: submission_interval.toData(), finalization_period: finalization_period.toData(), - submission_start_height: submission_start_height.toString(), + submission_start_height: submission_start_height.toFixed(), oracle_enabled, metadata, } @@ -160,7 +159,7 @@ export class BridgeConfig extends JSONSerializable< batchInfo: batch_info.toProto(), submissionInterval: submission_interval.toProto(), finalizationPeriod: finalization_period.toProto(), - submissionStartHeight: Long.fromNumber(submission_start_height), + submissionStartHeight: submission_start_height, oracleEnabled: oracle_enabled, metadata: metadata ? Buffer.from(metadata, 'base64') : undefined, }) diff --git a/src/core/ophost/Output.ts b/src/core/ophost/Output.ts index 80f70b8..37f95aa 100644 --- a/src/core/ophost/Output.ts +++ b/src/core/ophost/Output.ts @@ -1,6 +1,5 @@ import { JSONSerializable } from '../../util/json' import { Output as Output_pb } from '@initia/opinit.proto/opinit/ophost/v1/types' -import Long from 'long' export class Output extends JSONSerializable< Output.Amino, @@ -38,9 +37,9 @@ export class Output extends JSONSerializable< this return { output_root, - l1_block_number: l1_block_number.toString(), + l1_block_number: l1_block_number.toFixed(), l1_block_time: l1_block_time.toISOString(), - l2_block_number: l2_block_number.toString(), + l2_block_number: l2_block_number.toFixed(), } } @@ -60,9 +59,9 @@ export class Output extends JSONSerializable< this return { output_root, - l1_block_number: l1_block_number.toString(), + l1_block_number: l1_block_number.toFixed(), l1_block_time: l1_block_time.toISOString(), - l2_block_number: l2_block_number.toString(), + l2_block_number: l2_block_number.toFixed(), } } @@ -80,9 +79,9 @@ export class Output extends JSONSerializable< this return Output_pb.fromPartial({ outputRoot: Buffer.from(output_root, 'base64'), - l1BlockNumber: Long.fromNumber(l1_block_number), + l1BlockNumber: l1_block_number, l1BlockTime: l1_block_time, - l2BlockNumber: Long.fromNumber(l2_block_number), + l2BlockNumber: l2_block_number, }) } } diff --git a/src/core/ophost/msgs/MsgDeleteOutput.ts b/src/core/ophost/msgs/MsgDeleteOutput.ts index 32b441e..2adaa73 100644 --- a/src/core/ophost/msgs/MsgDeleteOutput.ts +++ b/src/core/ophost/msgs/MsgDeleteOutput.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { MsgDeleteOutput as MsgDeleteOutput_pb } from '@initia/opinit.proto/opinit/ophost/v1/tx' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class MsgDeleteOutput extends JSONSerializable< MsgDeleteOutput.Amino, @@ -39,8 +38,8 @@ export class MsgDeleteOutput extends JSONSerializable< type: 'ophost/MsgDeleteOutput', value: { challenger, - bridge_id: bridge_id.toString(), - output_index: output_index.toString(), + bridge_id: bridge_id.toFixed(), + output_index: output_index.toFixed(), }, } } @@ -59,8 +58,8 @@ export class MsgDeleteOutput extends JSONSerializable< return { '@type': '/opinit.ophost.v1.MsgDeleteOutput', challenger, - bridge_id: bridge_id.toString(), - output_index: output_index.toString(), + bridge_id: bridge_id.toFixed(), + output_index: output_index.toFixed(), } } @@ -76,8 +75,8 @@ export class MsgDeleteOutput extends JSONSerializable< const { challenger, bridge_id, output_index } = this return MsgDeleteOutput_pb.fromPartial({ challenger, - bridgeId: Long.fromNumber(bridge_id), - outputIndex: Long.fromNumber(output_index), + bridgeId: bridge_id, + outputIndex: output_index, }) } diff --git a/src/core/ophost/msgs/MsgFinalizeTokenWithdrawal.ts b/src/core/ophost/msgs/MsgFinalizeTokenWithdrawal.ts index 817c4ee..dc91b5a 100644 --- a/src/core/ophost/msgs/MsgFinalizeTokenWithdrawal.ts +++ b/src/core/ophost/msgs/MsgFinalizeTokenWithdrawal.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../../bech32' import { Coin } from '../../Coin' import { MsgFinalizeTokenWithdrawal as MsgFinalizeTokenWithdrawal_pb } from '@initia/opinit.proto/opinit/ophost/v1/tx' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class MsgFinalizeTokenWithdrawal extends JSONSerializable< MsgFinalizeTokenWithdrawal.Amino, @@ -92,12 +91,12 @@ export class MsgFinalizeTokenWithdrawal extends JSONSerializable< type: 'ophost/MsgFinalizeTokenWithdrawal', value: { sender, - bridge_id: bridge_id.toString(), - output_index: output_index.toString(), + bridge_id: bridge_id.toFixed(), + output_index: output_index.toFixed(), withdrawal_proofs, from, to, - sequence: sequence.toString(), + sequence: sequence.toFixed(), amount: amount.toAmino(), version, storage_root, @@ -156,12 +155,12 @@ export class MsgFinalizeTokenWithdrawal extends JSONSerializable< return { '@type': '/opinit.ophost.v1.MsgFinalizeTokenWithdrawal', sender, - bridge_id: bridge_id.toString(), - output_index: output_index.toString(), + bridge_id: bridge_id.toFixed(), + output_index: output_index.toFixed(), withdrawal_proofs, from, to, - sequence: sequence.toString(), + sequence: sequence.toFixed(), amount: amount.toData(), version, storage_root, @@ -206,14 +205,14 @@ export class MsgFinalizeTokenWithdrawal extends JSONSerializable< return MsgFinalizeTokenWithdrawal_pb.fromPartial({ sender, - bridgeId: Long.fromNumber(bridge_id), - outputIndex: Long.fromNumber(output_index), + bridgeId: bridge_id, + outputIndex: output_index, withdrawalProofs: withdrawal_proofs.map((proof) => Buffer.from(proof, 'base64') ), from, to, - sequence: Long.fromNumber(sequence), + sequence, amount: amount.toProto(), version: Buffer.from(version, 'base64'), storageRoot: Buffer.from(storage_root, 'base64'), diff --git a/src/core/ophost/msgs/MsgInitiateTokenDeposit.ts b/src/core/ophost/msgs/MsgInitiateTokenDeposit.ts index cf3621d..bd21b42 100644 --- a/src/core/ophost/msgs/MsgInitiateTokenDeposit.ts +++ b/src/core/ophost/msgs/MsgInitiateTokenDeposit.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../../bech32' import { Coin } from '../../Coin' import { MsgInitiateTokenDeposit as MsgInitiateTokenDeposit_pb } from '@initia/opinit.proto/opinit/ophost/v1/tx' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class MsgInitiateTokenDeposit extends JSONSerializable< MsgInitiateTokenDeposit.Amino, @@ -48,7 +47,7 @@ export class MsgInitiateTokenDeposit extends JSONSerializable< type: 'ophost/MsgInitiateTokenDeposit', value: { sender, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), to, amount: amount.toAmino(), data, @@ -74,7 +73,7 @@ export class MsgInitiateTokenDeposit extends JSONSerializable< return { '@type': '/opinit.ophost.v1.MsgInitiateTokenDeposit', sender, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), to, amount: amount.toData(), data, @@ -99,7 +98,7 @@ export class MsgInitiateTokenDeposit extends JSONSerializable< const { sender, bridge_id, to, amount, data } = this return MsgInitiateTokenDeposit_pb.fromPartial({ sender, - bridgeId: Long.fromNumber(bridge_id), + bridgeId: bridge_id, to, amount: amount.toProto(), data: data ? Buffer.from(data, 'base64') : undefined, diff --git a/src/core/ophost/msgs/MsgProposeOutput.ts b/src/core/ophost/msgs/MsgProposeOutput.ts index 379dd4a..78bee77 100644 --- a/src/core/ophost/msgs/MsgProposeOutput.ts +++ b/src/core/ophost/msgs/MsgProposeOutput.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { MsgProposeOutput as MsgProposeOutput_pb } from '@initia/opinit.proto/opinit/ophost/v1/tx' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class MsgProposeOutput extends JSONSerializable< MsgProposeOutput.Amino, @@ -52,9 +51,9 @@ export class MsgProposeOutput extends JSONSerializable< type: 'ophost/MsgProposeOutput', value: { proposer, - bridge_id: bridge_id.toString(), - output_index: output_index.toString(), - l2_block_number: l2_block_number.toString(), + bridge_id: bridge_id.toFixed(), + output_index: output_index.toFixed(), + l2_block_number: l2_block_number.toFixed(), output_root, }, } @@ -78,9 +77,9 @@ export class MsgProposeOutput extends JSONSerializable< return { '@type': '/opinit.ophost.v1.MsgProposeOutput', proposer, - bridge_id: bridge_id.toString(), - output_index: output_index.toString(), - l2_block_number: l2_block_number.toString(), + bridge_id: bridge_id.toFixed(), + output_index: output_index.toFixed(), + l2_block_number: l2_block_number.toFixed(), output_root, } } @@ -100,9 +99,9 @@ export class MsgProposeOutput extends JSONSerializable< this return MsgProposeOutput_pb.fromPartial({ proposer, - bridgeId: Long.fromNumber(bridge_id), - outputIndex: Long.fromNumber(output_index), - l2BlockNumber: Long.fromNumber(l2_block_number), + bridgeId: bridge_id, + outputIndex: output_index, + l2BlockNumber: l2_block_number, outputRoot: output_root ? Buffer.from(output_root, 'base64') : undefined, }) } diff --git a/src/core/ophost/msgs/MsgRecordBatch.ts b/src/core/ophost/msgs/MsgRecordBatch.ts index d613270..e308458 100644 --- a/src/core/ophost/msgs/MsgRecordBatch.ts +++ b/src/core/ophost/msgs/MsgRecordBatch.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { MsgRecordBatch as MsgRecordBatch_pb } from '@initia/opinit.proto/opinit/ophost/v1/tx' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class MsgRecordBatch extends JSONSerializable< MsgRecordBatch.Amino, @@ -35,7 +34,7 @@ export class MsgRecordBatch extends JSONSerializable< type: 'ophost/MsgRecordBatch', value: { submitter, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), batch_bytes, }, } @@ -51,7 +50,7 @@ export class MsgRecordBatch extends JSONSerializable< return { '@type': '/opinit.ophost.v1.MsgRecordBatch', submitter, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), batch_bytes, } } @@ -68,7 +67,7 @@ export class MsgRecordBatch extends JSONSerializable< const { submitter, bridge_id, batch_bytes } = this return MsgRecordBatch_pb.fromPartial({ submitter, - bridgeId: Long.fromNumber(bridge_id), + bridgeId: bridge_id, batchBytes: batch_bytes ? Buffer.from(batch_bytes, 'base64') : undefined, }) } diff --git a/src/core/ophost/msgs/MsgUpdateBatchInfo.ts b/src/core/ophost/msgs/MsgUpdateBatchInfo.ts index 16b6464..c5033de 100644 --- a/src/core/ophost/msgs/MsgUpdateBatchInfo.ts +++ b/src/core/ophost/msgs/MsgUpdateBatchInfo.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../../bech32' import { MsgUpdateBatchInfo as MsgUpdateBatchInfo_pb } from '@initia/opinit.proto/opinit/ophost/v1/tx' import { Any } from '@initia/initia.proto/google/protobuf/any' import { BatchInfo } from '../BatchInfo' -import Long from 'long' export class MsgUpdateBatchInfo extends JSONSerializable< MsgUpdateBatchInfo.Amino, @@ -41,7 +40,7 @@ export class MsgUpdateBatchInfo extends JSONSerializable< type: 'ophost/MsgUpdateBatchInfo', value: { authority, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), new_batch_info: new_batch_info.toAmino(), }, } @@ -61,7 +60,7 @@ export class MsgUpdateBatchInfo extends JSONSerializable< return { '@type': '/opinit.ophost.v1.MsgUpdateBatchInfo', authority, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), new_batch_info: new_batch_info.toData(), } } @@ -78,7 +77,7 @@ export class MsgUpdateBatchInfo extends JSONSerializable< const { authority, bridge_id, new_batch_info } = this return MsgUpdateBatchInfo_pb.fromPartial({ authority, - bridgeId: Long.fromNumber(bridge_id), + bridgeId: bridge_id, newBatchInfo: new_batch_info.toProto(), }) } diff --git a/src/core/ophost/msgs/MsgUpdateChallenger.ts b/src/core/ophost/msgs/MsgUpdateChallenger.ts index f9e02c5..682e922 100644 --- a/src/core/ophost/msgs/MsgUpdateChallenger.ts +++ b/src/core/ophost/msgs/MsgUpdateChallenger.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { MsgUpdateChallenger as MsgUpdateChallenger_pb } from '@initia/opinit.proto/opinit/ophost/v1/tx' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class MsgUpdateChallenger extends JSONSerializable< MsgUpdateChallenger.Amino, @@ -38,7 +37,7 @@ export class MsgUpdateChallenger extends JSONSerializable< type: 'ophost/MsgUpdateChallenger', value: { authority, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), challenger, }, } @@ -54,7 +53,7 @@ export class MsgUpdateChallenger extends JSONSerializable< return { '@type': '/opinit.ophost.v1.MsgUpdateChallenger', authority, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), challenger, } } @@ -73,7 +72,7 @@ export class MsgUpdateChallenger extends JSONSerializable< const { authority, bridge_id, challenger } = this return MsgUpdateChallenger_pb.fromPartial({ authority, - bridgeId: Long.fromNumber(bridge_id), + bridgeId: bridge_id, challenger, }) } diff --git a/src/core/ophost/msgs/MsgUpdateMetadata.ts b/src/core/ophost/msgs/MsgUpdateMetadata.ts index 0a577bb..15131d6 100644 --- a/src/core/ophost/msgs/MsgUpdateMetadata.ts +++ b/src/core/ophost/msgs/MsgUpdateMetadata.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { MsgUpdateMetadata as MsgUpdateMetadata_pb } from '@initia/opinit.proto/opinit/ophost/v1/tx' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class MsgUpdateMetadata extends JSONSerializable< MsgUpdateMetadata.Amino, @@ -36,7 +35,7 @@ export class MsgUpdateMetadata extends JSONSerializable< type: 'ophost/MsgUpdateMetadata', value: { authority, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), metadata, }, } @@ -52,7 +51,7 @@ export class MsgUpdateMetadata extends JSONSerializable< return { '@type': '/opinit.ophost.v1.MsgUpdateMetadata', authority, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), metadata, } } @@ -69,7 +68,7 @@ export class MsgUpdateMetadata extends JSONSerializable< const { authority, bridge_id, metadata } = this return MsgUpdateMetadata_pb.fromPartial({ authority, - bridgeId: Long.fromNumber(bridge_id), + bridgeId: bridge_id, metadata: Buffer.from(metadata, 'base64'), }) } diff --git a/src/core/ophost/msgs/MsgUpdateOracleConfig.ts b/src/core/ophost/msgs/MsgUpdateOracleConfig.ts index 4ee8472..43b1946 100644 --- a/src/core/ophost/msgs/MsgUpdateOracleConfig.ts +++ b/src/core/ophost/msgs/MsgUpdateOracleConfig.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { MsgUpdateOracleConfig as MsgUpdateOracleConfig_pb } from '@initia/opinit.proto/opinit/ophost/v1/tx' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class MsgUpdateOracleConfig extends JSONSerializable< MsgUpdateOracleConfig.Amino, @@ -42,7 +41,7 @@ export class MsgUpdateOracleConfig extends JSONSerializable< type: 'ophost/MsgUpdateOracleConfig', value: { authority, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), oracle_enabled, }, } @@ -64,7 +63,7 @@ export class MsgUpdateOracleConfig extends JSONSerializable< return { '@type': '/opinit.ophost.v1.MsgUpdateOracleConfig', authority, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), oracle_enabled, } } @@ -83,7 +82,7 @@ export class MsgUpdateOracleConfig extends JSONSerializable< const { authority, bridge_id, oracle_enabled } = this return MsgUpdateOracleConfig_pb.fromPartial({ authority, - bridgeId: Long.fromNumber(bridge_id), + bridgeId: bridge_id, oracleEnabled: oracle_enabled, }) } diff --git a/src/core/ophost/msgs/MsgUpdateProposer.ts b/src/core/ophost/msgs/MsgUpdateProposer.ts index 77002b8..66301b3 100644 --- a/src/core/ophost/msgs/MsgUpdateProposer.ts +++ b/src/core/ophost/msgs/MsgUpdateProposer.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { MsgUpdateProposer as MsgUpdateProposer_pb } from '@initia/opinit.proto/opinit/ophost/v1/tx' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class MsgUpdateProposer extends JSONSerializable< MsgUpdateProposer.Amino, @@ -36,7 +35,7 @@ export class MsgUpdateProposer extends JSONSerializable< type: 'ophost/MsgUpdateProposer', value: { authority, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), new_proposer, }, } @@ -52,7 +51,7 @@ export class MsgUpdateProposer extends JSONSerializable< return { '@type': '/opinit.ophost.v1.MsgUpdateProposer', authority, - bridge_id: bridge_id.toString(), + bridge_id: bridge_id.toFixed(), new_proposer, } } @@ -69,7 +68,7 @@ export class MsgUpdateProposer extends JSONSerializable< const { authority, bridge_id, new_proposer } = this return MsgUpdateProposer_pb.fromPartial({ authority, - bridgeId: Long.fromNumber(bridge_id), + bridgeId: bridge_id, newProposer: new_proposer, }) } diff --git a/src/core/oracle/QuotePrice.ts b/src/core/oracle/QuotePrice.ts index 691fc20..d554a72 100644 --- a/src/core/oracle/QuotePrice.ts +++ b/src/core/oracle/QuotePrice.ts @@ -1,6 +1,5 @@ import { JSONSerializable } from '../../util/json' import { QuotePrice as QuotePrice_pb } from '@initia/initia.proto/connect/oracle/v2/genesis' -import Long from 'long' export class QuotePrice extends JSONSerializable< QuotePrice.Amino, @@ -34,7 +33,7 @@ export class QuotePrice extends JSONSerializable< return { price, block_timestamp: block_timestamp.toISOString(), - block_height: block_height.toString(), + block_height: block_height.toFixed(), } } @@ -52,7 +51,7 @@ export class QuotePrice extends JSONSerializable< return { price, block_timestamp: block_timestamp.toISOString(), - block_height: block_height.toString(), + block_height: block_height.toFixed(), } } @@ -69,7 +68,7 @@ export class QuotePrice extends JSONSerializable< return QuotePrice_pb.fromPartial({ price, blockTimestamp: block_timestamp, - blockHeight: Long.fromNumber(block_height), + blockHeight: block_height, }) } } diff --git a/src/core/slashing/SlashingParams.ts b/src/core/slashing/SlashingParams.ts index bb79024..97a0edf 100644 --- a/src/core/slashing/SlashingParams.ts +++ b/src/core/slashing/SlashingParams.ts @@ -1,7 +1,6 @@ import { JSONSerializable } from '../../util/json' import { Duration } from '../Duration' import { Params as Params_pb } from '@initia/initia.proto/cosmos/slashing/v1beta1/slashing' -import Long from 'long' export class SlashingParams extends JSONSerializable< SlashingParams.Amino, @@ -17,10 +16,10 @@ export class SlashingParams extends JSONSerializable< */ constructor( public signed_blocks_window: number, - public min_signed_per_window: number, + public min_signed_per_window: string, public downtime_jail_duration: Duration, - public slash_fraction_double_sign: number, - public slash_fraction_downtime: number + public slash_fraction_double_sign: string, + public slash_fraction_downtime: string ) { super() } @@ -38,10 +37,10 @@ export class SlashingParams extends JSONSerializable< return new SlashingParams( parseInt(signed_blocks_window), - parseInt(min_signed_per_window), + min_signed_per_window, Duration.fromAmino(downtime_jail_duration), - parseInt(slash_fraction_double_sign), - parseInt(slash_fraction_downtime) + slash_fraction_double_sign, + slash_fraction_downtime ) } @@ -57,11 +56,11 @@ export class SlashingParams extends JSONSerializable< return { type: 'cosmos-sdk/x/slashing/Params', value: { - signed_blocks_window: signed_blocks_window.toString(), - min_signed_per_window: min_signed_per_window.toString(), + signed_blocks_window: signed_blocks_window.toFixed(), + min_signed_per_window, downtime_jail_duration: downtime_jail_duration.toAmino(), - slash_fraction_double_sign: slash_fraction_double_sign.toString(), - slash_fraction_downtime: slash_fraction_downtime.toString(), + slash_fraction_double_sign, + slash_fraction_downtime, }, } } @@ -77,10 +76,10 @@ export class SlashingParams extends JSONSerializable< return new SlashingParams( parseInt(signed_blocks_window), - parseInt(min_signed_per_window), + min_signed_per_window, Duration.fromData(downtime_jail_duration), - parseInt(slash_fraction_double_sign), - parseInt(slash_fraction_downtime) + slash_fraction_double_sign, + slash_fraction_downtime ) } @@ -95,21 +94,21 @@ export class SlashingParams extends JSONSerializable< return { '@type': '/cosmos.slashing.v1beta1.Params', - signed_blocks_window: signed_blocks_window.toString(), - min_signed_per_window: min_signed_per_window.toString(), + signed_blocks_window: signed_blocks_window.toFixed(), + min_signed_per_window, downtime_jail_duration: downtime_jail_duration.toData(), - slash_fraction_double_sign: slash_fraction_double_sign.toString(), - slash_fraction_downtime: slash_fraction_downtime.toString(), + slash_fraction_double_sign, + slash_fraction_downtime, } } public static fromProto(data: SlashingParams.Proto): SlashingParams { return new SlashingParams( data.signedBlocksWindow.toNumber(), - parseFloat(data.minSignedPerWindow.toString()), + data.minSignedPerWindow.toString(), Duration.fromProto(data.downtimeJailDuration as Duration.Proto), - parseFloat(data.slashFractionDoubleSign.toString()), - parseFloat(data.slashFractionDowntime.toString()) + data.slashFractionDoubleSign.toString(), + data.slashFractionDowntime.toString() ) } @@ -123,13 +122,11 @@ export class SlashingParams extends JSONSerializable< } = this return Params_pb.fromPartial({ - signedBlocksWindow: Long.fromNumber(signed_blocks_window), - minSignedPerWindow: Buffer.from(min_signed_per_window.toString()), + signedBlocksWindow: signed_blocks_window, + minSignedPerWindow: Buffer.from(min_signed_per_window), downtimeJailDuration: downtime_jail_duration.toProto(), - slashFractionDoubleSign: Buffer.from( - slash_fraction_double_sign.toString() - ), - slashFractionDowntime: Buffer.from(slash_fraction_downtime.toString()), + slashFractionDoubleSign: Buffer.from(slash_fraction_double_sign), + slashFractionDowntime: Buffer.from(slash_fraction_downtime), }) } } diff --git a/src/core/tokenfactory/TokenfactoryParams.ts b/src/core/tokenfactory/TokenfactoryParams.ts index 3cc4add..928600b 100644 --- a/src/core/tokenfactory/TokenfactoryParams.ts +++ b/src/core/tokenfactory/TokenfactoryParams.ts @@ -1,7 +1,6 @@ import { JSONSerializable } from '../../util/json' import { Coins } from '../Coins' import { Params as Params_pb } from '@initia/initia.proto/miniwasm/tokenfactory/v1/params' -import Long from 'long' export class TokenfactoryParams extends JSONSerializable< TokenfactoryParams.Amino, @@ -33,7 +32,7 @@ export class TokenfactoryParams extends JSONSerializable< const { denom_creation_fee, denom_creation_gas_consume } = this return { denom_creation_fee: denom_creation_fee.toAmino(), - denom_creation_gas_consume: denom_creation_gas_consume.toString(), + denom_creation_gas_consume: denom_creation_gas_consume.toFixed(), } } @@ -49,7 +48,7 @@ export class TokenfactoryParams extends JSONSerializable< const { denom_creation_fee, denom_creation_gas_consume } = this return { denom_creation_fee: denom_creation_fee.toData(), - denom_creation_gas_consume: denom_creation_gas_consume.toString(), + denom_creation_gas_consume: denom_creation_gas_consume.toFixed(), } } @@ -64,7 +63,7 @@ export class TokenfactoryParams extends JSONSerializable< const { denom_creation_fee, denom_creation_gas_consume } = this return Params_pb.fromPartial({ denomCreationFee: denom_creation_fee.toProto(), - denomCreationGasConsume: Long.fromNumber(denom_creation_gas_consume), + denomCreationGasConsume: denom_creation_gas_consume, }) } } diff --git a/src/core/tx/Fee.ts b/src/core/tx/Fee.ts index 694e43d..a274992 100644 --- a/src/core/tx/Fee.ts +++ b/src/core/tx/Fee.ts @@ -3,7 +3,6 @@ import { Coins } from '../Coins' import { num } from '../num' import { AccAddress } from '../bech32' import { Fee as Fee_pb } from '@initia/initia.proto/cosmos/tx/v1beta1/tx' -import Long from 'long' /** * A transaction must include a fee, otherwise it will be rejected. @@ -34,7 +33,7 @@ export class Fee extends JSONSerializable { public toAmino(): Fee.Amino { return { - gas: num(this.gas_limit).toFixed(0), + gas: num(this.gas_limit).toFixed(), amount: this.amount.toAmino(), } } @@ -71,7 +70,7 @@ export class Fee extends JSONSerializable { const { amount, gas_limit, payer, granter } = this return Fee_pb.fromPartial({ amount: amount.toProto(), - gasLimit: Long.fromNumber(gas_limit), + gasLimit: gas_limit, granter, payer, }) diff --git a/src/core/tx/SignDoc.ts b/src/core/tx/SignDoc.ts index 2c1a612..396d1f7 100644 --- a/src/core/tx/SignDoc.ts +++ b/src/core/tx/SignDoc.ts @@ -1,9 +1,9 @@ import { JSONSerializable } from '../../util/json' import { Fee } from './Fee' import { Msg } from '../Msg' -import Long from 'long' import { SignDoc as SignDoc_pb } from '@initia/initia.proto/cosmos/tx/v1beta1/tx' import { TxBody, AuthInfo, Tx } from './Tx' + /** * A sign message is a data structure that is used to create a [[StdSignature]] to be later * appended to the list of signatures in an [[StdTx]]. Essentially, it contains all the @@ -48,11 +48,11 @@ export class SignDoc extends JSONSerializable< return { chain_id, - account_number: account_number.toString(), - sequence: sequence.toString(), + account_number: account_number.toFixed(), + sequence: sequence.toFixed(), timeout_height: timeout_height && timeout_height !== 0 - ? timeout_height.toString() + ? timeout_height.toFixed() : undefined, fee: fee.toAmino(), msgs: messages.map((m): Msg.Amino => m.toAmino()), @@ -75,7 +75,7 @@ export class SignDoc extends JSONSerializable< return SignDoc_pb.fromPartial({ bodyBytes: tx_body.toBytes(), authInfoBytes: auth_info.toBytes(), - accountNumber: Long.fromNumber(account_number), + accountNumber: account_number, chainId: chain_id, }) } diff --git a/src/core/tx/Tx.ts b/src/core/tx/Tx.ts index 840ce2e..225c6f6 100644 --- a/src/core/tx/Tx.ts +++ b/src/core/tx/Tx.ts @@ -21,7 +21,6 @@ import { import { CompactBitArray } from './CompactBitArray' import { Msg } from '../Msg' import { Fee } from './Fee' -import Long from 'long' import { SignatureV2 } from './SignatureV2' import { SignerData } from '../../client' @@ -201,7 +200,7 @@ export class TxBody { return TxBody_pb.fromPartial({ memo: this.memo, messages: this.messages.map((m) => m.packAny()), - timeoutHeight: Long.fromNumber(this.timeout_height ?? 0), + timeoutHeight: this.timeout_height, }) } @@ -303,7 +302,7 @@ export class SignerInfo { return SignerInfo_pb.fromPartial({ modeInfo: mode_info.toProto(), publicKey: public_key?.packAny(), - sequence: Long.fromNumber(sequence), + sequence, }) } } diff --git a/src/core/upgrade/Plan.ts b/src/core/upgrade/Plan.ts index d8d8e56..581f599 100644 --- a/src/core/upgrade/Plan.ts +++ b/src/core/upgrade/Plan.ts @@ -1,6 +1,5 @@ import { JSONSerializable } from '../../util/json' import { Plan as Plan_pb } from '@initia/initia.proto/cosmos/upgrade/v1beta1/upgrade' -import Long from 'long' /* * Plan specifies information about a planned upgrade and when it should occur. @@ -28,7 +27,7 @@ export class Plan extends JSONSerializable { const { name, height, info } = this return { name, - height: height.toString(), + height: height.toFixed(), info, } } @@ -42,7 +41,7 @@ export class Plan extends JSONSerializable { const { name, height, info } = this return { name, - height: height.toString(), + height: height.toFixed(), info, } } @@ -55,7 +54,7 @@ export class Plan extends JSONSerializable { const { name, height, info } = this return Plan_pb.fromPartial({ name, - height: Long.fromNumber(height), + height, info, }) } diff --git a/src/core/wasm/AbsoluteTxPosition.ts b/src/core/wasm/AbsoluteTxPosition.ts index 7182c04..22b66cb 100644 --- a/src/core/wasm/AbsoluteTxPosition.ts +++ b/src/core/wasm/AbsoluteTxPosition.ts @@ -1,6 +1,5 @@ import { JSONSerializable } from '../../util/json' import { AbsoluteTxPosition as AbsoluteTxPosition_pb } from '@initia/initia.proto/cosmwasm/wasm/v1/types' -import Long from 'long' export class AbsoluteTxPosition extends JSONSerializable< AbsoluteTxPosition.Amino, @@ -26,8 +25,8 @@ export class AbsoluteTxPosition extends JSONSerializable< public toAmino(): AbsoluteTxPosition.Amino { const { block_height, tx_index } = this return { - block_height: block_height.toString(), - tx_index: tx_index.toString(), + block_height: block_height.toFixed(), + tx_index: tx_index.toFixed(), } } @@ -39,8 +38,8 @@ export class AbsoluteTxPosition extends JSONSerializable< public toData(): AbsoluteTxPosition.Data { const { block_height, tx_index } = this return { - block_height: block_height.toString(), - tx_index: tx_index.toString(), + block_height: block_height.toFixed(), + tx_index: tx_index.toFixed(), } } @@ -54,8 +53,8 @@ export class AbsoluteTxPosition extends JSONSerializable< public toProto(): AbsoluteTxPosition.Proto { const { block_height, tx_index } = this return AbsoluteTxPosition_pb.fromPartial({ - blockHeight: Long.fromNumber(block_height), - txIndex: Long.fromNumber(tx_index), + blockHeight: block_height, + txIndex: tx_index, }) } } diff --git a/src/core/wasm/authorizations/CombinedLimit.ts b/src/core/wasm/authorizations/CombinedLimit.ts index 547b51e..1c2143c 100644 --- a/src/core/wasm/authorizations/CombinedLimit.ts +++ b/src/core/wasm/authorizations/CombinedLimit.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { Coins } from '../../Coins' import { CombinedLimit as CombinedLimit_pb } from '@initia/initia.proto/cosmwasm/wasm/v1/authz' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class CombinedLimit extends JSONSerializable< CombinedLimit.Amino, @@ -34,7 +33,7 @@ export class CombinedLimit extends JSONSerializable< return { type: 'wasm/CombinedLimit', value: { - calls_remaining: calls_remaining.toString(), + calls_remaining: calls_remaining.toFixed(), amounts: amounts.toAmino(), }, } @@ -49,7 +48,7 @@ export class CombinedLimit extends JSONSerializable< const { calls_remaining, amounts } = this return { '@type': '/cosmwasm.wasm.v1.CombinedLimit', - calls_remaining: calls_remaining.toString(), + calls_remaining: calls_remaining.toFixed(), amounts: amounts.toData(), } } @@ -64,7 +63,7 @@ export class CombinedLimit extends JSONSerializable< public toProto(): CombinedLimit.Proto { const { calls_remaining, amounts } = this return CombinedLimit_pb.fromPartial({ - callsRemaining: Long.fromNumber(calls_remaining), + callsRemaining: calls_remaining, amounts: amounts.toProto(), }) } diff --git a/src/core/wasm/authorizations/MaxCallsLimit.ts b/src/core/wasm/authorizations/MaxCallsLimit.ts index 347bdd7..0f9b0f0 100644 --- a/src/core/wasm/authorizations/MaxCallsLimit.ts +++ b/src/core/wasm/authorizations/MaxCallsLimit.ts @@ -1,7 +1,6 @@ import { JSONSerializable } from '../../../util/json' import { MaxCallsLimit as MaxCallsLimit_pb } from '@initia/initia.proto/cosmwasm/wasm/v1/authz' import { Any } from '@initia/initia.proto/google/protobuf/any' -import Long from 'long' export class MaxCallsLimit extends JSONSerializable< MaxCallsLimit.Amino, @@ -19,7 +18,7 @@ export class MaxCallsLimit extends JSONSerializable< public toAmino(): MaxCallsLimit.Amino { return { type: 'wasm/MaxCallsLimit', - value: { remaining: this.remaining.toString() }, + value: { remaining: this.remaining.toFixed() }, } } @@ -30,7 +29,7 @@ export class MaxCallsLimit extends JSONSerializable< public toData(): MaxCallsLimit.Data { return { '@type': '/cosmwasm.wasm.v1.MaxCallsLimit', - remaining: this.remaining.toString(), + remaining: this.remaining.toFixed(), } } @@ -40,7 +39,7 @@ export class MaxCallsLimit extends JSONSerializable< public toProto(): MaxCallsLimit.Proto { return MaxCallsLimit_pb.fromPartial({ - remaining: Long.fromNumber(this.remaining), + remaining: this.remaining, }) } diff --git a/src/core/wasm/msgs/MsgInstantiateContract.ts b/src/core/wasm/msgs/MsgInstantiateContract.ts index 81eb8e9..aae3d30 100644 --- a/src/core/wasm/msgs/MsgInstantiateContract.ts +++ b/src/core/wasm/msgs/MsgInstantiateContract.ts @@ -3,7 +3,6 @@ import { Coins } from '../../Coins' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgInstantiateContract as MsgInstantiateContract_pb } from '@initia/initia.proto/cosmwasm/wasm/v1/tx' -import Long from 'long' export class MsgInstantiateContract extends JSONSerializable< MsgInstantiateContract.Amino, @@ -55,7 +54,7 @@ export class MsgInstantiateContract extends JSONSerializable< value: { sender, admin, - code_id: code_id.toString(), + code_id: code_id.toFixed(), label, msg, funds: funds.toAmino(), @@ -83,7 +82,7 @@ export class MsgInstantiateContract extends JSONSerializable< '@type': '/cosmwasm.wasm.v1.MsgInstantiateContract', sender, admin, - code_id: code_id.toString(), + code_id: code_id.toFixed(), label, msg, funds: funds.toData(), @@ -108,7 +107,7 @@ export class MsgInstantiateContract extends JSONSerializable< return MsgInstantiateContract_pb.fromPartial({ sender, admin, - codeId: Long.fromNumber(code_id), + codeId: code_id, label, msg: Buffer.from(msg, 'base64'), funds: funds.toProto(), diff --git a/src/core/wasm/msgs/MsgInstantiateContractV2.ts b/src/core/wasm/msgs/MsgInstantiateContractV2.ts index b85605c..df64d90 100644 --- a/src/core/wasm/msgs/MsgInstantiateContractV2.ts +++ b/src/core/wasm/msgs/MsgInstantiateContractV2.ts @@ -3,7 +3,6 @@ import { Coins } from '../../Coins' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgInstantiateContract2 as MsgInstantiateContract2_pb } from '@initia/initia.proto/cosmwasm/wasm/v1/tx' -import Long from 'long' export class MsgInstantiateContractV2 extends JSONSerializable< MsgInstantiateContractV2.Amino, @@ -61,7 +60,7 @@ export class MsgInstantiateContractV2 extends JSONSerializable< value: { sender, admin, - code_id: code_id.toString(), + code_id: code_id.toFixed(), label, msg, funds: funds.toAmino(), @@ -93,7 +92,7 @@ export class MsgInstantiateContractV2 extends JSONSerializable< '@type': '/cosmwasm.wasm.v1.MsgInstantiateContract2', sender, admin, - code_id: code_id.toString(), + code_id: code_id.toFixed(), label, msg, funds: funds.toData(), @@ -122,7 +121,7 @@ export class MsgInstantiateContractV2 extends JSONSerializable< return MsgInstantiateContract2_pb.fromPartial({ sender, admin, - codeId: Long.fromNumber(code_id), + codeId: code_id, label, msg: Buffer.from(msg, 'base64'), funds: funds.toProto(), diff --git a/src/core/wasm/msgs/MsgMigrateContract.ts b/src/core/wasm/msgs/MsgMigrateContract.ts index d1463fe..2ad045d 100644 --- a/src/core/wasm/msgs/MsgMigrateContract.ts +++ b/src/core/wasm/msgs/MsgMigrateContract.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgMigrateContract as MsgMigrateContract_pb } from '@initia/initia.proto/cosmwasm/wasm/v1/tx' -import Long from 'long' export class MsgMigrateContract extends JSONSerializable< MsgMigrateContract.Amino, @@ -39,7 +38,7 @@ export class MsgMigrateContract extends JSONSerializable< value: { sender, contract, - code_id: code_id.toString(), + code_id: code_id.toFixed(), msg, }, } @@ -56,7 +55,7 @@ export class MsgMigrateContract extends JSONSerializable< '@type': '/cosmwasm.wasm.v1.MsgMigrateContract', sender, contract, - code_id: code_id.toString(), + code_id: code_id.toFixed(), msg, } } @@ -75,7 +74,7 @@ export class MsgMigrateContract extends JSONSerializable< return MsgMigrateContract_pb.fromPartial({ sender, contract, - codeId: Long.fromNumber(code_id), + codeId: code_id, msg: Buffer.from(msg, 'base64'), }) } diff --git a/src/core/wasm/msgs/MsgPinCodes.ts b/src/core/wasm/msgs/MsgPinCodes.ts index fab0bf8..bb9321e 100644 --- a/src/core/wasm/msgs/MsgPinCodes.ts +++ b/src/core/wasm/msgs/MsgPinCodes.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgPinCodes as MsgPinCodes_pb } from '@initia/initia.proto/cosmwasm/wasm/v1/tx' -import Long from 'long' export class MsgPinCodes extends JSONSerializable< MsgPinCodes.Amino, @@ -33,7 +32,7 @@ export class MsgPinCodes extends JSONSerializable< type: 'wasm/MsgPinCodes', value: { authority, - code_ids: code_ids.map((id) => id.toString()), + code_ids: code_ids.map((id) => id.toFixed()), }, } } @@ -48,7 +47,7 @@ export class MsgPinCodes extends JSONSerializable< return { '@type': '/cosmwasm.wasm.v1.MsgPinCodes', authority, - code_ids: code_ids.map((id) => id.toString()), + code_ids: code_ids.map((id) => id.toFixed()), } } @@ -63,7 +62,7 @@ export class MsgPinCodes extends JSONSerializable< const { authority, code_ids } = this return MsgPinCodes_pb.fromPartial({ authority, - codeIds: code_ids.map((id) => Long.fromNumber(id)), + codeIds: code_ids, }) } diff --git a/src/core/wasm/msgs/MsgUnpinCodes.ts b/src/core/wasm/msgs/MsgUnpinCodes.ts index c6d6ceb..f438fcd 100644 --- a/src/core/wasm/msgs/MsgUnpinCodes.ts +++ b/src/core/wasm/msgs/MsgUnpinCodes.ts @@ -2,7 +2,6 @@ import { JSONSerializable } from '../../../util/json' import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgUnpinCodes as MsgUnpinCodes_pb } from '@initia/initia.proto/cosmwasm/wasm/v1/tx' -import Long from 'long' export class MsgUnpinCodes extends JSONSerializable< MsgUnpinCodes.Amino, @@ -33,7 +32,7 @@ export class MsgUnpinCodes extends JSONSerializable< type: 'wasm/MsgUnpinCodes', value: { authority, - code_ids: code_ids.map((id) => id.toString()), + code_ids: code_ids.map((id) => id.toFixed()), }, } } @@ -48,7 +47,7 @@ export class MsgUnpinCodes extends JSONSerializable< return { '@type': '/cosmwasm.wasm.v1.MsgUnpinCodes', authority, - code_ids: code_ids.map((id) => id.toString()), + code_ids: code_ids.map((id) => id.toFixed()), } } @@ -63,7 +62,7 @@ export class MsgUnpinCodes extends JSONSerializable< const { authority, code_ids } = this return MsgUnpinCodes_pb.fromPartial({ authority, - codeIds: code_ids.map((id) => Long.fromNumber(id)), + codeIds: code_ids, }) } diff --git a/src/core/wasm/msgs/MsgUpdateInstantiateConfig.ts b/src/core/wasm/msgs/MsgUpdateInstantiateConfig.ts index 5d5823c..b86eac7 100644 --- a/src/core/wasm/msgs/MsgUpdateInstantiateConfig.ts +++ b/src/core/wasm/msgs/MsgUpdateInstantiateConfig.ts @@ -3,7 +3,6 @@ import { AccAddress } from '../../bech32' import { Any } from '@initia/initia.proto/google/protobuf/any' import { MsgUpdateInstantiateConfig as MsgUpdateInstantiateConfig_pb } from '@initia/initia.proto/cosmwasm/wasm/v1/tx' import { AccessConfig } from '../AccessConfig' -import Long from 'long' export class MsgUpdateInstantiateConfig extends JSONSerializable< MsgUpdateInstantiateConfig.Amino, @@ -42,7 +41,7 @@ export class MsgUpdateInstantiateConfig extends JSONSerializable< type: 'wasm/MsgUpdateInstantiateConfig', value: { sender, - code_id: code_id.toString(), + code_id: code_id.toFixed(), new_instantiate_permission: new_instantiate_permission.toAmino(), }, } @@ -64,7 +63,7 @@ export class MsgUpdateInstantiateConfig extends JSONSerializable< return { '@type': '/cosmwasm.wasm.v1.MsgUpdateInstantiateConfig', sender, - code_id: code_id.toString(), + code_id: code_id.toFixed(), new_instantiate_permission: new_instantiate_permission.toData(), } } @@ -85,7 +84,7 @@ export class MsgUpdateInstantiateConfig extends JSONSerializable< const { sender, code_id, new_instantiate_permission } = this return MsgUpdateInstantiateConfig_pb.fromPartial({ sender, - codeId: Long.fromNumber(code_id), + codeId: code_id, newInstantiatePermission: new_instantiate_permission.toProto(), }) } diff --git a/vite.config.ts b/vite.config.ts index 2336171..e4b9e02 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -22,7 +22,6 @@ export default defineConfig({ 'bip32', 'bip39', 'keccak256', - 'long', 'ripemd160', 'secp256k1', 'semver',