diff --git a/__fixtures__/abstract/apps/betting.json b/__fixtures__/abstract/apps/betting.json new file mode 100644 index 00000000..c88ea83a --- /dev/null +++ b/__fixtures__/abstract/apps/betting.json @@ -0,0 +1,1112 @@ +{ + "contract_name": "module-schema", + "contract_version": "0.19.0", + "idl_version": "1.0.0", + "instantiate": { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "InstantiateMsg", + "description": "Init msg", + "type": "object", + "properties": { + "rake": { + "anyOf": [ + { + "$ref": "#/definitions/Decimal" + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false, + "definitions": { + "Decimal": { + "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)", + "type": "string" + } + } + }, + "execute": { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "ExecuteMsg", + "description": "Execute Msg", + "oneOf": [ + { + "description": "Create a round of betting Admin only", + "type": "object", + "required": [ + "create_round" + ], + "properties": { + "create_round": { + "type": "object", + "required": [ + "base_bet_token", + "description", + "name" + ], + "properties": { + "base_bet_token": { + "$ref": "#/definitions/AssetEntry" + }, + "description": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Register as a team for the hackathon Uses the account caller to find the account id", + "type": "object", + "required": [ + "register" + ], + "properties": { + "register": { + "type": "object", + "required": [ + "round_id" + ], + "properties": { + "round_id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Register teams manually for the round, with predefined odds set. Good for creating games with predefined odds, but payout can exceed account balance.", + "type": "object", + "required": [ + "update_accounts" + ], + "properties": { + "update_accounts": { + "type": "object", + "required": [ + "round_id", + "to_add", + "to_remove" + ], + "properties": { + "round_id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + }, + "to_add": { + "type": "array", + "items": { + "$ref": "#/definitions/AccountOdds" + } + }, + "to_remove": { + "type": "array", + "items": { + "$ref": "#/definitions/AccountId" + } + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Place a new bet for a round", + "type": "object", + "required": [ + "place_bet" + ], + "properties": { + "place_bet": { + "type": "object", + "required": [ + "bet", + "round_id" + ], + "properties": { + "bet": { + "$ref": "#/definitions/Bet" + }, + "round_id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Distribute winnings to the winners of the round", + "type": "object", + "required": [ + "distribute_winnings" + ], + "properties": { + "distribute_winnings": { + "type": "object", + "required": [ + "round_id" + ], + "properties": { + "round_id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Admin only", + "type": "object", + "required": [ + "close_round" + ], + "properties": { + "close_round": { + "type": "object", + "required": [ + "round_id" + ], + "properties": { + "round_id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + }, + "winner": { + "anyOf": [ + { + "$ref": "#/definitions/AccountId" + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Update the config of the contract", + "type": "object", + "required": [ + "update_config" + ], + "properties": { + "update_config": { + "type": "object", + "properties": { + "rake": { + "anyOf": [ + { + "$ref": "#/definitions/Decimal" + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + } + ], + "definitions": { + "AccountId": { + "description": "Unique identifier for an account. On each chain this is unique.", + "type": "object", + "required": [ + "seq", + "trace" + ], + "properties": { + "seq": { + "description": "Unique identifier for the accounts create on a local chain. Is reused when creating an interchain account.", + "type": "integer", + "format": "uint32", + "minimum": 0.0 + }, + "trace": { + "description": "Sequence of the chain that triggered the IBC account creation `AccountTrace::Local` if the account was created locally Example: Account created on Juno which has an abstract interchain account on Osmosis, which in turn creates an interchain account on Terra -> `AccountTrace::Remote(vec![\"juno\", \"osmosis\"])`", + "allOf": [ + { + "$ref": "#/definitions/AccountTrace" + } + ] + } + }, + "additionalProperties": false + }, + "AccountOdds": { + "type": "object", + "required": [ + "account_id", + "odds" + ], + "properties": { + "account_id": { + "$ref": "#/definitions/AccountId" + }, + "odds": { + "$ref": "#/definitions/Decimal" + } + }, + "additionalProperties": false + }, + "AccountTrace": { + "description": "The identifier of chain that triggered the account creation", + "oneOf": [ + { + "type": "string", + "enum": [ + "local" + ] + }, + { + "type": "object", + "required": [ + "remote" + ], + "properties": { + "remote": { + "type": "array", + "items": { + "$ref": "#/definitions/ChainName" + } + } + }, + "additionalProperties": false + } + ] + }, + "AnsAsset": { + "type": "object", + "required": [ + "amount", + "name" + ], + "properties": { + "amount": { + "$ref": "#/definitions/Uint128" + }, + "name": { + "$ref": "#/definitions/AssetEntry" + } + } + }, + "AssetEntry": { + "description": "An unchecked ANS asset entry. This is a string that is formatted as `src_chain>[intermediate_chain>]asset_name`", + "type": "string" + }, + "Bet": { + "description": "TODO: remove round ID and replace this tuple", + "type": "object", + "required": [ + "account_id", + "asset" + ], + "properties": { + "account_id": { + "$ref": "#/definitions/AccountId" + }, + "asset": { + "$ref": "#/definitions/AnsAsset" + } + }, + "additionalProperties": false + }, + "ChainName": { + "description": "The name of a chain, aka the chain-id without the post-fix number. ex. `cosmoshub-4` -> `cosmoshub`, `juno-1` -> `juno`", + "type": "string" + }, + "Decimal": { + "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)", + "type": "string" + }, + "Uint128": { + "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```", + "type": "string" + } + } + }, + "query": { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "QueryMsg", + "description": "Query Msg", + "oneOf": [ + { + "description": "Returns [`RoundResponse`]", + "type": "object", + "required": [ + "round" + ], + "properties": { + "round": { + "type": "object", + "required": [ + "round_id" + ], + "properties": { + "round_id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Returns [`RoundsResponse`]", + "type": "object", + "required": [ + "list_rounds" + ], + "properties": { + "list_rounds": { + "type": "object", + "properties": { + "limit": { + "type": [ + "integer", + "null" + ], + "format": "uint32", + "minimum": 0.0 + }, + "start_after": { + "type": [ + "integer", + "null" + ], + "format": "uint64", + "minimum": 0.0 + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Returns [`OddsResponse`]", + "type": "object", + "required": [ + "odds" + ], + "properties": { + "odds": { + "type": "object", + "required": [ + "round_id", + "team_id" + ], + "properties": { + "round_id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + }, + "team_id": { + "$ref": "#/definitions/AccountId" + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Returns [`ListOddsResponse`]", + "type": "object", + "required": [ + "list_odds" + ], + "properties": { + "list_odds": { + "type": "object", + "required": [ + "round_id" + ], + "properties": { + "round_id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Returns [`ConfigResponse`]", + "type": "object", + "required": [ + "config" + ], + "properties": { + "config": { + "type": "object", + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Returns [`BetsResponse`]", + "type": "object", + "required": [ + "bets" + ], + "properties": { + "bets": { + "type": "object", + "required": [ + "round_id" + ], + "properties": { + "round_id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + } + ], + "definitions": { + "AccountId": { + "description": "Unique identifier for an account. On each chain this is unique.", + "type": "object", + "required": [ + "seq", + "trace" + ], + "properties": { + "seq": { + "description": "Unique identifier for the accounts create on a local chain. Is reused when creating an interchain account.", + "type": "integer", + "format": "uint32", + "minimum": 0.0 + }, + "trace": { + "description": "Sequence of the chain that triggered the IBC account creation `AccountTrace::Local` if the account was created locally Example: Account created on Juno which has an abstract interchain account on Osmosis, which in turn creates an interchain account on Terra -> `AccountTrace::Remote(vec![\"juno\", \"osmosis\"])`", + "allOf": [ + { + "$ref": "#/definitions/AccountTrace" + } + ] + } + }, + "additionalProperties": false + }, + "AccountTrace": { + "description": "The identifier of chain that triggered the account creation", + "oneOf": [ + { + "type": "string", + "enum": [ + "local" + ] + }, + { + "type": "object", + "required": [ + "remote" + ], + "properties": { + "remote": { + "type": "array", + "items": { + "$ref": "#/definitions/ChainName" + } + } + }, + "additionalProperties": false + } + ] + }, + "ChainName": { + "description": "The name of a chain, aka the chain-id without the post-fix number. ex. `cosmoshub-4` -> `cosmoshub`, `juno-1` -> `juno`", + "type": "string" + } + } + }, + "migrate": { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "MigrateMsg", + "description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)", + "type": "object" + }, + "sudo": null, + "responses": { + "bets": { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "BetsResponse", + "type": "object", + "required": [ + "bets", + "round_id" + ], + "properties": { + "bets": { + "description": "Address of the LP token", + "type": "array", + "items": { + "type": "array", + "items": [ + { + "$ref": "#/definitions/Addr" + }, + { + "$ref": "#/definitions/Uint128" + } + ], + "maxItems": 2, + "minItems": 2 + } + }, + "round_id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + } + }, + "additionalProperties": false, + "definitions": { + "Addr": { + "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.", + "type": "string" + }, + "Uint128": { + "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```", + "type": "string" + } + } + }, + "config": { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "ConfigResponse", + "type": "object", + "required": [ + "rake" + ], + "properties": { + "rake": { + "description": "Address of the LP token", + "allOf": [ + { + "$ref": "#/definitions/Decimal" + } + ] + } + }, + "additionalProperties": false, + "definitions": { + "Decimal": { + "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)", + "type": "string" + } + } + }, + "list_odds": { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "ListOddsResponse", + "type": "object", + "required": [ + "odds", + "round_id" + ], + "properties": { + "odds": { + "type": "array", + "items": { + "$ref": "#/definitions/AccountOdds" + } + }, + "round_id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + } + }, + "additionalProperties": false, + "definitions": { + "AccountId": { + "description": "Unique identifier for an account. On each chain this is unique.", + "type": "object", + "required": [ + "seq", + "trace" + ], + "properties": { + "seq": { + "description": "Unique identifier for the accounts create on a local chain. Is reused when creating an interchain account.", + "type": "integer", + "format": "uint32", + "minimum": 0.0 + }, + "trace": { + "description": "Sequence of the chain that triggered the IBC account creation `AccountTrace::Local` if the account was created locally Example: Account created on Juno which has an abstract interchain account on Osmosis, which in turn creates an interchain account on Terra -> `AccountTrace::Remote(vec![\"juno\", \"osmosis\"])`", + "allOf": [ + { + "$ref": "#/definitions/AccountTrace" + } + ] + } + }, + "additionalProperties": false + }, + "AccountOdds": { + "type": "object", + "required": [ + "account_id", + "odds" + ], + "properties": { + "account_id": { + "$ref": "#/definitions/AccountId" + }, + "odds": { + "$ref": "#/definitions/Decimal" + } + }, + "additionalProperties": false + }, + "AccountTrace": { + "description": "The identifier of chain that triggered the account creation", + "oneOf": [ + { + "type": "string", + "enum": [ + "local" + ] + }, + { + "type": "object", + "required": [ + "remote" + ], + "properties": { + "remote": { + "type": "array", + "items": { + "$ref": "#/definitions/ChainName" + } + } + }, + "additionalProperties": false + } + ] + }, + "ChainName": { + "description": "The name of a chain, aka the chain-id without the post-fix number. ex. `cosmoshub-4` -> `cosmoshub`, `juno-1` -> `juno`", + "type": "string" + }, + "Decimal": { + "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)", + "type": "string" + } + } + }, + "list_rounds": { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "RoundsResponse", + "type": "object", + "required": [ + "rounds" + ], + "properties": { + "rounds": { + "type": "array", + "items": { + "$ref": "#/definitions/RoundResponse" + } + } + }, + "additionalProperties": false, + "definitions": { + "AccountId": { + "description": "Unique identifier for an account. On each chain this is unique.", + "type": "object", + "required": [ + "seq", + "trace" + ], + "properties": { + "seq": { + "description": "Unique identifier for the accounts create on a local chain. Is reused when creating an interchain account.", + "type": "integer", + "format": "uint32", + "minimum": 0.0 + }, + "trace": { + "description": "Sequence of the chain that triggered the IBC account creation `AccountTrace::Local` if the account was created locally Example: Account created on Juno which has an abstract interchain account on Osmosis, which in turn creates an interchain account on Terra -> `AccountTrace::Remote(vec![\"juno\", \"osmosis\"])`", + "allOf": [ + { + "$ref": "#/definitions/AccountTrace" + } + ] + } + }, + "additionalProperties": false + }, + "AccountTrace": { + "description": "The identifier of chain that triggered the account creation", + "oneOf": [ + { + "type": "string", + "enum": [ + "local" + ] + }, + { + "type": "object", + "required": [ + "remote" + ], + "properties": { + "remote": { + "type": "array", + "items": { + "$ref": "#/definitions/ChainName" + } + } + }, + "additionalProperties": false + } + ] + }, + "AnsAsset": { + "type": "object", + "required": [ + "amount", + "name" + ], + "properties": { + "amount": { + "$ref": "#/definitions/Uint128" + }, + "name": { + "$ref": "#/definitions/AssetEntry" + } + } + }, + "AssetEntry": { + "description": "An unchecked ANS asset entry. This is a string that is formatted as `src_chain>[intermediate_chain>]asset_name`", + "type": "string" + }, + "ChainName": { + "description": "The name of a chain, aka the chain-id without the post-fix number. ex. `cosmoshub-4` -> `cosmoshub`, `juno-1` -> `juno`", + "type": "string" + }, + "RoundResponse": { + "type": "object", + "required": [ + "bet_count", + "description", + "id", + "name", + "status", + "teams", + "total_bet" + ], + "properties": { + "bet_count": { + "type": "integer", + "format": "uint128", + "minimum": 0.0 + }, + "description": { + "type": "string" + }, + "id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + }, + "name": { + "type": "string" + }, + "status": { + "$ref": "#/definitions/RoundStatus" + }, + "teams": { + "type": "array", + "items": { + "$ref": "#/definitions/AccountId" + } + }, + "total_bet": { + "$ref": "#/definitions/AnsAsset" + } + }, + "additionalProperties": false + }, + "RoundStatus": { + "oneOf": [ + { + "type": "string", + "enum": [ + "open", + "rewards_distributed" + ] + }, + { + "description": "Round is closed, and there may or may not be a winning team", + "type": "object", + "required": [ + "closed" + ], + "properties": { + "closed": { + "type": "object", + "properties": { + "winning_team": { + "anyOf": [ + { + "$ref": "#/definitions/AccountId" + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + } + ] + }, + "Uint128": { + "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```", + "type": "string" + } + } + }, + "odds": { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "OddsResponse", + "description": "State query response", + "type": "object", + "required": [ + "odds", + "round_id" + ], + "properties": { + "odds": { + "$ref": "#/definitions/Decimal" + }, + "round_id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + } + }, + "additionalProperties": false, + "definitions": { + "Decimal": { + "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)", + "type": "string" + } + } + }, + "round": { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "RoundResponse", + "type": "object", + "required": [ + "bet_count", + "description", + "id", + "name", + "status", + "teams", + "total_bet" + ], + "properties": { + "bet_count": { + "type": "integer", + "format": "uint128", + "minimum": 0.0 + }, + "description": { + "type": "string" + }, + "id": { + "type": "integer", + "format": "uint64", + "minimum": 0.0 + }, + "name": { + "type": "string" + }, + "status": { + "$ref": "#/definitions/RoundStatus" + }, + "teams": { + "type": "array", + "items": { + "$ref": "#/definitions/AccountId" + } + }, + "total_bet": { + "$ref": "#/definitions/AnsAsset" + } + }, + "additionalProperties": false, + "definitions": { + "AccountId": { + "description": "Unique identifier for an account. On each chain this is unique.", + "type": "object", + "required": [ + "seq", + "trace" + ], + "properties": { + "seq": { + "description": "Unique identifier for the accounts create on a local chain. Is reused when creating an interchain account.", + "type": "integer", + "format": "uint32", + "minimum": 0.0 + }, + "trace": { + "description": "Sequence of the chain that triggered the IBC account creation `AccountTrace::Local` if the account was created locally Example: Account created on Juno which has an abstract interchain account on Osmosis, which in turn creates an interchain account on Terra -> `AccountTrace::Remote(vec![\"juno\", \"osmosis\"])`", + "allOf": [ + { + "$ref": "#/definitions/AccountTrace" + } + ] + } + }, + "additionalProperties": false + }, + "AccountTrace": { + "description": "The identifier of chain that triggered the account creation", + "oneOf": [ + { + "type": "string", + "enum": [ + "local" + ] + }, + { + "type": "object", + "required": [ + "remote" + ], + "properties": { + "remote": { + "type": "array", + "items": { + "$ref": "#/definitions/ChainName" + } + } + }, + "additionalProperties": false + } + ] + }, + "AnsAsset": { + "type": "object", + "required": [ + "amount", + "name" + ], + "properties": { + "amount": { + "$ref": "#/definitions/Uint128" + }, + "name": { + "$ref": "#/definitions/AssetEntry" + } + } + }, + "AssetEntry": { + "description": "An unchecked ANS asset entry. This is a string that is formatted as `src_chain>[intermediate_chain>]asset_name`", + "type": "string" + }, + "ChainName": { + "description": "The name of a chain, aka the chain-id without the post-fix number. ex. `cosmoshub-4` -> `cosmoshub`, `juno-1` -> `juno`", + "type": "string" + }, + "RoundStatus": { + "oneOf": [ + { + "type": "string", + "enum": [ + "open", + "rewards_distributed" + ] + }, + { + "description": "Round is closed, and there may or may not be a winning team", + "type": "object", + "required": [ + "closed" + ], + "properties": { + "closed": { + "type": "object", + "properties": { + "winning_team": { + "anyOf": [ + { + "$ref": "#/definitions/AccountId" + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + } + ] + }, + "Uint128": { + "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```", + "type": "string" + } + } + } + } +} diff --git a/__fixtures__/issues/98/out/98.client.ts b/__fixtures__/issues/98/out/98.client.ts index 52e29b32..10b59ccf 100644 --- a/__fixtures__/issues/98/out/98.client.ts +++ b/__fixtures__/issues/98/out/98.client.ts @@ -75,7 +75,7 @@ export interface 98Interface extends 98ReadOnlyInterface { }: { id: number; instantiateMsg: Binary; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; registerPlugin: ({ checksum, codeId, @@ -90,12 +90,12 @@ export interface 98Interface extends 98ReadOnlyInterface { ipfsHash: string; name: string; version: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; unregisterPlugin: ({ id }: { id: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updatePlugin: ({ checksum, codeId, @@ -112,17 +112,17 @@ export interface 98Interface extends 98ReadOnlyInterface { ipfsHash?: string; name?: string; version?: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateRegistryFee: ({ newFee }: { newFee: Coin; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateDaoAddr: ({ newAddr }: { newAddr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class 98Client extends 98QueryClient implements 98Interface { client: SigningCosmWasmClient; @@ -148,13 +148,13 @@ export class 98Client extends 98QueryClient implements 98Interface { }: { id: number; instantiateMsg: Binary; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { proxy_install_plugin: { id, instantiate_msg: instantiateMsg } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; registerPlugin = async ({ checksum, @@ -170,7 +170,7 @@ export class 98Client extends 98QueryClient implements 98Interface { ipfsHash: string; name: string; version: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { register_plugin: { checksum, @@ -180,18 +180,18 @@ export class 98Client extends 98QueryClient implements 98Interface { name, version } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; unregisterPlugin = async ({ id }: { id: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { unregister_plugin: { id } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updatePlugin = async ({ checksum, @@ -209,7 +209,7 @@ export class 98Client extends 98QueryClient implements 98Interface { ipfsHash?: string; name?: string; version?: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_plugin: { checksum, @@ -220,28 +220,28 @@ export class 98Client extends 98QueryClient implements 98Interface { name, version } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateRegistryFee = async ({ newFee }: { newFee: Coin; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_registry_fee: { new_fee: newFee } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateDaoAddr = async ({ newAddr }: { newAddr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_dao_addr: { new_addr: newAddr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/abstract/apps/autocompounder/Autocompounder.client.ts b/__output__/abstract/apps/autocompounder/Autocompounder.client.ts index d8d31b5a..d1172c28 100644 --- a/__output__/abstract/apps/autocompounder/Autocompounder.client.ts +++ b/__output__/abstract/apps/autocompounder/Autocompounder.client.ts @@ -6,13 +6,13 @@ import { CamelCasedProperties } from "type-fest"; import { SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate"; -import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js"; +import { AccountPublicClient, AccountWalletClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory } from "@abstract-money/core"; import { StdFee, Coin } from "@cosmjs/amino"; import { Decimal, AssetEntry, BondingPeriodSelector, Duration, InstantiateMsg, ExecuteMsg, Uint128, AnsAsset, QueryMsg, MigrateMsg, Expiration, Timestamp, Uint64, ArrayOfTupleOfStringAndArrayOfClaim, Claim, ArrayOfClaim, Addr, PoolAddressBaseForAddr, AssetInfoBaseForAddr, PoolType, Config, PoolMetadata } from "./Autocompounder.types"; import { AutocompounderQueryMsgBuilder, AutocompounderExecuteMsgBuilder } from "./Autocompounder.message-builder"; export interface IAutocompounderAppQueryClient { moduleId: string; - accountQueryClient: AbstractAccountQueryClient; + accountPublicClient: AccountPublicClient; _moduleAddress: string | undefined; config: () => Promise; pendingClaims: (params: CamelCasedProperties["balance"]>) => Promise; - connectSigningClient: (signingClient: SigningCosmWasmClient, address: string) => AutocompounderAppClient; getAddress: () => Promise; } export class AutocompounderAppQueryClient implements IAutocompounderAppQueryClient { - accountQueryClient: AbstractAccountQueryClient; + accountPublicClient: AccountPublicClient; moduleId: string; _moduleAddress: string | undefined; constructor({ - abstractQueryClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, moduleId }: { - abstractQueryClient: AbstractQueryClient; - accountId: AbstractAccountId; - managerAddress: string; - proxyAddress: string; + accountPublicClient: AccountPublicClient; moduleId: string; }) { - this.accountQueryClient = new AbstractAccountQueryClient({ - abstract: abstractQueryClient, - accountId, - managerAddress, - proxyAddress - }); + this.accountPublicClient = accountPublicClient; this.moduleId = moduleId; this.config = this.config.bind(this); this.pendingClaims = this.pendingClaims.bind(this); @@ -97,7 +85,9 @@ export class AutocompounderAppQueryClient implements IAutocompounderAppQueryClie }; getAddress = async (): Promise => { if (!this._moduleAddress) { - const address = await this.accountQueryClient.getModuleAddress(this.moduleId); + const address = await this.accountPublicClient.getModuleAddress({ + id: this.moduleId + }); if (address === null) { throw new Error(`Module ${this.moduleId} not installed`); @@ -108,17 +98,8 @@ export class AutocompounderAppQueryClient implements IAutocompounderAppQueryClie return this._moduleAddress!; }; - connectSigningClient = (signingClient: SigningCosmWasmClient, address: string): AutocompounderAppClient => { - return new AutocompounderAppClient({ - accountId: this.accountQueryClient.accountId, - managerAddress: this.accountQueryClient.managerAddress, - proxyAddress: this.accountQueryClient.proxyAddress, - moduleId: this.moduleId, - abstractClient: this.accountQueryClient.abstract.connectSigningClient(signingClient, address) - }); - }; _query = async (queryMsg: QueryMsg): Promise => { - return this.accountQueryClient.queryModule({ + return this.accountPublicClient.queryModule({ moduleId: this.moduleId, moduleType: "app", queryMsg @@ -126,41 +107,34 @@ export class AutocompounderAppQueryClient implements IAutocompounderAppQueryClie }; } export interface IAutocompounderAppClient extends IAutocompounderAppQueryClient { - accountClient: AbstractAccountClient; + accountWalletClient: AccountWalletClient; updateFeeConfig: (params: CamelCasedProperties["update_fee_config"]>, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }>["update_fee_config"]>, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; deposit: (params: CamelCasedProperties["deposit"]>, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - compound: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - batchUnbond: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }>["deposit"]>, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + compound: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + batchUnbond: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class AutocompounderAppClient extends AutocompounderAppQueryClient implements IAutocompounderAppClient { - accountClient: AbstractAccountClient; + accountWalletClient: AccountWalletClient; constructor({ - abstractClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, + accountWalletClient, moduleId }: { - abstractClient: AbstractClient; - accountId: AbstractAccountId; - managerAddress: string; - proxyAddress: string; + accountPublicClient: AccountPublicClient; + accountWalletClient: AccountWalletClient; moduleId: string; }) { super({ - abstractQueryClient: abstractClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, moduleId }); - this.accountClient = AbstractAccountClient.fromQueryClient(this.accountQueryClient, abstractClient); + this.accountWalletClient = accountWalletClient; this.updateFeeConfig = this.updateFeeConfig.bind(this); this.deposit = this.deposit.bind(this); this.withdraw = this.withdraw.bind(this); @@ -170,25 +144,27 @@ export class AutocompounderAppClient extends AutocompounderAppQueryClient implem updateFeeConfig = async (params: CamelCasedProperties["update_fee_config"]>, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { - return this._execute(AutocompounderExecuteMsgBuilder.updateFeeConfig(params), fee, memo, _funds); + }>["update_fee_config"]>, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(AutocompounderExecuteMsgBuilder.updateFeeConfig(params), fee_, memo_, funds_); }; deposit = async (params: CamelCasedProperties["deposit"]>, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { - return this._execute(AutocompounderExecuteMsgBuilder.deposit(params), fee, memo, _funds); + }>["deposit"]>, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(AutocompounderExecuteMsgBuilder.deposit(params), fee_, memo_, funds_); }; - withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { - return this._execute(AutocompounderExecuteMsgBuilder.withdraw(), fee, memo, _funds); + withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(AutocompounderExecuteMsgBuilder.withdraw(), fee_, memo_, funds_); }; - compound = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { - return this._execute(AutocompounderExecuteMsgBuilder.compound(), fee, memo, _funds); + compound = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(AutocompounderExecuteMsgBuilder.compound(), fee_, memo_, funds_); }; - batchUnbond = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { - return this._execute(AutocompounderExecuteMsgBuilder.batchUnbond(), fee, memo, _funds); + batchUnbond = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(AutocompounderExecuteMsgBuilder.batchUnbond(), fee_, memo_, funds_); }; - _execute = async (msg: ExecuteMsg, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + _execute = async (msg: ExecuteMsg, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { + const signingCwClient = await this.accountWalletClient.getSigningCosmWasmClient(); + const sender = await this.accountWalletClient.getSenderAddress(); const moduleMsg: AppExecuteMsg = AppExecuteMsgFactory.executeApp(msg); - return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee, memo, _funds); + return await signingCwClient.execute(sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/abstract/apps/autocompounder/Autocompounder.message-composer.ts b/__output__/abstract/apps/autocompounder/Autocompounder.message-composer.ts index acb3b4bb..bbf9ff69 100644 --- a/__output__/abstract/apps/autocompounder/Autocompounder.message-composer.ts +++ b/__output__/abstract/apps/autocompounder/Autocompounder.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Decimal, AssetEntry, BondingPeriodSelector, Duration, InstantiateMsg, ExecuteMsg, Uint128, AnsAsset, QueryMsg, MigrateMsg, Expiration, Timestamp, Uint64, ArrayOfTupleOfStringAndArrayOfClaim, Claim, ArrayOfClaim, Addr, PoolAddressBaseForAddr, AssetInfoBaseForAddr, PoolType, Config, PoolMetadata } from "./Autocompounder.types"; export interface AutocompounderMsg { contractAddress: string; @@ -21,15 +21,15 @@ export interface AutocompounderMsg { deposit?: Decimal; performance?: Decimal; withdrawal?: Decimal; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; deposit: ({ funds }: { funds: AnsAsset[]; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; - compound: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; - batchUnbond: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; + compound: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; + batchUnbond: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class AutocompounderMsgComposer implements AutocompounderMsg { sender: string; @@ -53,7 +53,7 @@ export class AutocompounderMsgComposer implements AutocompounderMsg { deposit?: Decimal; performance?: Decimal; withdrawal?: Decimal; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_fee_config: { deposit, @@ -68,7 +68,7 @@ export class AutocompounderMsgComposer implements AutocompounderMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(moduleMsg)), - funds: _funds + funds: funds_ }) }; }; @@ -76,7 +76,7 @@ export class AutocompounderMsgComposer implements AutocompounderMsg { funds }: { funds: AnsAsset[]; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { deposit: { funds @@ -89,11 +89,11 @@ export class AutocompounderMsgComposer implements AutocompounderMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(moduleMsg)), - funds: _funds + funds: funds_ }) }; }; - withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { withdraw: {} }; @@ -104,11 +104,11 @@ export class AutocompounderMsgComposer implements AutocompounderMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(moduleMsg)), - funds: _funds + funds: funds_ }) }; }; - compound = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + compound = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { compound: {} }; @@ -119,11 +119,11 @@ export class AutocompounderMsgComposer implements AutocompounderMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(moduleMsg)), - funds: _funds + funds: funds_ }) }; }; - batchUnbond = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + batchUnbond = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { batch_unbond: {} }; @@ -134,7 +134,7 @@ export class AutocompounderMsgComposer implements AutocompounderMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(moduleMsg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/abstract/apps/etf-prefix/Etf.client.ts b/__output__/abstract/apps/etf-prefix/Etf.client.ts index 8adaea41..e7c52344 100644 --- a/__output__/abstract/apps/etf-prefix/Etf.client.ts +++ b/__output__/abstract/apps/etf-prefix/Etf.client.ts @@ -6,42 +6,30 @@ import { CamelCasedProperties } from "type-fest"; import { SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate"; -import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js"; +import { AccountPublicClient, AccountWalletClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory } from "@abstract-money/core"; import { StdFee, Coin } from "@cosmjs/amino"; import { Decimal, InstantiateMsg, ExecuteMsg, Uint128, AssetInfoBaseForString, AssetBaseForString, QueryMsg, MigrateMsg, StateResponse } from "./Etf.types"; import { EtfQueryMsgBuilder, EtfExecuteMsgBuilder } from "./Etf.message-builder"; export interface IEtfTestQueryClient { moduleId: string; - accountQueryClient: AbstractAccountQueryClient; + accountPublicClient: AccountPublicClient; _moduleAddress: string | undefined; state: () => Promise; - connectSigningClient: (signingClient: SigningCosmWasmClient, address: string) => EtfTestClient; getAddress: () => Promise; } export class EtfTestQueryClient implements IEtfTestQueryClient { - accountQueryClient: AbstractAccountQueryClient; + accountPublicClient: AccountPublicClient; moduleId: string; _moduleAddress: string | undefined; constructor({ - abstractQueryClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, moduleId }: { - abstractQueryClient: AbstractQueryClient; - accountId: AbstractAccountId; - managerAddress: string; - proxyAddress: string; + accountPublicClient: AccountPublicClient; moduleId: string; }) { - this.accountQueryClient = new AbstractAccountQueryClient({ - abstract: abstractQueryClient, - accountId, - managerAddress, - proxyAddress - }); + this.accountPublicClient = accountPublicClient; this.moduleId = moduleId; this.state = this.state.bind(this); } @@ -51,7 +39,9 @@ export class EtfTestQueryClient implements IEtfTestQueryClient { }; getAddress = async (): Promise => { if (!this._moduleAddress) { - const address = await this.accountQueryClient.getModuleAddress(this.moduleId); + const address = await this.accountPublicClient.getModuleAddress({ + id: this.moduleId + }); if (address === null) { throw new Error(`Module ${this.moduleId} not installed`); @@ -62,17 +52,8 @@ export class EtfTestQueryClient implements IEtfTestQueryClient { return this._moduleAddress!; }; - connectSigningClient = (signingClient: SigningCosmWasmClient, address: string): EtfTestClient => { - return new EtfTestClient({ - accountId: this.accountQueryClient.accountId, - managerAddress: this.accountQueryClient.managerAddress, - proxyAddress: this.accountQueryClient.proxyAddress, - moduleId: this.moduleId, - abstractClient: this.accountQueryClient.abstract.connectSigningClient(signingClient, address) - }); - }; _query = async (queryMsg: QueryMsg): Promise => { - return this.accountQueryClient.queryModule({ + return this.accountPublicClient.queryModule({ moduleId: this.moduleId, moduleType: "app", queryMsg @@ -80,54 +61,49 @@ export class EtfTestQueryClient implements IEtfTestQueryClient { }; } export interface IEtfTestClient extends IEtfTestQueryClient { - accountClient: AbstractAccountClient; + accountWalletClient: AccountWalletClient; provideLiquidity: (params: CamelCasedProperties["provide_liquidity"]>, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }>["provide_liquidity"]>, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; setFee: (params: CamelCasedProperties["set_fee"]>, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }>["set_fee"]>, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class EtfTestClient extends EtfTestQueryClient implements IEtfTestClient { - accountClient: AbstractAccountClient; + accountWalletClient: AccountWalletClient; constructor({ - abstractClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, + accountWalletClient, moduleId }: { - abstractClient: AbstractClient; - accountId: AbstractAccountId; - managerAddress: string; - proxyAddress: string; + accountPublicClient: AccountPublicClient; + accountWalletClient: AccountWalletClient; moduleId: string; }) { super({ - abstractQueryClient: abstractClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, moduleId }); - this.accountClient = AbstractAccountClient.fromQueryClient(this.accountQueryClient, abstractClient); + this.accountWalletClient = accountWalletClient; this.provideLiquidity = this.provideLiquidity.bind(this); this.setFee = this.setFee.bind(this); } provideLiquidity = async (params: CamelCasedProperties["provide_liquidity"]>, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { - return this._execute(EtfExecuteMsgBuilder.provideLiquidity(params), fee, memo, _funds); + }>["provide_liquidity"]>, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(EtfExecuteMsgBuilder.provideLiquidity(params), fee_, memo_, funds_); }; setFee = async (params: CamelCasedProperties["set_fee"]>, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { - return this._execute(EtfExecuteMsgBuilder.setFee(params), fee, memo, _funds); + }>["set_fee"]>, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(EtfExecuteMsgBuilder.setFee(params), fee_, memo_, funds_); }; - _execute = async (msg: ExecuteMsg, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + _execute = async (msg: ExecuteMsg, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { + const signingCwClient = await this.accountWalletClient.getSigningCosmWasmClient(); + const sender = await this.accountWalletClient.getSenderAddress(); const moduleMsg: AppExecuteMsg = AppExecuteMsgFactory.executeApp(msg); - return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee, memo, _funds); + return await signingCwClient.execute(sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/abstract/apps/etf-prefix/Etf.message-composer.ts b/__output__/abstract/apps/etf-prefix/Etf.message-composer.ts index 19c1d85f..0238374e 100644 --- a/__output__/abstract/apps/etf-prefix/Etf.message-composer.ts +++ b/__output__/abstract/apps/etf-prefix/Etf.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Decimal, InstantiateMsg, ExecuteMsg, Uint128, AssetInfoBaseForString, AssetBaseForString, QueryMsg, MigrateMsg, StateResponse } from "./Etf.types"; export interface EtfMsg { contractAddress: string; @@ -17,12 +17,12 @@ export interface EtfMsg { asset }: { asset: AssetBaseForString; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; setFee: ({ fee }: { fee: Decimal; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class EtfMsgComposer implements EtfMsg { sender: string; @@ -39,7 +39,7 @@ export class EtfMsgComposer implements EtfMsg { asset }: { asset: AssetBaseForString; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { provide_liquidity: { asset @@ -52,7 +52,7 @@ export class EtfMsgComposer implements EtfMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(moduleMsg)), - funds: _funds + funds: funds_ }) }; }; @@ -60,7 +60,7 @@ export class EtfMsgComposer implements EtfMsg { fee }: { fee: Decimal; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { set_fee: { fee @@ -73,7 +73,7 @@ export class EtfMsgComposer implements EtfMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(moduleMsg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/abstract/apps/etf/Etf.client.ts b/__output__/abstract/apps/etf/Etf.client.ts index 89344df1..2cf366ae 100644 --- a/__output__/abstract/apps/etf/Etf.client.ts +++ b/__output__/abstract/apps/etf/Etf.client.ts @@ -6,42 +6,30 @@ import { CamelCasedProperties } from "type-fest"; import { SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate"; -import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js"; +import { AccountPublicClient, AccountWalletClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory } from "@abstract-money/core"; import { StdFee, Coin } from "@cosmjs/amino"; import { Decimal, InstantiateMsg, ExecuteMsg, Uint128, AssetInfoBaseForString, AssetBaseForString, QueryMsg, MigrateMsg, StateResponse } from "./Etf.types"; import { EtfQueryMsgBuilder, EtfExecuteMsgBuilder } from "./Etf.message-builder"; export interface IEtfAppQueryClient { moduleId: string; - accountQueryClient: AbstractAccountQueryClient; + accountPublicClient: AccountPublicClient; _moduleAddress: string | undefined; state: () => Promise; - connectSigningClient: (signingClient: SigningCosmWasmClient, address: string) => EtfAppClient; getAddress: () => Promise; } export class EtfAppQueryClient implements IEtfAppQueryClient { - accountQueryClient: AbstractAccountQueryClient; + accountPublicClient: AccountPublicClient; moduleId: string; _moduleAddress: string | undefined; constructor({ - abstractQueryClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, moduleId }: { - abstractQueryClient: AbstractQueryClient; - accountId: AbstractAccountId; - managerAddress: string; - proxyAddress: string; + accountPublicClient: AccountPublicClient; moduleId: string; }) { - this.accountQueryClient = new AbstractAccountQueryClient({ - abstract: abstractQueryClient, - accountId, - managerAddress, - proxyAddress - }); + this.accountPublicClient = accountPublicClient; this.moduleId = moduleId; this.state = this.state.bind(this); } @@ -51,7 +39,9 @@ export class EtfAppQueryClient implements IEtfAppQueryClient { }; getAddress = async (): Promise => { if (!this._moduleAddress) { - const address = await this.accountQueryClient.getModuleAddress(this.moduleId); + const address = await this.accountPublicClient.getModuleAddress({ + id: this.moduleId + }); if (address === null) { throw new Error(`Module ${this.moduleId} not installed`); @@ -62,17 +52,8 @@ export class EtfAppQueryClient implements IEtfAppQueryClient { return this._moduleAddress!; }; - connectSigningClient = (signingClient: SigningCosmWasmClient, address: string): EtfAppClient => { - return new EtfAppClient({ - accountId: this.accountQueryClient.accountId, - managerAddress: this.accountQueryClient.managerAddress, - proxyAddress: this.accountQueryClient.proxyAddress, - moduleId: this.moduleId, - abstractClient: this.accountQueryClient.abstract.connectSigningClient(signingClient, address) - }); - }; _query = async (queryMsg: QueryMsg): Promise => { - return this.accountQueryClient.queryModule({ + return this.accountPublicClient.queryModule({ moduleId: this.moduleId, moduleType: "app", queryMsg @@ -80,54 +61,49 @@ export class EtfAppQueryClient implements IEtfAppQueryClient { }; } export interface IEtfAppClient extends IEtfAppQueryClient { - accountClient: AbstractAccountClient; + accountWalletClient: AccountWalletClient; provideLiquidity: (params: CamelCasedProperties["provide_liquidity"]>, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }>["provide_liquidity"]>, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; setFee: (params: CamelCasedProperties["set_fee"]>, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }>["set_fee"]>, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class EtfAppClient extends EtfAppQueryClient implements IEtfAppClient { - accountClient: AbstractAccountClient; + accountWalletClient: AccountWalletClient; constructor({ - abstractClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, + accountWalletClient, moduleId }: { - abstractClient: AbstractClient; - accountId: AbstractAccountId; - managerAddress: string; - proxyAddress: string; + accountPublicClient: AccountPublicClient; + accountWalletClient: AccountWalletClient; moduleId: string; }) { super({ - abstractQueryClient: abstractClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, moduleId }); - this.accountClient = AbstractAccountClient.fromQueryClient(this.accountQueryClient, abstractClient); + this.accountWalletClient = accountWalletClient; this.provideLiquidity = this.provideLiquidity.bind(this); this.setFee = this.setFee.bind(this); } provideLiquidity = async (params: CamelCasedProperties["provide_liquidity"]>, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { - return this._execute(EtfExecuteMsgBuilder.provideLiquidity(params), fee, memo, _funds); + }>["provide_liquidity"]>, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(EtfExecuteMsgBuilder.provideLiquidity(params), fee_, memo_, funds_); }; setFee = async (params: CamelCasedProperties["set_fee"]>, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { - return this._execute(EtfExecuteMsgBuilder.setFee(params), fee, memo, _funds); + }>["set_fee"]>, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(EtfExecuteMsgBuilder.setFee(params), fee_, memo_, funds_); }; - _execute = async (msg: ExecuteMsg, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + _execute = async (msg: ExecuteMsg, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { + const signingCwClient = await this.accountWalletClient.getSigningCosmWasmClient(); + const sender = await this.accountWalletClient.getSenderAddress(); const moduleMsg: AppExecuteMsg = AppExecuteMsgFactory.executeApp(msg); - return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee, memo, _funds); + return await signingCwClient.execute(sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/abstract/apps/etf/Etf.message-composer.ts b/__output__/abstract/apps/etf/Etf.message-composer.ts index 19c1d85f..0238374e 100644 --- a/__output__/abstract/apps/etf/Etf.message-composer.ts +++ b/__output__/abstract/apps/etf/Etf.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Decimal, InstantiateMsg, ExecuteMsg, Uint128, AssetInfoBaseForString, AssetBaseForString, QueryMsg, MigrateMsg, StateResponse } from "./Etf.types"; export interface EtfMsg { contractAddress: string; @@ -17,12 +17,12 @@ export interface EtfMsg { asset }: { asset: AssetBaseForString; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; setFee: ({ fee }: { fee: Decimal; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class EtfMsgComposer implements EtfMsg { sender: string; @@ -39,7 +39,7 @@ export class EtfMsgComposer implements EtfMsg { asset }: { asset: AssetBaseForString; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { provide_liquidity: { asset @@ -52,7 +52,7 @@ export class EtfMsgComposer implements EtfMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(moduleMsg)), - funds: _funds + funds: funds_ }) }; }; @@ -60,7 +60,7 @@ export class EtfMsgComposer implements EtfMsg { fee }: { fee: Decimal; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { set_fee: { fee @@ -73,7 +73,7 @@ export class EtfMsgComposer implements EtfMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(moduleMsg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts index b59f15e6..471ab4b6 100644 --- a/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts +++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.client.ts @@ -31,7 +31,7 @@ export interface CwAdminFactoryInterface { codeId: number; instantiateMsg: Binary; label: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwAdminFactoryClient implements CwAdminFactoryInterface { client: SigningCosmWasmClient; @@ -53,13 +53,13 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface { codeId: number; instantiateMsg: Binary; label: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { instantiate_contract_with_self_admin: { code_id: codeId, instantiate_msg: instantiateMsg, label } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts index 4e79d534..0d4bdf03 100644 --- a/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts +++ b/__output__/builder/bundler_test/contracts/CwAdminFactory.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types"; export interface CwAdminFactoryMsg { contractAddress: string; @@ -21,7 +21,7 @@ export interface CwAdminFactoryMsg { codeId: number; instantiateMsg: Binary; label: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg { sender: string; @@ -41,7 +41,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg { codeId: number; instantiateMsg: Binary; label: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { instantiate_contract_with_self_admin: { code_id: codeId, @@ -55,7 +55,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts index 0feaf370..8bdc57ca 100644 --- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts +++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.client.ts @@ -109,7 +109,7 @@ export interface CwCodeIdRegistryInterface { amount: Uint128; msg: Binary; sender: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; register: ({ chainId, checksum, @@ -122,7 +122,7 @@ export interface CwCodeIdRegistryInterface { codeId: number; name: string; version: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; setOwner: ({ chainId, name, @@ -131,21 +131,21 @@ export interface CwCodeIdRegistryInterface { chainId: string; name: string; owner?: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; unregister: ({ chainId, codeId }: { chainId: string; codeId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateConfig: ({ admin, paymentInfo }: { admin?: string; paymentInfo?: PaymentInfo; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { client: SigningCosmWasmClient; @@ -171,14 +171,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { amount: Uint128; msg: Binary; sender: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { receive: { amount, msg, sender } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; register = async ({ chainId, @@ -192,7 +192,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { codeId: number; name: string; version: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { register: { chain_id: chainId, @@ -201,7 +201,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { name, version } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; setOwner = async ({ chainId, @@ -211,14 +211,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { chainId: string; name: string; owner?: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { set_owner: { chain_id: chainId, name, owner } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; unregister = async ({ chainId, @@ -226,13 +226,13 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { }: { chainId: string; codeId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { unregister: { chain_id: chainId, code_id: codeId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateConfig = async ({ admin, @@ -240,12 +240,12 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { }: { admin?: string; paymentInfo?: PaymentInfo; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_config: { admin, payment_info: paymentInfo } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts index d8f02b18..770499dd 100644 --- a/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts +++ b/__output__/builder/bundler_test/contracts/CwCodeIdRegistry.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types"; export interface CwCodeIdRegistryMsg { contractAddress: string; @@ -21,7 +21,7 @@ export interface CwCodeIdRegistryMsg { amount: Uint128; msg: Binary; sender: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; register: ({ chainId, checksum, @@ -34,7 +34,7 @@ export interface CwCodeIdRegistryMsg { codeId: number; name: string; version: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; setOwner: ({ chainId, name, @@ -43,21 +43,21 @@ export interface CwCodeIdRegistryMsg { chainId: string; name: string; owner?: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; unregister: ({ chainId, codeId }: { chainId: string; codeId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateConfig: ({ admin, paymentInfo }: { admin?: string; paymentInfo?: PaymentInfo; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: string; @@ -81,7 +81,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { amount: Uint128; msg: Binary; sender: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { receive: { amount, @@ -95,7 +95,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -111,7 +111,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { codeId: number; name: string; version: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { register: { chain_id: chainId, @@ -127,7 +127,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -139,7 +139,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { chainId: string; name: string; owner?: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { set_owner: { chain_id: chainId, @@ -153,7 +153,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -163,7 +163,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { }: { chainId: string; codeId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { unregister: { chain_id: chainId, @@ -176,7 +176,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -186,7 +186,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { }: { admin?: string; paymentInfo?: PaymentInfo; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_config: { admin, @@ -199,7 +199,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/bundler_test/contracts/CwSingle.client.ts b/__output__/builder/bundler_test/contracts/CwSingle.client.ts index ab08e73a..a595c03c 100644 --- a/__output__/builder/bundler_test/contracts/CwSingle.client.ts +++ b/__output__/builder/bundler_test/contracts/CwSingle.client.ts @@ -176,24 +176,24 @@ export interface CwSingleInterface { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; vote: ({ proposalId, vote }: { proposalId: number; vote: Vote; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; execute: ({ proposalId }: { proposalId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; close: ({ proposalId }: { proposalId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateConfig: ({ allowRevoting, dao, @@ -210,27 +210,27 @@ export interface CwSingleInterface { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addProposalHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeProposalHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addVoteHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeVoteHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwSingleClient implements CwSingleInterface { client: SigningCosmWasmClient; @@ -260,14 +260,14 @@ export class CwSingleClient implements CwSingleInterface { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { propose: { description, msgs, title } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; vote = async ({ proposalId, @@ -275,35 +275,35 @@ export class CwSingleClient implements CwSingleInterface { }: { proposalId: number; vote: Vote; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { vote: { proposal_id: proposalId, vote } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; execute = async ({ proposalId }: { proposalId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { execute: { proposal_id: proposalId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; close = async ({ proposalId }: { proposalId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { close: { proposal_id: proposalId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateConfig = async ({ allowRevoting, @@ -321,7 +321,7 @@ export class CwSingleClient implements CwSingleInterface { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_config: { allow_revoting: allowRevoting, @@ -332,50 +332,50 @@ export class CwSingleClient implements CwSingleInterface { only_members_execute: onlyMembersExecute, threshold } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addProposalHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_proposal_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeProposalHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_proposal_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addVoteHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_vote_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeVoteHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_vote_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts index 8f7e310e..0c57b4a2 100644 --- a/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts +++ b/__output__/builder/bundler_test/contracts/CwSingle.message-composer.ts @@ -7,7 +7,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types"; export interface CwSingleMsg { contractAddress: string; @@ -20,24 +20,24 @@ export interface CwSingleMsg { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; vote: ({ proposalId, vote }: { proposalId: number; vote: Vote; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; execute: ({ proposalId }: { proposalId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; close: ({ proposalId }: { proposalId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateConfig: ({ allowRevoting, dao, @@ -54,27 +54,27 @@ export interface CwSingleMsg { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; addProposalHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; removeProposalHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; addVoteHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; removeVoteHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwSingleMsgComposer implements CwSingleMsg { sender: string; @@ -102,7 +102,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { propose: { description, @@ -116,7 +116,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -126,7 +126,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { }: { proposalId: number; vote: Vote; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { vote: { proposal_id: proposalId, @@ -139,7 +139,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -147,7 +147,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { proposalId }: { proposalId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { execute: { proposal_id: proposalId @@ -159,7 +159,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -167,7 +167,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { proposalId }: { proposalId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { close: { proposal_id: proposalId @@ -179,7 +179,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -199,7 +199,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_config: { allow_revoting: allowRevoting, @@ -217,7 +217,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -225,7 +225,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { add_proposal_hook: { address @@ -237,7 +237,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -245,7 +245,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { remove_proposal_hook: { address @@ -257,7 +257,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -265,7 +265,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { add_vote_hook: { address @@ -277,7 +277,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -285,7 +285,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { remove_vote_hook: { address @@ -297,7 +297,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/bundler_test/contracts/Factory.client.ts b/__output__/builder/bundler_test/contracts/Factory.client.ts index ca2bb4d8..236e09e7 100644 --- a/__output__/builder/bundler_test/contracts/Factory.client.ts +++ b/__output__/builder/bundler_test/contracts/Factory.client.ts @@ -114,43 +114,43 @@ export interface FactoryInterface { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateProxyUser: ({ newUser, oldUser }: { newUser: Addr; oldUser: Addr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; migrateWallet: ({ migrationMsg, walletAddress }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateCodeId: ({ newCodeId, ty }: { newCodeId: number; ty: CodeIdType; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateWalletFee: ({ newFee }: { newFee: Coin; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateGovecAddr: ({ addr }: { addr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateAdmin: ({ addr }: { addr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class FactoryClient implements FactoryInterface { client: SigningCosmWasmClient; @@ -174,12 +174,12 @@ export class FactoryClient implements FactoryInterface { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { create_wallet: { create_wallet_msg: createWalletMsg } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateProxyUser = async ({ newUser, @@ -187,13 +187,13 @@ export class FactoryClient implements FactoryInterface { }: { newUser: Addr; oldUser: Addr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_proxy_user: { new_user: newUser, old_user: oldUser } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; migrateWallet = async ({ migrationMsg, @@ -201,13 +201,13 @@ export class FactoryClient implements FactoryInterface { }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { migrate_wallet: { migration_msg: migrationMsg, wallet_address: walletAddress } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateCodeId = async ({ newCodeId, @@ -215,45 +215,45 @@ export class FactoryClient implements FactoryInterface { }: { newCodeId: number; ty: CodeIdType; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_code_id: { new_code_id: newCodeId, ty } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateWalletFee = async ({ newFee }: { newFee: Coin; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_wallet_fee: { new_fee: newFee } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateGovecAddr = async ({ addr }: { addr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_govec_addr: { addr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateAdmin = async ({ addr }: { addr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_admin: { addr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts index 14635942..578640f8 100644 --- a/__output__/builder/bundler_test/contracts/Factory.message-composer.ts +++ b/__output__/builder/bundler_test/contracts/Factory.message-composer.ts @@ -7,7 +7,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types"; export interface FactoryMsg { contractAddress: string; @@ -16,43 +16,43 @@ export interface FactoryMsg { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateProxyUser: ({ newUser, oldUser }: { newUser: Addr; oldUser: Addr; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; migrateWallet: ({ migrationMsg, walletAddress }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateCodeId: ({ newCodeId, ty }: { newCodeId: number; ty: CodeIdType; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateWalletFee: ({ newFee }: { newFee: Coin; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateGovecAddr: ({ addr }: { addr: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateAdmin: ({ addr }: { addr: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class FactoryMsgComposer implements FactoryMsg { sender: string; @@ -74,7 +74,7 @@ export class FactoryMsgComposer implements FactoryMsg { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { create_wallet: { create_wallet_msg: createWalletMsg @@ -86,7 +86,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -96,7 +96,7 @@ export class FactoryMsgComposer implements FactoryMsg { }: { newUser: Addr; oldUser: Addr; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_proxy_user: { new_user: newUser, @@ -109,7 +109,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -119,7 +119,7 @@ export class FactoryMsgComposer implements FactoryMsg { }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { migrate_wallet: { migration_msg: migrationMsg, @@ -132,7 +132,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -142,7 +142,7 @@ export class FactoryMsgComposer implements FactoryMsg { }: { newCodeId: number; ty: CodeIdType; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_code_id: { new_code_id: newCodeId, @@ -155,7 +155,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -163,7 +163,7 @@ export class FactoryMsgComposer implements FactoryMsg { newFee }: { newFee: Coin; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_wallet_fee: { new_fee: newFee @@ -175,7 +175,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -183,7 +183,7 @@ export class FactoryMsgComposer implements FactoryMsg { addr }: { addr: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_govec_addr: { addr @@ -195,7 +195,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -203,7 +203,7 @@ export class FactoryMsgComposer implements FactoryMsg { addr }: { addr: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_admin: { addr @@ -215,7 +215,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/bundler_test/contracts/Minter.client.ts b/__output__/builder/bundler_test/contracts/Minter.client.ts index fb8794fc..7bb78380 100644 --- a/__output__/builder/bundler_test/contracts/Minter.client.ts +++ b/__output__/builder/bundler_test/contracts/Minter.client.ts @@ -68,31 +68,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface { export interface MinterInterface { contractAddress: string; sender: string; - mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; setWhitelist: ({ whitelist }: { whitelist: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updatePerAddressLimit: ({ perAddressLimit }: { perAddressLimit: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mintTo: ({ recipient }: { recipient: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mintFor: ({ recipient, tokenId }: { recipient: string; tokenId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class MinterClient implements MinterInterface { client: SigningCosmWasmClient; @@ -112,48 +112,48 @@ export class MinterClient implements MinterInterface { this.withdraw = this.withdraw.bind(this); } - mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; setWhitelist = async ({ whitelist }: { whitelist: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { set_whitelist: { whitelist } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_start_time: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updatePerAddressLimit = async ({ perAddressLimit }: { perAddressLimit: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_per_address_limit: { per_address_limit: perAddressLimit } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mintTo = async ({ recipient }: { recipient: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint_to: { recipient } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mintFor = async ({ recipient, @@ -161,17 +161,17 @@ export class MinterClient implements MinterInterface { }: { recipient: string; tokenId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint_for: { recipient, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { withdraw: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts index 23ff03b4..fd536be0 100644 --- a/__output__/builder/bundler_test/contracts/Minter.message-composer.ts +++ b/__output__/builder/bundler_test/contracts/Minter.message-composer.ts @@ -7,36 +7,36 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types"; export interface MinterMsg { contractAddress: string; sender: string; - mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + mint: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; setWhitelist: ({ whitelist }: { whitelist: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - updateStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + updateStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; updatePerAddressLimit: ({ perAddressLimit }: { perAddressLimit: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; mintTo: ({ recipient }: { recipient: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; mintFor: ({ recipient, tokenId }: { recipient: string; tokenId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class MinterMsgComposer implements MinterMsg { sender: string; @@ -54,7 +54,7 @@ export class MinterMsgComposer implements MinterMsg { this.withdraw = this.withdraw.bind(this); } - mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + mint = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint: {} }; @@ -64,7 +64,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -72,7 +72,7 @@ export class MinterMsgComposer implements MinterMsg { whitelist }: { whitelist: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { set_whitelist: { whitelist @@ -84,11 +84,11 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - updateStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + updateStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_start_time: {} }; @@ -98,7 +98,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -106,7 +106,7 @@ export class MinterMsgComposer implements MinterMsg { perAddressLimit }: { perAddressLimit: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_per_address_limit: { per_address_limit: perAddressLimit @@ -118,7 +118,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -126,7 +126,7 @@ export class MinterMsgComposer implements MinterMsg { recipient }: { recipient: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint_to: { recipient @@ -138,7 +138,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -148,7 +148,7 @@ export class MinterMsgComposer implements MinterMsg { }: { recipient: string; tokenId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint_for: { recipient, @@ -161,11 +161,11 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { withdraw: {} }; @@ -175,7 +175,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/default/CwAdminFactory.client.ts b/__output__/builder/default/CwAdminFactory.client.ts index c4d441bf..8259b324 100644 --- a/__output__/builder/default/CwAdminFactory.client.ts +++ b/__output__/builder/default/CwAdminFactory.client.ts @@ -31,7 +31,7 @@ export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface codeId: number; instantiateMsg: Binary; label: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements CwAdminFactoryInterface { client: SigningCosmWasmClient; @@ -54,13 +54,13 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C codeId: number; instantiateMsg: Binary; label: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { instantiate_contract_with_self_admin: { code_id: codeId, instantiate_msg: instantiateMsg, label } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/default/CwAdminFactory.message-composer.ts b/__output__/builder/default/CwAdminFactory.message-composer.ts index 4e79d534..0d4bdf03 100644 --- a/__output__/builder/default/CwAdminFactory.message-composer.ts +++ b/__output__/builder/default/CwAdminFactory.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types"; export interface CwAdminFactoryMsg { contractAddress: string; @@ -21,7 +21,7 @@ export interface CwAdminFactoryMsg { codeId: number; instantiateMsg: Binary; label: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg { sender: string; @@ -41,7 +41,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg { codeId: number; instantiateMsg: Binary; label: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { instantiate_contract_with_self_admin: { code_id: codeId, @@ -55,7 +55,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/default/CwCodeIdRegistry.client.ts b/__output__/builder/default/CwCodeIdRegistry.client.ts index 05e39c08..7f645095 100644 --- a/__output__/builder/default/CwCodeIdRegistry.client.ts +++ b/__output__/builder/default/CwCodeIdRegistry.client.ts @@ -109,7 +109,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter amount: Uint128; msg: Binary; sender: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; register: ({ chainId, checksum, @@ -122,7 +122,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter codeId: number; name: string; version: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; setOwner: ({ chainId, name, @@ -131,21 +131,21 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter chainId: string; name: string; owner?: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; unregister: ({ chainId, codeId }: { chainId: string; codeId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateConfig: ({ admin, paymentInfo }: { admin?: string; paymentInfo?: PaymentInfo; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implements CwCodeIdRegistryInterface { client: SigningCosmWasmClient; @@ -172,14 +172,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen amount: Uint128; msg: Binary; sender: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { receive: { amount, msg, sender } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; register = async ({ chainId, @@ -193,7 +193,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen codeId: number; name: string; version: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { register: { chain_id: chainId, @@ -202,7 +202,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen name, version } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; setOwner = async ({ chainId, @@ -212,14 +212,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen chainId: string; name: string; owner?: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { set_owner: { chain_id: chainId, name, owner } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; unregister = async ({ chainId, @@ -227,13 +227,13 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen }: { chainId: string; codeId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { unregister: { chain_id: chainId, code_id: codeId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateConfig = async ({ admin, @@ -241,12 +241,12 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen }: { admin?: string; paymentInfo?: PaymentInfo; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_config: { admin, payment_info: paymentInfo } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts index d8f02b18..770499dd 100644 --- a/__output__/builder/default/CwCodeIdRegistry.message-composer.ts +++ b/__output__/builder/default/CwCodeIdRegistry.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types"; export interface CwCodeIdRegistryMsg { contractAddress: string; @@ -21,7 +21,7 @@ export interface CwCodeIdRegistryMsg { amount: Uint128; msg: Binary; sender: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; register: ({ chainId, checksum, @@ -34,7 +34,7 @@ export interface CwCodeIdRegistryMsg { codeId: number; name: string; version: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; setOwner: ({ chainId, name, @@ -43,21 +43,21 @@ export interface CwCodeIdRegistryMsg { chainId: string; name: string; owner?: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; unregister: ({ chainId, codeId }: { chainId: string; codeId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateConfig: ({ admin, paymentInfo }: { admin?: string; paymentInfo?: PaymentInfo; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: string; @@ -81,7 +81,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { amount: Uint128; msg: Binary; sender: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { receive: { amount, @@ -95,7 +95,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -111,7 +111,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { codeId: number; name: string; version: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { register: { chain_id: chainId, @@ -127,7 +127,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -139,7 +139,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { chainId: string; name: string; owner?: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { set_owner: { chain_id: chainId, @@ -153,7 +153,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -163,7 +163,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { }: { chainId: string; codeId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { unregister: { chain_id: chainId, @@ -176,7 +176,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -186,7 +186,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { }: { admin?: string; paymentInfo?: PaymentInfo; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_config: { admin, @@ -199,7 +199,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/default/CwSingle.client.ts b/__output__/builder/default/CwSingle.client.ts index 24366309..762d7722 100644 --- a/__output__/builder/default/CwSingle.client.ts +++ b/__output__/builder/default/CwSingle.client.ts @@ -176,24 +176,24 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; vote: ({ proposalId, vote }: { proposalId: number; vote: Vote; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; execute: ({ proposalId }: { proposalId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; close: ({ proposalId }: { proposalId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateConfig: ({ allowRevoting, dao, @@ -210,27 +210,27 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addProposalHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeProposalHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addVoteHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeVoteHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwSingleClient extends CwSingleQueryClient implements CwSingleInterface { client: SigningCosmWasmClient; @@ -261,14 +261,14 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { propose: { description, msgs, title } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; vote = async ({ proposalId, @@ -276,35 +276,35 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter }: { proposalId: number; vote: Vote; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { vote: { proposal_id: proposalId, vote } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; execute = async ({ proposalId }: { proposalId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { execute: { proposal_id: proposalId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; close = async ({ proposalId }: { proposalId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { close: { proposal_id: proposalId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateConfig = async ({ allowRevoting, @@ -322,7 +322,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_config: { allow_revoting: allowRevoting, @@ -333,50 +333,50 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter only_members_execute: onlyMembersExecute, threshold } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addProposalHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_proposal_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeProposalHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_proposal_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addVoteHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_vote_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeVoteHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_vote_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/default/CwSingle.message-composer.ts b/__output__/builder/default/CwSingle.message-composer.ts index 8f7e310e..0c57b4a2 100644 --- a/__output__/builder/default/CwSingle.message-composer.ts +++ b/__output__/builder/default/CwSingle.message-composer.ts @@ -7,7 +7,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types"; export interface CwSingleMsg { contractAddress: string; @@ -20,24 +20,24 @@ export interface CwSingleMsg { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; vote: ({ proposalId, vote }: { proposalId: number; vote: Vote; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; execute: ({ proposalId }: { proposalId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; close: ({ proposalId }: { proposalId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateConfig: ({ allowRevoting, dao, @@ -54,27 +54,27 @@ export interface CwSingleMsg { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; addProposalHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; removeProposalHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; addVoteHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; removeVoteHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwSingleMsgComposer implements CwSingleMsg { sender: string; @@ -102,7 +102,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { propose: { description, @@ -116,7 +116,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -126,7 +126,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { }: { proposalId: number; vote: Vote; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { vote: { proposal_id: proposalId, @@ -139,7 +139,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -147,7 +147,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { proposalId }: { proposalId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { execute: { proposal_id: proposalId @@ -159,7 +159,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -167,7 +167,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { proposalId }: { proposalId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { close: { proposal_id: proposalId @@ -179,7 +179,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -199,7 +199,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_config: { allow_revoting: allowRevoting, @@ -217,7 +217,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -225,7 +225,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { add_proposal_hook: { address @@ -237,7 +237,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -245,7 +245,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { remove_proposal_hook: { address @@ -257,7 +257,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -265,7 +265,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { add_vote_hook: { address @@ -277,7 +277,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -285,7 +285,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { remove_vote_hook: { address @@ -297,7 +297,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/default/Factory.client.ts b/__output__/builder/default/Factory.client.ts index ae107e8a..348eee1d 100644 --- a/__output__/builder/default/Factory.client.ts +++ b/__output__/builder/default/Factory.client.ts @@ -114,43 +114,43 @@ export interface FactoryInterface extends FactoryReadOnlyInterface { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateProxyUser: ({ newUser, oldUser }: { newUser: Addr; oldUser: Addr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; migrateWallet: ({ migrationMsg, walletAddress }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateCodeId: ({ newCodeId, ty }: { newCodeId: number; ty: CodeIdType; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateWalletFee: ({ newFee }: { newFee: Coin; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateGovecAddr: ({ addr }: { addr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateAdmin: ({ addr }: { addr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class FactoryClient extends FactoryQueryClient implements FactoryInterface { client: SigningCosmWasmClient; @@ -175,12 +175,12 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { create_wallet: { create_wallet_msg: createWalletMsg } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateProxyUser = async ({ newUser, @@ -188,13 +188,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac }: { newUser: Addr; oldUser: Addr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_proxy_user: { new_user: newUser, old_user: oldUser } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; migrateWallet = async ({ migrationMsg, @@ -202,13 +202,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { migrate_wallet: { migration_msg: migrationMsg, wallet_address: walletAddress } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateCodeId = async ({ newCodeId, @@ -216,45 +216,45 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac }: { newCodeId: number; ty: CodeIdType; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_code_id: { new_code_id: newCodeId, ty } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateWalletFee = async ({ newFee }: { newFee: Coin; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_wallet_fee: { new_fee: newFee } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateGovecAddr = async ({ addr }: { addr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_govec_addr: { addr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateAdmin = async ({ addr }: { addr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_admin: { addr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/default/Factory.message-composer.ts b/__output__/builder/default/Factory.message-composer.ts index 14635942..578640f8 100644 --- a/__output__/builder/default/Factory.message-composer.ts +++ b/__output__/builder/default/Factory.message-composer.ts @@ -7,7 +7,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types"; export interface FactoryMsg { contractAddress: string; @@ -16,43 +16,43 @@ export interface FactoryMsg { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateProxyUser: ({ newUser, oldUser }: { newUser: Addr; oldUser: Addr; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; migrateWallet: ({ migrationMsg, walletAddress }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateCodeId: ({ newCodeId, ty }: { newCodeId: number; ty: CodeIdType; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateWalletFee: ({ newFee }: { newFee: Coin; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateGovecAddr: ({ addr }: { addr: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateAdmin: ({ addr }: { addr: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class FactoryMsgComposer implements FactoryMsg { sender: string; @@ -74,7 +74,7 @@ export class FactoryMsgComposer implements FactoryMsg { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { create_wallet: { create_wallet_msg: createWalletMsg @@ -86,7 +86,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -96,7 +96,7 @@ export class FactoryMsgComposer implements FactoryMsg { }: { newUser: Addr; oldUser: Addr; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_proxy_user: { new_user: newUser, @@ -109,7 +109,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -119,7 +119,7 @@ export class FactoryMsgComposer implements FactoryMsg { }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { migrate_wallet: { migration_msg: migrationMsg, @@ -132,7 +132,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -142,7 +142,7 @@ export class FactoryMsgComposer implements FactoryMsg { }: { newCodeId: number; ty: CodeIdType; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_code_id: { new_code_id: newCodeId, @@ -155,7 +155,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -163,7 +163,7 @@ export class FactoryMsgComposer implements FactoryMsg { newFee }: { newFee: Coin; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_wallet_fee: { new_fee: newFee @@ -175,7 +175,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -183,7 +183,7 @@ export class FactoryMsgComposer implements FactoryMsg { addr }: { addr: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_govec_addr: { addr @@ -195,7 +195,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -203,7 +203,7 @@ export class FactoryMsgComposer implements FactoryMsg { addr }: { addr: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_admin: { addr @@ -215,7 +215,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/default/Minter.client.ts b/__output__/builder/default/Minter.client.ts index c5aab35f..70335fad 100644 --- a/__output__/builder/default/Minter.client.ts +++ b/__output__/builder/default/Minter.client.ts @@ -68,31 +68,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface { export interface MinterInterface extends MinterReadOnlyInterface { contractAddress: string; sender: string; - mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; setWhitelist: ({ whitelist }: { whitelist: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updatePerAddressLimit: ({ perAddressLimit }: { perAddressLimit: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mintTo: ({ recipient }: { recipient: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mintFor: ({ recipient, tokenId }: { recipient: string; tokenId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class MinterClient extends MinterQueryClient implements MinterInterface { client: SigningCosmWasmClient; @@ -113,48 +113,48 @@ export class MinterClient extends MinterQueryClient implements MinterInterface { this.withdraw = this.withdraw.bind(this); } - mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; setWhitelist = async ({ whitelist }: { whitelist: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { set_whitelist: { whitelist } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_start_time: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updatePerAddressLimit = async ({ perAddressLimit }: { perAddressLimit: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_per_address_limit: { per_address_limit: perAddressLimit } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mintTo = async ({ recipient }: { recipient: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint_to: { recipient } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mintFor = async ({ recipient, @@ -162,17 +162,17 @@ export class MinterClient extends MinterQueryClient implements MinterInterface { }: { recipient: string; tokenId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint_for: { recipient, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { withdraw: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/default/Minter.message-composer.ts b/__output__/builder/default/Minter.message-composer.ts index 23ff03b4..fd536be0 100644 --- a/__output__/builder/default/Minter.message-composer.ts +++ b/__output__/builder/default/Minter.message-composer.ts @@ -7,36 +7,36 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types"; export interface MinterMsg { contractAddress: string; sender: string; - mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + mint: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; setWhitelist: ({ whitelist }: { whitelist: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - updateStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + updateStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; updatePerAddressLimit: ({ perAddressLimit }: { perAddressLimit: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; mintTo: ({ recipient }: { recipient: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; mintFor: ({ recipient, tokenId }: { recipient: string; tokenId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class MinterMsgComposer implements MinterMsg { sender: string; @@ -54,7 +54,7 @@ export class MinterMsgComposer implements MinterMsg { this.withdraw = this.withdraw.bind(this); } - mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + mint = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint: {} }; @@ -64,7 +64,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -72,7 +72,7 @@ export class MinterMsgComposer implements MinterMsg { whitelist }: { whitelist: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { set_whitelist: { whitelist @@ -84,11 +84,11 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - updateStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + updateStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_start_time: {} }; @@ -98,7 +98,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -106,7 +106,7 @@ export class MinterMsgComposer implements MinterMsg { perAddressLimit }: { perAddressLimit: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_per_address_limit: { per_address_limit: perAddressLimit @@ -118,7 +118,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -126,7 +126,7 @@ export class MinterMsgComposer implements MinterMsg { recipient }: { recipient: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint_to: { recipient @@ -138,7 +138,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -148,7 +148,7 @@ export class MinterMsgComposer implements MinterMsg { }: { recipient: string; tokenId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint_for: { recipient, @@ -161,11 +161,11 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { withdraw: {} }; @@ -175,7 +175,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/invoke/CwAdminFactory.client.ts b/__output__/builder/invoke/CwAdminFactory.client.ts index c4d441bf..8259b324 100644 --- a/__output__/builder/invoke/CwAdminFactory.client.ts +++ b/__output__/builder/invoke/CwAdminFactory.client.ts @@ -31,7 +31,7 @@ export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface codeId: number; instantiateMsg: Binary; label: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements CwAdminFactoryInterface { client: SigningCosmWasmClient; @@ -54,13 +54,13 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C codeId: number; instantiateMsg: Binary; label: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { instantiate_contract_with_self_admin: { code_id: codeId, instantiate_msg: instantiateMsg, label } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/invoke/CwCodeIdRegistry.client.ts b/__output__/builder/invoke/CwCodeIdRegistry.client.ts index 05e39c08..7f645095 100644 --- a/__output__/builder/invoke/CwCodeIdRegistry.client.ts +++ b/__output__/builder/invoke/CwCodeIdRegistry.client.ts @@ -109,7 +109,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter amount: Uint128; msg: Binary; sender: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; register: ({ chainId, checksum, @@ -122,7 +122,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter codeId: number; name: string; version: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; setOwner: ({ chainId, name, @@ -131,21 +131,21 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter chainId: string; name: string; owner?: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; unregister: ({ chainId, codeId }: { chainId: string; codeId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateConfig: ({ admin, paymentInfo }: { admin?: string; paymentInfo?: PaymentInfo; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implements CwCodeIdRegistryInterface { client: SigningCosmWasmClient; @@ -172,14 +172,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen amount: Uint128; msg: Binary; sender: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { receive: { amount, msg, sender } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; register = async ({ chainId, @@ -193,7 +193,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen codeId: number; name: string; version: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { register: { chain_id: chainId, @@ -202,7 +202,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen name, version } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; setOwner = async ({ chainId, @@ -212,14 +212,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen chainId: string; name: string; owner?: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { set_owner: { chain_id: chainId, name, owner } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; unregister = async ({ chainId, @@ -227,13 +227,13 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen }: { chainId: string; codeId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { unregister: { chain_id: chainId, code_id: codeId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateConfig = async ({ admin, @@ -241,12 +241,12 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen }: { admin?: string; paymentInfo?: PaymentInfo; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_config: { admin, payment_info: paymentInfo } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/invoke/CwSingle.client.ts b/__output__/builder/invoke/CwSingle.client.ts index 24366309..762d7722 100644 --- a/__output__/builder/invoke/CwSingle.client.ts +++ b/__output__/builder/invoke/CwSingle.client.ts @@ -176,24 +176,24 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; vote: ({ proposalId, vote }: { proposalId: number; vote: Vote; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; execute: ({ proposalId }: { proposalId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; close: ({ proposalId }: { proposalId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateConfig: ({ allowRevoting, dao, @@ -210,27 +210,27 @@ export interface CwSingleInterface extends CwSingleReadOnlyInterface { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addProposalHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeProposalHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addVoteHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeVoteHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwSingleClient extends CwSingleQueryClient implements CwSingleInterface { client: SigningCosmWasmClient; @@ -261,14 +261,14 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { propose: { description, msgs, title } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; vote = async ({ proposalId, @@ -276,35 +276,35 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter }: { proposalId: number; vote: Vote; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { vote: { proposal_id: proposalId, vote } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; execute = async ({ proposalId }: { proposalId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { execute: { proposal_id: proposalId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; close = async ({ proposalId }: { proposalId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { close: { proposal_id: proposalId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateConfig = async ({ allowRevoting, @@ -322,7 +322,7 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_config: { allow_revoting: allowRevoting, @@ -333,50 +333,50 @@ export class CwSingleClient extends CwSingleQueryClient implements CwSingleInter only_members_execute: onlyMembersExecute, threshold } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addProposalHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_proposal_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeProposalHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_proposal_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addVoteHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_vote_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeVoteHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_vote_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/invoke/Factory.client.ts b/__output__/builder/invoke/Factory.client.ts index ae107e8a..348eee1d 100644 --- a/__output__/builder/invoke/Factory.client.ts +++ b/__output__/builder/invoke/Factory.client.ts @@ -114,43 +114,43 @@ export interface FactoryInterface extends FactoryReadOnlyInterface { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateProxyUser: ({ newUser, oldUser }: { newUser: Addr; oldUser: Addr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; migrateWallet: ({ migrationMsg, walletAddress }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateCodeId: ({ newCodeId, ty }: { newCodeId: number; ty: CodeIdType; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateWalletFee: ({ newFee }: { newFee: Coin; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateGovecAddr: ({ addr }: { addr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateAdmin: ({ addr }: { addr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class FactoryClient extends FactoryQueryClient implements FactoryInterface { client: SigningCosmWasmClient; @@ -175,12 +175,12 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { create_wallet: { create_wallet_msg: createWalletMsg } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateProxyUser = async ({ newUser, @@ -188,13 +188,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac }: { newUser: Addr; oldUser: Addr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_proxy_user: { new_user: newUser, old_user: oldUser } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; migrateWallet = async ({ migrationMsg, @@ -202,13 +202,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { migrate_wallet: { migration_msg: migrationMsg, wallet_address: walletAddress } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateCodeId = async ({ newCodeId, @@ -216,45 +216,45 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac }: { newCodeId: number; ty: CodeIdType; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_code_id: { new_code_id: newCodeId, ty } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateWalletFee = async ({ newFee }: { newFee: Coin; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_wallet_fee: { new_fee: newFee } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateGovecAddr = async ({ addr }: { addr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_govec_addr: { addr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateAdmin = async ({ addr }: { addr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_admin: { addr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/invoke/Minter.client.ts b/__output__/builder/invoke/Minter.client.ts index c5aab35f..70335fad 100644 --- a/__output__/builder/invoke/Minter.client.ts +++ b/__output__/builder/invoke/Minter.client.ts @@ -68,31 +68,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface { export interface MinterInterface extends MinterReadOnlyInterface { contractAddress: string; sender: string; - mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; setWhitelist: ({ whitelist }: { whitelist: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updatePerAddressLimit: ({ perAddressLimit }: { perAddressLimit: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mintTo: ({ recipient }: { recipient: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mintFor: ({ recipient, tokenId }: { recipient: string; tokenId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class MinterClient extends MinterQueryClient implements MinterInterface { client: SigningCosmWasmClient; @@ -113,48 +113,48 @@ export class MinterClient extends MinterQueryClient implements MinterInterface { this.withdraw = this.withdraw.bind(this); } - mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; setWhitelist = async ({ whitelist }: { whitelist: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { set_whitelist: { whitelist } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_start_time: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updatePerAddressLimit = async ({ perAddressLimit }: { perAddressLimit: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_per_address_limit: { per_address_limit: perAddressLimit } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mintTo = async ({ recipient }: { recipient: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint_to: { recipient } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mintFor = async ({ recipient, @@ -162,17 +162,17 @@ export class MinterClient extends MinterQueryClient implements MinterInterface { }: { recipient: string; tokenId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint_for: { recipient, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { withdraw: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/no-extends/CwAdminFactory.client.ts b/__output__/builder/no-extends/CwAdminFactory.client.ts index b59f15e6..471ab4b6 100644 --- a/__output__/builder/no-extends/CwAdminFactory.client.ts +++ b/__output__/builder/no-extends/CwAdminFactory.client.ts @@ -31,7 +31,7 @@ export interface CwAdminFactoryInterface { codeId: number; instantiateMsg: Binary; label: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwAdminFactoryClient implements CwAdminFactoryInterface { client: SigningCosmWasmClient; @@ -53,13 +53,13 @@ export class CwAdminFactoryClient implements CwAdminFactoryInterface { codeId: number; instantiateMsg: Binary; label: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { instantiate_contract_with_self_admin: { code_id: codeId, instantiate_msg: instantiateMsg, label } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts index 4e79d534..0d4bdf03 100644 --- a/__output__/builder/no-extends/CwAdminFactory.message-composer.ts +++ b/__output__/builder/no-extends/CwAdminFactory.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types"; export interface CwAdminFactoryMsg { contractAddress: string; @@ -21,7 +21,7 @@ export interface CwAdminFactoryMsg { codeId: number; instantiateMsg: Binary; label: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg { sender: string; @@ -41,7 +41,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg { codeId: number; instantiateMsg: Binary; label: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { instantiate_contract_with_self_admin: { code_id: codeId, @@ -55,7 +55,7 @@ export class CwAdminFactoryMsgComposer implements CwAdminFactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts index 0feaf370..8bdc57ca 100644 --- a/__output__/builder/no-extends/CwCodeIdRegistry.client.ts +++ b/__output__/builder/no-extends/CwCodeIdRegistry.client.ts @@ -109,7 +109,7 @@ export interface CwCodeIdRegistryInterface { amount: Uint128; msg: Binary; sender: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; register: ({ chainId, checksum, @@ -122,7 +122,7 @@ export interface CwCodeIdRegistryInterface { codeId: number; name: string; version: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; setOwner: ({ chainId, name, @@ -131,21 +131,21 @@ export interface CwCodeIdRegistryInterface { chainId: string; name: string; owner?: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; unregister: ({ chainId, codeId }: { chainId: string; codeId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateConfig: ({ admin, paymentInfo }: { admin?: string; paymentInfo?: PaymentInfo; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { client: SigningCosmWasmClient; @@ -171,14 +171,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { amount: Uint128; msg: Binary; sender: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { receive: { amount, msg, sender } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; register = async ({ chainId, @@ -192,7 +192,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { codeId: number; name: string; version: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { register: { chain_id: chainId, @@ -201,7 +201,7 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { name, version } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; setOwner = async ({ chainId, @@ -211,14 +211,14 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { chainId: string; name: string; owner?: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { set_owner: { chain_id: chainId, name, owner } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; unregister = async ({ chainId, @@ -226,13 +226,13 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { }: { chainId: string; codeId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { unregister: { chain_id: chainId, code_id: codeId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateConfig = async ({ admin, @@ -240,12 +240,12 @@ export class CwCodeIdRegistryClient implements CwCodeIdRegistryInterface { }: { admin?: string; paymentInfo?: PaymentInfo; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_config: { admin, payment_info: paymentInfo } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts index d8f02b18..770499dd 100644 --- a/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts +++ b/__output__/builder/no-extends/CwCodeIdRegistry.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types"; export interface CwCodeIdRegistryMsg { contractAddress: string; @@ -21,7 +21,7 @@ export interface CwCodeIdRegistryMsg { amount: Uint128; msg: Binary; sender: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; register: ({ chainId, checksum, @@ -34,7 +34,7 @@ export interface CwCodeIdRegistryMsg { codeId: number; name: string; version: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; setOwner: ({ chainId, name, @@ -43,21 +43,21 @@ export interface CwCodeIdRegistryMsg { chainId: string; name: string; owner?: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; unregister: ({ chainId, codeId }: { chainId: string; codeId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateConfig: ({ admin, paymentInfo }: { admin?: string; paymentInfo?: PaymentInfo; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: string; @@ -81,7 +81,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { amount: Uint128; msg: Binary; sender: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { receive: { amount, @@ -95,7 +95,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -111,7 +111,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { codeId: number; name: string; version: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { register: { chain_id: chainId, @@ -127,7 +127,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -139,7 +139,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { chainId: string; name: string; owner?: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { set_owner: { chain_id: chainId, @@ -153,7 +153,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -163,7 +163,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { }: { chainId: string; codeId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { unregister: { chain_id: chainId, @@ -176,7 +176,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -186,7 +186,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { }: { admin?: string; paymentInfo?: PaymentInfo; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_config: { admin, @@ -199,7 +199,7 @@ export class CwCodeIdRegistryMsgComposer implements CwCodeIdRegistryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/no-extends/CwSingle.client.ts b/__output__/builder/no-extends/CwSingle.client.ts index ab08e73a..a595c03c 100644 --- a/__output__/builder/no-extends/CwSingle.client.ts +++ b/__output__/builder/no-extends/CwSingle.client.ts @@ -176,24 +176,24 @@ export interface CwSingleInterface { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; vote: ({ proposalId, vote }: { proposalId: number; vote: Vote; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; execute: ({ proposalId }: { proposalId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; close: ({ proposalId }: { proposalId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateConfig: ({ allowRevoting, dao, @@ -210,27 +210,27 @@ export interface CwSingleInterface { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addProposalHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeProposalHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addVoteHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeVoteHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwSingleClient implements CwSingleInterface { client: SigningCosmWasmClient; @@ -260,14 +260,14 @@ export class CwSingleClient implements CwSingleInterface { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { propose: { description, msgs, title } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; vote = async ({ proposalId, @@ -275,35 +275,35 @@ export class CwSingleClient implements CwSingleInterface { }: { proposalId: number; vote: Vote; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { vote: { proposal_id: proposalId, vote } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; execute = async ({ proposalId }: { proposalId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { execute: { proposal_id: proposalId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; close = async ({ proposalId }: { proposalId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { close: { proposal_id: proposalId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateConfig = async ({ allowRevoting, @@ -321,7 +321,7 @@ export class CwSingleClient implements CwSingleInterface { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_config: { allow_revoting: allowRevoting, @@ -332,50 +332,50 @@ export class CwSingleClient implements CwSingleInterface { only_members_execute: onlyMembersExecute, threshold } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addProposalHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_proposal_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeProposalHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_proposal_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addVoteHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_vote_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeVoteHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_vote_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/no-extends/CwSingle.message-composer.ts b/__output__/builder/no-extends/CwSingle.message-composer.ts index 8f7e310e..0c57b4a2 100644 --- a/__output__/builder/no-extends/CwSingle.message-composer.ts +++ b/__output__/builder/no-extends/CwSingle.message-composer.ts @@ -7,7 +7,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwSingle.types"; export interface CwSingleMsg { contractAddress: string; @@ -20,24 +20,24 @@ export interface CwSingleMsg { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; vote: ({ proposalId, vote }: { proposalId: number; vote: Vote; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; execute: ({ proposalId }: { proposalId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; close: ({ proposalId }: { proposalId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateConfig: ({ allowRevoting, dao, @@ -54,27 +54,27 @@ export interface CwSingleMsg { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; addProposalHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; removeProposalHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; addVoteHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; removeVoteHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwSingleMsgComposer implements CwSingleMsg { sender: string; @@ -102,7 +102,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { propose: { description, @@ -116,7 +116,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -126,7 +126,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { }: { proposalId: number; vote: Vote; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { vote: { proposal_id: proposalId, @@ -139,7 +139,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -147,7 +147,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { proposalId }: { proposalId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { execute: { proposal_id: proposalId @@ -159,7 +159,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -167,7 +167,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { proposalId }: { proposalId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { close: { proposal_id: proposalId @@ -179,7 +179,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -199,7 +199,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_config: { allow_revoting: allowRevoting, @@ -217,7 +217,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -225,7 +225,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { add_proposal_hook: { address @@ -237,7 +237,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -245,7 +245,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { remove_proposal_hook: { address @@ -257,7 +257,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -265,7 +265,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { add_vote_hook: { address @@ -277,7 +277,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -285,7 +285,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { remove_vote_hook: { address @@ -297,7 +297,7 @@ export class CwSingleMsgComposer implements CwSingleMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/no-extends/Factory.client.ts b/__output__/builder/no-extends/Factory.client.ts index ca2bb4d8..236e09e7 100644 --- a/__output__/builder/no-extends/Factory.client.ts +++ b/__output__/builder/no-extends/Factory.client.ts @@ -114,43 +114,43 @@ export interface FactoryInterface { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateProxyUser: ({ newUser, oldUser }: { newUser: Addr; oldUser: Addr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; migrateWallet: ({ migrationMsg, walletAddress }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateCodeId: ({ newCodeId, ty }: { newCodeId: number; ty: CodeIdType; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateWalletFee: ({ newFee }: { newFee: Coin; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateGovecAddr: ({ addr }: { addr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateAdmin: ({ addr }: { addr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class FactoryClient implements FactoryInterface { client: SigningCosmWasmClient; @@ -174,12 +174,12 @@ export class FactoryClient implements FactoryInterface { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { create_wallet: { create_wallet_msg: createWalletMsg } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateProxyUser = async ({ newUser, @@ -187,13 +187,13 @@ export class FactoryClient implements FactoryInterface { }: { newUser: Addr; oldUser: Addr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_proxy_user: { new_user: newUser, old_user: oldUser } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; migrateWallet = async ({ migrationMsg, @@ -201,13 +201,13 @@ export class FactoryClient implements FactoryInterface { }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { migrate_wallet: { migration_msg: migrationMsg, wallet_address: walletAddress } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateCodeId = async ({ newCodeId, @@ -215,45 +215,45 @@ export class FactoryClient implements FactoryInterface { }: { newCodeId: number; ty: CodeIdType; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_code_id: { new_code_id: newCodeId, ty } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateWalletFee = async ({ newFee }: { newFee: Coin; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_wallet_fee: { new_fee: newFee } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateGovecAddr = async ({ addr }: { addr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_govec_addr: { addr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateAdmin = async ({ addr }: { addr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_admin: { addr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/no-extends/Factory.message-composer.ts b/__output__/builder/no-extends/Factory.message-composer.ts index 14635942..578640f8 100644 --- a/__output__/builder/no-extends/Factory.message-composer.ts +++ b/__output__/builder/no-extends/Factory.message-composer.ts @@ -7,7 +7,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types"; export interface FactoryMsg { contractAddress: string; @@ -16,43 +16,43 @@ export interface FactoryMsg { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateProxyUser: ({ newUser, oldUser }: { newUser: Addr; oldUser: Addr; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; migrateWallet: ({ migrationMsg, walletAddress }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateCodeId: ({ newCodeId, ty }: { newCodeId: number; ty: CodeIdType; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateWalletFee: ({ newFee }: { newFee: Coin; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateGovecAddr: ({ addr }: { addr: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateAdmin: ({ addr }: { addr: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class FactoryMsgComposer implements FactoryMsg { sender: string; @@ -74,7 +74,7 @@ export class FactoryMsgComposer implements FactoryMsg { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { create_wallet: { create_wallet_msg: createWalletMsg @@ -86,7 +86,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -96,7 +96,7 @@ export class FactoryMsgComposer implements FactoryMsg { }: { newUser: Addr; oldUser: Addr; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_proxy_user: { new_user: newUser, @@ -109,7 +109,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -119,7 +119,7 @@ export class FactoryMsgComposer implements FactoryMsg { }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { migrate_wallet: { migration_msg: migrationMsg, @@ -132,7 +132,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -142,7 +142,7 @@ export class FactoryMsgComposer implements FactoryMsg { }: { newCodeId: number; ty: CodeIdType; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_code_id: { new_code_id: newCodeId, @@ -155,7 +155,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -163,7 +163,7 @@ export class FactoryMsgComposer implements FactoryMsg { newFee }: { newFee: Coin; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_wallet_fee: { new_fee: newFee @@ -175,7 +175,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -183,7 +183,7 @@ export class FactoryMsgComposer implements FactoryMsg { addr }: { addr: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_govec_addr: { addr @@ -195,7 +195,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -203,7 +203,7 @@ export class FactoryMsgComposer implements FactoryMsg { addr }: { addr: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_admin: { addr @@ -215,7 +215,7 @@ export class FactoryMsgComposer implements FactoryMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/builder/no-extends/Minter.client.ts b/__output__/builder/no-extends/Minter.client.ts index fb8794fc..7bb78380 100644 --- a/__output__/builder/no-extends/Minter.client.ts +++ b/__output__/builder/no-extends/Minter.client.ts @@ -68,31 +68,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface { export interface MinterInterface { contractAddress: string; sender: string; - mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; setWhitelist: ({ whitelist }: { whitelist: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updatePerAddressLimit: ({ perAddressLimit }: { perAddressLimit: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mintTo: ({ recipient }: { recipient: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mintFor: ({ recipient, tokenId }: { recipient: string; tokenId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class MinterClient implements MinterInterface { client: SigningCosmWasmClient; @@ -112,48 +112,48 @@ export class MinterClient implements MinterInterface { this.withdraw = this.withdraw.bind(this); } - mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; setWhitelist = async ({ whitelist }: { whitelist: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { set_whitelist: { whitelist } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_start_time: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updatePerAddressLimit = async ({ perAddressLimit }: { perAddressLimit: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_per_address_limit: { per_address_limit: perAddressLimit } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mintTo = async ({ recipient }: { recipient: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint_to: { recipient } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mintFor = async ({ recipient, @@ -161,17 +161,17 @@ export class MinterClient implements MinterInterface { }: { recipient: string; tokenId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint_for: { recipient, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { withdraw: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/builder/no-extends/Minter.message-composer.ts b/__output__/builder/no-extends/Minter.message-composer.ts index 23ff03b4..fd536be0 100644 --- a/__output__/builder/no-extends/Minter.message-composer.ts +++ b/__output__/builder/no-extends/Minter.message-composer.ts @@ -7,36 +7,36 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types"; export interface MinterMsg { contractAddress: string; sender: string; - mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + mint: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; setWhitelist: ({ whitelist }: { whitelist: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - updateStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + updateStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; updatePerAddressLimit: ({ perAddressLimit }: { perAddressLimit: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; mintTo: ({ recipient }: { recipient: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; mintFor: ({ recipient, tokenId }: { recipient: string; tokenId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class MinterMsgComposer implements MinterMsg { sender: string; @@ -54,7 +54,7 @@ export class MinterMsgComposer implements MinterMsg { this.withdraw = this.withdraw.bind(this); } - mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + mint = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint: {} }; @@ -64,7 +64,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -72,7 +72,7 @@ export class MinterMsgComposer implements MinterMsg { whitelist }: { whitelist: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { set_whitelist: { whitelist @@ -84,11 +84,11 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - updateStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + updateStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_start_time: {} }; @@ -98,7 +98,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -106,7 +106,7 @@ export class MinterMsgComposer implements MinterMsg { perAddressLimit }: { perAddressLimit: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_per_address_limit: { per_address_limit: perAddressLimit @@ -118,7 +118,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -126,7 +126,7 @@ export class MinterMsgComposer implements MinterMsg { recipient }: { recipient: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint_to: { recipient @@ -138,7 +138,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -148,7 +148,7 @@ export class MinterMsgComposer implements MinterMsg { }: { recipient: string; tokenId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint_for: { recipient, @@ -161,11 +161,11 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { withdraw: {} }; @@ -175,7 +175,7 @@ export class MinterMsgComposer implements MinterMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts index c4d441bf..8259b324 100644 --- a/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts +++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.client.ts @@ -31,7 +31,7 @@ export interface CwAdminFactoryInterface extends CwAdminFactoryReadOnlyInterface codeId: number; instantiateMsg: Binary; label: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements CwAdminFactoryInterface { client: SigningCosmWasmClient; @@ -54,13 +54,13 @@ export class CwAdminFactoryClient extends CwAdminFactoryQueryClient implements C codeId: number; instantiateMsg: Binary; label: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { instantiate_contract_with_self_admin: { code_id: codeId, instantiate_msg: instantiateMsg, label } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts index dbacbe33..a67021b4 100644 --- a/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts +++ b/__output__/daodao/cw-admin-factory/CwAdminFactory.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { ExecuteMsg, Binary, InstantiateMsg, QueryMsg } from "./CwAdminFactory.types"; export interface CwAdminFactoryMessage { contractAddress: string; @@ -21,7 +21,7 @@ export interface CwAdminFactoryMessage { codeId: number; instantiateMsg: Binary; label: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage { sender: string; @@ -41,7 +41,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage { codeId: number; instantiateMsg: Binary; label: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { instantiate_contract_with_self_admin: { code_id: codeId, @@ -55,7 +55,7 @@ export class CwAdminFactoryMessageComposer implements CwAdminFactoryMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts index 05e39c08..7f645095 100644 --- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts +++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.client.ts @@ -109,7 +109,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter amount: Uint128; msg: Binary; sender: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; register: ({ chainId, checksum, @@ -122,7 +122,7 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter codeId: number; name: string; version: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; setOwner: ({ chainId, name, @@ -131,21 +131,21 @@ export interface CwCodeIdRegistryInterface extends CwCodeIdRegistryReadOnlyInter chainId: string; name: string; owner?: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; unregister: ({ chainId, codeId }: { chainId: string; codeId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateConfig: ({ admin, paymentInfo }: { admin?: string; paymentInfo?: PaymentInfo; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implements CwCodeIdRegistryInterface { client: SigningCosmWasmClient; @@ -172,14 +172,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen amount: Uint128; msg: Binary; sender: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { receive: { amount, msg, sender } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; register = async ({ chainId, @@ -193,7 +193,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen codeId: number; name: string; version: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { register: { chain_id: chainId, @@ -202,7 +202,7 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen name, version } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; setOwner = async ({ chainId, @@ -212,14 +212,14 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen chainId: string; name: string; owner?: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { set_owner: { chain_id: chainId, name, owner } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; unregister = async ({ chainId, @@ -227,13 +227,13 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen }: { chainId: string; codeId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { unregister: { chain_id: chainId, code_id: codeId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateConfig = async ({ admin, @@ -241,12 +241,12 @@ export class CwCodeIdRegistryClient extends CwCodeIdRegistryQueryClient implemen }: { admin?: string; paymentInfo?: PaymentInfo; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_config: { admin, payment_info: paymentInfo } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts index f2cc5691..02b28b44 100644 --- a/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts +++ b/__output__/daodao/cw-code-id-registry/CwCodeIdRegistry.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Addr, PaymentInfo, Uint128, ConfigResponse, ExecuteMsg, Binary, Cw20ReceiveMsg, GetRegistrationResponse, Registration, InfoForCodeIdResponse, InstantiateMsg, ListRegistrationsResponse, QueryMsg, ReceiveMsg } from "./CwCodeIdRegistry.types"; export interface CwCodeIdRegistryMessage { contractAddress: string; @@ -21,7 +21,7 @@ export interface CwCodeIdRegistryMessage { amount: Uint128; msg: Binary; sender: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; register: ({ chainId, checksum, @@ -34,7 +34,7 @@ export interface CwCodeIdRegistryMessage { codeId: number; name: string; version: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; setOwner: ({ chainId, name, @@ -43,21 +43,21 @@ export interface CwCodeIdRegistryMessage { chainId: string; name: string; owner?: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; unregister: ({ chainId, codeId }: { chainId: string; codeId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateConfig: ({ admin, paymentInfo }: { admin?: string; paymentInfo?: PaymentInfo; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage { sender: string; @@ -81,7 +81,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage amount: Uint128; msg: Binary; sender: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { receive: { amount, @@ -95,7 +95,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -111,7 +111,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage codeId: number; name: string; version: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { register: { chain_id: chainId, @@ -127,7 +127,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -139,7 +139,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage chainId: string; name: string; owner?: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { set_owner: { chain_id: chainId, @@ -153,7 +153,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -163,7 +163,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage }: { chainId: string; codeId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { unregister: { chain_id: chainId, @@ -176,7 +176,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -186,7 +186,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage }: { admin?: string; paymentInfo?: PaymentInfo; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_config: { admin, @@ -199,7 +199,7 @@ export class CwCodeIdRegistryMessageComposer implements CwCodeIdRegistryMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts index 3339300b..7d967cfd 100644 --- a/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts +++ b/__output__/daodao/cw-named-groups/CwNamedGroups.client.ts @@ -114,17 +114,17 @@ export interface CwNamedGroupsInterface extends CwNamedGroupsReadOnlyInterface { addressesToAdd?: string[]; addressesToRemove?: string[]; group: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeGroup: ({ group }: { group: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateOwner: ({ owner }: { owner: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwNamedGroupsInterface { client: SigningCosmWasmClient; @@ -149,35 +149,35 @@ export class CwNamedGroupsClient extends CwNamedGroupsQueryClient implements CwN addressesToAdd?: string[]; addressesToRemove?: string[]; group: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update: { addresses_to_add: addressesToAdd, addresses_to_remove: addressesToRemove, group } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeGroup = async ({ group }: { group: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_group: { group } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateOwner = async ({ owner }: { owner: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_owner: { owner } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts index 855cf7ad..d889994d 100644 --- a/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts +++ b/__output__/daodao/cw-named-groups/CwNamedGroups.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { DumpResponse, Group, ExecuteMsg, InstantiateMsg, Addr, ListAddressesResponse, ListGroupsResponse, QueryMsg } from "./CwNamedGroups.types"; export interface CwNamedGroupsMessage { contractAddress: string; @@ -21,17 +21,17 @@ export interface CwNamedGroupsMessage { addressesToAdd?: string[]; addressesToRemove?: string[]; group: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; removeGroup: ({ group }: { group: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateOwner: ({ owner }: { owner: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage { sender: string; @@ -53,7 +53,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage { addressesToAdd?: string[]; addressesToRemove?: string[]; group: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update: { addresses_to_add: addressesToAdd, @@ -67,7 +67,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -75,7 +75,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage { group }: { group: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { remove_group: { group @@ -87,7 +87,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -95,7 +95,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage { owner }: { owner: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_owner: { owner @@ -107,7 +107,7 @@ export class CwNamedGroupsMessageComposer implements CwNamedGroupsMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts index 56c760c9..ce315d4e 100644 --- a/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts +++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.client.ts @@ -176,24 +176,24 @@ export interface CwProposalSingleInterface extends CwProposalSingleReadOnlyInter description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; vote: ({ proposalId, vote }: { proposalId: number; vote: Vote; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; execute: ({ proposalId }: { proposalId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; close: ({ proposalId }: { proposalId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateConfig: ({ allowRevoting, dao, @@ -210,27 +210,27 @@ export interface CwProposalSingleInterface extends CwProposalSingleReadOnlyInter minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addProposalHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeProposalHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addVoteHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeVoteHook: ({ address }: { address: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CwProposalSingleClient extends CwProposalSingleQueryClient implements CwProposalSingleInterface { client: SigningCosmWasmClient; @@ -261,14 +261,14 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { propose: { description, msgs, title } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; vote = async ({ proposalId, @@ -276,35 +276,35 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen }: { proposalId: number; vote: Vote; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { vote: { proposal_id: proposalId, vote } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; execute = async ({ proposalId }: { proposalId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { execute: { proposal_id: proposalId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; close = async ({ proposalId }: { proposalId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { close: { proposal_id: proposalId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateConfig = async ({ allowRevoting, @@ -322,7 +322,7 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_config: { allow_revoting: allowRevoting, @@ -333,50 +333,50 @@ export class CwProposalSingleClient extends CwProposalSingleQueryClient implemen only_members_execute: onlyMembersExecute, threshold } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addProposalHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_proposal_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeProposalHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_proposal_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addVoteHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_vote_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeVoteHook = async ({ address }: { address: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_vote_hook: { address } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts index d587ca36..642757d4 100644 --- a/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts +++ b/__output__/daodao/cw-proposal-single/CwProposalSingle.message-composer.ts @@ -7,7 +7,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Addr, Uint128, Duration, Threshold, PercentageThreshold, Decimal, ConfigResponse, CheckedDepositInfo, ExecuteMsg, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, Timestamp, Uint64, WasmMsg, GovMsg, VoteOption, Vote, DepositToken, Coin, Empty, IbcTimeout, IbcTimeoutBlock, DepositInfo, GovernanceModulesResponse, InfoResponse, ContractVersion, InstantiateMsg, Expiration, Status, ListProposalsResponse, ProposalResponse, Proposal, Votes, ListVotesResponse, VoteInfo, MigrateMsg, ProposalCountResponse, ProposalHooksResponse, QueryMsg, ReverseProposalsResponse, VoteHooksResponse, VoteResponse } from "./CwProposalSingle.types"; export interface CwProposalSingleMessage { contractAddress: string; @@ -20,24 +20,24 @@ export interface CwProposalSingleMessage { description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; vote: ({ proposalId, vote }: { proposalId: number; vote: Vote; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; execute: ({ proposalId }: { proposalId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; close: ({ proposalId }: { proposalId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateConfig: ({ allowRevoting, dao, @@ -54,27 +54,27 @@ export interface CwProposalSingleMessage { minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; addProposalHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; removeProposalHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; addVoteHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; removeVoteHook: ({ address }: { address: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CwProposalSingleMessageComposer implements CwProposalSingleMessage { sender: string; @@ -102,7 +102,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage description: string; msgs: CosmosMsgForEmpty[]; title: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { propose: { description, @@ -116,7 +116,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -126,7 +126,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage }: { proposalId: number; vote: Vote; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { vote: { proposal_id: proposalId, @@ -139,7 +139,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -147,7 +147,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage proposalId }: { proposalId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { execute: { proposal_id: proposalId @@ -159,7 +159,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -167,7 +167,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage proposalId }: { proposalId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { close: { proposal_id: proposalId @@ -179,7 +179,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -199,7 +199,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage minVotingPeriod?: Duration; onlyMembersExecute: boolean; threshold: Threshold; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_config: { allow_revoting: allowRevoting, @@ -217,7 +217,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -225,7 +225,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { add_proposal_hook: { address @@ -237,7 +237,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -245,7 +245,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { remove_proposal_hook: { address @@ -257,7 +257,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -265,7 +265,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { add_vote_hook: { address @@ -277,7 +277,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -285,7 +285,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage address }: { address: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { remove_vote_hook: { address @@ -297,7 +297,7 @@ export class CwProposalSingleMessageComposer implements CwProposalSingleMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/idl-version/accounts-nft/AccountsNft.client.ts b/__output__/idl-version/accounts-nft/AccountsNft.client.ts index ca6c94fc..29988044 100644 --- a/__output__/idl-version/accounts-nft/AccountsNft.client.ts +++ b/__output__/idl-version/accounts-nft/AccountsNft.client.ts @@ -297,20 +297,20 @@ export interface AccountsNftInterface extends AccountsNftReadOnlyInterface { newOwner }: { newOwner: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - acceptOwnership: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + acceptOwnership: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mint: ({ user }: { user: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; transferNft: ({ recipient, tokenId }: { recipient: string; tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; sendNft: ({ contract, msg, @@ -319,7 +319,7 @@ export interface AccountsNftInterface extends AccountsNftReadOnlyInterface { contract: string; msg: Binary; tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; approve: ({ expires, spender, @@ -328,31 +328,31 @@ export interface AccountsNftInterface extends AccountsNftReadOnlyInterface { expires?: Expiration; spender: string; tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; revoke: ({ spender, tokenId }: { spender: string; tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; approveAll: ({ expires, operator }: { expires?: Expiration; operator: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; revokeAll: ({ operator }: { operator: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; burn: ({ tokenId }: { tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class AccountsNftClient extends AccountsNftQueryClient implements AccountsNftInterface { client: SigningCosmWasmClient; @@ -380,28 +380,28 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account newOwner }: { newOwner: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { propose_new_owner: { new_owner: newOwner } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - acceptOwnership = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + acceptOwnership = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { accept_ownership: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mint = async ({ user }: { user: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint: { user } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; transferNft = async ({ recipient, @@ -409,13 +409,13 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account }: { recipient: string; tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { transfer_nft: { recipient, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; sendNft = async ({ contract, @@ -425,14 +425,14 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account contract: string; msg: Binary; tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { send_nft: { contract, msg, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; approve = async ({ expires, @@ -442,14 +442,14 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account expires?: Expiration; spender: string; tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { approve: { expires, spender, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; revoke = async ({ spender, @@ -457,13 +457,13 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account }: { spender: string; tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { revoke: { spender, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; approveAll = async ({ expires, @@ -471,34 +471,34 @@ export class AccountsNftClient extends AccountsNftQueryClient implements Account }: { expires?: Expiration; operator: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { approve_all: { expires, operator } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; revokeAll = async ({ operator }: { operator: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { revoke_all: { operator } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; burn = async ({ tokenId }: { tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { burn: { token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts index 9d6afe53..7b1ef4ff 100644 --- a/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts +++ b/__output__/idl-version/accounts-nft/AccountsNft.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { InstantiateMsg, ExecuteMsg, Binary, Expiration, Timestamp, Uint64, QueryMsg, VaultBaseForString, Uint128, ArrayOfSharesResponseItem, SharesResponseItem, AllNftInfoResponseForEmpty, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, OperatorsResponse, String, TokensResponse, ArrayOfVaultBaseForString, ApprovalResponse, ApprovalsResponse, ContractInfoResponse, MinterResponse, NumTokensResponse } from "./AccountsNft.types"; export interface AccountsNftMessage { contractAddress: string; @@ -17,20 +17,20 @@ export interface AccountsNftMessage { newOwner }: { newOwner: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - acceptOwnership: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + acceptOwnership: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; mint: ({ user }: { user: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; transferNft: ({ recipient, tokenId }: { recipient: string; tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; sendNft: ({ contract, msg, @@ -39,7 +39,7 @@ export interface AccountsNftMessage { contract: string; msg: Binary; tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; approve: ({ expires, spender, @@ -48,31 +48,31 @@ export interface AccountsNftMessage { expires?: Expiration; spender: string; tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; revoke: ({ spender, tokenId }: { spender: string; tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; approveAll: ({ expires, operator }: { expires?: Expiration; operator: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; revokeAll: ({ operator }: { operator: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; burn: ({ tokenId }: { tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class AccountsNftMessageComposer implements AccountsNftMessage { sender: string; @@ -97,7 +97,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { newOwner }: { newOwner: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { propose_new_owner: { new_owner: newOwner @@ -109,11 +109,11 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - acceptOwnership = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + acceptOwnership = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { accept_ownership: {} }; @@ -123,7 +123,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -131,7 +131,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { user }: { user: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint: { user @@ -143,7 +143,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -153,7 +153,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { }: { recipient: string; tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { transfer_nft: { recipient, @@ -166,7 +166,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -178,7 +178,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { contract: string; msg: Binary; tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { send_nft: { contract, @@ -192,7 +192,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -204,7 +204,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { expires?: Expiration; spender: string; tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { approve: { expires, @@ -218,7 +218,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -228,7 +228,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { }: { spender: string; tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { revoke: { spender, @@ -241,7 +241,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -251,7 +251,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { }: { expires?: Expiration; operator: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { approve_all: { expires, @@ -264,7 +264,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -272,7 +272,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { operator }: { operator: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { revoke_all: { operator @@ -284,7 +284,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -292,7 +292,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { tokenId }: { tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { burn: { token_id: tokenId @@ -304,7 +304,7 @@ export class AccountsNftMessageComposer implements AccountsNftMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts index aaa4be29..ac96e706 100644 --- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts +++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.client.ts @@ -189,24 +189,24 @@ export interface Cw3FixedMultiSigInterface extends Cw3FixedMultiSigReadOnlyInter latest?: Expiration; msgs: CosmosMsgForEmpty[]; title: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; vote: ({ proposalId, vote }: { proposalId: number; vote: Vote; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; execute: ({ proposalId }: { proposalId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; close: ({ proposalId }: { proposalId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implements Cw3FixedMultiSigInterface { client: SigningCosmWasmClient; @@ -234,7 +234,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen latest?: Expiration; msgs: CosmosMsgForEmpty[]; title: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { propose: { description, @@ -242,7 +242,7 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen msgs, title } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; vote = async ({ proposalId, @@ -250,34 +250,34 @@ export class Cw3FixedMultiSigClient extends Cw3FixedMultiSigQueryClient implemen }: { proposalId: number; vote: Vote; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { vote: { proposal_id: proposalId, vote } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; execute = async ({ proposalId }: { proposalId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { execute: { proposal_id: proposalId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; close = async ({ proposalId }: { proposalId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { close: { proposal_id: proposalId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts index e03d9c30..e99f2b24 100644 --- a/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts +++ b/__output__/idl-version/cw3-fixed-multisig/Cw3FixedMultiSig.message-composer.ts @@ -7,7 +7,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Duration, Threshold, Decimal, InstantiateMsg, Voter, ExecuteMsg, Expiration, Timestamp, Uint64, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Vote, Coin, Empty, QueryMsg, Status, ThresholdResponse, ProposalListResponse, ProposalResponseForEmpty, VoterListResponse, VoterDetail, VoteListResponse, VoteInfo, VoteResponse, VoterResponse } from "./Cw3FixedMultiSig.types"; export interface Cw3FixedMultiSigMessage { contractAddress: string; @@ -22,24 +22,24 @@ export interface Cw3FixedMultiSigMessage { latest?: Expiration; msgs: CosmosMsgForEmpty[]; title: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; vote: ({ proposalId, vote }: { proposalId: number; vote: Vote; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; execute: ({ proposalId }: { proposalId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; close: ({ proposalId }: { proposalId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage { sender: string; @@ -64,7 +64,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage latest?: Expiration; msgs: CosmosMsgForEmpty[]; title: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { propose: { description, @@ -79,7 +79,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -89,7 +89,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage }: { proposalId: number; vote: Vote; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { vote: { proposal_id: proposalId, @@ -102,7 +102,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -110,7 +110,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage proposalId }: { proposalId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { execute: { proposal_id: proposalId @@ -122,7 +122,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -130,7 +130,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage proposalId }: { proposalId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { close: { proposal_id: proposalId @@ -142,7 +142,7 @@ export class Cw3FixedMultiSigMessageComposer implements Cw3FixedMultiSigMessage sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/idl-version/cw4-group/Cw4Group.client.ts b/__output__/idl-version/cw4-group/Cw4Group.client.ts index 1754e255..332e1e7d 100644 --- a/__output__/idl-version/cw4-group/Cw4Group.client.ts +++ b/__output__/idl-version/cw4-group/Cw4Group.client.ts @@ -92,24 +92,24 @@ export interface Cw4GroupInterface extends Cw4GroupReadOnlyInterface { admin }: { admin?: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateMembers: ({ add, remove }: { add: Member[]; remove: string[]; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addHook: ({ addr }: { addr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeHook: ({ addr }: { addr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInterface { client: SigningCosmWasmClient; @@ -131,12 +131,12 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter admin }: { admin?: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_admin: { admin } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateMembers = async ({ add, @@ -144,34 +144,34 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter }: { add: Member[]; remove: string[]; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_members: { add, remove } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addHook = async ({ addr }: { addr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_hook: { addr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeHook = async ({ addr }: { addr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_hook: { addr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts index 4f5d98c8..cbc6fee9 100644 --- a/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts +++ b/__output__/idl-version/cw4-group/Cw4Group.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, AdminResponse, HooksResponse, MemberListResponse, MemberResponse, TotalWeightResponse } from "./Cw4Group.types"; export interface Cw4GroupMessage { contractAddress: string; @@ -17,24 +17,24 @@ export interface Cw4GroupMessage { admin }: { admin?: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateMembers: ({ add, remove }: { add: Member[]; remove: string[]; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; addHook: ({ addr }: { addr: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; removeHook: ({ addr }: { addr: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class Cw4GroupMessageComposer implements Cw4GroupMessage { sender: string; @@ -53,7 +53,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage { admin }: { admin?: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_admin: { admin @@ -65,7 +65,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -75,7 +75,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage { }: { add: Member[]; remove: string[]; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_members: { add, @@ -88,7 +88,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -96,7 +96,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage { addr }: { addr: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { add_hook: { addr @@ -108,7 +108,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -116,7 +116,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage { addr }: { addr: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { remove_hook: { addr @@ -128,7 +128,7 @@ export class Cw4GroupMessageComposer implements Cw4GroupMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/idl-version/cyberpunk/CyberPunk.client.ts b/__output__/idl-version/cyberpunk/CyberPunk.client.ts index e4fcd7f7..40d40a4a 100644 --- a/__output__/idl-version/cyberpunk/CyberPunk.client.ts +++ b/__output__/idl-version/cyberpunk/CyberPunk.client.ts @@ -36,8 +36,8 @@ export interface CyberPunkInterface extends CyberPunkReadOnlyInterface { }: { memCost: number; timeCost: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - mirrorEnv: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + mirrorEnv: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkInterface { client: SigningCosmWasmClient; @@ -59,17 +59,17 @@ export class CyberPunkClient extends CyberPunkQueryClient implements CyberPunkIn }: { memCost: number; timeCost: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { argon2: { mem_cost: memCost, time_cost: timeCost } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - mirrorEnv = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + mirrorEnv = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mirror_env: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts index ecf67a6d..23214278 100644 --- a/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts +++ b/__output__/idl-version/cyberpunk/CyberPunk.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { InstantiateMsg, ExecuteMsg, QueryMsg, Timestamp, Uint64, Addr, Env, BlockInfo, ContractInfo, TransactionInfo } from "./CyberPunk.types"; export interface CyberPunkMessage { contractAddress: string; @@ -19,8 +19,8 @@ export interface CyberPunkMessage { }: { memCost: number; timeCost: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - mirrorEnv: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + mirrorEnv: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class CyberPunkMessageComposer implements CyberPunkMessage { sender: string; @@ -39,7 +39,7 @@ export class CyberPunkMessageComposer implements CyberPunkMessage { }: { memCost: number; timeCost: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { argon2: { mem_cost: memCost, @@ -52,11 +52,11 @@ export class CyberPunkMessageComposer implements CyberPunkMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - mirrorEnv = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + mirrorEnv = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mirror_env: {} }; @@ -66,7 +66,7 @@ export class CyberPunkMessageComposer implements CyberPunkMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/idl-version/hackatom/HackAtom.client.ts b/__output__/idl-version/hackatom/HackAtom.client.ts index 2e4b43c8..ac055bca 100644 --- a/__output__/idl-version/hackatom/HackAtom.client.ts +++ b/__output__/idl-version/hackatom/HackAtom.client.ts @@ -76,18 +76,18 @@ export class HackAtomQueryClient implements HackAtomReadOnlyInterface { export interface HackAtomInterface extends HackAtomReadOnlyInterface { contractAddress: string; sender: string; - release: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - cpuLoop: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - storageLoop: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - memoryLoop: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - messageLoop: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + release: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + cpuLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + storageLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + memoryLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + messageLoop: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; allocateLargeMemory: ({ pages }: { pages: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - panic: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - userErrorsInApiCalls: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + panic: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + userErrorsInApiCalls: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class HackAtomClient extends HackAtomQueryClient implements HackAtomInterface { client: SigningCosmWasmClient; @@ -109,50 +109,50 @@ export class HackAtomClient extends HackAtomQueryClient implements HackAtomInter this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this); } - release = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + release = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { release: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - cpuLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + cpuLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { cpu_loop: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - storageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + storageLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { storage_loop: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - memoryLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + memoryLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { memory_loop: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - messageLoop = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + messageLoop = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { message_loop: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; allocateLargeMemory = async ({ pages }: { pages: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { allocate_large_memory: { pages } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - panic = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + panic = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { panic: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - userErrorsInApiCalls = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + userErrorsInApiCalls = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { user_errors_in_api_calls: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/idl-version/hackatom/HackAtom.message-composer.ts b/__output__/idl-version/hackatom/HackAtom.message-composer.ts index e4d88d36..b71c9567 100644 --- a/__output__/idl-version/hackatom/HackAtom.message-composer.ts +++ b/__output__/idl-version/hackatom/HackAtom.message-composer.ts @@ -7,23 +7,23 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, SudoMsg, Uint128, Coin, IntResponse, AllBalanceResponse, Binary, RecurseResponse, VerifierResponse } from "./HackAtom.types"; export interface HackAtomMessage { contractAddress: string; sender: string; - release: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; - cpuLoop: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; - storageLoop: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; - memoryLoop: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; - messageLoop: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + release: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; + cpuLoop: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; + storageLoop: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; + memoryLoop: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; + messageLoop: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; allocateLargeMemory: ({ pages }: { pages: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - panic: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; - userErrorsInApiCalls: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + panic: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; + userErrorsInApiCalls: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class HackAtomMessageComposer implements HackAtomMessage { sender: string; @@ -42,7 +42,7 @@ export class HackAtomMessageComposer implements HackAtomMessage { this.userErrorsInApiCalls = this.userErrorsInApiCalls.bind(this); } - release = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + release = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { release: {} }; @@ -52,11 +52,11 @@ export class HackAtomMessageComposer implements HackAtomMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - cpuLoop = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + cpuLoop = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { cpu_loop: {} }; @@ -66,11 +66,11 @@ export class HackAtomMessageComposer implements HackAtomMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - storageLoop = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + storageLoop = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { storage_loop: {} }; @@ -80,11 +80,11 @@ export class HackAtomMessageComposer implements HackAtomMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - memoryLoop = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + memoryLoop = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { memory_loop: {} }; @@ -94,11 +94,11 @@ export class HackAtomMessageComposer implements HackAtomMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - messageLoop = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + messageLoop = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { message_loop: {} }; @@ -108,7 +108,7 @@ export class HackAtomMessageComposer implements HackAtomMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -116,7 +116,7 @@ export class HackAtomMessageComposer implements HackAtomMessage { pages }: { pages: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { allocate_large_memory: { pages @@ -128,11 +128,11 @@ export class HackAtomMessageComposer implements HackAtomMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - panic = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + panic = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { panic: {} }; @@ -142,11 +142,11 @@ export class HackAtomMessageComposer implements HackAtomMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - userErrorsInApiCalls = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + userErrorsInApiCalls = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { user_errors_in_api_calls: {} }; @@ -156,7 +156,7 @@ export class HackAtomMessageComposer implements HackAtomMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/minter/Minter.client.ts b/__output__/minter/Minter.client.ts index c5aab35f..70335fad 100644 --- a/__output__/minter/Minter.client.ts +++ b/__output__/minter/Minter.client.ts @@ -68,31 +68,31 @@ export class MinterQueryClient implements MinterReadOnlyInterface { export interface MinterInterface extends MinterReadOnlyInterface { contractAddress: string; sender: string; - mint: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + mint: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; setWhitelist: ({ whitelist }: { whitelist: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - updateStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + updateStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updatePerAddressLimit: ({ perAddressLimit }: { perAddressLimit: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mintTo: ({ recipient }: { recipient: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mintFor: ({ recipient, tokenId }: { recipient: string; tokenId: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - withdraw: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + withdraw: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class MinterClient extends MinterQueryClient implements MinterInterface { client: SigningCosmWasmClient; @@ -113,48 +113,48 @@ export class MinterClient extends MinterQueryClient implements MinterInterface { this.withdraw = this.withdraw.bind(this); } - mint = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + mint = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; setWhitelist = async ({ whitelist }: { whitelist: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { set_whitelist: { whitelist } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - updateStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + updateStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_start_time: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updatePerAddressLimit = async ({ perAddressLimit }: { perAddressLimit: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_per_address_limit: { per_address_limit: perAddressLimit } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mintTo = async ({ recipient }: { recipient: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint_to: { recipient } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mintFor = async ({ recipient, @@ -162,17 +162,17 @@ export class MinterClient extends MinterQueryClient implements MinterInterface { }: { recipient: string; tokenId: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint_for: { recipient, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - withdraw = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + withdraw = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { withdraw: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/minter/Minter.message-composer.ts b/__output__/minter/Minter.message-composer.ts index 483a02b3..8b32581f 100644 --- a/__output__/minter/Minter.message-composer.ts +++ b/__output__/minter/Minter.message-composer.ts @@ -7,36 +7,36 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Timestamp, Uint64, Uint128, ConfigResponse, Coin, Addr, Config, ExecuteMsg, Decimal, InstantiateMsg, InstantiateMsg1, CollectionInfoForRoyaltyInfoResponse, RoyaltyInfoResponse, QueryMsg } from "./Minter.types"; export interface MinterMessage { contractAddress: string; sender: string; - mint: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + mint: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; setWhitelist: ({ whitelist }: { whitelist: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - updateStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + updateStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; updatePerAddressLimit: ({ perAddressLimit }: { perAddressLimit: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; mintTo: ({ recipient }: { recipient: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; mintFor: ({ recipient, tokenId }: { recipient: string; tokenId: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - withdraw: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + withdraw: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class MinterMessageComposer implements MinterMessage { sender: string; @@ -54,7 +54,7 @@ export class MinterMessageComposer implements MinterMessage { this.withdraw = this.withdraw.bind(this); } - mint = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + mint = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint: {} }; @@ -64,7 +64,7 @@ export class MinterMessageComposer implements MinterMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -72,7 +72,7 @@ export class MinterMessageComposer implements MinterMessage { whitelist }: { whitelist: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { set_whitelist: { whitelist @@ -84,11 +84,11 @@ export class MinterMessageComposer implements MinterMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - updateStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + updateStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_start_time: {} }; @@ -98,7 +98,7 @@ export class MinterMessageComposer implements MinterMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -106,7 +106,7 @@ export class MinterMessageComposer implements MinterMessage { perAddressLimit }: { perAddressLimit: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_per_address_limit: { per_address_limit: perAddressLimit @@ -118,7 +118,7 @@ export class MinterMessageComposer implements MinterMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -126,7 +126,7 @@ export class MinterMessageComposer implements MinterMessage { recipient }: { recipient: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint_to: { recipient @@ -138,7 +138,7 @@ export class MinterMessageComposer implements MinterMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -148,7 +148,7 @@ export class MinterMessageComposer implements MinterMessage { }: { recipient: string; tokenId: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint_for: { recipient, @@ -161,11 +161,11 @@ export class MinterMessageComposer implements MinterMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - withdraw = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + withdraw = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { withdraw: {} }; @@ -175,7 +175,7 @@ export class MinterMessageComposer implements MinterMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/sg721-updatable/Sg721Updatable.client.ts b/__output__/sg721-updatable/Sg721Updatable.client.ts index 27d62ae1..c2389e58 100644 --- a/__output__/sg721-updatable/Sg721Updatable.client.ts +++ b/__output__/sg721-updatable/Sg721Updatable.client.ts @@ -242,22 +242,22 @@ export class Sg721UpdatableQueryClient implements Sg721UpdatableReadOnlyInterfac export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface { contractAddress: string; sender: string; - freezeTokenMetadata: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + freezeTokenMetadata: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateTokenMetadata: ({ tokenId, tokenUri }: { tokenId: string; tokenUri?: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - enableUpdatable: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + enableUpdatable: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; transferNft: ({ recipient, tokenId }: { recipient: string; tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; sendNft: ({ contract, msg, @@ -266,7 +266,7 @@ export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface contract: string; msg: Binary; tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; approve: ({ expires, spender, @@ -275,38 +275,38 @@ export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface expires?: Expiration; spender: string; tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; revoke: ({ spender, tokenId }: { spender: string; tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; approveAll: ({ expires, operator }: { expires?: Expiration; operator: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; revokeAll: ({ operator }: { operator: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; burn: ({ tokenId }: { tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateCollectionInfo: ({ collectionInfo }: { collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - updateTradingStartTime: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - freezeCollectionInfo: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + updateTradingStartTime: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + freezeCollectionInfo: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mint: ({ extension, owner, @@ -317,12 +317,12 @@ export interface Sg721UpdatableInterface extends Sg721UpdatableReadOnlyInterface owner: string; tokenId: string; tokenUri?: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; extension: ({ msg }: { msg: Empty; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements Sg721UpdatableInterface { client: SigningCosmWasmClient; @@ -351,10 +351,10 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S this.extension = this.extension.bind(this); } - freezeTokenMetadata = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + freezeTokenMetadata = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { freeze_token_metadata: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateTokenMetadata = async ({ tokenId, @@ -362,18 +362,18 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S }: { tokenId: string; tokenUri?: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_token_metadata: { token_id: tokenId, token_uri: tokenUri } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - enableUpdatable = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + enableUpdatable = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { enable_updatable: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; transferNft = async ({ recipient, @@ -381,13 +381,13 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S }: { recipient: string; tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { transfer_nft: { recipient, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; sendNft = async ({ contract, @@ -397,14 +397,14 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S contract: string; msg: Binary; tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { send_nft: { contract, msg, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; approve = async ({ expires, @@ -414,14 +414,14 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S expires?: Expiration; spender: string; tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { approve: { expires, spender, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; revoke = async ({ spender, @@ -429,13 +429,13 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S }: { spender: string; tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { revoke: { spender, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; approveAll = async ({ expires, @@ -443,56 +443,56 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S }: { expires?: Expiration; operator: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { approve_all: { expires, operator } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; revokeAll = async ({ operator }: { operator: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { revoke_all: { operator } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; burn = async ({ tokenId }: { tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { burn: { token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateCollectionInfo = async ({ collectionInfo }: { collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_collection_info: { collection_info: collectionInfo } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - updateTradingStartTime = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + updateTradingStartTime = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_trading_start_time: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - freezeCollectionInfo = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + freezeCollectionInfo = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { freeze_collection_info: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mint = async ({ extension, @@ -504,7 +504,7 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S owner: string; tokenId: string; tokenUri?: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint: { extension, @@ -512,17 +512,17 @@ export class Sg721UpdatableClient extends Sg721UpdatableQueryClient implements S token_id: tokenId, token_uri: tokenUri } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; extension = async ({ msg }: { msg: Empty; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { extension: { msg } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/sg721-updatable/Sg721Updatable.message-composer.ts b/__output__/sg721-updatable/Sg721Updatable.message-composer.ts index 6a58003f..730804ec 100644 --- a/__output__/sg721-updatable/Sg721Updatable.message-composer.ts +++ b/__output__/sg721-updatable/Sg721Updatable.message-composer.ts @@ -8,27 +8,27 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForNullable_EmptyAndEmpty, Binary, UpdateCollectionInfoMsgForRoyaltyInfoResponse, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, QueryMsg, TokensResponse } from "./Sg721Updatable.types"; export interface Sg721UpdatableMsg { contractAddress: string; sender: string; - freezeTokenMetadata: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + freezeTokenMetadata: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateTokenMetadata: ({ tokenId, tokenUri }: { tokenId: string; tokenUri?: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - enableUpdatable: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + enableUpdatable: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; transferNft: ({ recipient, tokenId }: { recipient: string; tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; sendNft: ({ contract, msg, @@ -37,7 +37,7 @@ export interface Sg721UpdatableMsg { contract: string; msg: Binary; tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; approve: ({ expires, spender, @@ -46,38 +46,38 @@ export interface Sg721UpdatableMsg { expires?: Expiration; spender: string; tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; revoke: ({ spender, tokenId }: { spender: string; tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; approveAll: ({ expires, operator }: { expires?: Expiration; operator: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; revokeAll: ({ operator }: { operator: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; burn: ({ tokenId }: { tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateCollectionInfo: ({ collectionInfo }: { collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - updateTradingStartTime: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; - freezeCollectionInfo: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + updateTradingStartTime: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; + freezeCollectionInfo: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; mint: ({ extension, owner, @@ -88,12 +88,12 @@ export interface Sg721UpdatableMsg { owner: string; tokenId: string; tokenUri?: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; extension: ({ msg }: { msg: Empty; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: string; @@ -119,7 +119,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { this.extension = this.extension.bind(this); } - freezeTokenMetadata = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + freezeTokenMetadata = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { freeze_token_metadata: {} }; @@ -129,7 +129,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -139,7 +139,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { }: { tokenId: string; tokenUri?: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_token_metadata: { token_id: tokenId, @@ -152,11 +152,11 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - enableUpdatable = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + enableUpdatable = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { enable_updatable: {} }; @@ -166,7 +166,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -176,7 +176,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { }: { recipient: string; tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { transfer_nft: { recipient, @@ -189,7 +189,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -201,7 +201,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { contract: string; msg: Binary; tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { send_nft: { contract, @@ -215,7 +215,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -227,7 +227,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { expires?: Expiration; spender: string; tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { approve: { expires, @@ -241,7 +241,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -251,7 +251,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { }: { spender: string; tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { revoke: { spender, @@ -264,7 +264,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -274,7 +274,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { }: { expires?: Expiration; operator: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { approve_all: { expires, @@ -287,7 +287,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -295,7 +295,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { operator }: { operator: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { revoke_all: { operator @@ -307,7 +307,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -315,7 +315,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { tokenId }: { tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { burn: { token_id: tokenId @@ -327,7 +327,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -335,7 +335,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { collectionInfo }: { collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_collection_info: { collection_info: collectionInfo @@ -347,11 +347,11 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - updateTradingStartTime = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + updateTradingStartTime = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_trading_start_time: {} }; @@ -361,11 +361,11 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - freezeCollectionInfo = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + freezeCollectionInfo = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { freeze_collection_info: {} }; @@ -375,7 +375,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -389,7 +389,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { owner: string; tokenId: string; tokenUri?: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint: { extension, @@ -404,7 +404,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -412,7 +412,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { msg }: { msg: Empty; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { extension: { msg @@ -424,7 +424,7 @@ export class Sg721UpdatableMsgComposer implements Sg721UpdatableMsg { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/sg721/Sg721.client.ts b/__output__/sg721/Sg721.client.ts index 198ce9f1..ca8422b0 100644 --- a/__output__/sg721/Sg721.client.ts +++ b/__output__/sg721/Sg721.client.ts @@ -248,7 +248,7 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface { }: { recipient: string; tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; sendNft: ({ contract, msg, @@ -257,7 +257,7 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface { contract: string; msg: Binary; tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; approve: ({ expires, spender, @@ -266,26 +266,26 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface { expires?: Expiration; spender: string; tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; revoke: ({ spender, tokenId }: { spender: string; tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; approveAll: ({ expires, operator }: { expires?: Expiration; operator: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; revokeAll: ({ operator }: { operator: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; mint: ({ extension, owner, @@ -296,12 +296,12 @@ export interface Sg721Interface extends Sg721ReadOnlyInterface { owner: string; tokenId: string; tokenUri?: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; burn: ({ tokenId }: { tokenId: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class Sg721Client extends Sg721QueryClient implements Sg721Interface { client: SigningCosmWasmClient; @@ -329,13 +329,13 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface { }: { recipient: string; tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { transfer_nft: { recipient, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; sendNft = async ({ contract, @@ -345,14 +345,14 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface { contract: string; msg: Binary; tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { send_nft: { contract, msg, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; approve = async ({ expires, @@ -362,14 +362,14 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface { expires?: Expiration; spender: string; tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { approve: { expires, spender, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; revoke = async ({ spender, @@ -377,13 +377,13 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface { }: { spender: string; tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { revoke: { spender, token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; approveAll = async ({ expires, @@ -391,24 +391,24 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface { }: { expires?: Expiration; operator: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { approve_all: { expires, operator } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; revokeAll = async ({ operator }: { operator: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { revoke_all: { operator } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; mint = async ({ extension, @@ -420,7 +420,7 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface { owner: string; tokenId: string; tokenUri?: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { mint: { extension, @@ -428,17 +428,17 @@ export class Sg721Client extends Sg721QueryClient implements Sg721Interface { token_id: tokenId, token_uri: tokenUri } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; burn = async ({ tokenId }: { tokenId: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { burn: { token_id: tokenId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/sg721/Sg721.message-composer.ts b/__output__/sg721/Sg721.message-composer.ts index 5c2053e7..464a20f2 100644 --- a/__output__/sg721/Sg721.message-composer.ts +++ b/__output__/sg721/Sg721.message-composer.ts @@ -8,7 +8,7 @@ import { Coin } from "@cosmjs/amino"; import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { Expiration, Timestamp, Uint64, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponseForEmpty, Empty, AllOperatorsResponse, AllTokensResponse, ApprovalResponse, ApprovalsResponse, Decimal, CollectionInfoResponse, RoyaltyInfoResponse, ContractInfoResponse, ExecuteMsgForEmpty, Binary, MintMsgForEmpty, InstantiateMsg, CollectionInfoForRoyaltyInfoResponse, MinterResponse, NftInfoResponse, NumTokensResponse, OperatorsResponse, QueryMsg, TokensResponse } from "./Sg721.types"; export interface Sg721Message { contractAddress: string; @@ -19,7 +19,7 @@ export interface Sg721Message { }: { recipient: string; tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; sendNft: ({ contract, msg, @@ -28,7 +28,7 @@ export interface Sg721Message { contract: string; msg: Binary; tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; approve: ({ expires, spender, @@ -37,26 +37,26 @@ export interface Sg721Message { expires?: Expiration; spender: string; tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; revoke: ({ spender, tokenId }: { spender: string; tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; approveAll: ({ expires, operator }: { expires?: Expiration; operator: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; revokeAll: ({ operator }: { operator: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; mint: ({ extension, owner, @@ -67,12 +67,12 @@ export interface Sg721Message { owner: string; tokenId: string; tokenUri?: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; burn: ({ tokenId }: { tokenId: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class Sg721MessageComposer implements Sg721Message { sender: string; @@ -97,7 +97,7 @@ export class Sg721MessageComposer implements Sg721Message { }: { recipient: string; tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { transfer_nft: { recipient, @@ -110,7 +110,7 @@ export class Sg721MessageComposer implements Sg721Message { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -122,7 +122,7 @@ export class Sg721MessageComposer implements Sg721Message { contract: string; msg: Binary; tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { send_nft: { contract, @@ -136,7 +136,7 @@ export class Sg721MessageComposer implements Sg721Message { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -148,7 +148,7 @@ export class Sg721MessageComposer implements Sg721Message { expires?: Expiration; spender: string; tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { approve: { expires, @@ -162,7 +162,7 @@ export class Sg721MessageComposer implements Sg721Message { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -172,7 +172,7 @@ export class Sg721MessageComposer implements Sg721Message { }: { spender: string; tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { revoke: { spender, @@ -185,7 +185,7 @@ export class Sg721MessageComposer implements Sg721Message { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -195,7 +195,7 @@ export class Sg721MessageComposer implements Sg721Message { }: { expires?: Expiration; operator: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { approve_all: { expires, @@ -208,7 +208,7 @@ export class Sg721MessageComposer implements Sg721Message { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -216,7 +216,7 @@ export class Sg721MessageComposer implements Sg721Message { operator }: { operator: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { revoke_all: { operator @@ -228,7 +228,7 @@ export class Sg721MessageComposer implements Sg721Message { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -242,7 +242,7 @@ export class Sg721MessageComposer implements Sg721Message { owner: string; tokenId: string; tokenUri?: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { mint: { extension, @@ -257,7 +257,7 @@ export class Sg721MessageComposer implements Sg721Message { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -265,7 +265,7 @@ export class Sg721MessageComposer implements Sg721Message { tokenId }: { tokenId: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { burn: { token_id: tokenId @@ -277,7 +277,7 @@ export class Sg721MessageComposer implements Sg721Message { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/vectis/factory/Factory.client.ts b/__output__/vectis/factory/Factory.client.ts index ae107e8a..348eee1d 100644 --- a/__output__/vectis/factory/Factory.client.ts +++ b/__output__/vectis/factory/Factory.client.ts @@ -114,43 +114,43 @@ export interface FactoryInterface extends FactoryReadOnlyInterface { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateProxyUser: ({ newUser, oldUser }: { newUser: Addr; oldUser: Addr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; migrateWallet: ({ migrationMsg, walletAddress }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateCodeId: ({ newCodeId, ty }: { newCodeId: number; ty: CodeIdType; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateWalletFee: ({ newFee }: { newFee: Coin; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateGovecAddr: ({ addr }: { addr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateAdmin: ({ addr }: { addr: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class FactoryClient extends FactoryQueryClient implements FactoryInterface { client: SigningCosmWasmClient; @@ -175,12 +175,12 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { create_wallet: { create_wallet_msg: createWalletMsg } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateProxyUser = async ({ newUser, @@ -188,13 +188,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac }: { newUser: Addr; oldUser: Addr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_proxy_user: { new_user: newUser, old_user: oldUser } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; migrateWallet = async ({ migrationMsg, @@ -202,13 +202,13 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { migrate_wallet: { migration_msg: migrationMsg, wallet_address: walletAddress } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateCodeId = async ({ newCodeId, @@ -216,45 +216,45 @@ export class FactoryClient extends FactoryQueryClient implements FactoryInterfac }: { newCodeId: number; ty: CodeIdType; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_code_id: { new_code_id: newCodeId, ty } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateWalletFee = async ({ newFee }: { newFee: Coin; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_wallet_fee: { new_fee: newFee } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateGovecAddr = async ({ addr }: { addr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_govec_addr: { addr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateAdmin = async ({ addr }: { addr: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_admin: { addr } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/vectis/factory/Factory.message-composer.ts b/__output__/vectis/factory/Factory.message-composer.ts index 6911707c..10137e60 100644 --- a/__output__/vectis/factory/Factory.message-composer.ts +++ b/__output__/vectis/factory/Factory.message-composer.ts @@ -7,7 +7,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { AdminAddrResponse, CodeIdResponse, CodeIdType, Uint128, Binary, CreateWalletMsg, Guardians, MultiSig, Coin, Cw20Coin, ExecuteMsg, Addr, ProxyMigrationTxMsg, WalletAddr, CanonicalAddr, RelayTransaction, FeeResponse, GovecAddrResponse, InstantiateMsg, QueryMsg, WalletQueryPrefix, Duration, StakingOptions, WalletInfo, ContractVersion, WalletsOfResponse, WalletsResponse } from "./Factory.types"; export interface FactoryMessage { contractAddress: string; @@ -16,43 +16,43 @@ export interface FactoryMessage { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateProxyUser: ({ newUser, oldUser }: { newUser: Addr; oldUser: Addr; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; migrateWallet: ({ migrationMsg, walletAddress }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateCodeId: ({ newCodeId, ty }: { newCodeId: number; ty: CodeIdType; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateWalletFee: ({ newFee }: { newFee: Coin; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateGovecAddr: ({ addr }: { addr: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateAdmin: ({ addr }: { addr: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class FactoryMessageComposer implements FactoryMessage { sender: string; @@ -74,7 +74,7 @@ export class FactoryMessageComposer implements FactoryMessage { createWalletMsg }: { createWalletMsg: CreateWalletMsg; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { create_wallet: { create_wallet_msg: createWalletMsg @@ -86,7 +86,7 @@ export class FactoryMessageComposer implements FactoryMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -96,7 +96,7 @@ export class FactoryMessageComposer implements FactoryMessage { }: { newUser: Addr; oldUser: Addr; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_proxy_user: { new_user: newUser, @@ -109,7 +109,7 @@ export class FactoryMessageComposer implements FactoryMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -119,7 +119,7 @@ export class FactoryMessageComposer implements FactoryMessage { }: { migrationMsg: ProxyMigrationTxMsg; walletAddress: WalletAddr; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { migrate_wallet: { migration_msg: migrationMsg, @@ -132,7 +132,7 @@ export class FactoryMessageComposer implements FactoryMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -142,7 +142,7 @@ export class FactoryMessageComposer implements FactoryMessage { }: { newCodeId: number; ty: CodeIdType; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_code_id: { new_code_id: newCodeId, @@ -155,7 +155,7 @@ export class FactoryMessageComposer implements FactoryMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -163,7 +163,7 @@ export class FactoryMessageComposer implements FactoryMessage { newFee }: { newFee: Coin; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_wallet_fee: { new_fee: newFee @@ -175,7 +175,7 @@ export class FactoryMessageComposer implements FactoryMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -183,7 +183,7 @@ export class FactoryMessageComposer implements FactoryMessage { addr }: { addr: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_govec_addr: { addr @@ -195,7 +195,7 @@ export class FactoryMessageComposer implements FactoryMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -203,7 +203,7 @@ export class FactoryMessageComposer implements FactoryMessage { addr }: { addr: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_admin: { addr @@ -215,7 +215,7 @@ export class FactoryMessageComposer implements FactoryMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/vectis/govec/Govec.client.ts b/__output__/vectis/govec/Govec.client.ts index 5b69d581..b4aa898e 100644 --- a/__output__/vectis/govec/Govec.client.ts +++ b/__output__/vectis/govec/Govec.client.ts @@ -51,40 +51,40 @@ export interface GovecInterface extends GovecReadOnlyInterface { msgs }: { msgs: CosmosMsgForEmpty[]; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - revertFreezeStatus: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + revertFreezeStatus: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; relay: ({ transaction }: { transaction: RelayTransaction; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; rotateUserKey: ({ newUserAddress }: { newUserAddress: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addRelayer: ({ newRelayerAddress }: { newRelayerAddress: Addr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeRelayer: ({ relayerAddress }: { relayerAddress: Addr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateGuardians: ({ guardians, newMultisigCodeId }: { guardians: Guardians; newMultisigCodeId?: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateLabel: ({ newLabel }: { newLabel: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class GovecClient extends GovecQueryClient implements GovecInterface { client: SigningCosmWasmClient; @@ -110,61 +110,61 @@ export class GovecClient extends GovecQueryClient implements GovecInterface { msgs }: { msgs: CosmosMsgForEmpty[]; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { execute: { msgs } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { revert_freeze_status: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; relay = async ({ transaction }: { transaction: RelayTransaction; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { relay: { transaction } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; rotateUserKey = async ({ newUserAddress }: { newUserAddress: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { rotate_user_key: { new_user_address: newUserAddress } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addRelayer = async ({ newRelayerAddress }: { newRelayerAddress: Addr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_relayer: { new_relayer_address: newRelayerAddress } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeRelayer = async ({ relayerAddress }: { relayerAddress: Addr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_relayer: { relayer_address: relayerAddress } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateGuardians = async ({ guardians, @@ -172,23 +172,23 @@ export class GovecClient extends GovecQueryClient implements GovecInterface { }: { guardians: Guardians; newMultisigCodeId?: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_guardians: { guardians, new_multisig_code_id: newMultisigCodeId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateLabel = async ({ newLabel }: { newLabel: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_label: { new_label: newLabel } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/vectis/govec/Govec.message-composer.ts b/__output__/vectis/govec/Govec.message-composer.ts index e6421692..04687584 100644 --- a/__output__/vectis/govec/Govec.message-composer.ts +++ b/__output__/vectis/govec/Govec.message-composer.ts @@ -7,7 +7,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Govec.types"; export interface GovecMessage { contractAddress: string; @@ -16,40 +16,40 @@ export interface GovecMessage { msgs }: { msgs: CosmosMsgForEmpty[]; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - revertFreezeStatus: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + revertFreezeStatus: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; relay: ({ transaction }: { transaction: RelayTransaction; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; rotateUserKey: ({ newUserAddress }: { newUserAddress: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; addRelayer: ({ newRelayerAddress }: { newRelayerAddress: Addr; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; removeRelayer: ({ relayerAddress }: { relayerAddress: Addr; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateGuardians: ({ guardians, newMultisigCodeId }: { guardians: Guardians; newMultisigCodeId?: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateLabel: ({ newLabel }: { newLabel: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class GovecMessageComposer implements GovecMessage { sender: string; @@ -72,7 +72,7 @@ export class GovecMessageComposer implements GovecMessage { msgs }: { msgs: CosmosMsgForEmpty[]; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { execute: { msgs @@ -84,11 +84,11 @@ export class GovecMessageComposer implements GovecMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - revertFreezeStatus = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + revertFreezeStatus = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { revert_freeze_status: {} }; @@ -98,7 +98,7 @@ export class GovecMessageComposer implements GovecMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -106,7 +106,7 @@ export class GovecMessageComposer implements GovecMessage { transaction }: { transaction: RelayTransaction; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { relay: { transaction @@ -118,7 +118,7 @@ export class GovecMessageComposer implements GovecMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -126,7 +126,7 @@ export class GovecMessageComposer implements GovecMessage { newUserAddress }: { newUserAddress: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { rotate_user_key: { new_user_address: newUserAddress @@ -138,7 +138,7 @@ export class GovecMessageComposer implements GovecMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -146,7 +146,7 @@ export class GovecMessageComposer implements GovecMessage { newRelayerAddress }: { newRelayerAddress: Addr; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { add_relayer: { new_relayer_address: newRelayerAddress @@ -158,7 +158,7 @@ export class GovecMessageComposer implements GovecMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -166,7 +166,7 @@ export class GovecMessageComposer implements GovecMessage { relayerAddress }: { relayerAddress: Addr; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { remove_relayer: { relayer_address: relayerAddress @@ -178,7 +178,7 @@ export class GovecMessageComposer implements GovecMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -188,7 +188,7 @@ export class GovecMessageComposer implements GovecMessage { }: { guardians: Guardians; newMultisigCodeId?: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_guardians: { guardians, @@ -201,7 +201,7 @@ export class GovecMessageComposer implements GovecMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -209,7 +209,7 @@ export class GovecMessageComposer implements GovecMessage { newLabel }: { newLabel: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_label: { new_label: newLabel @@ -221,7 +221,7 @@ export class GovecMessageComposer implements GovecMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/__output__/vectis/proxy/Proxy.client.ts b/__output__/vectis/proxy/Proxy.client.ts index 8c9edd2c..fda75353 100644 --- a/__output__/vectis/proxy/Proxy.client.ts +++ b/__output__/vectis/proxy/Proxy.client.ts @@ -51,40 +51,40 @@ export interface ProxyInterface extends ProxyReadOnlyInterface { msgs }: { msgs: CosmosMsgForEmpty[]; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; - revertFreezeStatus: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; + revertFreezeStatus: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; relay: ({ transaction }: { transaction: RelayTransaction; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; rotateUserKey: ({ newUserAddress }: { newUserAddress: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; addRelayer: ({ newRelayerAddress }: { newRelayerAddress: Addr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; removeRelayer: ({ relayerAddress }: { relayerAddress: Addr; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateGuardians: ({ guardians, newMultisigCodeId }: { guardians: Guardians; newMultisigCodeId?: number; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; updateLabel: ({ newLabel }: { newLabel: string; - }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise; + }, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise; } export class ProxyClient extends ProxyQueryClient implements ProxyInterface { client: SigningCosmWasmClient; @@ -110,61 +110,61 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface { msgs }: { msgs: CosmosMsgForEmpty[]; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { execute: { msgs } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; - revertFreezeStatus = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + revertFreezeStatus = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { revert_freeze_status: {} - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; relay = async ({ transaction }: { transaction: RelayTransaction; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { relay: { transaction } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; rotateUserKey = async ({ newUserAddress }: { newUserAddress: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { rotate_user_key: { new_user_address: newUserAddress } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; addRelayer = async ({ newRelayerAddress }: { newRelayerAddress: Addr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { add_relayer: { new_relayer_address: newRelayerAddress } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; removeRelayer = async ({ relayerAddress }: { relayerAddress: Addr; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { remove_relayer: { relayer_address: relayerAddress } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateGuardians = async ({ guardians, @@ -172,23 +172,23 @@ export class ProxyClient extends ProxyQueryClient implements ProxyInterface { }: { guardians: Guardians; newMultisigCodeId?: number; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_guardians: { guardians, new_multisig_code_id: newMultisigCodeId } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; updateLabel = async ({ newLabel }: { newLabel: string; - }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise => { + }, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise => { return await this.client.execute(this.sender, this.contractAddress, { update_label: { new_label: newLabel } - }, fee, memo, _funds); + }, fee_, memo_, funds_); }; } \ No newline at end of file diff --git a/__output__/vectis/proxy/Proxy.message-composer.ts b/__output__/vectis/proxy/Proxy.message-composer.ts index 14310433..2940aabe 100644 --- a/__output__/vectis/proxy/Proxy.message-composer.ts +++ b/__output__/vectis/proxy/Proxy.message-composer.ts @@ -7,7 +7,7 @@ import { MsgExecuteContractEncodeObject } from "@cosmjs/cosmwasm-stargate"; import { MsgExecuteContract } from "cosmjs-types/cosmwasm/wasm/v1/tx"; import { toUtf8 } from "@cosmjs/encoding"; -import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/abstract.js"; +import { AppExecuteMsg, AppExecuteMsgFactory } from "@abstract-money/core"; import { CanExecuteRelayResponse, CosmosMsgForEmpty, BankMsg, Uint128, StakingMsg, DistributionMsg, WasmMsg, Binary, Coin, Empty, ExecuteMsgForEmpty, Addr, RelayTransaction, Guardians, MultiSig, InfoResponse, ContractVersion, InstantiateMsg, CreateWalletMsg, QueryMsg, Uint64 } from "./Proxy.types"; export interface ProxyMessage { contractAddress: string; @@ -16,40 +16,40 @@ export interface ProxyMessage { msgs }: { msgs: CosmosMsgForEmpty[]; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; - revertFreezeStatus: (_funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; + revertFreezeStatus: (funds_?: Coin[]) => MsgExecuteContractEncodeObject; relay: ({ transaction }: { transaction: RelayTransaction; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; rotateUserKey: ({ newUserAddress }: { newUserAddress: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; addRelayer: ({ newRelayerAddress }: { newRelayerAddress: Addr; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; removeRelayer: ({ relayerAddress }: { relayerAddress: Addr; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateGuardians: ({ guardians, newMultisigCodeId }: { guardians: Guardians; newMultisigCodeId?: number; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; updateLabel: ({ newLabel }: { newLabel: string; - }, _funds?: Coin[]) => MsgExecuteContractEncodeObject; + }, funds_?: Coin[]) => MsgExecuteContractEncodeObject; } export class ProxyMessageComposer implements ProxyMessage { sender: string; @@ -72,7 +72,7 @@ export class ProxyMessageComposer implements ProxyMessage { msgs }: { msgs: CosmosMsgForEmpty[]; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { execute: { msgs @@ -84,11 +84,11 @@ export class ProxyMessageComposer implements ProxyMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; - revertFreezeStatus = (_funds?: Coin[]): MsgExecuteContractEncodeObject => { + revertFreezeStatus = (funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { revert_freeze_status: {} }; @@ -98,7 +98,7 @@ export class ProxyMessageComposer implements ProxyMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -106,7 +106,7 @@ export class ProxyMessageComposer implements ProxyMessage { transaction }: { transaction: RelayTransaction; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { relay: { transaction @@ -118,7 +118,7 @@ export class ProxyMessageComposer implements ProxyMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -126,7 +126,7 @@ export class ProxyMessageComposer implements ProxyMessage { newUserAddress }: { newUserAddress: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { rotate_user_key: { new_user_address: newUserAddress @@ -138,7 +138,7 @@ export class ProxyMessageComposer implements ProxyMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -146,7 +146,7 @@ export class ProxyMessageComposer implements ProxyMessage { newRelayerAddress }: { newRelayerAddress: Addr; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { add_relayer: { new_relayer_address: newRelayerAddress @@ -158,7 +158,7 @@ export class ProxyMessageComposer implements ProxyMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -166,7 +166,7 @@ export class ProxyMessageComposer implements ProxyMessage { relayerAddress }: { relayerAddress: Addr; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { remove_relayer: { relayer_address: relayerAddress @@ -178,7 +178,7 @@ export class ProxyMessageComposer implements ProxyMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -188,7 +188,7 @@ export class ProxyMessageComposer implements ProxyMessage { }: { guardians: Guardians; newMultisigCodeId?: number; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_guardians: { guardians, @@ -201,7 +201,7 @@ export class ProxyMessageComposer implements ProxyMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; @@ -209,7 +209,7 @@ export class ProxyMessageComposer implements ProxyMessage { newLabel }: { newLabel: string; - }, _funds?: Coin[]): MsgExecuteContractEncodeObject => { + }, funds_?: Coin[]): MsgExecuteContractEncodeObject => { const msg = { update_label: { new_label: newLabel @@ -221,7 +221,7 @@ export class ProxyMessageComposer implements ProxyMessage { sender: this.sender, contract: this.contractAddress, msg: toUtf8(JSON.stringify(msg)), - funds: _funds + funds: funds_ }) }; }; diff --git a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap index 66ee0af0..dcb1cf92 100644 --- a/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap +++ b/packages/ts-codegen/__tests__/__snapshots__/builder.test.ts.snap @@ -10,6 +10,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -52,6 +53,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -95,6 +97,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -138,6 +141,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -181,6 +185,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -224,6 +229,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -267,6 +273,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -312,6 +319,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -355,6 +363,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -410,6 +419,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -452,6 +462,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -495,6 +506,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -538,6 +550,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -581,6 +594,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -624,6 +638,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -667,6 +682,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -712,6 +728,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", @@ -755,6 +772,7 @@ TSBuilder { "abstractApp": Object { "clientPrefix": "App", "enabled": false, + "moduleType": "app", }, "bundle": Object { "bundleFile": "bundle.ts", diff --git a/packages/ts-codegen/package.json b/packages/ts-codegen/package.json index 2d50036c..01cd1e6e 100644 --- a/packages/ts-codegen/package.json +++ b/packages/ts-codegen/package.json @@ -1,6 +1,6 @@ { "name": "@abstract-money/ts-codegen", - "version": "0.36.0-beta-1", + "version": "0.37.0-beta-3", "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.", "author": "Dan Lynch ", "homepage": "https://github.com/cosmwasm/ts-codegen", @@ -101,6 +101,6 @@ "parse-package-name": "1.0.0", "rimraf": "3.0.2", "shelljs": "0.8.5", - "wasm-ast-types": "npm:@abstract-money/wasm-ast-types@0.27.0-beta-1" + "wasm-ast-types": "npm:@abstract-money/wasm-ast-types@0.28.0-beta-3" } } diff --git a/packages/wasm-ast-types/package.json b/packages/wasm-ast-types/package.json index 2140130e..bae676e0 100644 --- a/packages/wasm-ast-types/package.json +++ b/packages/wasm-ast-types/package.json @@ -1,6 +1,6 @@ { "name": "@abstract-money/wasm-ast-types", - "version": "0.27.0-beta-1", + "version": "0.28.0-beta-3", "description": "CosmWasm TypeScript AST generation", "author": "Dan Lynch ", "homepage": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types#readme", diff --git a/packages/wasm-ast-types/src/abstract-app/__snapshots__/abstract-app.spec.ts.snap b/packages/wasm-ast-types/src/abstract-app/__snapshots__/abstract-app.spec.ts.snap index f0bcda4a..1729669d 100644 --- a/packages/wasm-ast-types/src/abstract-app/__snapshots__/abstract-app.spec.ts.snap +++ b/packages/wasm-ast-types/src/abstract-app/__snapshots__/abstract-app.spec.ts.snap @@ -2,29 +2,22 @@ exports[`AutocompounderAppClient 1`] = ` "export class AutocompounderAppClient extends AutocompounderAppQueryClient implements IAutocompounderAppClient { - accountClient: AbstractAccountClient; + accountWalletClient: AccountWalletClient; constructor({ - abstractClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, + accountWalletClient, moduleId }: { - abstractClient: AbstractClient; - accountId: AbstractAccountId; - managerAddress: string; - proxyAddress: string; + accountPublicClient: AccountPublicClient; + accountWalletClient: AccountWalletClient; moduleId: string; }) { super({ - abstractQueryClient: abstractClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, moduleId }); - this.accountClient = AbstractAccountClient.fromQueryClient(this.accountQueryClient, abstractClient); + this.accountWalletClient = accountWalletClient; this.updateFeeConfig = this.updateFeeConfig.bind(this); this.deposit = this.deposit.bind(this); this.withdraw = this.withdraw.bind(this); @@ -52,37 +45,28 @@ exports[`AutocompounderAppClient 1`] = ` return this._execute(AutocompounderExecuteMsgBuilder.batchUnbond(), fee_, memo_, funds_); }; _execute = async (msg: ExecuteMsg, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise => { + const signingCwClient = await this.accountWalletClient.getSigningCosmWasmClient(); + const sender = await this.accountWalletClient.getSenderAddress(); const moduleMsg: AppExecuteMsg = AppExecuteMsgFactory.executeApp(msg); - return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_); + return await signingCwClient.execute(sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_); }; }" `; exports[`AutocompounderAppQueryClient 1`] = ` "export class AutocompounderAppQueryClient implements IAutocompounderAppQueryClient { - accountQueryClient: AbstractAccountQueryClient; + accountPublicClient: AccountPublicClient; moduleId: string; _moduleAddress: string | undefined; constructor({ - abstractQueryClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, moduleId }: { - abstractQueryClient: AbstractQueryClient; - accountId: AbstractAccountId; - managerAddress: string; - proxyAddress: string; + accountPublicClient: AccountPublicClient; moduleId: string; }) { - this.accountQueryClient = new AbstractAccountQueryClient({ - abstract: abstractQueryClient, - accountId, - managerAddress, - proxyAddress - }); + this.accountPublicClient = accountPublicClient; this.moduleId = moduleId; this.config = this.config.bind(this); this.pendingClaims = this.pendingClaims.bind(this); @@ -124,7 +108,9 @@ exports[`AutocompounderAppQueryClient 1`] = ` }; getAddress = async (): Promise => { if (!this._moduleAddress) { - const address = await this.accountQueryClient.getModuleAddress(this.moduleId); + const address = await this.accountPublicClient.getModuleAddress({ + id: this.moduleId + }); if (address === null) { throw new Error(\`Module \${this.moduleId} not installed\`); @@ -135,17 +121,155 @@ exports[`AutocompounderAppQueryClient 1`] = ` return this._moduleAddress!; }; - connectSigningClient = (signingClient: SigningCosmWasmClient, address: string): AutocompounderAppClient => { - return new AutocompounderAppClient({ - accountId: this.accountQueryClient.accountId, - managerAddress: this.accountQueryClient.managerAddress, - proxyAddress: this.accountQueryClient.proxyAddress, + _query = async (queryMsg: QueryMsg): Promise => { + return this.accountPublicClient.queryModule({ moduleId: this.moduleId, - abstractClient: this.accountQueryClient.abstract.connectSigningClient(signingClient, address) + moduleType: \\"app\\", + queryMsg }); }; +}" +`; + +exports[`BettingAppClient 1`] = ` +"export class BettingAppClient extends BettingAppQueryClient implements IBettingAppClient { + accountWalletClient: AccountWalletClient; + + constructor({ + accountPublicClient, + accountWalletClient, + moduleId + }: { + accountPublicClient: AccountPublicClient; + accountWalletClient: AccountWalletClient; + moduleId: string; + }) { + super({ + accountPublicClient, + moduleId + }); + this.accountWalletClient = accountWalletClient; + this.createRound = this.createRound.bind(this); + this.register = this.register.bind(this); + this.updateAccounts = this.updateAccounts.bind(this); + this.placeBet = this.placeBet.bind(this); + this.distributeWinnings = this.distributeWinnings.bind(this); + this.closeRound = this.closeRound.bind(this); + this.updateConfig = this.updateConfig.bind(this); + } + + createRound = async (params: CamelCasedProperties[\\"create_round\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(BettingExecuteMsgBuilder.createRound(params), fee_, memo_, funds_); + }; + register = async (params: CamelCasedProperties[\\"register\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(BettingExecuteMsgBuilder.register(params), fee_, memo_, funds_); + }; + updateAccounts = async (params: CamelCasedProperties[\\"update_accounts\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(BettingExecuteMsgBuilder.updateAccounts(params), fee_, memo_, funds_); + }; + placeBet = async (params: CamelCasedProperties[\\"place_bet\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(BettingExecuteMsgBuilder.placeBet(params), fee_, memo_, funds_); + }; + distributeWinnings = async (params: CamelCasedProperties[\\"distribute_winnings\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(BettingExecuteMsgBuilder.distributeWinnings(params), fee_, memo_, funds_); + }; + closeRound = async (params: CamelCasedProperties[\\"close_round\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(BettingExecuteMsgBuilder.closeRound(params), fee_, memo_, funds_); + }; + updateConfig = async (params: CamelCasedProperties[\\"update_config\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise => { + return this._execute(BettingExecuteMsgBuilder.updateConfig(params), fee_, memo_, funds_); + }; + _execute = async (msg: ExecuteMsg, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise => { + const signingCwClient = await this.accountWalletClient.getSigningCosmWasmClient(); + const sender = await this.accountWalletClient.getSenderAddress(); + const moduleMsg: AppExecuteMsg = AppExecuteMsgFactory.executeApp(msg); + return await signingCwClient.execute(sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_); + }; +}" +`; + +exports[`BettingAppQueryClient 1`] = ` +"export class BettingAppQueryClient implements IBettingAppQueryClient { + accountPublicClient: AccountPublicClient; + moduleId: string; + _moduleAddress: string | undefined; + + constructor({ + accountPublicClient, + moduleId + }: { + accountPublicClient: AccountPublicClient; + moduleId: string; + }) { + this.accountPublicClient = accountPublicClient; + this.moduleId = moduleId; + this.round = this.round.bind(this); + this.listRounds = this.listRounds.bind(this); + this.odds = this.odds.bind(this); + this.listOdds = this.listOdds.bind(this); + this.config = this.config.bind(this); + this.bets = this.bets.bind(this); + } + + round = async (params: CamelCasedProperties[\\"round\\"]>): Promise => { + return this._query(BettingQueryMsgBuilder.round(params)); + }; + listRounds = async (params: CamelCasedProperties[\\"list_rounds\\"]>): Promise => { + return this._query(BettingQueryMsgBuilder.listRounds(params)); + }; + odds = async (params: CamelCasedProperties[\\"odds\\"]>): Promise => { + return this._query(BettingQueryMsgBuilder.odds(params)); + }; + listOdds = async (params: CamelCasedProperties[\\"list_odds\\"]>): Promise => { + return this._query(BettingQueryMsgBuilder.listOdds(params)); + }; + config = async (): Promise => { + return this._query(BettingQueryMsgBuilder.config()); + }; + bets = async (params: CamelCasedProperties[\\"bets\\"]>): Promise => { + return this._query(BettingQueryMsgBuilder.bets(params)); + }; + getAddress = async (): Promise => { + if (!this._moduleAddress) { + const address = await this.accountPublicClient.getModuleAddress({ + id: this.moduleId + }); + + if (address === null) { + throw new Error(\`Module \${this.moduleId} not installed\`); + } + + this._moduleAddress = address; + } + + return this._moduleAddress!; + }; _query = async (queryMsg: QueryMsg): Promise => { - return this.accountQueryClient.queryModule({ + return this.accountPublicClient.queryModule({ moduleId: this.moduleId, moduleType: \\"app\\", queryMsg @@ -156,29 +280,22 @@ exports[`AutocompounderAppQueryClient 1`] = ` exports[`DexAdapterClient 1`] = ` "export class DexAdapterClient extends DexAdapterQueryClient implements IDexAdapterClient { - accountClient: AbstractAccountClient; + accountWalletClient: AccountWalletClient; constructor({ - abstractClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, + accountWalletClient, moduleId }: { - abstractClient: AbstractClient; - accountId: AbstractAccountId; - managerAddress: string; - proxyAddress: string; + accountPublicClient: AccountPublicClient; + accountWalletClient: AccountWalletClient; moduleId: string; }) { super({ - abstractQueryClient: abstractClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, moduleId }); - this.accountClient = AbstractAccountClient.fromQueryClient(this.accountQueryClient, abstractClient); + this.accountWalletClient = accountWalletClient; this.updateFee = this.updateFee.bind(this); this.ansAction = this.ansAction.bind(this); this.rawAction = this.rawAction.bind(this); @@ -200,18 +317,20 @@ exports[`DexAdapterClient 1`] = ` return this._execute(DexClientExecuteMsgBuilder.rawAction(params), fee_, memo_, funds_); }; _execute = async (msg: ExecuteMsg, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise => { + const signingCwClient = await this.accountWalletClient.getSigningCosmWasmClient(); + const sender = await this.accountWalletClient.getSenderAddress(); const moduleMsg: AdapterExecuteMsg = AdapterExecuteMsgFactory.executeAdapter({ request: msg, - proxyAddress: this.accountQueryClient.proxyAddress + proxyAddress: this.accountPublicClient.proxyAddress }); - return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_); + return await signingCwClient.execute(sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_); }; }" `; exports[`IAutocompounderAppClient 1`] = ` "export interface IAutocompounderAppClient extends IAutocompounderAppQueryClient { - accountClient: AbstractAccountClient; + accountWalletClient: AccountWalletClient; updateFeeConfig: (params: CamelCasedProperties[\\"update_fee_config\\"]>, fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise; @@ -227,7 +346,7 @@ exports[`IAutocompounderAppClient 1`] = ` exports[`IAutocompounderAppQueryClient 1`] = ` "export interface IAutocompounderAppQueryClient { moduleId: string; - accountQueryClient: AbstractAccountQueryClient; + accountPublicClient: AccountPublicClient; _moduleAddress: string | undefined; config: () => Promise; pendingClaims: (params: CamelCasedProperties[\\"balance\\"]>) => Promise; - connectSigningClient: (signingClient: SigningCosmWasmClient, address: string) => AutocompounderAppClient; + getAddress: () => Promise; +}" +`; + +exports[`IBettingAppClient 1`] = ` +"export interface IBettingAppClient extends IBettingAppQueryClient { + accountWalletClient: AccountWalletClient; + createRound: (params: CamelCasedProperties[\\"create_round\\"]>, fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise; + register: (params: CamelCasedProperties[\\"register\\"]>, fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise; + updateAccounts: (params: CamelCasedProperties[\\"update_accounts\\"]>, fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise; + placeBet: (params: CamelCasedProperties[\\"place_bet\\"]>, fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise; + distributeWinnings: (params: CamelCasedProperties[\\"distribute_winnings\\"]>, fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise; + closeRound: (params: CamelCasedProperties[\\"close_round\\"]>, fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise; + updateConfig: (params: CamelCasedProperties[\\"update_config\\"]>, fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise; +}" +`; + +exports[`IBettingAppQueryClient 1`] = ` +"export interface IBettingAppQueryClient { + moduleId: string; + accountPublicClient: AccountPublicClient; + _moduleAddress: string | undefined; + round: (params: CamelCasedProperties[\\"round\\"]>) => Promise; + listRounds: (params: CamelCasedProperties[\\"list_rounds\\"]>) => Promise; + odds: (params: CamelCasedProperties[\\"odds\\"]>) => Promise; + listOdds: (params: CamelCasedProperties[\\"list_odds\\"]>) => Promise; + config: () => Promise; + bets: (params: CamelCasedProperties[\\"bets\\"]>) => Promise; getAddress: () => Promise; }" `; exports[`IbcMailClientAppClient 1`] = ` "export class IbcMailClientAppClient extends IbcMailClientAppQueryClient implements IIbcMailClientAppClient { - accountClient: AbstractAccountClient; + accountWalletClient: AccountWalletClient; constructor({ - abstractClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, + accountWalletClient, moduleId }: { - abstractClient: AbstractClient; - accountId: AbstractAccountId; - managerAddress: string; - proxyAddress: string; + accountPublicClient: AccountPublicClient; + accountWalletClient: AccountWalletClient; moduleId: string; }) { super({ - abstractQueryClient: abstractClient, - accountId, - managerAddress, - proxyAddress, + accountPublicClient, moduleId }); - this.accountClient = AbstractAccountClient.fromQueryClient(this.accountQueryClient, abstractClient); + this.accountWalletClient = accountWalletClient; this.sendMessage = this.sendMessage.bind(this); this.receiveMessage = this.receiveMessage.bind(this); this.updateConfig = this.updateConfig.bind(this); @@ -291,8 +454,10 @@ exports[`IbcMailClientAppClient 1`] = ` return this._execute(IbcMailClientExecuteMsgBuilder.updateConfig(), fee_, memo_, funds_); }; _execute = async (msg: ExecuteMsg, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise => { + const signingCwClient = await this.accountWalletClient.getSigningCosmWasmClient(); + const sender = await this.accountWalletClient.getSenderAddress(); const moduleMsg: AppExecuteMsg = AppExecuteMsgFactory.executeApp(msg); - return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_); + return await signingCwClient.execute(sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_); }; }" `; diff --git a/packages/wasm-ast-types/src/abstract-app/__snapshots__/query-options-factory.spec.ts.snap b/packages/wasm-ast-types/src/abstract-app/__snapshots__/query-options-factory.spec.ts.snap index 20514ff6..113de751 100644 --- a/packages/wasm-ast-types/src/abstract-app/__snapshots__/query-options-factory.spec.ts.snap +++ b/packages/wasm-ast-types/src/abstract-app/__snapshots__/query-options-factory.spec.ts.snap @@ -59,7 +59,7 @@ exports[`etf 1`] = ` "export const etfQueries = createQueryKeys(\\"Etf\\", { state: (queryClient: AutocompounderQueryClient) => ({ queryKey: [{ - accountId: queryClient.accountQueryClient.accountId, + accountId: queryClient.accountPublicClient.getRegistryAccountId(), moduleId: queryClient.moduleId }], queryFn: ctx => queryClient.state() @@ -191,21 +191,21 @@ exports[`subscription 1`] = ` "export const subscriptionQueries = createQueryKeys(\\"Subscription\\", { state: (queryClient: AutocompounderQueryClient) => ({ queryKey: [{ - accountId: queryClient.accountQueryClient.accountId, + accountId: queryClient.accountPublicClient.getRegistryAccountId(), moduleId: queryClient.moduleId }], queryFn: ctx => queryClient.state() }), config: (queryClient: AutocompounderQueryClient) => ({ queryKey: [{ - accountId: queryClient.accountQueryClient.accountId, + accountId: queryClient.accountPublicClient.getRegistryAccountId(), moduleId: queryClient.moduleId }], queryFn: ctx => queryClient.config() }), fee: (queryClient: AutocompounderQueryClient) => ({ queryKey: [{ - accountId: queryClient.accountQueryClient.accountId, + accountId: queryClient.accountPublicClient.getRegistryAccountId(), moduleId: queryClient.moduleId }], queryFn: ctx => queryClient.fee() @@ -214,7 +214,7 @@ exports[`subscription 1`] = ` subscriber_state: unknown; }>[\\"subscriber_state\\"]>) => ({ queryKey: [{ - accountId: queryClient.accountQueryClient.accountId, + accountId: queryClient.accountPublicClient.getRegistryAccountId(), moduleId: queryClient.moduleId }, params], queryFn: ctx => queryClient.subscriberState(params) @@ -223,7 +223,7 @@ exports[`subscription 1`] = ` contributor_state: unknown; }>[\\"contributor_state\\"]>) => ({ queryKey: [{ - accountId: queryClient.accountQueryClient.accountId, + accountId: queryClient.accountPublicClient.getRegistryAccountId(), moduleId: queryClient.moduleId }, params], queryFn: ctx => queryClient.contributorState(params) diff --git a/packages/wasm-ast-types/src/abstract-app/abstract-app.spec.ts b/packages/wasm-ast-types/src/abstract-app/abstract-app.spec.ts index af0efd46..f3f50a07 100644 --- a/packages/wasm-ast-types/src/abstract-app/abstract-app.spec.ts +++ b/packages/wasm-ast-types/src/abstract-app/abstract-app.spec.ts @@ -1,4 +1,5 @@ import autocompounder_schema from '../../../../__fixtures__/abstract/apps/autocompounder.json'; +import betting_schema from '../../../../__fixtures__/abstract/apps/betting.json'; import ibcmailclient_schema from '../../../../__fixtures__/abstract/apps/ibcmail/client.json'; import dex_schema from '../../../../__fixtures__/abstract/adapters/dex/dex.json'; import { expectCode, makeContext } from '../../test-utils'; @@ -65,6 +66,62 @@ it('AutocompounderAppClient', () => { ); }); +it('IBettingAppQueryClient', () => { + const ctx = makeContext(betting_schema.query); + + expectCode( + createAppQueryInterface( + ctx, + 'IBettingAppQueryClient', + 'BettingAppClient', + betting_schema.query + ) + ); +}); + +it('BettingAppQueryClient', () => { + const ctx = makeContext(betting_schema.query); + + expectCode( + createAppQueryClass( + ctx, + 'Betting', + 'BettingAppQueryClient', + 'IBettingAppQueryClient', + betting_schema.query + ) + ); +}); + +it('IBettingAppClient', () => { + const ctx = makeContext(betting_schema.execute); + + expectCode( + createAppExecuteInterface( + ctx, + 'IBettingAppClient', + 'BettingAppClient', + 'IBettingAppQueryClient', + betting_schema.execute + ) + ); +}); + +it('BettingAppClient', () => { + const ctx = makeContext(betting_schema.execute); + + expectCode( + createAppExecuteClass( + ctx, + 'Betting', + 'BettingAppClient', + 'IBettingAppClient', + 'BettingAppQueryClient', + betting_schema.execute + ) + ); +}); + it('IbcMailClientAppClient', () => { const ctx = makeContext(ibcmailclient_schema.execute); diff --git a/packages/wasm-ast-types/src/abstract-app/abstract-app.ts b/packages/wasm-ast-types/src/abstract-app/abstract-app.ts index 1b3751c8..e824e712 100644 --- a/packages/wasm-ast-types/src/abstract-app/abstract-app.ts +++ b/packages/wasm-ast-types/src/abstract-app/abstract-app.ts @@ -57,15 +57,12 @@ export const createAbstractAppQueryFactory = ( const CLASS_VARS = { moduleId: t.identifier('moduleId'), _moduleAddress: t.identifier('_moduleAddress'), - accountClient: t.identifier('accountClient'), - accountQueryClient: t.identifier('accountQueryClient') + accountWalletClient: t.identifier('accountWalletClient'), + accountPublicClient: t.identifier('accountPublicClient') }; -const ABSTRACT_ACCOUNT_CLIENT = 'AbstractAccountClient'; -const ABSTRACT_CLIENT = 'AbstractClient'; -const ABSTRACT_QUERY_CLIENT = 'AbstractQueryClient'; -const ABSTRACT_ACCOUNT_ID = 'AbstractAccountId'; -const ABSTRACT_ACCOUNT_QUERY_CLIENT = 'AbstractAccountQueryClient'; +const ACCOUNT_WALLET_CLIENT = 'AccountWalletClient'; +const ACCOUNT_PUBLIC_CLIENT = 'AccountPublicClient'; const ADDRESS_GETTER_FN_NAME = 'getAddress'; /** @@ -122,28 +119,6 @@ function extractCamelcasedMethodParams( */ const staticQueryInterfaceMethods = (connectedAppClientName: string) => { return [ - t.tsPropertySignature( - t.identifier('connectSigningClient'), - t.tsTypeAnnotation( - t.tsFunctionType( - undefined, - // params - [ - identifier( - 'signingClient', - t.tsTypeAnnotation( - t.tsTypeReference(t.identifier('SigningCosmWasmClient')) - ) - ), - identifier('address', t.tsTypeAnnotation(t.tsStringKeyword())) - ], - // Return the connected app client - t.tsTypeAnnotation( - t.tsTypeReference(t.identifier(connectedAppClientName)) - ) - ) - ) - ), t.tsPropertySignature( t.identifier(ADDRESS_GETTER_FN_NAME), t.tsTypeAnnotation( @@ -165,7 +140,7 @@ function extractCamelcasedMethodParams( mutClassName: string, queryMsg: QueryMsg ) => { - context.addUtils(['SigningCosmWasmClient', ABSTRACT_QUERY_CLIENT]); + context.addUtils(['SigningCosmWasmClient', ACCOUNT_PUBLIC_CLIENT]); const methods = getMessageProperties(queryMsg).map((jsonschema) => { const underscoreName = Object.keys(jsonschema.properties)[0]; @@ -197,9 +172,9 @@ function extractCamelcasedMethodParams( t.tsTypeAnnotation(t.tsStringKeyword()) ), t.tSPropertySignature( - CLASS_VARS.accountQueryClient, + CLASS_VARS.accountPublicClient, t.tsTypeAnnotation( - t.tsTypeReference(t.identifier(ABSTRACT_ACCOUNT_QUERY_CLIENT)) + t.tsTypeReference(t.identifier(ACCOUNT_PUBLIC_CLIENT)) ) ), t.tSPropertySignature( @@ -232,7 +207,7 @@ function extractCamelcasedMethodParams( t.memberExpression( t.memberExpression( t.thisExpression(), - CLASS_VARS.accountQueryClient + CLASS_VARS.accountPublicClient ), t.identifier('queryModule') ), @@ -269,7 +244,7 @@ function extractCamelcasedMethodParams( ): t.ExportNamedDeclaration => { context.addUtils([ 'SigningCosmWasmClient', - ABSTRACT_ACCOUNT_CLIENT, + ACCOUNT_WALLET_CLIENT, 'ExecuteResult', 'AppExecuteMsg', 'AppExecuteMsgFactory', @@ -309,9 +284,9 @@ function extractCamelcasedMethodParams( extendsDeclaration, t.tSInterfaceBody([ t.tSPropertySignature( - CLASS_VARS.accountClient, + CLASS_VARS.accountWalletClient, t.tsTypeAnnotation( - t.tsTypeReference(t.identifier(ABSTRACT_ACCOUNT_CLIENT)) + t.tsTypeReference(t.identifier(ACCOUNT_WALLET_CLIENT)) ) ), ...methods @@ -329,7 +304,7 @@ function extractCamelcasedMethodParams( t.objectProperty(t.identifier('proxyAddress'), t.memberExpression( t.memberExpression( t.thisExpression(), - CLASS_VARS.accountQueryClient + CLASS_VARS.accountPublicClient ), t.identifier('proxyAddress') )) @@ -347,6 +322,40 @@ function extractCamelcasedMethodParams( ], t.blockStatement( [ + t.variableDeclaration('const', [ + t.variableDeclarator( + t.identifier('signingCwClient'), + t.awaitExpression( + t.callExpression( + t.memberExpression( + t.memberExpression( + t.thisExpression(), + CLASS_VARS.accountWalletClient + ), + t.identifier('getSigningCosmWasmClient') + ), + [] + ) + ) + ) + ]), + t.variableDeclaration('const', [ + t.variableDeclarator( + t.identifier('sender'), + t.awaitExpression( + t.callExpression( + t.memberExpression( + t.memberExpression( + t.thisExpression(), + CLASS_VARS.accountWalletClient + ), + t.identifier('getSenderAddress') + ), + [] + ) + ) + ) + ]), t.variableDeclaration('const', [ t.variableDeclarator( identifier( @@ -373,27 +382,11 @@ function extractCamelcasedMethodParams( t.awaitExpression( t.callExpression( t.memberExpression( - t.memberExpression( - t.memberExpression( - t.memberExpression( - t.thisExpression(), - t.identifier('accountClient') - ), - t.identifier('abstract') - ), - t.identifier('client') - ), + t.identifier('signingCwClient'), t.identifier('execute') ), [ - t.memberExpression( - t.memberExpression( - t.thisExpression(), - - t.identifier('accountClient') - ), - t.identifier('sender') - ), + t.identifier('sender'), // get this module address t.awaitExpression( t.callExpression( @@ -432,7 +425,7 @@ function extractCamelcasedMethodParams( ): t.ExportNamedDeclaration => { const moduleName = pascal(_moduleName); - context.addUtils([ABSTRACT_QUERY_CLIENT, ABSTRACT_ACCOUNT_QUERY_CLIENT]); + context.addUtils([ACCOUNT_PUBLIC_CLIENT, ACCOUNT_WALLET_CLIENT]); const propertyNames = getMessageProperties(queryMsg) .map((method) => Object.keys(method.properties)?.[0]) @@ -445,11 +438,6 @@ function extractCamelcasedMethodParams( }); methods.push(ADDRESS_ACCESSOR_FN); - methods.push( - connectSigningClientMethod( - `${moduleName}${context.options.abstractApp?.clientPrefix ?? ''}Client` - ) - ); methods.push(QUERY_APP_FN(context.options.abstractApp.moduleType)); return t.exportNamedDeclaration( @@ -458,9 +446,9 @@ function extractCamelcasedMethodParams( [ // client classProperty( - 'accountQueryClient', + 'accountPublicClient', t.tsTypeAnnotation( - t.tsTypeReference(t.identifier(ABSTRACT_ACCOUNT_QUERY_CLIENT)) + t.tsTypeReference(t.identifier(ACCOUNT_PUBLIC_CLIENT)) ) ), @@ -485,25 +473,11 @@ function extractCamelcasedMethodParams( [ autoTypedObjectPattern([ shorthandProperty( - 'abstractQueryClient', - t.tsTypeAnnotation( - t.tsTypeReference(t.identifier(ABSTRACT_QUERY_CLIENT)) - ) - ), - shorthandProperty( - 'accountId', + 'accountPublicClient', t.tsTypeAnnotation( - t.tsTypeReference(t.identifier(ABSTRACT_ACCOUNT_ID)) + t.tsTypeReference(t.identifier(ACCOUNT_PUBLIC_CLIENT)) ) ), - shorthandProperty( - 'managerAddress', - t.tsTypeAnnotation(t.tsStringKeyword()) - ), - shorthandProperty( - 'proxyAddress', - t.tsTypeAnnotation(t.tsStringKeyword()) - ), shorthandProperty( 'moduleId', t.tsTypeAnnotation(t.tsStringKeyword()) @@ -516,21 +490,9 @@ function extractCamelcasedMethodParams( '=', t.memberExpression( t.thisExpression(), - CLASS_VARS.accountQueryClient + CLASS_VARS.accountPublicClient ), - t.newExpression(t.identifier(ABSTRACT_ACCOUNT_QUERY_CLIENT), [ - t.objectExpression([ - t.objectProperty( - t.identifier('abstract'), - t.identifier('abstractQueryClient'), - false, - true - ), - shorthandProperty('accountId'), - shorthandProperty('managerAddress'), - shorthandProperty('proxyAddress') - ]) - ]) + t.identifier('accountPublicClient') ) ), t.expressionStatement( @@ -575,15 +537,21 @@ function extractCamelcasedMethodParams( t.memberExpression( t.memberExpression( t.thisExpression(), - CLASS_VARS.accountQueryClient + CLASS_VARS.accountPublicClient ), t.identifier('getModuleAddress') ), [ - t.memberExpression( - t.thisExpression(), - t.identifier('moduleId') - ) + t.objectExpression([ + t.objectProperty( + t.identifier('id' + ), + t.memberExpression( + t.thisExpression(), + t.identifier('moduleId') + ) + ) + ]) ] ) ) @@ -631,82 +599,6 @@ function extractCamelcasedMethodParams( ); - const connectSigningClientMethod = (mutClientName: string) => { - return t.classProperty( - t.identifier('connectSigningClient'), - arrowFunctionExpression( - [ - identifier( - 'signingClient', - t.tsTypeAnnotation( - t.tsTypeReference(t.identifier('SigningCosmWasmClient')) - ) - ), - identifier('address', t.tsTypeAnnotation(t.tsStringKeyword())) - ], - t.blockStatement([ - t.returnStatement( - t.newExpression(t.identifier(mutClientName), [ - t.objectExpression([ - t.objectProperty( - t.identifier('accountId'), - t.memberExpression( - t.memberExpression( - t.thisExpression(), - CLASS_VARS.accountQueryClient - ), - t.identifier('accountId') - ) - ), - t.objectProperty( - t.identifier('managerAddress'), - t.memberExpression( - t.memberExpression( - t.thisExpression(), - CLASS_VARS.accountQueryClient - ), - t.identifier('managerAddress') - ) - ), - t.objectProperty( - t.identifier('proxyAddress'), - t.memberExpression( - t.memberExpression( - t.thisExpression(), - CLASS_VARS.accountQueryClient - ), - t.identifier('proxyAddress') - ) - ), - t.objectProperty( - t.identifier('moduleId'), - t.memberExpression(t.thisExpression(), t.identifier('moduleId')) - ), - t.objectProperty( - t.identifier('abstractClient'), - t.callExpression( - t.memberExpression( - t.memberExpression( - t.memberExpression( - t.thisExpression(), - CLASS_VARS.accountQueryClient - ), - t.identifier('abstract') - ), - t.identifier('connectSigningClient') - ), - [t.identifier('signingClient'), t.identifier('address')] - ) - ) - ]) - ]) - ) - ]), - t.tsTypeAnnotation(t.tsTypeReference(t.identifier(mutClientName))) - ) - ); - }; - /* public pendingClaims = async ( params: ExtractCamelizedParams @@ -774,11 +666,9 @@ function extractCamelcasedMethodParams( const moduleType = context.options.abstractApp?.moduleType ?? 'app'; context.addUtils([ - ABSTRACT_ACCOUNT_CLIENT, + ACCOUNT_WALLET_CLIENT, 'StdFee', 'Coin', - ABSTRACT_CLIENT, - ABSTRACT_ACCOUNT_ID ]); const propertyNames = getMessageProperties(execMsg) @@ -799,12 +689,11 @@ function extractCamelcasedMethodParams( [ // client classProperty( - 'accountClient', + 'accountWalletClient', t.tsTypeAnnotation( - t.tsTypeReference(t.identifier(ABSTRACT_ACCOUNT_CLIENT)) + t.tsTypeReference(t.identifier(ACCOUNT_WALLET_CLIENT)) ) ), - // constructor t.classMethod( 'constructor', @@ -813,25 +702,17 @@ function extractCamelcasedMethodParams( [ autoTypedObjectPattern([ shorthandProperty( - 'abstractClient', + 'accountPublicClient', t.tsTypeAnnotation( - t.tsTypeReference(t.identifier(ABSTRACT_CLIENT)) + t.tsTypeReference(t.identifier(ACCOUNT_PUBLIC_CLIENT)) ) ), shorthandProperty( - 'accountId', + 'accountWalletClient', t.tsTypeAnnotation( - t.tsTypeReference(t.identifier(ABSTRACT_ACCOUNT_ID)) + t.tsTypeReference(t.identifier(ACCOUNT_WALLET_CLIENT)) ) ), - shorthandProperty( - 'managerAddress', - t.tsTypeAnnotation(t.tsStringKeyword()) - ), - shorthandProperty( - 'proxyAddress', - t.tsTypeAnnotation(t.tsStringKeyword()) - ), shorthandProperty( 'moduleId', t.tsTypeAnnotation(t.tsStringKeyword()) @@ -843,15 +724,7 @@ function extractCamelcasedMethodParams( // TODO! t.callExpression(t.super(), [ t.objectExpression([ - t.objectProperty( - identifier('abstractQueryClient', undefined), - t.identifier('abstractClient'), - false, - true - ), - shorthandProperty('accountId'), - shorthandProperty('managerAddress'), - shorthandProperty('proxyAddress'), + shorthandProperty('accountPublicClient'), shorthandProperty('moduleId') ]) ]) @@ -861,27 +734,14 @@ function extractCamelcasedMethodParams( '=', t.memberExpression( t.thisExpression(), - CLASS_VARS.accountClient + CLASS_VARS.accountWalletClient ), - t.callExpression( - t.memberExpression( - t.identifier(ABSTRACT_ACCOUNT_CLIENT), - t.identifier('fromQueryClient') - ), - [ - t.memberExpression( - t.thisExpression(), - CLASS_VARS.accountQueryClient - ), - t.identifier('abstractClient') - ] - ) + t.identifier('accountWalletClient') ) ), ...bindings ]) ), - ...methods ], [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))], diff --git a/packages/wasm-ast-types/src/abstract-app/query-options-factory.ts b/packages/wasm-ast-types/src/abstract-app/query-options-factory.ts index bcf3ac96..874a4414 100644 --- a/packages/wasm-ast-types/src/abstract-app/query-options-factory.ts +++ b/packages/wasm-ast-types/src/abstract-app/query-options-factory.ts @@ -1,17 +1,8 @@ import { RenderContext } from '../context'; import * as t from '@babel/types'; -import { - createExtractTypeAnnotation, - createTypedObjectParams, - getMessageProperties, - getResponseType, - identifier, - shorthandProperty, - tsObjectPattern -} from '../utils'; +import { createExtractTypeAnnotation, createTypedObjectParams, getMessageProperties, identifier } from '../utils'; import { camel } from 'case'; -import { ExecuteMsg, QueryMsg } from '../types'; -import { getWasmMethodArgs } from '../client'; +import { QueryMsg } from '../types'; type GenerationType = 'abstract-app' | 'contract'; @@ -55,14 +46,16 @@ const ABSTRACT_APP_QUERY_KEYS = t.objectExpression([ // Abstract account Id t.objectProperty( t.identifier('accountId'), - t.memberExpression( + t.callExpression( t.memberExpression( - t.identifier('queryClient'), - t.identifier('accountQueryClient'), - false + t.memberExpression( + t.identifier('queryClient'), + t.identifier('accountPublicClient'), + false + ), + t.identifier('getRegistryAccountId') ), - t.identifier('accountId'), - false + [] ) ), // Abstract module Id diff --git a/packages/wasm-ast-types/src/context/imports.ts b/packages/wasm-ast-types/src/context/imports.ts index 9ca72a0c..3c463ccc 100644 --- a/packages/wasm-ast-types/src/context/imports.ts +++ b/packages/wasm-ast-types/src/context/imports.ts @@ -54,15 +54,13 @@ export const UTILS = { CamelCasedProperties: 'type-fest', // Abstract - AbstractClient: '@abstract-money/abstract.js', - AbstractQueryClient: '@abstract-money/abstract.js', - AbstractAccountId: '@abstract-money/abstract.js', - AbstractAccountClient: '@abstract-money/abstract.js', - AbstractAccountQueryClient: '@abstract-money/abstract.js', - AppExecuteMsg: '@abstract-money/abstract.js', - AppExecuteMsgFactory: '@abstract-money/abstract.js', - AdapterExecuteMsg: '@abstract-money/abstract.js', - AdapterExecuteMsgFactory: '@abstract-money/abstract.js', + AccountPublicClient: '@abstract-money/core', + AccountWalletClient: '@abstract-money/core', + AccountId: '@abstract-money/core', + AppExecuteMsg: '@abstract-money/core', + AppExecuteMsgFactory: '@abstract-money/core', + AdapterExecuteMsg: '@abstract-money/core', + AdapterExecuteMsgFactory: '@abstract-money/core', // react-query createQueryKeys: '@lukemorales/query-key-factory', diff --git a/yarn.lock b/yarn.lock index d94ff6f7..a291f257 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18,49 +18,6 @@ ts-pattern "^4.0.6" type-fest "^3.5.0" -"@abstract-money/ts-codegen@file:/Users/adair/Development/CosmWasm/ts-codegen/packages/ts-codegen": - version "0.35.8" - resolved "file:packages/ts-codegen" - dependencies: - "@babel/core" "7.18.10" - "@babel/generator" "7.18.12" - "@babel/parser" "7.18.11" - "@babel/plugin-proposal-class-properties" "7.18.6" - "@babel/plugin-proposal-export-default-from" "7.18.10" - "@babel/plugin-proposal-object-rest-spread" "7.18.9" - "@babel/plugin-transform-runtime" "7.18.10" - "@babel/preset-env" "7.18.10" - "@babel/preset-typescript" "^7.18.6" - "@babel/runtime" "^7.18.9" - "@babel/traverse" "7.18.11" - "@babel/types" "7.18.10" - "@pyramation/json-schema-to-typescript" " 11.0.4" - case "1.6.3" - dargs "7.0.0" - deepmerge "4.2.2" - dotty "0.1.2" - fuzzy "0.1.3" - glob "8.0.3" - inquirerer "0.1.3" - long "^5.2.0" - minimist "1.2.6" - mkdirp "1.0.4" - parse-package-name "1.0.0" - rimraf "3.0.2" - shelljs "0.8.5" - wasm-ast-types "npm:@abstract-money/wasm-ast-types@0.26.6" - -"@abstract-money/wasm-ast-types@file:/Users/adair/Development/CosmWasm/ts-codegen/packages/wasm-ast-types": - version "0.26.7" - resolved "file:packages/wasm-ast-types" - dependencies: - "@babel/runtime" "^7.18.9" - "@babel/types" "7.18.10" - "@jest/transform" "28.1.3" - ast-stringify "0.1.0" - case "1.6.3" - deepmerge "4.2.2" - "@ampproject/remapping@^2.1.0", "@ampproject/remapping@^2.2.0": version "2.2.1" resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz" @@ -97,7 +54,7 @@ resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.7.tgz" integrity sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA== -"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.12.0", "@babel/core@^7.13.0", "@babel/core@^7.4.0-0", "@babel/core@^7.8.0", "@babel/core@>=7.0.0-beta.0 <8", "@babel/core@>=7.11.0", "@babel/core@7.18.10": +"@babel/core@7.18.10": version "7.18.10" resolved "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz" integrity sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw== @@ -118,28 +75,29 @@ json5 "^2.2.1" semver "^6.3.0" -"@babel/core@^7.11.6": - version "7.21.8" - resolved "https://registry.npmjs.org/@babel/core/-/core-7.21.8.tgz" - integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ== +"@babel/core@7.9.6": + version "7.9.6" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz" + integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg== dependencies: - "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.5" - "@babel/helper-compilation-targets" "^7.21.5" - "@babel/helper-module-transforms" "^7.21.5" - "@babel/helpers" "^7.21.5" - "@babel/parser" "^7.21.8" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.5" - "@babel/types" "^7.21.5" + "@babel/code-frame" "^7.8.3" + "@babel/generator" "^7.9.6" + "@babel/helper-module-transforms" "^7.9.0" + "@babel/helpers" "^7.9.6" + "@babel/parser" "^7.9.6" + "@babel/template" "^7.8.6" + "@babel/traverse" "^7.9.6" + "@babel/types" "^7.9.6" convert-source-map "^1.7.0" debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.2" - semver "^6.3.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.13" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" -"@babel/core@^7.12.3": +"@babel/core@^7.11.6", "@babel/core@^7.12.3": version "7.21.8" resolved "https://registry.npmjs.org/@babel/core/-/core-7.21.8.tgz" integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ== @@ -160,28 +118,6 @@ json5 "^2.2.2" semver "^6.3.0" -"@babel/core@7.9.6": - version "7.9.6" - resolved "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz" - integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg== - dependencies: - "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.9.6" - "@babel/helper-module-transforms" "^7.9.0" - "@babel/helpers" "^7.9.6" - "@babel/parser" "^7.9.6" - "@babel/template" "^7.8.6" - "@babel/traverse" "^7.9.6" - "@babel/types" "^7.9.6" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.2" - lodash "^4.17.13" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - "@babel/eslint-parser@^7.18.9": version "7.21.8" resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.21.8.tgz" @@ -191,6 +127,15 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.0" +"@babel/generator@7.18.12": + version "7.18.12" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz" + integrity sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg== + dependencies: + "@babel/types" "^7.18.10" + "@jridgewell/gen-mapping" "^0.3.2" + jsesc "^2.5.1" + "@babel/generator@^7.18.10", "@babel/generator@^7.21.5", "@babel/generator@^7.7.2", "@babel/generator@^7.9.6": version "7.21.5" resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz" @@ -201,15 +146,6 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/generator@7.18.12": - version "7.18.12" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz" - integrity sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg== - dependencies: - "@babel/types" "^7.18.10" - "@jridgewell/gen-mapping" "^0.3.2" - jsesc "^2.5.1" - "@babel/helper-annotate-as-pure@^7.18.6": version "7.18.6" resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz" @@ -250,16 +186,7 @@ "@babel/helper-split-export-declaration" "^7.18.6" semver "^6.3.0" -"@babel/helper-create-regexp-features-plugin@^7.18.6": - version "7.21.8" - resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.8.tgz" - integrity sha512-zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - regexpu-core "^5.3.1" - semver "^6.3.0" - -"@babel/helper-create-regexp-features-plugin@^7.20.5": +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5": version "7.21.8" resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.8.tgz" integrity sha512-zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g== @@ -438,16 +365,16 @@ regenerator-runtime "^0.13.11" v8flags "^3.1.1" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.20.7", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8", "@babel/parser@^7.9.6": - version "7.21.8" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz" - integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA== - "@babel/parser@7.18.11": version "7.18.11" resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz" integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.20.7", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8", "@babel/parser@^7.9.6": + version "7.21.8" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz" + integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA== + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz" @@ -474,7 +401,7 @@ "@babel/helper-remap-async-to-generator" "^7.18.9" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-class-properties@^7.18.6", "@babel/plugin-proposal-class-properties@7.18.6": +"@babel/plugin-proposal-class-properties@7.18.6", "@babel/plugin-proposal-class-properties@^7.18.6": version "7.18.6" resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz" integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ== @@ -563,28 +490,6 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.18.9": - version "7.20.7" - resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz" - integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg== - dependencies: - "@babel/compat-data" "^7.20.5" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.20.7" - -"@babel/plugin-proposal-object-rest-spread@^7.9.6": - version "7.20.7" - resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz" - integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg== - dependencies: - "@babel/compat-data" "^7.20.5" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.20.7" - "@babel/plugin-proposal-object-rest-spread@7.18.9": version "7.18.9" resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz" @@ -605,6 +510,17 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.0" "@babel/plugin-transform-parameters" "^7.9.5" +"@babel/plugin-proposal-object-rest-spread@^7.18.9", "@babel/plugin-proposal-object-rest-spread@^7.9.6": + version "7.20.7" + resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz" + integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg== + dependencies: + "@babel/compat-data" "^7.20.5" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.20.7" + "@babel/plugin-proposal-optional-catch-binding@^7.18.6", "@babel/plugin-proposal-optional-catch-binding@^7.8.3": version "7.18.6" resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz" @@ -1323,22 +1239,6 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/traverse@^7.18.10", "@babel/traverse@^7.20.5", "@babel/traverse@^7.21.5", "@babel/traverse@^7.7.2", "@babel/traverse@^7.9.6": - version "7.21.5" - resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz" - integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw== - dependencies: - "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.5" - "@babel/helper-environment-visitor" "^7.21.5" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.21.5" - "@babel/types" "^7.21.5" - debug "^4.1.0" - globals "^11.1.0" - "@babel/traverse@7.18.11": version "7.18.11" resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz" @@ -1355,14 +1255,21 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.9.6": +"@babel/traverse@^7.18.10", "@babel/traverse@^7.20.5", "@babel/traverse@^7.21.5", "@babel/traverse@^7.7.2", "@babel/traverse@^7.9.6": version "7.21.5" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz" - integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q== + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz" + integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw== dependencies: - "@babel/helper-string-parser" "^7.21.5" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" + "@babel/code-frame" "^7.21.4" + "@babel/generator" "^7.21.5" + "@babel/helper-environment-visitor" "^7.21.5" + "@babel/helper-function-name" "^7.21.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.21.5" + "@babel/types" "^7.21.5" + debug "^4.1.0" + globals "^11.1.0" "@babel/types@7.18.10": version "7.18.10" @@ -1373,6 +1280,15 @@ "@babel/helper-validator-identifier" "^7.18.6" to-fast-properties "^2.0.0" +"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.9.6": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz" + integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q== + dependencies: + "@babel/helper-string-parser" "^7.21.5" + "@babel/helper-validator-identifier" "^7.19.1" + to-fast-properties "^2.0.0" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz" @@ -1386,7 +1302,7 @@ "@noble/hashes" "^1.0.0" protobufjs "^6.8.8" -"@cosmjs/amino@^0.28.3", "@cosmjs/amino@0.28.13": +"@cosmjs/amino@0.28.13", "@cosmjs/amino@^0.28.3": version "0.28.13" resolved "https://registry.npmjs.org/@cosmjs/amino/-/amino-0.28.13.tgz" integrity sha512-IHnH2zGwaY69qT4mVAavr/pfzx6YE+ud1NHJbvVePlbGiz68CXTi5LHR+K0lrKB5mQ7E+ZErWz2mw5U/x+V1wQ== @@ -1441,7 +1357,7 @@ typescript "~4.4" yargs "^15.3.1" -"@cosmjs/cosmwasm-stargate@^0.28.3", "@cosmjs/cosmwasm-stargate@0.28.13": +"@cosmjs/cosmwasm-stargate@0.28.13", "@cosmjs/cosmwasm-stargate@^0.28.3": version "0.28.13" resolved "https://registry.npmjs.org/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.28.13.tgz" integrity sha512-dVZNOiRd8btQreRUabncGhVXGCS2wToXqxi9l3KEHwCJQ2RWTshuqV+EZAdCaYHE5W6823s2Ol2W/ukA9AXJPw== @@ -1458,23 +1374,6 @@ long "^4.0.0" pako "^2.0.2" -"@cosmjs/cosmwasm-stargate@^0.29.4": - version "0.29.5" - resolved "https://registry.npmjs.org/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.29.5.tgz" - integrity sha512-TNdSvm2tEE3XMCuxHxquzls56t40hC8qnLeYJWHsY2ECZmRK3KrnpRReEr7N7bLtODToK7X/riYrV0JaYxjrYA== - dependencies: - "@cosmjs/amino" "^0.29.5" - "@cosmjs/crypto" "^0.29.5" - "@cosmjs/encoding" "^0.29.5" - "@cosmjs/math" "^0.29.5" - "@cosmjs/proto-signing" "^0.29.5" - "@cosmjs/stargate" "^0.29.5" - "@cosmjs/tendermint-rpc" "^0.29.5" - "@cosmjs/utils" "^0.29.5" - cosmjs-types "^0.5.2" - long "^4.0.0" - pako "^2.0.2" - "@cosmjs/cosmwasm-stargate@0.30.1": version "0.30.1" resolved "https://registry.npmjs.org/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.30.1.tgz" @@ -1492,7 +1391,24 @@ long "^4.0.0" pako "^2.0.2" -"@cosmjs/crypto@^0.28.3", "@cosmjs/crypto@0.28.13": +"@cosmjs/cosmwasm-stargate@^0.29.4": + version "0.29.5" + resolved "https://registry.npmjs.org/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.29.5.tgz" + integrity sha512-TNdSvm2tEE3XMCuxHxquzls56t40hC8qnLeYJWHsY2ECZmRK3KrnpRReEr7N7bLtODToK7X/riYrV0JaYxjrYA== + dependencies: + "@cosmjs/amino" "^0.29.5" + "@cosmjs/crypto" "^0.29.5" + "@cosmjs/encoding" "^0.29.5" + "@cosmjs/math" "^0.29.5" + "@cosmjs/proto-signing" "^0.29.5" + "@cosmjs/stargate" "^0.29.5" + "@cosmjs/tendermint-rpc" "^0.29.5" + "@cosmjs/utils" "^0.29.5" + cosmjs-types "^0.5.2" + long "^4.0.0" + pako "^2.0.2" + +"@cosmjs/crypto@0.28.13", "@cosmjs/crypto@^0.28.3": version "0.28.13" resolved "https://registry.npmjs.org/@cosmjs/crypto/-/crypto-0.28.13.tgz" integrity sha512-ynKfM0q/tMBQMHJby6ad8lR3gkgBKaelQhIsCZTjClsnuC7oYT9y3ThSZCUWr7Pa9h0J8ahU2YV2oFWFVWJQzQ== @@ -1531,7 +1447,7 @@ elliptic "^6.5.4" libsodium-wrappers "^0.7.6" -"@cosmjs/encoding@^0.28.3", "@cosmjs/encoding@0.28.13": +"@cosmjs/encoding@0.28.13", "@cosmjs/encoding@^0.28.3": version "0.28.13" resolved "https://registry.npmjs.org/@cosmjs/encoding/-/encoding-0.28.13.tgz" integrity sha512-jtXbAYtV77rLHxoIrjGFsvgGjeTKttuHRv6cvuy3toCZzY7JzTclKH5O2g36IIE4lXwD9xwuhGJ2aa6A3dhNkA== @@ -1558,13 +1474,21 @@ bech32 "^1.1.4" readonly-date "^1.0.0" -"@cosmjs/faucet-client@^0.28.3", "@cosmjs/faucet-client@0.28.13": +"@cosmjs/faucet-client@0.28.13", "@cosmjs/faucet-client@^0.28.3": version "0.28.13" resolved "https://registry.npmjs.org/@cosmjs/faucet-client/-/faucet-client-0.28.13.tgz" integrity sha512-M6f0Wbw3hvdfYbVpfGDXwjbRAcCgMRm5slWK6cU8BpotckLvBb0xoBvrhklG/ooz6ZTZfAc2e/EJ8GVhksdvpA== dependencies: axios "^0.21.2" +"@cosmjs/json-rpc@0.28.13": + version "0.28.13" + resolved "https://registry.npmjs.org/@cosmjs/json-rpc/-/json-rpc-0.28.13.tgz" + integrity sha512-fInSvg7x9P6p+GWqet+TMhrMTM3OWWdLJOGS5w2ryubMjgpR1rLiAx77MdTNkArW+/6sUwku0sN4veM4ENQu6A== + dependencies: + "@cosmjs/stream" "0.28.13" + xstream "^11.14.0" + "@cosmjs/json-rpc@^0.29.5": version "0.29.5" resolved "https://registry.npmjs.org/@cosmjs/json-rpc/-/json-rpc-0.29.5.tgz" @@ -1581,14 +1505,6 @@ "@cosmjs/stream" "^0.30.1" xstream "^11.14.0" -"@cosmjs/json-rpc@0.28.13": - version "0.28.13" - resolved "https://registry.npmjs.org/@cosmjs/json-rpc/-/json-rpc-0.28.13.tgz" - integrity sha512-fInSvg7x9P6p+GWqet+TMhrMTM3OWWdLJOGS5w2ryubMjgpR1rLiAx77MdTNkArW+/6sUwku0sN4veM4ENQu6A== - dependencies: - "@cosmjs/stream" "0.28.13" - xstream "^11.14.0" - "@cosmjs/ledger-amino@^0.28.3": version "0.28.13" resolved "https://registry.npmjs.org/@cosmjs/ledger-amino/-/ledger-amino-0.28.13.tgz" @@ -1602,7 +1518,7 @@ ledger-cosmos-js "^2.1.8" semver "^7.3.2" -"@cosmjs/math@^0.28.3", "@cosmjs/math@0.28.13": +"@cosmjs/math@0.28.13", "@cosmjs/math@^0.28.3": version "0.28.13" resolved "https://registry.npmjs.org/@cosmjs/math/-/math-0.28.13.tgz" integrity sha512-PDpL8W/kbyeWi0mQ2OruyqE8ZUAdxPs1xCbDX3WXJwy2oU+X2UTbkuweJHVpS9CIqmZulBoWQAmlf6t6zr1N/g== @@ -1623,7 +1539,7 @@ dependencies: bn.js "^5.2.0" -"@cosmjs/proto-signing@^0.28.3", "@cosmjs/proto-signing@0.28.13": +"@cosmjs/proto-signing@0.28.13", "@cosmjs/proto-signing@^0.28.3": version "0.28.13" resolved "https://registry.npmjs.org/@cosmjs/proto-signing/-/proto-signing-0.28.13.tgz" integrity sha512-nSl/2ZLsUJYz3Ad0RY3ihZUgRHIow2OnYqKsESMu+3RA/jTi9bDYhiBu8mNMHI0xrEJry918B2CyI56pOUHdPQ== @@ -1662,6 +1578,16 @@ cosmjs-types "^0.7.1" long "^4.0.0" +"@cosmjs/socket@0.28.13": + version "0.28.13" + resolved "https://registry.npmjs.org/@cosmjs/socket/-/socket-0.28.13.tgz" + integrity sha512-lavwGxQ5VdeltyhpFtwCRVfxeWjH5D5mmN7jgx9nuCf3XSFbTcOYxrk2pQ4usenu1Q1KZdL4Yl5RCNrJuHD9Ug== + dependencies: + "@cosmjs/stream" "0.28.13" + isomorphic-ws "^4.0.1" + ws "^7" + xstream "^11.14.0" + "@cosmjs/socket@^0.29.5": version "0.29.5" resolved "https://registry.npmjs.org/@cosmjs/socket/-/socket-0.29.5.tgz" @@ -1682,17 +1608,7 @@ ws "^7" xstream "^11.14.0" -"@cosmjs/socket@0.28.13": - version "0.28.13" - resolved "https://registry.npmjs.org/@cosmjs/socket/-/socket-0.28.13.tgz" - integrity sha512-lavwGxQ5VdeltyhpFtwCRVfxeWjH5D5mmN7jgx9nuCf3XSFbTcOYxrk2pQ4usenu1Q1KZdL4Yl5RCNrJuHD9Ug== - dependencies: - "@cosmjs/stream" "0.28.13" - isomorphic-ws "^4.0.1" - ws "^7" - xstream "^11.14.0" - -"@cosmjs/stargate@^0.28.3", "@cosmjs/stargate@^0.28.9", "@cosmjs/stargate@0.28.13": +"@cosmjs/stargate@0.28.13", "@cosmjs/stargate@^0.28.3", "@cosmjs/stargate@^0.28.9": version "0.28.13" resolved "https://registry.npmjs.org/@cosmjs/stargate/-/stargate-0.28.13.tgz" integrity sha512-dVBMazDz8/eActHsRcZjDHHptOBMqvibj5CFgEtZBp22gP6ASzoAUXTlkSVk5FBf4sfuUHoff6st134/+PGMAg== @@ -1746,6 +1662,13 @@ protobufjs "~6.11.3" xstream "^11.14.0" +"@cosmjs/stream@0.28.13": + version "0.28.13" + resolved "https://registry.npmjs.org/@cosmjs/stream/-/stream-0.28.13.tgz" + integrity sha512-AnjtfwT8NwPPkd3lhZhjOlOzT0Kn9bgEu2IPOZjQ1nmG2bplsr6TJmnwn0dJxHT7UGtex17h6whKB5N4wU37Wg== + dependencies: + xstream "^11.14.0" + "@cosmjs/stream@^0.29.5": version "0.29.5" resolved "https://registry.npmjs.org/@cosmjs/stream/-/stream-0.29.5.tgz" @@ -1760,11 +1683,20 @@ dependencies: xstream "^11.14.0" -"@cosmjs/stream@0.28.13": +"@cosmjs/tendermint-rpc@0.28.13": version "0.28.13" - resolved "https://registry.npmjs.org/@cosmjs/stream/-/stream-0.28.13.tgz" - integrity sha512-AnjtfwT8NwPPkd3lhZhjOlOzT0Kn9bgEu2IPOZjQ1nmG2bplsr6TJmnwn0dJxHT7UGtex17h6whKB5N4wU37Wg== + resolved "https://registry.npmjs.org/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.28.13.tgz" + integrity sha512-GB+ZmfuJIGQm0hsRtLYjeR3lOxF7Z6XyCBR0cX5AAYOZzSEBJjevPgUHD6tLn8zIhvzxaW3/VKnMB+WmlxdH4w== dependencies: + "@cosmjs/crypto" "0.28.13" + "@cosmjs/encoding" "0.28.13" + "@cosmjs/json-rpc" "0.28.13" + "@cosmjs/math" "0.28.13" + "@cosmjs/socket" "0.28.13" + "@cosmjs/stream" "0.28.13" + "@cosmjs/utils" "0.28.13" + axios "^0.21.2" + readonly-date "^1.0.0" xstream "^11.14.0" "@cosmjs/tendermint-rpc@^0.29.5": @@ -1799,23 +1731,7 @@ readonly-date "^1.0.0" xstream "^11.14.0" -"@cosmjs/tendermint-rpc@0.28.13": - version "0.28.13" - resolved "https://registry.npmjs.org/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.28.13.tgz" - integrity sha512-GB+ZmfuJIGQm0hsRtLYjeR3lOxF7Z6XyCBR0cX5AAYOZzSEBJjevPgUHD6tLn8zIhvzxaW3/VKnMB+WmlxdH4w== - dependencies: - "@cosmjs/crypto" "0.28.13" - "@cosmjs/encoding" "0.28.13" - "@cosmjs/json-rpc" "0.28.13" - "@cosmjs/math" "0.28.13" - "@cosmjs/socket" "0.28.13" - "@cosmjs/stream" "0.28.13" - "@cosmjs/utils" "0.28.13" - axios "^0.21.2" - readonly-date "^1.0.0" - xstream "^11.14.0" - -"@cosmjs/utils@^0.28.3", "@cosmjs/utils@0.28.13": +"@cosmjs/utils@0.28.13", "@cosmjs/utils@^0.28.3": version "0.28.13" resolved "https://registry.npmjs.org/@cosmjs/utils/-/utils-0.28.13.tgz" integrity sha512-dVeMBiyg+46x7XBZEfJK8yTihphbCFpjVYmLJVqmTsHfJwymQ65cpyW/C+V/LgWARGK8hWQ/aX9HM5Ao8QmMSg== @@ -2050,7 +1966,7 @@ jest-haste-map "^28.1.3" slash "^3.0.0" -"@jest/transform@^28.1.3", "@jest/transform@28.1.3": +"@jest/transform@28.1.3", "@jest/transform@^28.1.3": version "28.1.3" resolved "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz" integrity sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA== @@ -2071,7 +1987,7 @@ slash "^3.0.0" write-file-atomic "^4.0.1" -"@jest/types@^28.0.0", "@jest/types@^28.1.3": +"@jest/types@^28.1.3": version "28.1.3" resolved "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz" integrity sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ== @@ -2102,16 +2018,16 @@ resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.15" - resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz" - integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== - "@jridgewell/sourcemap-codec@1.4.14": version "1.4.14" resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.15" + resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.8", "@jridgewell/trace-mapping@^0.3.9": version "0.3.18" resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz" @@ -2850,7 +2766,7 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== @@ -2935,7 +2851,7 @@ dependencies: "@octokit/types" "^6.0.3" -"@octokit/core@^3.5.1", "@octokit/core@>=2", "@octokit/core@>=3": +"@octokit/core@^3.5.1": version "3.6.0" resolved "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz" integrity sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q== @@ -3309,6 +3225,14 @@ dependencies: "@types/yargs-parser" "*" +JSONStream@^1.0.4: + version "1.3.5" + resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + abbrev@1: version "1.1.1" resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz" @@ -3319,7 +3243,7 @@ acorn-jsx@^5.3.2: resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.8.0: +acorn@^8.8.0: version "8.8.2" resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== @@ -3329,7 +3253,7 @@ add-stream@^1.0.0: resolved "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz" integrity sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ== -agent-base@^6.0.2, agent-base@6: +agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== @@ -3528,7 +3452,7 @@ asn1@~0.2.3: dependencies: safer-buffer "~2.1.0" -assert-plus@^1.0.0, assert-plus@1.0.0: +assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== @@ -3584,7 +3508,7 @@ babel-core@7.0.0-bridge.0: resolved "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz" integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg== -babel-jest@^28.0.0, babel-jest@^28.1.3, babel-jest@28.1.3: +babel-jest@28.1.3, babel-jest@^28.1.3: version "28.1.3" resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz" integrity sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q== @@ -3767,7 +3691,7 @@ brorand@^1.1.0: resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz" integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== -browserslist@^4.11.1, browserslist@^4.21.3, browserslist@^4.21.5, "browserslist@>= 4.21.0": +browserslist@^4.11.1, browserslist@^4.21.3, browserslist@^4.21.5: version "4.21.5" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz" integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== @@ -3898,16 +3822,7 @@ chalk@^1.0.0, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -4096,16 +4011,16 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - color-name@1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + colors@^1.1.2: version "1.4.0" resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz" @@ -4238,8 +4153,8 @@ conventional-commits-parser@^3.2.0: resolved "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz" integrity sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q== dependencies: - is-text-path "^1.0.1" JSONStream "^1.0.4" + is-text-path "^1.0.1" lodash "^4.17.15" meow "^8.0.0" split2 "^3.0.0" @@ -4276,16 +4191,16 @@ core-js@^3.26.0: resolved "https://registry.npmjs.org/core-js/-/core-js-3.30.2.tgz" integrity sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg== -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - core-util-is@1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + cosmiconfig@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz" @@ -4373,7 +4288,7 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -d@^1.0.1, d@1: +d@1, d@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/d/-/d-1.0.1.tgz" integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA== @@ -4381,7 +4296,7 @@ d@^1.0.1, d@1: es5-ext "^0.10.50" type "^1.0.1" -dargs@^7.0.0, dargs@7.0.0: +dargs@7.0.0, dargs@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz" integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg== @@ -4398,7 +4313,7 @@ dateformat@^3.0.0: resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@4: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3: version "4.3.4" resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -4438,16 +4353,16 @@ deep-is@^0.1.3: resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== -deepmerge@^4.2.2: - version "4.3.1" - resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz" - integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== - deepmerge@4.2.2: version "4.2.2" resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== +deepmerge@^4.2.2: + version "4.3.1" + resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz" + integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== + defaults@^1.0.3: version "1.0.4" resolved "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz" @@ -4590,7 +4505,7 @@ emoji-regex@^8.0.0: resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -encoding@^0.1.0, encoding@^0.1.12: +encoding@^0.1.12: version "0.1.13" resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -4750,14 +4665,6 @@ eslint-plugin-prettier@^4.2.1: dependencies: prettier-linter-helpers "^1.0.0" -eslint-scope@^7.1.1: - version "7.2.0" - resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz" - integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw== - dependencies: - esrecurse "^4.3.0" - estraverse "^5.2.0" - eslint-scope@5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz" @@ -4766,6 +4673,14 @@ eslint-scope@5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" +eslint-scope@^7.1.1: + version "7.2.0" + resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz" + integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw== + dependencies: + esrecurse "^4.3.0" + estraverse "^5.2.0" + eslint-utils@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz" @@ -4778,17 +4693,12 @@ eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint-visitor-keys@^3.3.0: - version "3.4.1" - resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz" - integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== - -eslint-visitor-keys@^3.4.1: +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: version "3.4.1" resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz" integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== -"eslint@^7.5.0 || ^8.0.0", eslint@>=5, eslint@>=7.0.0, eslint@>=7.28.0, eslint@8.21.0: +eslint@8.21.0: version "8.21.0" resolved "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz" integrity sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA== @@ -4955,16 +4865,16 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" -extsprintf@^1.2.0: - version "1.4.1" - resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz" - integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== - extsprintf@1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz" integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g== +extsprintf@^1.2.0: + version "1.4.1" + resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== + fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" @@ -4986,7 +4896,7 @@ fast-glob@^3.2.9: merge2 "^1.3.0" micromatch "^4.0.4" -fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@2.x: +fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== @@ -5339,42 +5249,35 @@ glob-promise@^4.2.2: dependencies: "@types/glob" "^7.1.3" -glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: - version "7.2.3" - resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== +glob@8.0.3: + version "8.0.3" + resolved "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz" + integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.1.1" + minimatch "^5.0.1" once "^1.3.0" - path-is-absolute "^1.0.0" -glob@8.0.3: - version "8.0.3" - resolved "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz" - integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== +glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: + version "7.2.3" + resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^5.0.1" + minimatch "^3.1.1" once "^1.3.0" + path-is-absolute "^1.0.0" globals@^11.1.0: version "11.12.0" resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.15.0: - version "13.20.0" - resolved "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz" - integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ== - dependencies: - type-fest "^0.20.2" - -globals@^13.19.0: +globals@^13.15.0, globals@^13.19.0: version "13.20.0" resolved "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz" integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ== @@ -5668,7 +5571,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@2: +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -5704,10 +5607,30 @@ inquirer-autocomplete-prompt@^0.11.1: ansi-escapes "^2.0.0" chalk "^1.1.3" figures "^2.0.0" - inquirer "3.1.1" - lodash "^4.17.4" - run-async "^2.3.0" - util "^0.10.3" + inquirer "3.1.1" + lodash "^4.17.4" + run-async "^2.3.0" + util "^0.10.3" + +inquirer@3.1.1: + version "3.1.1" + resolved "https://registry.npmjs.org/inquirer/-/inquirer-3.1.1.tgz" + integrity sha512-H50sHQwgvvaTBd3HpKMVtL/u6LoHDvYym51gd7bGQe/+9HkCE+J0/3N5FJLfd6O6oz44hHewC2Pc2LodzWVafQ== + dependencies: + ansi-escapes "^2.0.0" + chalk "^1.0.0" + cli-cursor "^2.1.0" + cli-width "^2.0.0" + external-editor "^2.0.4" + figures "^2.0.0" + lodash "^4.3.0" + mute-stream "0.0.7" + run-async "^2.2.0" + rx-lite "^4.0.8" + rx-lite-aggregates "^4.0.8" + string-width "^2.0.0" + strip-ansi "^3.0.0" + through "^2.3.6" inquirer@^6.0.0: version "6.5.2" @@ -5747,26 +5670,6 @@ inquirer@^7.3.3: strip-ansi "^6.0.0" through "^2.3.6" -inquirer@3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/inquirer/-/inquirer-3.1.1.tgz" - integrity sha512-H50sHQwgvvaTBd3HpKMVtL/u6LoHDvYym51gd7bGQe/+9HkCE+J0/3N5FJLfd6O6oz44hHewC2Pc2LodzWVafQ== - dependencies: - ansi-escapes "^2.0.0" - chalk "^1.0.0" - cli-cursor "^2.1.0" - cli-width "^2.0.0" - external-editor "^2.0.4" - figures "^2.0.0" - lodash "^4.3.0" - mute-stream "0.0.7" - run-async "^2.2.0" - rx-lite "^4.0.8" - rx-lite-aggregates "^4.0.8" - string-width "^2.0.0" - strip-ansi "^3.0.0" - through "^2.3.6" - inquirerer@0.1.3: version "0.1.3" resolved "https://registry.npmjs.org/inquirerer/-/inquirerer-0.1.3.tgz" @@ -6302,7 +6205,7 @@ jest-resolve-dependencies@^28.1.3: jest-regex-util "^28.0.2" jest-snapshot "^28.1.3" -jest-resolve@*, jest-resolve@^28.1.3: +jest-resolve@^28.1.3: version "28.1.3" resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz" integrity sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ== @@ -6448,7 +6351,7 @@ jest-worker@^28.1.3: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@^28.0.0, jest@^28.1.3, jest@28.1.3: +jest@28.1.3, jest@^28.1.3: version "28.1.3" resolved "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz" integrity sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA== @@ -6542,14 +6445,6 @@ jsonparse@^1.2.0, jsonparse@^1.3.1: resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz" integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== -JSONStream@^1.0.4: - version "1.3.5" - resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz" - integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" - jsprim@^1.2.2: version "1.4.2" resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz" @@ -6820,7 +6715,7 @@ make-dir@^3.0.0: dependencies: semver "^6.0.0" -make-error@^1.1.1, make-error@1.x: +make-error@1.x, make-error@^1.1.1: version "1.3.6" resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== @@ -6994,16 +6889,16 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: - version "1.2.8" - resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz" - integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== - minimist@1.2.6: version "1.2.6" resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== +minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: + version "1.2.8" + resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz" @@ -7095,6 +6990,11 @@ mkdirp-infer-owner@^2.0.0: infer-owner "^1.0.4" mkdirp "^1.0.3" +mkdirp@1.0.4, mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + mkdirp@^0.5.1, mkdirp@^0.5.5: version "0.5.6" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz" @@ -7102,26 +7002,21 @@ mkdirp@^0.5.1, mkdirp@^0.5.5: dependencies: minimist "^1.2.6" -mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - modify-values@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== -ms@^2.0.0: - version "2.1.3" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - ms@2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.0.0: + version "2.1.3" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + multimatch@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz" @@ -7133,17 +7028,12 @@ multimatch@^5.0.0: arrify "^2.0.1" minimatch "^3.0.4" -mute-stream@~0.0.4: - version "0.0.8" - resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - mute-stream@0.0.7: version "0.0.7" resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz" integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ== -mute-stream@0.0.8: +mute-stream@0.0.8, mute-stream@~0.0.4: version "0.0.8" resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== @@ -7172,7 +7062,7 @@ neo-async@^2.6.0: resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -next-tick@^1.1.0, next-tick@1: +next-tick@1, next-tick@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz" integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== @@ -7250,27 +7140,7 @@ nopt@^5.0.0: dependencies: abbrev "1" -normalize-package-data@^2.0.0: - version "2.5.0" - resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-package-data@^2.3.2: - version "2.5.0" - resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-package-data@^2.5.0: +normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -7514,14 +7384,7 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0: - version "2.3.0" - resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^2.2.0: +p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz" integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== @@ -7805,21 +7668,16 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.6.2: - version "2.8.8" - resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +prettier@2.7.1: + version "2.7.1" + resolved "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz" + integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== -prettier@^2.7.1: +prettier@^2.6.2, prettier@^2.7.1: version "2.8.8" resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz" integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== -prettier@>=2.0.0, prettier@2.7.1: - version "2.7.1" - resolved "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz" - integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== - pretty-format@^28.0.0, pretty-format@^28.1.3: version "28.1.3" resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz" @@ -8037,27 +7895,14 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -read@~1.0.1, read@1: +read@1, read@~1.0.1: version "1.0.7" resolved "https://registry.npmjs.org/read/-/read-1.0.7.tgz" integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ== dependencies: mute-stream "~0.0.4" -readable-stream@^2.0.6: - version "2.3.8" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz" - integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.6.0, readable-stream@3: +readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.6.0: version "3.6.2" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -8066,7 +7911,7 @@ readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.6.0, readable string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@~2.3.6: +readable-stream@^2.0.6, readable-stream@~2.3.6: version "2.3.8" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz" integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== @@ -8283,6 +8128,13 @@ reusify@^1.0.4: resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== +rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + rimraf@^2.6.3: version "2.7.1" resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz" @@ -8290,13 +8142,6 @@ rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@^3.0.0, rimraf@^3.0.2, rimraf@3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - ripemd160@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz" @@ -8329,7 +8174,7 @@ rx-lite@*, rx-lite@^4.0.8: resolved "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz" integrity sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA== -rxjs@^6.4.0, rxjs@^6.6.0, rxjs@6: +rxjs@6, rxjs@^6.4.0, rxjs@^6.6.0: version "6.6.7" resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz" integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== @@ -8365,62 +8210,27 @@ safe-regex-test@^1.0.0: get-intrinsic "^1.1.3" is-regex "^1.1.4" -safer-buffer@^2.0.2, safer-buffer@^2.1.0, "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -semver@^5.4.1, semver@^5.5.0, semver@^5.5.1: - version "5.7.1" - resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^5.6.0: - version "5.7.1" - resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^5.7.0: - version "5.7.1" - resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^5.7.1: +"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.0.0: - version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^6.1.1: - version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^6.1.2: - version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^6.3.0: - version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@7.x: +semver@7.x, semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8: version "7.5.1" resolved "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz" integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw== dependencies: lru-cache "^6.0.0" -"semver@2 || 3 || 4 || 5": - version "5.7.1" - resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== +semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" @@ -8534,14 +8344,6 @@ sort-keys@^4.0.0: dependencies: is-plain-obj "^2.0.0" -source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.19: - version "0.5.21" - resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - source-map-support@0.5.13: version "0.5.13" resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz" @@ -8550,6 +8352,14 @@ source-map-support@0.5.13: buffer-from "^1.0.0" source-map "^0.6.0" +source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.19: + version "0.5.21" + resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map@^0.5.0: version "0.5.7" resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" @@ -8591,13 +8401,6 @@ split-on-first@^1.0.0: resolved "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz" integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw== -split@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/split/-/split-1.0.1.tgz" - integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== - dependencies: - through "2" - split2@^3.0.0: version "3.2.2" resolved "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz" @@ -8605,6 +8408,13 @@ split2@^3.0.0: dependencies: readable-stream "^3.0.0" +split@^1.0.0: + version "1.0.1" + resolved "https://registry.npmjs.org/split/-/split-1.0.1.tgz" + integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== + dependencies: + through "2" + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" @@ -8644,20 +8454,6 @@ strict-uri-encode@^2.0.0: resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz" integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ== -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - string-argv@^0.3.1: version "0.3.2" resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz" @@ -8689,15 +8485,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string-width@^2.0.0: - version "2.1.1" - resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string-width@^2.1.0: +string-width@^2.0.0, string-width@^2.1.0: version "2.1.1" resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -8732,6 +8520,20 @@ string.prototype.trimstart@^1.0.6: define-properties "^1.1.4" es-abstract "^1.20.4" +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" @@ -8922,11 +8724,6 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" -through@^2.3.4, through@^2.3.6, "through@>=2.2.7 <3", through@2: - version "2.3.8" - resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" - integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - through2@^2.0.0: version "2.0.5" resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz" @@ -8942,6 +8739,11 @@ through2@^4.0.0: dependencies: readable-stream "3" +through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6: + version "2.3.8" + resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== + timers-ext@^0.1.7: version "0.1.7" resolved "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz" @@ -9139,12 +8941,12 @@ typedarray@^0.0.6: resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@^4.7.4, typescript@>=4.3: +typescript@^4.7.4: version "4.9.5" resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== -typescript@>=2.7, typescript@~4.4: +typescript@~4.4: version "4.4.4" resolved "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz" integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA== @@ -9322,10 +9124,8 @@ walker@^1.0.8: dependencies: makeerror "1.0.12" -"wasm-ast-types@npm:@abstract-money/wasm-ast-types@0.26.7": - version "0.26.7" - resolved "https://registry.npmjs.org/@abstract-money/wasm-ast-types/-/wasm-ast-types-0.26.7.tgz" - integrity sha512-hUs2s+EZyEeOhWRDOW9Y27dnXf+Cy/QxfkU1pR8f6a8pn9+qYYzUg+EXOTqEMi0jhngqcyFVFHQ76O84UYB8/A== +"wasm-ast-types@file:packages/wasm-ast-types": + version "0.28.0-beta-1" dependencies: "@babel/runtime" "^7.18.9" "@babel/types" "7.18.10" @@ -9510,7 +9310,7 @@ write-pkg@^4.0.0: type-fest "^0.4.1" write-json-file "^3.2.0" -ws@*, ws@^7: +ws@^7: version "7.5.9" resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== @@ -9538,12 +9338,7 @@ y18n@^5.0.5: resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== -yallist@^3.0.0, yallist@^3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - -yallist@^3.0.2: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -9558,6 +9353,11 @@ yaml@^1.10.0, yaml@^1.7.2: resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== +yargs-parser@20.2.4: + version "20.2.4" + resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + yargs-parser@^18.1.2: version "18.1.3" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz" @@ -9571,21 +9371,11 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3: resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs-parser@^21.0.1: - version "21.1.1" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs-parser@^21.1.1: +yargs-parser@^21.0.1, yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - yargs@^15.3.1: version "15.4.1" resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"