Merge branch 'broxus:master' into master

README.md

@@ -921,3 +921,9 @@ import { toNano, fromNano, getRandomNonce, convertAmount, isValidEverAddress, st
 toNano(10); // 10000000000
 fromNano(10000000000); // 10```
 ````
+
+## Plugins
+
+1. [locklift-verify](https://github.com/broxus/locklift-verifier)
+2. [locklift-deploy](https://github.com/broxus/locklift-deploy)
+3. [locklift-plugin-boilerplate(example of implementation)](https://github.com/broxus/locklift-plugin-boilerplate)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "locklift",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "Node JS framework for working with Ever contracts. Inspired by Truffle and Hardhat. Helps you to build, test, run and maintain your smart contracts.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

sample-project-typescript/.gitattributes

@@ -0,0 +1 @@
+*.tsol linguist-language=Solidity

sample-project-typescript/.gitignore

@@ -0,0 +1,4 @@
+.idea
+node_modules
+.temp
+.vscode

sample-project-typescript/locklift.config.ts

@@ -8,6 +8,10 @@ declare global {
 const LOCAL_NETWORK_ENDPOINT = process.env.NETWORK_ENDPOINT || "http://localhost/graphql";
 const DEV_NET_NETWORK_ENDPOINT = process.env.DEV_NET_NETWORK_ENDPOINT || "https://devnet-sandbox.evercloud.dev/graphql";
 
+const VENOM_TESTNET_ENDPOINT = process.env.VENOM_TESTNET_ENDPOINT || "https://jrpc-testnet.venom.foundation/rpc";
+const VENOM_TESTNET_TRACE_ENDPOINT =
+  process.env.VENOM_TESTNET_TRACE_ENDPOINT || "https://gql-testnet.venom.foundation/graphql";
+
 // Create your own link on https://dashboard.evercloud.dev/
 const MAIN_NET_NETWORK_ENDPOINT = process.env.MAIN_NET_NETWORK_ENDPOINT || "https://mainnet.evercloud.dev/XXX/graphql";
 
@@ -87,6 +91,30 @@ const config: LockliftConfig = {
         amount: 20,
       },
     },
+    venom_testnet: {
+      connection: {
+        id: 1000,
+        type: "jrpc",
+        group: "dev",
+        data: {
+          endpoint: VENOM_TESTNET_ENDPOINT,
+        },
+      },
+      giver: {
+        address: "0:0000000000000000000000000000000000000000000000000000000000000000",
+        phrase: "phrase",
+        accountId: 0,
+      },
+      tracing: {
+        endpoint: VENOM_TESTNET_TRACE_ENDPOINT,
+      },
+      keys: {
+        // Use everdev to generate your phrase
+        // !!! Never commit it in your repos !!!
+        // phrase: "action inject penalty envelope rabbit element slim tornado dinner pizza off blood",
+        amount: 20,
+      },
+    },
     main: {
       // Specify connection settings for https://github.com/broxus/everscale-standalone-client/
       connection: {

src/index.ts

@@ -33,6 +33,7 @@ export { toNano, fromNano, getRandomNonce, convertAmount } from "./utils";
 export { WalletTypes } from "./types";
 export { TraceType, InteractionType } from "./internal/tracing/types";
 export { lockliftChai } from "./chaiPlugin";
+export { NetworkValue, ConfigState } from "./internal/config";
 
 export class Locklift<FactorySource extends FactoryType> {
   public readonly utils = utils;

src/internal/cli/builder/index.ts

@@ -71,6 +71,12 @@ export class Builder {
                 contractFileName: parse(contractFileName).name,
                 path,
               })),
+              catchError(e => {
+                logger.printError(
+                  `path: ${path}, contractFile: ${contractFileName} error: ${e?.stderr?.toString() || e}`,
+                );
+                return throwError(undefined);
+              }),
             );
           }),
           //Warnings
@@ -79,11 +85,7 @@ export class Builder {
               isValidCompilerOutputLog(output.output.stderr.toString()) &&
               logger.printBuilderLog(output.output.stderr.toString()),
           ),
-          //Errors
-          catchError(e => {
-            logger.printError(e?.stderr?.toString() || e);
-            return throwError(undefined);
-          }),
+
           filter(({ output }) => {
             //Only contracts
             return !!output?.stdout.toString();
@@ -106,7 +108,7 @@ export class Builder {
                 return tvmLinkerLog.stdout.toString().match(new RegExp("Saved to file (.*)."));
               }),
               catchError(e => {
-                logger.printError(e?.stderr?.toString());
+                logger.printError(`contractFileName: ${contractFileName} error:${e?.stderr?.toString()}`);
                 return throwError(undefined);
               }),
               map(matchResult => {

src/internal/config/index.ts

@@ -39,14 +39,14 @@ export type KeysConfig = {
 };
 
 export type Networks<T extends ConfigState = ConfigState.EXTERNAL> = Record<"local" | string, NetworkValue<T>>;
-export type NetworkValue<T extends ConfigState = ConfigState.EXTERNAL> = {
+export interface NetworkValue<T extends ConfigState = ConfigState.EXTERNAL> {
   giver: GiverConfig;
   keys: T extends ConfigState.EXTERNAL ? KeysConfig : Required<KeysConfig>;
   connection: ConnectionProperties;
   tracing?: {
     endpoint: string;
   };
-};
+}
 
 export type ExternalCotracts = Record<string, Array<string>>;
 export type GiverConfig = {
@@ -122,7 +122,7 @@ export const JoiConfig = Joi.object<LockliftConfig>({
       tracing: Joi.object({
         endpoint: Joi.string(),
       }).optional(),
-    }),
+    }).unknown(),
   ),
   mocha: Joi.object({
     tsconfig: Joi.string().optional(),