fix: support new Clarity string types #223

Author: zone117x

package-lock.json

@@ -91,7 +91,7 @@
     "@apidevtools/json-schema-ref-parser": "^9.0.1",
     "@awaitjs/express": "^0.5.1",
     "@blockstack/stacks-blockchain-api-types": "file:docs",
-    "@blockstack/stacks-transactions": "0.6.0-beta.1",
+    "@blockstack/stacks-transactions": "0.7.0",
     "@promster/express": "^4.1.12",
     "@promster/server": "^4.2.13",
     "@promster/types": "^1.0.6",

package.json

@@ -17,7 +17,7 @@ const BUCKET_URL = `https://${BUCKET_NAME}.storage.googleapis.com/`;
 const envVars = {
   STACKS_BLOCKCHAIN_REPO: 'https://github.com/blockstack/stacks-blockchain.git',
   STACKS_BLOCKCHAIN_BRANCH: 'master',
-  STACKS_BLOCKCHAIN_BIN: 'stacks-node',
+  STACKS_BLOCKCHAIN_BIN: 'stacks-node-krypton',
   STACKS_BLOCKCHAIN_DIST_PLATFORM: 'linux-x64',
 };
 Object.entries(envVars).forEach(([key, val]) => envVars[key] = process.env[key] || val);
@@ -49,15 +49,15 @@ const bucket = storage.bucket(BUCKET_NAME);
 const buildDist = () => new Promise((resolve, reject) => {
   // const buildOutputDir = fs.mkdtempSync(path.join(__dirname, '.stacks-core-build-'));
   const buildOutputDir = path.join(__dirname, `.stacks-core-build-${shortCommit}`);
-  const binFileResult = `${buildOutputDir}/bin/${envVars.STACKS_BLOCKCHAIN_BIN}`;
+  const binFileResult = `${buildOutputDir}/bin/stacks-node`;
   fs.mkdirSync(buildOutputDir, { recursive: true });
   if (fs.existsSync(binFileResult)) {
     console.warn(`Skipping build step -- already exists at ${binFileResult}`);
     resolve(binFileResult);
     return;
   }
   console.log(`Building stacks-blockchain binaries into '${buildOutputDir}'`);
-  const cargoCmd = `cargo install --git https://github.com/blockstack/stacks-blockchain.git --rev "${gitCommit}" stacks-node --bin=${envVars.STACKS_BLOCKCHAIN_BIN} --root /build-out`;
+  const cargoCmd = `cargo install --git https://github.com/blockstack/stacks-blockchain.git --rev "${gitCommit}" stacks-node --bin=stacks-node --root /build-out`;
   const dockerRunCmd = `docker run -v "${buildOutputDir}:/build-out" rust:stretch ${cargoCmd}`;
   console.log(`Running build via docker: ${dockerRunCmd}`);
   const result = spawn(dockerRunCmd, {

stacks-blockchain/dist-tool/index.js

@@ -3,7 +3,7 @@ FROM everpeace/curl-jq as build
 ENV ARTIFACTS "http://blockstack-stacks-blockchain_artifacts.storage.googleapis.com/index.json"
 
 RUN curl -s "$ARTIFACTS" --output ./artifacts-resp.json \
-  && cat ./artifacts-resp.json | jq -r '."stacks-node"."linux-x64".latest.url' > ./url \
+  && cat ./artifacts-resp.json | jq -r '."stacks-node-krypton"."linux-x64".latest.url' > ./url \
   && mkdir -p /app \
   && echo "Fetching $(cat ./url)" \
   && curl --compressed $(cat ./url) --output /bin/stacks-node \