From 135e40a3bd85da2e802c207698a6d655e92b491d Mon Sep 17 00:00:00 2001 From: Serkan Reis Date: Mon, 29 Apr 2024 12:03:49 +0300 Subject: [PATCH] Updates imports & transaction results --- config.example.js | 2 +- devops/rarity.ts | 2 +- devops/testnet-launch.ts | 2 +- src/account.ts | 8 ++------ src/collection-actions/execute/airdrop-file.ts | 3 ++- src/collection-actions/execute/burn.ts | 2 +- src/collection-actions/execute/mint-for-file.ts | 9 +++------ src/collection-actions/execute/mint.ts | 6 ++++-- src/collection-actions/execute/shuffle.ts | 2 +- src/collection-actions/execute/transfer-file.ts | 2 +- src/collection-actions/execute/update-metadata.ts | 3 ++- src/collection-actions/query/query-mint-count.ts | 2 +- src/collection-actions/query/query-minters.ts | 2 +- src/create-collection/base-minter.ts | 13 +++++++------ src/create-collection/minter.ts | 11 ++++++----- src/create-collection/open-edition-minter.ts | 11 ++++++----- src/helpers/utils.ts | 2 +- src/marketplace/floor-price.ts | 2 +- src/marketplace/floor-sweeper.ts | 5 ++++- src/query.ts | 2 +- src/splits/query-splits.ts | 2 +- src/splits/splits.ts | 2 +- src/vending-snapshot.ts | 2 +- src/whitelist/whitelist-file.ts | 2 +- src/whitelist/whitelist-flex.ts | 2 +- src/whitelist/whitelist.ts | 2 +- 26 files changed, 53 insertions(+), 50 deletions(-) diff --git a/config.example.js b/config.example.js index 849fa13d..c048c913 100644 --- a/config.example.js +++ b/config.example.js @@ -16,7 +16,7 @@ module.exports = { // NFT.storage endpoint nftStorageEndpoint: 'https://api.nft.storage', // NFT.storage API key - nftStorageApiKey: '', + nftStorageApiKey: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkaWQ6ZXRocjoweDJBODk5OGI4ZkE2YTM1NzMyYmMxQTRDQzNhOUU2M0Y2NUM3ZjA1RWIiLCJpc3MiOiJuZnQtc3RvcmFnZSIsImlhdCI6MTY1NTE5MTcwNDQ2MiwibmFtZSI6IlRlc3QifQ.IbdV_26bkPHSdd81sxox5AoG-5a4CCEY4aCrdbCXwAE', // Pinata API Key (optional) pinataApiKey: '', // Pinata Secret Key (optional) diff --git a/devops/rarity.ts b/devops/rarity.ts index 313a8e7d..f29a785c 100644 --- a/devops/rarity.ts +++ b/devops/rarity.ts @@ -5,7 +5,7 @@ // ex: yarn devops-rarity -import { CosmWasmClient } from 'cosmwasm'; +import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'; const fetch = require('node-fetch'); const config = require('../config'); require('dotenv').config(); diff --git a/devops/testnet-launch.ts b/devops/testnet-launch.ts index 77157892..686c87ef 100644 --- a/devops/testnet-launch.ts +++ b/devops/testnet-launch.ts @@ -55,7 +55,7 @@ const collection3 = require('./collection3'); import { create_minter as create_minter } from '../src/create-collection/minter'; import { batchMint } from '../src/collection-actions/execute/mint'; import { toStars } from '../src/helpers/utils'; -import { CosmWasmClient } from 'cosmwasm'; +import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'; import { naturalCompare } from '../src/helpers/sort'; // Define constants to use for launch. overrides config.js diff --git a/src/account.ts b/src/account.ts index b71a2270..900d4919 100644 --- a/src/account.ts +++ b/src/account.ts @@ -1,9 +1,5 @@ -import { - encodeSecp256k1Pubkey, - Secp256k1HdWallet, - Bip39, - Random, -} from 'cosmwasm'; +import { Bip39, Random } from '@cosmjs/crypto'; +import { Secp256k1HdWallet, encodeSecp256k1Pubkey } from '@cosmjs/amino'; async function createAccount() { const mnemonic = Bip39.encode(Random.getBytes(16)).toString(); diff --git a/src/collection-actions/execute/airdrop-file.ts b/src/collection-actions/execute/airdrop-file.ts index 5bac4310..6f8168ba 100644 --- a/src/collection-actions/execute/airdrop-file.ts +++ b/src/collection-actions/execute/airdrop-file.ts @@ -8,7 +8,8 @@ // Accepts cosmos, stars addresses. import { ExecuteMsg } from '@stargazezone/types/contracts/minter/execute_msg'; -import { coin, MsgExecuteContractEncodeObject } from 'cosmwasm'; +import { coin } from '@cosmjs/amino'; +import { MsgExecuteContractEncodeObject } from '@cosmjs/cosmwasm-stargate'; import { toStars } from '../../helpers/utils'; import inquirer from 'inquirer'; import { getClient } from '../../helpers/client'; diff --git a/src/collection-actions/execute/burn.ts b/src/collection-actions/execute/burn.ts index 716c248b..45a55680 100644 --- a/src/collection-actions/execute/burn.ts +++ b/src/collection-actions/execute/burn.ts @@ -2,7 +2,7 @@ import { getClient } from '../../helpers/client'; import { toStars } from '../../helpers/utils'; import inquirer from 'inquirer'; import { mintTo } from './mint'; -import { SigningCosmWasmClient } from 'cosmwasm'; +import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate'; const config = require('../../../config'); const BATCH_BURN_LIMIT = 50; diff --git a/src/collection-actions/execute/mint-for-file.ts b/src/collection-actions/execute/mint-for-file.ts index 7540c9ca..c63cbd51 100644 --- a/src/collection-actions/execute/mint-for-file.ts +++ b/src/collection-actions/execute/mint-for-file.ts @@ -7,12 +7,9 @@ // Accepts cosmos, stars addresses. -import { - calculateFee, - coin, - GasPrice, - MsgExecuteContractEncodeObject, -} from 'cosmwasm'; +import { MsgExecuteContractEncodeObject } from '@cosmjs/cosmwasm-stargate'; +import { calculateFee, coin, GasPrice } from '@cosmjs/stargate'; + import { toStars } from '../../helpers/utils'; import { getClient } from '../../helpers/client'; import inquirer from 'inquirer'; diff --git a/src/collection-actions/execute/mint.ts b/src/collection-actions/execute/mint.ts index a55b2eb6..23a567ea 100644 --- a/src/collection-actions/execute/mint.ts +++ b/src/collection-actions/execute/mint.ts @@ -1,4 +1,6 @@ -import { MsgExecuteContractEncodeObject, coins, toUtf8, Coin } from 'cosmwasm'; +import { MsgExecuteContractEncodeObject } from '@cosmjs/cosmwasm-stargate'; +import { coins, Coin } from '@cosmjs/amino'; +import { toUtf8 } from '@cosmjs/encoding'; import { MsgExecuteContract } from 'cosmjs-types/cosmwasm/wasm/v1/tx'; import { getClient } from '../../helpers/client'; import { isValidIpfsUrl, toStars } from '../../helpers/utils'; @@ -248,7 +250,7 @@ async function format_funds(funds: Coin) { const args = process.argv.slice(2); if (args.length == 0) { - console.log('No arguments provided, need --to or --for'); + console.log('No arguments provided, need --to, --for or --token-uri'); } else if (args.length == 1 && args[0] == '--test-whitelist') { test_whitelist(); } else if (args.length == 2 && args[0] == '--to') { diff --git a/src/collection-actions/execute/shuffle.ts b/src/collection-actions/execute/shuffle.ts index b213f926..1bcbb46c 100644 --- a/src/collection-actions/execute/shuffle.ts +++ b/src/collection-actions/execute/shuffle.ts @@ -4,7 +4,7 @@ // Shuffling can act as a countermeasure against rarity snipers. // Shuffle Fee is meant to be controlled by governance proposal. It is currently hardcoded to 500 stars. -import { coins } from 'cosmwasm'; +import { coins } from '@cosmjs/amino'; import { toStars } from '../../helpers/utils'; import { getClient } from '../../helpers/client'; diff --git a/src/collection-actions/execute/transfer-file.ts b/src/collection-actions/execute/transfer-file.ts index 251e4ee0..341a0b03 100644 --- a/src/collection-actions/execute/transfer-file.ts +++ b/src/collection-actions/execute/transfer-file.ts @@ -6,7 +6,7 @@ // Accepts cosmos, stars addresses. -import { coin, MsgExecuteContractEncodeObject } from 'cosmwasm'; +import { MsgExecuteContractEncodeObject } from '@cosmjs/cosmwasm-stargate'; import { toStars } from '../../helpers/utils'; import { getClient } from '../../helpers/client'; import inquirer from 'inquirer'; diff --git a/src/collection-actions/execute/update-metadata.ts b/src/collection-actions/execute/update-metadata.ts index 55f1a439..4d737cbb 100644 --- a/src/collection-actions/execute/update-metadata.ts +++ b/src/collection-actions/execute/update-metadata.ts @@ -1,7 +1,8 @@ // Update metadata for token ids using metadata.csv // Requires the collection is sg721-updatable contract -import { MsgExecuteContractEncodeObject, toUtf8 } from 'cosmwasm'; +import { MsgExecuteContractEncodeObject } from '@cosmjs/cosmwasm-stargate'; +import { toUtf8 } from '@cosmjs/encoding'; import { MsgExecuteContract } from 'cosmjs-types/cosmwasm/wasm/v1/tx'; import inquirer from 'inquirer'; import { assertIsDeliverTxSuccess } from '@cosmjs/stargate'; diff --git a/src/collection-actions/query/query-mint-count.ts b/src/collection-actions/query/query-mint-count.ts index df183278..5dea427d 100644 --- a/src/collection-actions/query/query-mint-count.ts +++ b/src/collection-actions/query/query-mint-count.ts @@ -1,4 +1,4 @@ -import { CosmWasmClient } from 'cosmwasm'; +import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'; import { toStars } from '../../helpers/utils'; import * as fs from 'fs'; diff --git a/src/collection-actions/query/query-minters.ts b/src/collection-actions/query/query-minters.ts index f3280b71..e8990683 100644 --- a/src/collection-actions/query/query-minters.ts +++ b/src/collection-actions/query/query-minters.ts @@ -1,4 +1,4 @@ -import { CosmWasmClient } from 'cosmwasm'; +import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'; const config = require('../../../config'); diff --git a/src/create-collection/base-minter.ts b/src/create-collection/base-minter.ts index da8cf7f4..09f4e23f 100644 --- a/src/create-collection/base-minter.ts +++ b/src/create-collection/base-minter.ts @@ -1,5 +1,6 @@ import { CreateMinterMsgForNullable_Empty } from '@stargazezone/launchpad/src/BaseMinter.types'; -import { coins, Decimal } from 'cosmwasm'; +import { coins } from '@cosmjs/amino'; +import { Decimal } from '@cosmjs/math'; import inquirer from 'inquirer'; import { getClient } from '../helpers/client'; import { @@ -113,15 +114,15 @@ export async function create_minter() { 'The `wasm` event emitted by the contract execution:', wasmEvent ); + console.info('Tx Hash: ', result.transactionHash); if (wasmEvent != undefined) { console.info('Add these contract addresses to config.js:'); - console.info('factory address: ', wasmEvent.attributes[0]['value']); - console.info('minter address: ', wasmEvent.attributes[2]['value']); + console.info('Minter address: ', result.logs[0].events[16].attributes[0].value); console.info( - 'collection contract address: ', - wasmEvent.attributes[7]['value'] + 'Collection contract address: ', + result.logs[0].events[18].attributes[0].value ); - return wasmEvent.attributes[2]['value']; + return result.logs[0].events[16].attributes[0].value; } } diff --git a/src/create-collection/minter.ts b/src/create-collection/minter.ts index 01e58197..652f13e7 100644 --- a/src/create-collection/minter.ts +++ b/src/create-collection/minter.ts @@ -2,7 +2,8 @@ import { CreateMinterMsgForVendingMinterInitMsgExtension, Timestamp, } from '@stargazezone/launchpad/src/VendingMinter.types'; -import { coins, Decimal } from 'cosmwasm'; +import { coins } from '@cosmjs/amino'; +import { Decimal } from '@cosmjs/math'; import inquirer from 'inquirer'; import { getClient } from '../helpers/client'; import { @@ -209,12 +210,12 @@ export async function create_minter(params: MinterParams) { 'The `wasm` event emitted by the contract execution:', wasmEvent ); + console.info('Transaction Hash:', result.transactionHash); if (wasmEvent != undefined) { console.info('Add these contract addresses to config.js:'); - console.info('factory address: ', wasmEvent.attributes[0]['value']); - console.info('minter address: ', wasmEvent.attributes[2]['value']); - console.info('sg721 contract address: ', wasmEvent.attributes[7]['value']); - return wasmEvent.attributes[2]['value']; + console.info('Minter address: ', result.logs[0].events[16].attributes[0].value); + console.info('Collection contract address: ', result.logs[0].events[18].attributes[0].value); + return result.logs[0].events[16].attributes[0].value; } } diff --git a/src/create-collection/open-edition-minter.ts b/src/create-collection/open-edition-minter.ts index b787cc5a..6ebf86ec 100644 --- a/src/create-collection/open-edition-minter.ts +++ b/src/create-collection/open-edition-minter.ts @@ -1,5 +1,6 @@ import { Timestamp } from '@stargazezone/launchpad/src/VendingMinter.types'; -import { coins, Decimal } from 'cosmwasm'; +import { coins } from '@cosmjs/amino'; +import { Decimal } from '@cosmjs/math'; import inquirer from 'inquirer'; import { getClient } from '../helpers/client'; import { @@ -213,12 +214,12 @@ export async function create_minter(params: OpenEditionMinterParams) { 'The `wasm` event emitted by the contract execution:', wasmEvent ); + console.info('Tx Hash: ', result.transactionHash); if (wasmEvent != undefined) { console.info('You may add these contract addresses to config.js to perform actions for the collection:'); - console.info('Open Edition Factory address: ', wasmEvent.attributes[0]['value']); - console.info('Open Edition Minter address: ', wasmEvent.attributes[2]['value']); - console.info('sg721 contract address: ', wasmEvent.attributes[7]['value']); - return wasmEvent.attributes[2]['value']; + console.info('Open Edition Minter address: ', result.logs[0].events[16].attributes[0].value); + console.info('Collection contract address: ', result.logs[0].events[18].attributes[0].value); + return result.logs[0].events[16].attributes[0].value; } } diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts index b518ae68..a1b27cb9 100644 --- a/src/helpers/utils.ts +++ b/src/helpers/utils.ts @@ -1,4 +1,4 @@ -import { toBech32, fromBech32 } from 'cosmwasm'; +import { toBech32, fromBech32 } from '@cosmjs/encoding'; const config = require('../../config'); export const toStars = (addr: string) => { diff --git a/src/marketplace/floor-price.ts b/src/marketplace/floor-price.ts index 9cd2cbbd..542e032a 100644 --- a/src/marketplace/floor-price.ts +++ b/src/marketplace/floor-price.ts @@ -3,7 +3,7 @@ // Queries AsksSortedByPrice // Outputs to console as csv -import { CosmWasmClient } from 'cosmwasm'; +import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'; import { toStars } from '../helpers/utils'; const config = require('../../config'); const fetch = require('node-fetch'); diff --git a/src/marketplace/floor-sweeper.ts b/src/marketplace/floor-sweeper.ts index ae374c99..af117eda 100644 --- a/src/marketplace/floor-sweeper.ts +++ b/src/marketplace/floor-sweeper.ts @@ -6,7 +6,10 @@ import { toStars } from '../helpers/utils'; const config = require('../../config'); import inquirer from 'inquirer'; import { getClient } from '../helpers/client'; -import { coin, MsgExecuteContractEncodeObject, toUtf8 } from 'cosmwasm'; +import { MsgExecuteContractEncodeObject } from '@cosmjs/cosmwasm-stargate'; +import { coin } from '@cosmjs/amino'; +import { toUtf8 } from '@cosmjs/encoding'; + import { MsgExecuteContract } from 'cosmjs-types/cosmwasm/wasm/v1/tx'; import { assertIsDeliverTxSuccess } from '@cosmjs/stargate'; diff --git a/src/query.ts b/src/query.ts index 86e67441..83b00799 100644 --- a/src/query.ts +++ b/src/query.ts @@ -1,4 +1,4 @@ -import { CosmWasmClient } from 'cosmwasm'; +import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'; import { toStars } from './helpers/utils'; const config = require('../config'); diff --git a/src/splits/query-splits.ts b/src/splits/query-splits.ts index 9e9b5b38..b1807a50 100644 --- a/src/splits/query-splits.ts +++ b/src/splits/query-splits.ts @@ -1,4 +1,4 @@ -import { CosmWasmClient } from 'cosmwasm'; +import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'; import { toStars } from '../helpers/utils'; const config = require('../../config'); diff --git a/src/splits/splits.ts b/src/splits/splits.ts index 1855e287..66b4273c 100644 --- a/src/splits/splits.ts +++ b/src/splits/splits.ts @@ -1,7 +1,7 @@ import inquirer from 'inquirer'; import { toStars } from '../helpers/utils'; import { getClient } from '../helpers/client'; -import { toBase64 } from 'cosmwasm'; +import { toBase64 } from '@cosmjs/encoding'; import { toUtf8 } from '@cosmjs/encoding'; import { InstantiateMsg as SplitsInstantiateMsg } from '@stargazezone/launchpad/src/Splits.types'; diff --git a/src/vending-snapshot.ts b/src/vending-snapshot.ts index 072211bd..3e8d7a14 100644 --- a/src/vending-snapshot.ts +++ b/src/vending-snapshot.ts @@ -1,4 +1,4 @@ -import { CosmWasmClient } from 'cosmwasm'; +import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'; import { appendFileSync } from 'fs'; const config = require('../config'); diff --git a/src/whitelist/whitelist-file.ts b/src/whitelist/whitelist-file.ts index 1c07915f..a1c7876b 100644 --- a/src/whitelist/whitelist-file.ts +++ b/src/whitelist/whitelist-file.ts @@ -3,7 +3,7 @@ // If you run into an error with `member_limit`, run `yarn whitelist --increase-member-limit` import { ExecuteMsg } from '@stargazezone/types/contracts/whitelist/execute_msg'; -import { MsgExecuteContractEncodeObject } from 'cosmwasm'; +import { MsgExecuteContractEncodeObject } from '@cosmjs/cosmwasm-stargate'; import { toStars } from '../helpers/utils'; import inquirer from 'inquirer'; import { getClient } from '../helpers/client'; diff --git a/src/whitelist/whitelist-flex.ts b/src/whitelist/whitelist-flex.ts index e2e7e68e..46f13660 100644 --- a/src/whitelist/whitelist-flex.ts +++ b/src/whitelist/whitelist-flex.ts @@ -1,7 +1,7 @@ import { InstantiateMsg } from '@stargazezone/types/contracts/whitelist/instantiate_msg'; import { ExecuteMsg } from '@stargazezone/types/contracts/whitelist/execute_msg'; import { Timestamp } from '@stargazezone/types/contracts/minter/shared-types'; -import { coins } from 'cosmwasm'; +import { coins } from '@cosmjs/amino'; import inquirer from 'inquirer'; import { toStars } from '../helpers/utils'; import { getClient } from '../helpers/client'; diff --git a/src/whitelist/whitelist.ts b/src/whitelist/whitelist.ts index b548d856..b6feb387 100644 --- a/src/whitelist/whitelist.ts +++ b/src/whitelist/whitelist.ts @@ -1,7 +1,7 @@ import { InstantiateMsg } from '@stargazezone/types/contracts/whitelist/instantiate_msg'; import { ExecuteMsg } from '@stargazezone/types/contracts/whitelist/execute_msg'; import { Timestamp } from '@stargazezone/types/contracts/minter/shared-types'; -import { coins } from 'cosmwasm'; +import { coins } from '@cosmjs/amino'; import inquirer from 'inquirer'; import { toStars, nameToAddress } from '../helpers/utils'; import { getClient } from '../helpers/client';