diff --git a/packages/bcp/src/cosmwasmconnector.ts b/packages/bcp/src/cosmwasmconnector.ts index cdf1c4b2..648568e9 100644 --- a/packages/bcp/src/cosmwasmconnector.ts +++ b/packages/bcp/src/cosmwasmconnector.ts @@ -10,12 +10,12 @@ import { CosmWasmConnection, TokenConfiguration } from "./cosmwasmconnection"; export function createCosmWasmConnector( url: string, addressPrefix: CosmosAddressBech32Prefix, - tokens: TokenConfiguration, + tokenConfig: TokenConfiguration, expectedChainId?: ChainId, ): ChainConnector { - const codec = new CosmWasmCodec(addressPrefix, tokens.bankTokens); + const codec = new CosmWasmCodec(addressPrefix, tokenConfig.bankTokens, tokenConfig.erc20Tokens); return { - establishConnection: async () => CosmWasmConnection.establish(url, addressPrefix, tokens), + establishConnection: async () => CosmWasmConnection.establish(url, addressPrefix, tokenConfig), codec: codec, expectedChainId: expectedChainId, }; diff --git a/packages/bcp/types/cosmwasmconnector.d.ts b/packages/bcp/types/cosmwasmconnector.d.ts index fbebceea..61ed984f 100644 --- a/packages/bcp/types/cosmwasmconnector.d.ts +++ b/packages/bcp/types/cosmwasmconnector.d.ts @@ -7,6 +7,6 @@ import { CosmWasmConnection, TokenConfiguration } from "./cosmwasmconnection"; export declare function createCosmWasmConnector( url: string, addressPrefix: CosmosAddressBech32Prefix, - tokens: TokenConfiguration, + tokenConfig: TokenConfiguration, expectedChainId?: ChainId, ): ChainConnector; diff --git a/packages/faucet/README.md b/packages/faucet/README.md index b2918908..3919206e 100644 --- a/packages/faucet/README.md +++ b/packages/faucet/README.md @@ -116,7 +116,7 @@ situation is different. ``` curl --header "Content-Type: application/json" \ --request POST \ - --data '{"ticker":"CASH","address":"tiov1k898u78hgs36uqw68dg7va5nfkgstu5z0fhz3f"}' \ + --data '{"ticker":"BASH","address":"cosmos1yre6ac7qfgyfgvh58ph0rgw627rhw766y430qq"}' \ http://localhost:8000/credit ``` diff --git a/packages/faucet/src/actions/start/start.ts b/packages/faucet/src/actions/start/start.ts index 408203f5..9f803cb7 100644 --- a/packages/faucet/src/actions/start/start.ts +++ b/packages/faucet/src/actions/start/start.ts @@ -19,7 +19,7 @@ export async function start(args: ReadonlyArray): Promise { const connector = createCosmWasmConnector( blockchainBaseUrl, constants.addressPrefix, - constants.tokenConfig, + constants.developmentTokenConfig, ); console.info(`Connecting to blockchain ${blockchainBaseUrl} ...`); const connection = await connector.establishConnection(); @@ -35,7 +35,7 @@ export async function start(args: ReadonlyArray): Promise { ); // Faucet - const faucet = new Faucet(constants.tokenConfig, connection, connector.codec, profile, true); + const faucet = new Faucet(constants.developmentTokenConfig, connection, connector.codec, profile, true); const chainTokens = await faucet.loadTokenTickers(); console.info("Chain tokens:", chainTokens); const accounts = await faucet.loadAccounts(); diff --git a/packages/faucet/src/constants.ts b/packages/faucet/src/constants.ts index bea2d710..3e37b1e8 100644 --- a/packages/faucet/src/constants.ts +++ b/packages/faucet/src/constants.ts @@ -6,7 +6,9 @@ export const port: number = Number.parseInt(process.env.FAUCET_PORT || "", 10) | export const mnemonic: string | undefined = process.env.FAUCET_MNEMONIC; export const addressPrefix = "cosmos"; -export const tokenConfig: TokenConfiguration = { + +/** For the local development chain */ +export const developmentTokenConfig: TokenConfiguration = { bankTokens: [ { fractionalDigits: 6, @@ -21,4 +23,12 @@ export const tokenConfig: TokenConfiguration = { denom: "ustake", }, ], + erc20Tokens: [ + { + contractAddress: "cosmos1hqrdl6wstt8qzshwc6mrumpjk9338k0lr4dqxd", + fractionalDigits: 0, + ticker: "BASH", + name: "Bash Token", + }, + ], }; diff --git a/packages/faucet/src/faucet.spec.ts b/packages/faucet/src/faucet.spec.ts index 51e5abb7..f59d6564 100644 --- a/packages/faucet/src/faucet.spec.ts +++ b/packages/faucet/src/faucet.spec.ts @@ -32,12 +32,6 @@ const defaultConfig: TokenConfiguration = { }, ], erc20Tokens: [ - // { - // contractAddress: "cosmos18vd8fpwxzck93qlwghaj6arh4p7c5n89uzcee5", - // fractionalDigits: 5, - // ticker: "ASH", - // name: "Ash Token", - // }, { contractAddress: "cosmos1hqrdl6wstt8qzshwc6mrumpjk9338k0lr4dqxd", fractionalDigits: 0,