Organized imports and some other fixes to make linting pass.

docs/preimage_under_codeseparator_en.md

@@ -41,7 +41,7 @@ The following is an example of how to deploy and call the `CheckLockTimeVerifyOC
 const amount = 2000
 
 // get locking script
-const CLTVOCS = buildContractClass(loadDesc('cltvOCS_debug_desc.json'));
+const CLTVOCS = buildContractClass(loadArtifact('cltvOCS_debug.json'));
 cltv = new CLTVOCS(1422674);
 
 // lock fund to the script

docs/preimage_under_codeseparator_zh_CN.md

@@ -38,7 +38,7 @@ contract CheckLockTimeVerifyOCS {
 const amount = 2000
 
 // get locking script
-const CLTVOCS = buildContractClass(loadDesc('cltvOCS_debug_desc.json'));
+const CLTVOCS = buildContractClass(loadArtifact('cltvOCS_debug.json'));
 cltv = new CLTVOCS(1422674);
 
 // lock fund to the script

docs/rawstate.md

@@ -35,7 +35,7 @@ contract Counter {
 
 
 ```typescript
-const Counter = buildContractClass(loadDescription('counter_desc.json'));
+const Counter = buildContractClass(loadArtifact('counter.json'));
 counter = new Counter();
 const dataPart = counter.dataPart;
 const dataPartASM = counter.dataPart.toASM();

src/abi.ts

@@ -1,12 +1,12 @@
-import { int2Asm, bsv, genLaunchConfigFile, buildContractCode } from './utils';
-import { AbstractContract, TxContext, VerifyResult, AsmVarValues } from './contract';
+import { bin2num } from './builtins';
+import { ABIEntity, ABIEntityType } from './compilerWrapper';
+import { AbstractContract, AsmVarValues, TxContext, VerifyResult } from './contract';
+import { deserializeArgfromHex } from './deserializer';
 import { SupportedParamType, TypeResolver } from './scryptTypes';
-import { ABIEntityType, ABIEntity } from './compilerWrapper';
-import { flatternArg } from './typeCheck';
 import { toScriptHex } from './serializer';
-import { bin2num } from './builtins';
 import Stateful from './stateful';
-import { deserializeArgfromHex } from './deserializer';
+import { flatternArg } from './typeCheck';
+import { bsv, buildContractCode, genLaunchConfigFile, int2Asm } from './utils';
 
 export type Script = bsv.Script;
 

src/builtins.ts

