Skip to content

Commit

Permalink
Merge branch 'main-v1' into docs/high-throughput-mint
Browse files Browse the repository at this point in the history
  • Loading branch information
sentientforest authored Dec 6, 2024
2 parents 81de89c + 4ec5c72 commit eb68969
Show file tree
Hide file tree
Showing 13 changed files with 72 additions and 48 deletions.
2 changes: 1 addition & 1 deletion chain-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gala-chain/api",
"version": "1.5.7",
"version": "1.5.8",
"description": "Common types, DTOs (Data Transfer Objects), APIs, signatures, and utils for GalaChain.",
"license": "Apache-2.0",
"dependencies": {
Expand Down
28 changes: 27 additions & 1 deletion chain-cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $ npm install -g @gala-chain/cli
$ galachain COMMAND
running command...
$ galachain (--version)
@gala-chain/cli/1.5.7 linux-x64 node-v18.20.4
@gala-chain/cli/1.5.8 linux-x64 node-v18.20.4
$ galachain --help [COMMAND]
USAGE
$ galachain COMMAND
Expand All @@ -40,6 +40,7 @@ USAGE
* [`galachain info [DEVELOPERPRIVATEKEY]`](#galachain-info-developerprivatekey)
* [`galachain init PATH`](#galachain-init-path)
* [`galachain keygen FILE`](#galachain-keygen-file)
* [`galachain logs`](#galachain-logs)
* [`galachain network-prune`](#galachain-network-prune)
* [`galachain network-up`](#galachain-network-up)
* [`galachain network:prune`](#galachain-networkprune)
Expand Down Expand Up @@ -331,6 +332,31 @@ EXAMPLES
$ galachain keygen data/user1
```

## `galachain logs`

```
USAGE
$ galachain logs [--json] [--log-level debug|info|warn|error] [-k <value>] [-s <value>] [-e <value>] [-l
<value>] [-f <value>] [--follow]
FLAGS
-e, --endTime=<value> [default: now] End time for logs. Accepts ISO8601 format or shorthand (e.g., now,
0).
-f, --filter=<value> Filter for logs (e.g., error, info, warn, debug).
-k, --developerPrivateKey=<value> Private key to sign the data. It can be a file path or a key string. If not
provided, the private key will be read from the environment variable
DEV_PRIVATE_KEY.
-l, --limit=<value> Maximum number of log entries to fetch.
-s, --startTime=<value> Start time for logs. Accepts ISO8601 format or shorthand (e.g.,
2023-01-01T00:00:00Z, 5m, 1h, 2d).
--follow Specify if logs should be streamed.
GLOBAL FLAGS
--json Format output as json.
--log-level=<option> Specify level for logging.
<options: debug|info|warn|error>
```

## `galachain network-prune`

Removes the network entirely.
Expand Down
4 changes: 2 additions & 2 deletions chain-cli/chaincode-template/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions chain-cli/chaincode-template/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@galachain/product",
"version": "1.5.7",
"version": "1.5.8",
"description": "Product Chaincode",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
Expand All @@ -22,17 +22,17 @@
"update-snapshot": "jest --updateSnapshot"
},
"dependencies": {
"@gala-chain/api": "1.5.7",
"@gala-chain/chaincode": "1.5.7",
"@gala-chain/api": "1.5.8",
"@gala-chain/chaincode": "1.5.8",
"@grpc/grpc-js": "1.10.10",
"dotenv": "^16.0.1",
"fabric-contract-api": "2.5.6",
"fabric-shim": "2.5.6"
},
"devDependencies": {
"@gala-chain/cli": "1.5.7",
"@gala-chain/client": "1.5.7",
"@gala-chain/test": "1.5.7",
"@gala-chain/cli": "1.5.8",
"@gala-chain/client": "1.5.8",
"@gala-chain/test": "1.5.8",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/jest": "^29.5.12",
"@types/node": "18.11.9",
Expand Down
4 changes: 2 additions & 2 deletions chain-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gala-chain/cli",
"version": "1.5.7",
"version": "1.5.8",
"description": "CLI for GalaChain to manage and deploy chaincodes",
"license": "Apache-2.0",
"bin": {
Expand All @@ -14,7 +14,7 @@
"/oclif.manifest.json"
],
"dependencies": {
"@gala-chain/api": "1.5.7",
"@gala-chain/api": "1.5.8",
"@noble/secp256k1": "^1.7.1",
"@oclif/core": "^3",
"@oclif/plugin-help": "^3",
Expand Down
4 changes: 2 additions & 2 deletions chain-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gala-chain/client",
"version": "1.5.7",
"version": "1.5.8",
"description": "GalaChain client library",
"license": "Apache-2.0",
"scripts": {
Expand All @@ -21,7 +21,7 @@
"lib"
],
"dependencies": {
"@gala-chain/api": "1.5.7",
"@gala-chain/api": "1.5.8",
"axios": "^1.6.0",
"jsonschema": "^1.4.1",
"tslib": "^2.6.2"
Expand Down
4 changes: 2 additions & 2 deletions chain-connect/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "@gala-chain/connect",
"version": "1.5.7",
"version": "1.5.8",
"dependencies": {
"@gala-chain/api": "1.5.7",
"@gala-chain/api": "1.5.8",
"ethers": "^6.12.1",
"tslib": "^2.3.0",
"bignumber.js": "9.1.2",
Expand Down
6 changes: 3 additions & 3 deletions chain-test/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@gala-chain/test",
"version": "1.5.7",
"version": "1.5.8",
"description": "Unit testing and integration testing for GalaChain",
"license": "Apache-2.0",
"dependencies": {
"@gala-chain/client": "1.5.7",
"@gala-chain/client": "1.5.8",
"nanoid": "^3.3.6",
"tslib": "^2.6.2",
"@jest/globals": "29.7.0"
},
"peerDependencies": {
"@gala-chain/api": "1.5.7",
"@gala-chain/api": "1.5.8",
"bignumber.js": "*",
"class-transformer": "*",
"elliptic": "*",
Expand Down
4 changes: 2 additions & 2 deletions chaincode/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gala-chain/chaincode",
"version": "1.5.7",
"version": "1.5.8",
"description": "Framework for building chaincodes on GalaChain",
"license": "Apache-2.0",
"type": "commonjs",
Expand All @@ -22,7 +22,7 @@
"update-snapshot": "jest --updateSnapshot"
},
"dependencies": {
"@gala-chain/api": "1.5.7",
"@gala-chain/api": "1.5.8",
"@grpc/grpc-js": "1.10.10",
"fabric-contract-api": "2.5.6",
"fabric-shim": "2.5.6",
Expand Down
4 changes: 3 additions & 1 deletion chaincode/src/fees/exitGateImplementations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ export async function lockOnMintProcessing(ctx: GalaChainContext, data: ILockOnM

const { lockName, lockAuthority, expirationModifier, lockPercentage } = lockConfiguration;

const mintQuantityToLock = quantity.times(lockPercentage).integerValue(BigNumber.ROUND_DOWN);
const mintQuantityToLock = quantity
.times(lockPercentage)
.decimalPlaces(tokenClassEntry.decimals, BigNumber.ROUND_DOWN);

const verifyAuthorizedOnBehalf = async (c: TokenClassKey) => undefined;

Expand Down
18 changes: 7 additions & 11 deletions licenses/licenses.csv
Original file line number Diff line number Diff line change
Expand Up @@ -197,17 +197,13 @@
"@fal-works/[email protected]","@fal-works/esbuild-plugin-global-externals","2.1.2","","esbuild plugin for replacing imports with global variables.","MIT"
"@fidm/[email protected]","@fidm/asn1","1.0.4","https://github.com/fidm/asn1","ASN.1/DER, PEM for Node.js","MIT"
"@fidm/[email protected]","@fidm/x509","1.2.1","https://github.com/fidm/x509","Pure JavaScript X509 certificate tools for Node.js","MIT"
"@floating-ui/[email protected]","@floating-ui/core","1.6.7","https://github.com/floating-ui/floating-ui","Positioning library for floating elements: tooltips, popovers, dropdowns, and more","MIT"
"@floating-ui/[email protected]","@floating-ui/dom","1.6.10","https://github.com/floating-ui/floating-ui","Floating UI for the web","MIT"
"@floating-ui/[email protected]","@floating-ui/react-dom","2.1.1","https://github.com/floating-ui/floating-ui","Floating UI for React DOM","MIT"
"@floating-ui/[email protected]","@floating-ui/utils","0.2.7","https://github.com/floating-ui/floating-ui","Utilities for Floating UI","MIT"
"@gala-chain/[email protected]","@gala-chain/api","1.5.7","","Common types, DTOs (Data Transfer Objects), APIs, signatures, and utils for GalaChain.","Apache-2.0"
"@gala-chain/[email protected]","@gala-chain/chaincode","1.5.7","","Framework for building chaincodes on GalaChain","Apache-2.0"
"@gala-chain/[email protected]","@gala-chain/cli","1.5.7","","CLI for GalaChain to manage and deploy chaincodes","Apache-2.0"
"@gala-chain/[email protected]","@gala-chain/client","1.5.7","","GalaChain client library","Apache-2.0"
"@gala-chain/[email protected]","@gala-chain/connect","1.5.7","https://github.com/GalaChain/sdk","GalaChain Connect is a library that provides developers with capabilities comparable to [ethers.js](https://docs.ethers.io/), allowing users to connect to and interact with GalaChain using wallets such as MetaMask.","Custom: https://docs.ethers.io/"
"@gala-chain/[email protected]","@gala-chain/sdk","1.5.7","","Welcome to developing with GalaChain! GalaChain SDK is a set of TS tools to help you develop on GalaChain:","UNLICENSED"
"@gala-chain/[email protected]","@gala-chain/test","1.5.7","","Unit testing and integration testing for GalaChain","Apache-2.0"
"@gala-chain/[email protected]","@gala-chain/api","1.5.8","","Common types, DTOs (Data Transfer Objects), APIs, signatures, and utils for GalaChain.","Apache-2.0"
"@gala-chain/[email protected]","@gala-chain/chaincode","1.5.8","","Framework for building chaincodes on GalaChain","Apache-2.0"
"@gala-chain/[email protected]","@gala-chain/cli","1.5.8","","CLI for GalaChain to manage and deploy chaincodes","Apache-2.0"
"@gala-chain/[email protected]","@gala-chain/client","1.5.8","","GalaChain client library","Apache-2.0"
"@gala-chain/[email protected]","@gala-chain/connect","1.5.8","https://github.com/GalaChain/sdk","GalaChain Connect is a library that provides developers with capabilities comparable to [ethers.js](https://docs.ethers.io/), allowing users to connect to and interact with GalaChain using wallets such as MetaMask.","Custom: https://docs.ethers.io/"
"@gala-chain/[email protected]","@gala-chain/sdk","1.5.8","","Welcome to developing with GalaChain! GalaChain SDK is a set of TS tools to help you develop on GalaChain:","UNLICENSED"
"@gala-chain/[email protected]","@gala-chain/test","1.5.8","","Unit testing and integration testing for GalaChain","Apache-2.0"
"@grpc/[email protected]","@grpc/grpc-js","1.10.10","https://github.com/grpc/grpc-node/tree/master/packages/grpc-js","gRPC Library for Node - pure JS implementation","Apache-2.0"
"@grpc/[email protected]","@grpc/grpc-js","1.10.11","https://github.com/grpc/grpc-node/tree/master/packages/grpc-js","gRPC Library for Node - pure JS implementation","Apache-2.0"
"@grpc/[email protected]","@grpc/grpc-js","1.9.15","https://github.com/grpc/grpc-node/tree/master/packages/grpc-js","gRPC Library for Node - pure JS implementation","Apache-2.0"
Expand Down
28 changes: 14 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gala-chain/sdk",
"version": "1.5.7",
"version": "1.5.8",
"license": "Apache-2.0",
"engines": {
"node": ">=16"
Expand Down

0 comments on commit eb68969

Please sign in to comment.