Merge pull request #185 from CashScript/next

Author: rkalis

.eslintrc.cjs

@@ -3,11 +3,11 @@ const path = require('path');
 module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
-  plugins: ['@typescript-eslint'],
+  plugins: ['@typescript-eslint', 'import'],
   extends: ['airbnb-typescript/base'],
   parserOptions: {
     project: path.join(__dirname, 'tsconfig.json'),
-    ecmaVersion: 2018,  // Allows for the parsing of modern ECMAScript features
+    ecmaVersion: 2021,  // Allows for the parsing of modern ECMAScript features
     sourceType: 'module',  // Allows for the use of imports
     extraFileExtensions: ['.cjs'],
   },
@@ -46,6 +46,7 @@ module.exports = {
     'max-classes-per-file': 0, // Multiple classes in one file are allowed (e.g. Errors)
     '@typescript-eslint/no-redeclare': 0, // I sometimes name variables an types the same
     'linebreak-style': 0, // Ignore linebreak lints https://stackoverflow.com/a/43008668/1129108
-    'import/extensions': ['error', 'always'], // ESM requires file extensions
+    'import/extensions': ['error', 'ignorePackages'], // ESM requires file extensions
+    '@typescript-eslint/only-throw-error': 'error', // We should only throw Error objects
   },
 }

.gitignore

@@ -105,3 +105,5 @@ typings/
 
 # DynamoDB Local files
 .dynamodb/
+
+manual-test.ts

DEVELOPMENT.md

@@ -1,3 +1,15 @@
+We use yarn workspaces + lerna for monorepo management. So to get started, clone this repository and run `yarn` in the root directory to install all dependencies for all packages.
+
+When updating code in one package, you can run `yarn build` in the root directory to build all packages so the changes get propagated to the other packages as well. If you're already in a package directory, you can run the following command to do so:
+
+```bash
+pushd ../.. && yarn build && popd
+```
+
+### Publishing a release
+
+To publish a new release, we use `yarn update-version 'x.x.x'` in the root directory to bump the version before release, and then `yarn publish-all` in the root directory to publish the release. In case of a tagged release (such as `next`), we use `TESTS_USE_MOCKNET=true yarn publish-all --dist-tag <tag name>` to publish the release with the specified tag.
+
 ## cashc
 
 ### Prerequisites
