@swapkit/toolboxes 1.0.0-beta.1 → 1.0.0-beta.11

package/src/cosmos/toolbox/thorchain.ts

@@ -43,8 +43,8 @@ function secp256k1HdWalletFromMnemonic({
   derivationPath?: string;
 }) {
   return async function secp256k1HdWalletFromMnemonic(mnemonic: string, index = 0) {
-    const { Secp256k1HdWallet } = await import("@cosmjs/amino");
-    const { stringToPath } = await import("@cosmjs/crypto");
+    const { Secp256k1HdWallet } = (await import("@cosmjs/amino")).default;
+    const { stringToPath } = (await import("@cosmjs/crypto")).default;
 
     return Secp256k1HdWallet.fromMnemonic(mnemonic, {
       hdPaths: [stringToPath(`${derivationPath}/${index}`)],
@@ -114,8 +114,8 @@ function broadcastMultisigTx({
     threshold: number,
     bodyBytes: Uint8Array,
   ) {
-    const { encodeSecp256k1Pubkey, pubkeyToAddress } = await import("@cosmjs/amino");
-    const { makeMultisignedTxBytes } = await import("@cosmjs/stargate");
+    const { encodeSecp256k1Pubkey, pubkeyToAddress } = (await import("@cosmjs/amino")).default;
+    const { makeMultisignedTxBytes } = (await import("@cosmjs/stargate")).default;
 
     const { sequence, fee } = JSON.parse(tx);
     const multisigPubkey = await createMultisig(membersPubKeys, threshold);
@@ -142,7 +142,8 @@ function broadcastMultisigTx({
 }
 
 async function createMultisig(pubKeys: string[], threshold: number, noSortPubKeys = true) {
-  const { createMultisigThresholdPubkey, encodeSecp256k1Pubkey } = await import("@cosmjs/amino");
+  const { createMultisigThresholdPubkey, encodeSecp256k1Pubkey } = (await import("@cosmjs/amino"))
+    .default;
   return createMultisigThresholdPubkey(
     pubKeys.map((pubKey) => encodeSecp256k1Pubkey(base64.decode(pubKey))),
     threshold,
@@ -161,7 +162,7 @@ async function signWithPrivateKey({
   privateKey: Uint8Array;
   message: string;
 }) {
-  const { Secp256k1 } = await import("@cosmjs/crypto");
+  const { Secp256k1 } = (await import("@cosmjs/crypto")).default;
 
   const signature = await Secp256k1.createSignature(base64.decode(message), privateKey);
   return base64.encode(Buffer.concat([signature.r(32), signature.s(32)]));
@@ -301,7 +302,7 @@ export async function createThorchainToolbox({
     signWithPrivateKey,
     transfer,
     pubkeyToAddress: async (pubkey: Pubkey) => {
-      const { pubkeyToAddress } = await import("@cosmjs/amino");
+      const { pubkeyToAddress } = (await import("@cosmjs/amino")).default;
       return pubkeyToAddress(pubkey, chainPrefix);
     },
   };

package/src/cosmos/util.ts

@@ -69,7 +69,7 @@ export const getDenomWithChain = ({ symbol, chain }: AssetValue) => {
 };
 
 export async function createStargateClient(url: string) {
-  const { StargateClient } = await import("@cosmjs/stargate");
+  const { StargateClient } = (await import("@cosmjs/stargate")).default;
 
   return StargateClient.connect(url);
 }
@@ -79,7 +79,7 @@ export async function createSigningStargateClient(
   signer: any,
   optionsOrBaseGas: string | SigningStargateClientOptions = {},
 ) {
-  const { SigningStargateClient, GasPrice } = await import("@cosmjs/stargate");
+  const { SigningStargateClient, GasPrice } = (await import("@cosmjs/stargate")).default;
   const gasPrice = typeof optionsOrBaseGas === "string" ? optionsOrBaseGas : "0.0003uatom";
   const options = typeof optionsOrBaseGas === "string" ? {} : optionsOrBaseGas;
 
@@ -93,7 +93,7 @@ export async function createOfflineStargateClient(
   wallet: OfflineSigner,
   registry?: SigningStargateClientOptions,
 ) {
-  const { SigningStargateClient } = await import("@cosmjs/stargate");
+  const { SigningStargateClient } = (await import("@cosmjs/stargate")).default;
 
   return SigningStargateClient.offline(wallet, registry);
 }

package/src/evm/toolbox/baseEVMToolbox.ts

@@ -538,6 +538,7 @@ function getEstimateGasLimit({ provider, signer }: ToolboxWrapParams) {
     assetValue,
     recipient,
     memo,
+    data,
     sender,
     funcName,
     funcParams,
@@ -547,6 +548,7 @@ function getEstimateGasLimit({ provider, signer }: ToolboxWrapParams) {
     funcName?: string;
     funcParams?: unknown[];
     txOverrides?: EVMTxParams;
+    data?: string;
   }) {
     // const value = assetValue.getBaseValue("bigint");
     const value = assetValue.bigIntValue;
@@ -573,7 +575,7 @@ function getEstimateGasLimit({ provider, signer }: ToolboxWrapParams) {
       from: sender,
       to: recipient,
       value,
-      data: memo ? hexlify(toUtf8Bytes(memo)) : undefined,
+      data: data ? data : memo ? hexlify(toUtf8Bytes(memo)) : undefined,
     });
   };
 }

package/src/ripple/index.ts

@@ -3,7 +3,6 @@ import {
   BaseDecimal,
   Chain,
   type ChainSigner,
-  type GenericCreateTransactionParams,
   type GenericTransferParams,
   SKConfig,
   SwapKitError,
@@ -111,10 +110,7 @@ export const getRippleToolbox = async (params: RippleToolboxParams = {}) => {
     recipient,
     memo,
     sender,
-  }: Omit<GenericCreateTransactionParams, "feeRate">) => {
-    if (!signer) {
-      throw new SwapKitError({ errorKey: "toolbox_ripple_signer_not_found" });
-    }
+  }: { assetValue: AssetValue; recipient: string; sender?: string; memo?: string }) => {
     if (!rippleValidateAddress(recipient)) {
       throw new SwapKitError({ errorKey: "core_transaction_invalid_recipient_address" });
     }

package/src/utxo/toolbox/bitcoinCash.ts

@@ -160,7 +160,7 @@ async function createTransaction({
   // .inputs and .outputs will be undefined if no solution was found
   if (!(inputs && outputs)) throw new Error("Balance insufficient for transaction");
   const getNetwork = await getUtxoNetwork();
-  const builder = new TransactionBuilder(getNetwork(chain));
+  const builder = new TransactionBuilder(getNetwork(chain)) as TransactionBuilderType;
 
   await Promise.all(
     inputs.map(async (utxo: UTXOType) => {

package/src/utxo/types.ts

@@ -52,4 +52,6 @@ export type TransactionBuilderType = {
     signatureAlgorithm?: string,
   ): void;
   build(): TransactionType;
+  addOutput(addressOrScriptBuffer: string | Buffer, value: number): void;
+  addInput(txHash: string | Buffer, vout: number, sequence?: number, prevOutScript?: Buffer): void;
 };