@@ -1,6 +1,4 @@
-import { Int, bsv, Ripemd160, Bytes } from '.';
-import { ScryptType } from './scryptTypes';
-import { toScriptASM } from './serializer';
+import { bsv, Bytes, Int, Ripemd160 } from '.';
 
 /** 
  * bigint can be converted to string with pack

src/compilerWrapper.ts

@@ -1,12 +1,11 @@
+import { ChildProcess, exec, execSync } from 'child_process';
+import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from 'fs';
 import { basename, dirname, join } from 'path';
-import { execSync, exec, ChildProcess } from 'child_process';
-import { readFileSync, writeFileSync, unlinkSync, existsSync, renameSync, mkdirSync } from 'fs';
-import rimraf = require('rimraf');
-import JSONbig = require('json-bigint');
 import {
-  path2uri, ContractArtifact, findCompiler, CURRENT_CONTRACT_ARTIFACT_VERSION,
-  buildTypeResolver, TypeResolver, resolveConstValue, hash160, md5
+  buildTypeResolver, ContractArtifact, CURRENT_CONTRACT_ARTIFACT_VERSION, findCompiler, hash160, md5, path2uri, resolveConstValue, TypeResolver
 } from './internal';
+import rimraf = require('rimraf');
+import JSONbig = require('json-bigint');
 
 
 const SYNTAX_ERR_REG = /(?<filePath>[^\s]+):(?<line>\d+):(?<column>\d+):\n([^\n]+\n){3}(unexpected (?<unexpected>[^\n]+)\nexpecting (?<expecting>[^\n]+)|(?<message>[^\n]+))/g;
@@ -529,7 +528,7 @@ function getOutputFilePath(baseDir: string, target: 'ast' | 'asm' | 'hex' | 'art
   } else if (target === 'dbg') {
     return join(baseDir, `stdin.${target}.json`);
   } else if (target === 'artifact') {
-    return join(baseDir, `stdin.json`);
+    return join(baseDir, 'stdin.json');
   }
   return join(baseDir, `stdin_${target}.json`);
 }

src/contract.ts

@@ -1,13 +1,12 @@
+import { basename, dirname } from 'path';
 import { ABIEntityType, Argument, LibraryEntity, ParamEntity, parseGenericType } from '.';
 import { ContractEntity, getFullFilePath, loadSourceMapfromArtifact, OpCode, StaticEntity } from './compilerWrapper';
 import {
-  ABICoder, Arguments, FunctionCall, Script, bsv, DEFAULT_FLAGS, resolveType, path2uri, TypeResolver,
-  StructEntity, ABIEntity, CompileResult, AliasEntity, hash160, buildContractCode, JSONParserSync, uri2path, findSrcInfoV2, findSrcInfoV1
+  ABICoder, ABIEntity, AliasEntity, Arguments, bsv, buildContractCode, CompileResult, DEFAULT_FLAGS, findSrcInfoV1, findSrcInfoV2, FunctionCall, hash160, JSONParserSync, path2uri, resolveType, Script, StructEntity, TypeResolver, uri2path
 } from './internal';
-import { SymbolType, TypeInfo, SupportedParamType, HashedMap, HashedSet, Bytes, isScryptType } from './scryptTypes';
-import { basename, dirname } from 'path';
-import { checkSupportedParamType, flatternArg } from './typeCheck';
+import { Bytes, HashedMap, HashedSet, isScryptType, SupportedParamType, SymbolType, TypeInfo } from './scryptTypes';
 import Stateful from './stateful';
+import { checkSupportedParamType, flatternArg } from './typeCheck';
 
 
 export interface TxContext {

src/deserializer.ts

@@ -1,6 +1,6 @@
 import { Argument, arrayTypeAndSize, bin2num, isArrayType, LibraryEntity, ParamEntity, StructEntity, SymbolType, TypeResolver } from '.';
+import { Bool, Bytes, Int, OpCodeType, PrivKey, PubKey, Ripemd160, ScryptType, Sha1, Sha256, Sig, SigHashPreimage, SigHashType, StructObject, SupportedParamType } from './scryptTypes';
 import Stateful from './stateful';
-import { ScryptType, Bool, Bytes, Int, PrivKey, PubKey, Ripemd160, SigHashPreimage, Sha1, Sha256, Sig, OpCodeType, SigHashType, SupportedParamType, StructObject } from './scryptTypes';
 import { bsv } from './utils';
 
 /**

src/findCompiler.ts

@@ -1,11 +1,11 @@
 
-import { join, resolve } from 'path';
-import * as minimist from 'minimist';
+import { execSync } from 'child_process';
 import { existsSync, readdirSync, statSync } from 'fs';
+import * as minimist from 'minimist';
+import * as os from 'os';
+import { join, resolve } from 'path';
 
 import compareVersions = require('compare-versions');
-import { execSync } from 'child_process';
-import * as os from 'os';
 import showNoCompilerFound = require('../util/showerror');
 
 

src/serializer.ts

@@ -1,4 +1,4 @@
-import { Bool, Bytes, Int, SupportedParamType, isBytes, ScryptType } from './scryptTypes';
+import { Bool, Bytes, Int, isBytes, ScryptType, SupportedParamType } from './scryptTypes';
 import { bsv } from './utils';
 
 

src/stateful.ts

@@ -1,7 +1,7 @@
 import { AbstractContract, Arguments, bin2num, bsv, num2bin, readBytes } from '.';
 import { deserializeArgfromHex } from './deserializer';
-import { flatternArg, parseLiteral } from './internal';
-import { Int, Bytes, SupportedParamType, ScryptType, Bool, PrivKey, PubKey, Sig, Ripemd160, Sha1, Sha256, SigHashType, SigHashPreimage, OpCodeType, TypeResolver, isBytes } from './scryptTypes';
+import { flatternArg } from './internal';
+import { Bool, Bytes, Int, isBytes, OpCodeType, PrivKey, PubKey, Ripemd160, ScryptType, Sha1, Sha256, Sig, SigHashPreimage, SigHashType, SupportedParamType, TypeResolver } from './scryptTypes';
 
 export default class Stateful {
 

src/typeCheck.ts

@@ -1,5 +1,5 @@
 import { Argument, Arguments, isArrayType, isGenericType, LibraryEntity, ParamEntity, parseGenericType, StructEntity } from '.';
-import { parseLiteral, subscript, toGenericType } from './internal';
+import { subscript, toGenericType } from './internal';
 import { isBytes, ScryptType, StructObject, SupportedParamType, SymbolType, TypeResolver } from './scryptTypes';
 
 

src/utils.ts

@@ -1,25 +1,19 @@
-import { pathToFileURL, fileURLToPath } from 'url';
-import * as fs from 'fs';
-import * as crypto from 'crypto';
+import { parseChunked, stringifyStream } from '@discoveryjs/json-ext';
 import * as bsv from 'bsv';
-import { join, sep } from 'path';
+import * as crypto from 'crypto';
+import * as fs from 'fs';
 import { tmpdir } from 'os';
-import { stringifyStream, parseChunked } from '@discoveryjs/json-ext';
+import { join, sep } from 'path';
 import { decode } from 'sourcemap-codec';
+import { fileURLToPath, pathToFileURL } from 'url';
 
 export { bsv };
 
-import {
-  SupportedParamType, StructEntity, compile,
-  findCompiler, CompileResult, AliasEntity, AbstractContract, AsmVarValues, TxContext, DebugConfiguration, DebugLaunch, FileUri,
-  Arguments,
-  Script, getValidatedHexString, ScryptType, toJSON, isScryptType
-} from './internal';
+import { ABIEntity, LibraryEntity, num2bin, SymbolType, toLiteralArrayType, TypeInfo } from '.';
 import { compileAsync, OpCode, StaticEntity } from './compilerWrapper';
 import { VerifyError } from './contract';
-import { ABIEntity, bin2num, LibraryEntity, num2bin, SymbolType, toLiteralArrayType, TypeInfo } from '.';
-import { arrayTypeAndSizeStr, flatternArg } from './typeCheck';
-import { deserializeArgfromHex } from './deserializer';
+import { AbstractContract, AliasEntity, AsmVarValues, compile, CompileResult, DebugConfiguration, DebugLaunch, FileUri, findCompiler, getValidatedHexString, isScryptType, Script, ScryptType, StructEntity, SupportedParamType, toJSON, TxContext } from './internal';
+import { arrayTypeAndSizeStr } from './typeCheck';
 
 const BN = bsv.crypto.BN;
 const Interp = bsv.Script.Interpreter;