@@ -24,4 +36,40 @@ When updating the grammar file in `src/grammar/CashScript.g4`, we also need to m
 
 ```bash
 yarn antlr
-``````
+```
+
+### Running `cashproof`
+
+Most of the bytecode optimisations that the `cashc` compiler uses can be verified for correctness using the [`cashproof` tool](https://github.com/EyeOfPython/cashproof). This tool needs to be installed separately by installing its dependencies using `pip` and cloning its repository from GitHub.
+
+From there, you can run `python <cashproof_path> [filenames]` to verify that the optimisations contained in these files are provably correct.
+
+Example:
+```bash
+python <cashproof_path> packages/cashc/test/cashproof/0.1.2=0.2.0.equiv
+```
+
+Note that if you want to run `cashproof` on the "main" CashScript optimisations file, you need to first extract the optimisations from the `cashc` compiler and save them in a separate file. This can be done using the following commands:
+
+```bash
+cp packages/utils/src/cashproof-optimisations.ts opt.equiv && sed -i '' '/`/d' opt.equiv
+python <cashproof_path> opt.equiv
+```
+
+## cashscript
+
+### Running tests
+
+By default, running tests in the `cashscript` package uses chipnet contracts, which requires the test accounts to have some chipnet BCH. To run the tests against a local "mock network", you can use the `TESTS_USE_MOCKNET` environment variable.
+
+```bash
+# Run all tests using the mock network
+TESTS_USE_MOCKNET=true yarn test
+```
+
+To run specific tests, you can use the `-t` flag to match the name mentioned in the `it` or `describe` block:
+
+```bash
+# Run all tests in the 'Transaction Builder' describe block (test/e2e/transaction-builder/TransactionBuilder.test.ts)
+yarn test -t 'Transaction Builder'
+```

README.md

@@ -1,22 +1,22 @@
 # CashScript
 
-[![Build Status](https://travis-ci.org/Bitcoin-com/cashscript.svg)](https://travis-ci.org/Bitcoin-com/cashscript)
-[![Coverage Status](https://img.shields.io/codecov/c/github/Bitcoin-com/cashscript.svg)](https://codecov.io/gh/Bitcoin-com/cashscript/)
+[![Build Status](https://travis-ci.org/CashScript/cashscript.svg)](https://travis-ci.org/CashScript/cashscript)
+[![Coverage Status](https://img.shields.io/codecov/c/github/CashScript/cashscript.svg)](https://codecov.io/gh/CashScript/cashscript/)
 [![NPM Version](https://img.shields.io/npm/v/cashscript.svg)](https://www.npmjs.com/package/cashscript)
 [![NPM Monthly Downloads](https://img.shields.io/npm/dm/cashscript.svg)](https://www.npmjs.com/package/cashscript)
 [![NPM License](https://img.shields.io/npm/l/cashscript.svg)](https://www.npmjs.com/package/cashscript)
 
 CashScript is a high-level programming language for smart contracts on Bitcoin Cash. It offers a strong abstraction layer over Bitcoin Cash' native virtual machine, Bitcoin Script. Its syntax is based on Ethereum's smart contract language Solidity, but its functionality is very different since smart contracts on Bitcoin Cash differ greatly from smart contracts on Ethereum. For a detailed comparison of them, refer to the blog post [_Smart Contracts on Ethereum, Bitcoin and Bitcoin Cash_](https://kalis.me/smart-contracts-eth-btc-bch/).
 
-This repository contains the code for the CashScript compiler & command line tool under [`packages/cashc/`](/packages/cashc). This repository also contains the code for the CashScript JavaScript SDK under [`packages/cashscript/`](/packages/cashscript). The source code of the [CashScript.org](https://cashscript.org) website is included under [`website/`](/website). Visit the website for a detailed [Documentation](https://cashscript.org/docs/) on the CashScript language and SDK.
+This repository contains the code for the CashScript compiler & command line tool under [`packages/cashc/`](/packages/cashc). This repository also contains the code for the CashScript TypeScript SDK under [`packages/cashscript/`](/packages/cashscript). The source code of the [CashScript.org](https://cashscript.org) website is included under [`website/`](/website). Visit the website for a detailed [Documentation](https://cashscript.org/docs/) on the CashScript language and SDK.
 
 ## The CashScript Language
 
 CashScript is a high-level language that allows you to write Bitcoin Cash smart contracts in a straightforward and familiar way. Its syntax is inspired by Ethereum's Solidity language, but its functionality is different since the underlying systems have very different fundamentals. See the [language documentation](https://cashscript.org/docs/language/) for a full reference of the language.
 
 ## The CashScript Compiler
 
-CashScript features a compiler as a standalone command line tool, called `cashc`. It can be installed through npm and used to compile `.cash` files into `.json` artifact files. These artifact files can be imported into the CashScript JavaScript SDK (or other SDKs in the future). The `cashc` NPM package can also be imported inside JavaScript files to compile `.cash` files without using the command line tool.
+CashScript features a compiler as a standalone command line tool, called `cashc`. It can be installed through npm and used to compile `.cash` files into `.json` artifact files. These artifact files can be imported into the CashScript TypeScript SDK (or other SDKs in the future). The `cashc` NPM package can also be imported inside JavaScript files to compile `.cash` files without using the command line tool.
 
 ### Installation
 
@@ -94,16 +94,16 @@ The "Hello World" of CashScript contracts is defining the P2PKH pattern inside a
 To run the examples, clone this repository and navigate to the `examples/` directory. Since the examples depend on the SDK, be sure to run `npm install` or `yarn` inside the `examples/` directory, which installs all required packages.
 
 ```bash
-git clone git@github.com:Bitcoin-com/cashscript.git
+git clone git@github.com:CashScript/cashscript.git
 cd cashscript/examples
 npm install
 ```
 
-All `.ts` files in the [`examples/`](/examples) directory can then be executed with `ts-node-esm`.
+All `.ts` files in the [`examples/`](/examples) directory can then be executed with `tsx`.
 
 ```bash
-npm install -g ts-node
-ts-node-esm p2pkh.ts
+npm install -g tsx
+tsx p2pkh.ts
 ```
 
 All `.js` files can be executed with `node`.

examples/README.md

@@ -12,11 +12,11 @@ cd cashscript/examples
 yarn
 ```
 
-All `.ts` files can then be executed with `ts-node-esm`.
+All `.ts` files can then be executed with `tsx`.
 
 ```bash
-npm install -g ts-node
-ts-node-esm p2pkh.ts
+npm install -g tsx
+tsx p2pkh.ts
 ```
 
 All `.js` files can be executed with `node`.

examples/announcement.cash

@@ -1,4 +1,4 @@
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 /* This is a contract showcasing covenants outside of regular transactional use.
  * It enforces the contract to make an "announcement" on Memo.cash, and send the

examples/common-js.js

@@ -11,7 +11,7 @@ import bip39 from 'bip39';
 
 // Generate entropy from BIP39 mnemonic phrase and initialise a root HD-wallet node
 const seed = await bip39.mnemonicToSeed('CashScript Examples');
-const rootNode = deriveHdPrivateNodeFromSeed(seed, true);
+const rootNode = deriveHdPrivateNodeFromSeed(seed, { assumeValidity: true, throwErrors: true });
 const baseDerivationPath = "m/44'/145'/0'/0";
 
 // Derive Alice's private key, public key, public key hash and address
@@ -20,4 +20,4 @@ if (typeof aliceNode === 'string') throw new Error();
 export const alicePub = secp256k1.derivePublicKeyCompressed(aliceNode.privateKey);
 export const alicePriv = aliceNode.privateKey;
 export const alicePkh = hash160(alicePub);
-export const aliceAddress = encodeCashAddress('bchtest', 'p2pkh', alicePkh);
+export const aliceAddress = encodeCashAddress({ prefix: 'bchtest', type: 'p2pkh', payload: alicePkh, throwErrors: true }).address;

examples/common.ts

@@ -10,7 +10,7 @@ import { PriceOracle } from './PriceOracle.js';
 
 // Generate entropy from BIP39 mnemonic phrase and initialise a root HD-wallet node
 const seed = await bip39.mnemonicToSeed('CashScript Examples');
-const rootNode = deriveHdPrivateNodeFromSeed(seed, true);
+const rootNode = deriveHdPrivateNodeFromSeed(seed, { assumeValidity: true, throwErrors: true });
 const baseDerivationPath = "m/44'/145'/0'/0";
 
 // Derive Alice's private key, public key, public key hash and address
@@ -19,15 +19,15 @@ if (typeof aliceNode === 'string') throw new Error();
 export const alicePub = secp256k1.derivePublicKeyCompressed(aliceNode.privateKey) as Uint8Array;
 export const alicePriv = aliceNode.privateKey;
 export const alicePkh = hash160(alicePub);
-export const aliceAddress = encodeCashAddress('bchtest', 'p2pkhWithTokens', alicePkh);
+export const aliceAddress = encodeCashAddress({ prefix: 'bchtest', type: 'p2pkhWithTokens', payload: alicePkh, throwErrors: true }).address;
 
 // Derive Bob's private key, public key, public key hash and address
 const bobNode = deriveHdPath(rootNode, `${baseDerivationPath}/1`);
 if (typeof bobNode === 'string') throw new Error();
 export const bobPub = secp256k1.derivePublicKeyCompressed(bobNode.privateKey) as Uint8Array;
 export const bobPriv = bobNode.privateKey;
 export const bobPkh = hash160(bobPub);
-export const bobAddress = encodeCashAddress('bchtest', 'p2pkhWithTokens', bobPkh);
+export const bobAddress = encodeCashAddress({ prefix: 'bchtest', type: 'p2pkhWithTokens', payload: bobPkh, throwErrors: true }).address;
 
 // Initialise a price oracle with a private key
 const oracleNode = deriveHdPath(rootNode, `${baseDerivationPath}/2`);
@@ -36,4 +36,4 @@ export const oraclePub = secp256k1.derivePublicKeyCompressed(oracleNode.privateK
 export const oraclePriv = oracleNode.privateKey;
 export const oracle = new PriceOracle(oracleNode.privateKey);
 export const oraclePkh = hash160(oraclePub);
-export const oracleAddress = encodeCashAddress('bchtest', 'p2pkhWithTokens', oraclePkh);
+export const oracleAddress = encodeCashAddress({ prefix: 'bchtest', type: 'p2pkhWithTokens', payload: oraclePkh, throwErrors: true }).address;

examples/hodl_vault.cash

@@ -1,4 +1,4 @@
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 // This contract forces HODLing until a certain price target has been reached
 // A minimum block is provided to ensure that oracle price entries from before this block are disregarded

examples/mecenas.cash

@@ -1,4 +1,4 @@
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 /* This is an unofficial CashScript port of Licho's Mecenas contract. It is
  * not compatible with Licho's EC plugin, but rather meant as a demonstration