feat: switch cli to @stacks/transactions

hirosystems · Sep 16, 2020 · 833b748 · 833b748
1 parent 30e446f
commit 833b748
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -81,7 +81,8 @@
     "minimist": ">=1.2.3"
   },
   "dependencies": {
-    "@blockstack/stacks-transactions": "^0.6.0",
+    "@stacks/transactions": "^1.0.0",
+    "@stacks/network": "^1.0.0",
     "ajv": "^4.11.5",
     "bip32": "^2.0.4",
     "bip39": "^3.0.2",

diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
@@ -22,8 +22,7 @@ import {
   estimateTransfer,
   estimateContractDeploy,
   estimateContractFunctionCall,
-  StacksMainnet,
-  StacksTestnet,
+  SignedTokenTransferOptions,
   TokenTransferOptions,
   ContractDeployOptions,
   ContractCallOptions,
@@ -35,7 +34,13 @@ import {
   validateContractCall,
   PostConditionMode,
   cvToString,
-} from '@blockstack/stacks-transactions';
+  StacksTransaction
+} from '@stacks/transactions';
+
+import {
+  StacksMainnet,
+  StacksTestnet,
+} from '@stacks/network';
 
 const c32check = require('c32check');
 
@@ -556,7 +561,7 @@ async function sendTokens(network: CLINetworkAdapter, args: string[]) : Promise<
   const txNetwork = network.isMainnet() ? new StacksMainnet() : new StacksTestnet();
   txNetwork.coreApiUrl = network.blockstackAPIUrl;
 
-  const options: TokenTransferOptions = {
+  const options: SignedTokenTransferOptions = {
     recipient: recipientAddress,
     amount: tokenAmount,
     senderKey: privateKey,
@@ -566,7 +571,7 @@ async function sendTokens(network: CLINetworkAdapter, args: string[]) : Promise<
     network: txNetwork
   }
 
-  const tx = await makeSTXTokenTransfer(options);
+  const tx: StacksTransaction = await makeSTXTokenTransfer(options);
 
   if (estimateOnly) {
     return estimateTransfer(tx, txNetwork).then((cost) => {

diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
@@ -22,9 +22,12 @@ import {
   trueCV,
   falseCV,
   standardPrincipalCV,
-  StacksNetwork,
   TransactionVersion,
-} from '@blockstack/stacks-transactions';
+} from '@stacks/transactions';
+
+import {
+  StacksNetwork,
+} from '@stacks/network';
 
 const ZoneFile = require('zone-file');