@alephium/web3 0.2.0-rc.19 → 0.2.0-rc.20

package/dist/src/contract/contract.d.ts

@@ -1,4 +1,4 @@
-import { NamedVals, node, NodeProvider, Number256, Token, Val } from '../api';
+import { NamedVals, node, Number256, Token, Val } from '../api';
 import { SignDeployContractTxParams, SignExecuteScriptTxParams, SignerWithNodeProvider } from '../signer';
 export declare type FieldsSig = node.FieldsSig;
 export declare type EventSig = node.EventSig;
@@ -60,7 +60,6 @@ export declare class Project {
     projectArtifact: ProjectArtifact;
     readonly contractsRootDir: string;
     readonly artifactsRootDir: string;
-    readonly nodeProvider: NodeProvider;
     static currentProject: Project;
     static readonly abstractContractMatcher: TypedMatcher<SourceType>;
     static readonly contractMatcher: TypedMatcher<SourceType.Contract>;
@@ -181,7 +180,6 @@ export interface ContractEventByTxId {
 }
 export declare type DebugMessage = node.DebugMessage;
 export interface TestContractResult {
-    address: string;
     contractId: string;
     contractAddress: string;
     returns: Val[];

package/dist/src/contract/contract.js

@@ -52,6 +52,7 @@ const api_1 = require("../api");
 const ralph = __importStar(require("./ralph"));
 const utils_1 = require("../utils");
 const global_1 = require("../global");
+const __1 = require("..");
 var SourceType;
 (function (SourceType) {
     SourceType[SourceType["Contract"] = 0] = "Contract";
@@ -155,8 +156,7 @@ class ProjectArtifact {
 }
 ProjectArtifact.artifactFileName = '.project.json';
 class Project {
-    constructor(provider, contractsRootDir, artifactsRootDir, sourceFiles, contracts, scripts, errorOnWarnings, projectArtifact) {
-        this.nodeProvider = provider;
+    constructor(contractsRootDir, artifactsRootDir, sourceFiles, contracts, scripts, errorOnWarnings, projectArtifact) {
         this.contractsRootDir = contractsRootDir;
         this.artifactsRootDir = artifactsRootDir;
         this.sourceFiles = sourceFiles;
@@ -274,7 +274,7 @@ class Project {
             scripts.push(new Compiled(sourceFile, script, scriptResult.warnings));
         });
         const projectArtifact = Project.buildProjectArtifact(files, contracts, scripts, compilerOptions);
-        const project = new Project(provider, contractsRootDir, artifactsRootDir, files, contracts, scripts, errorOnWarnings, projectArtifact);
+        const project = new Project(contractsRootDir, artifactsRootDir, files, contracts, scripts, errorOnWarnings, projectArtifact);
         await project.saveArtifactsToFile();
         return project;
     }
@@ -298,7 +298,7 @@ class Project {
                     scripts.push(new Compiled(file, artifact, warnings));
                 }
             }
-            return new Project(provider, contractsRootDir, artifactsRootDir, files, contracts, scripts, errorOnWarnings, projectArtifact);
+            return new Project(contractsRootDir, artifactsRootDir, files, contracts, scripts, errorOnWarnings, projectArtifact);
         }
         catch (error) {
             console.log(`Failed to load artifacts, error: ${error}, try to re-compile contracts...`);
@@ -424,7 +424,7 @@ class Contract extends Artifact {
         return Contract.fromJson(artifact, bytecodeDebugPatch, codeHashDebug);
     }
     async fetchState(address, group) {
-        const state = await Project.currentProject.nodeProvider.contracts.getContractsAddressState(address, {
+        const state = await __1.web3.getCurrentNodeProvider().contracts.getContractsAddressState(address, {
             group: group
         });
         return this.fromApiContractState(state);
@@ -467,7 +467,7 @@ class Contract extends Artifact {
     }
     async _test(funcName, params, expectPublic, accessType, printDebugMessages) {
         const apiParams = this.toTestContract(funcName, params);
-        const apiResult = await Project.currentProject.nodeProvider.contracts.postContractsTestContract(apiParams);
+        const apiResult = await __1.web3.getCurrentNodeProvider().contracts.postContractsTestContract(apiParams);
         const methodIndex = typeof params.testMethodIndex !== 'undefined' ? params.testMethodIndex : this.getMethodIndex(funcName);
         const isPublic = this.functions[`${methodIndex}`].isPublic;
         if (printDebugMessages) {
@@ -563,7 +563,6 @@ class Contract extends Artifact {
         addressToCodeHash.set(result.address, result.codeHash);
         result.contracts.forEach((contract) => addressToCodeHash.set(contract.address, contract.codeHash));
         return {
-            address: result.address,
             contractId: (0, utils_1.binToHex)((0, utils_1.contractIdFromAddress)(result.address)),
             contractAddress: result.address,
             returns: (0, api_1.fromApiArray)(result.returns, this.functions[`${methodIndex}`].returnTypes),

package/dist/src/index.js

@@ -44,6 +44,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.utils = exports.web3 = void 0;
+BigInt.prototype['toJSON'] = function () {
+    return this.toString();
+};
 __exportStar(require("./api"), exports);
 __exportStar(require("./contract"), exports);
 __exportStar(require("./signer"), exports);

package/dist/src/utils/bs58.d.ts

@@ -1,4 +1,5 @@
 /** This source is under MIT License and come originally from https://github.com/cryptocoinjs/bs58 **/
 import basex from 'base-x';
 export declare const bs58: basex.BaseConverter;
+export declare function isBase58(s: string): boolean;
 export default bs58;

package/dist/src/utils/bs58.js

@@ -20,9 +20,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bs58 = void 0;
+exports.isBase58 = exports.bs58 = void 0;
 /** This source is under MIT License and come originally from https://github.com/cryptocoinjs/bs58 **/
 const base_x_1 = __importDefault(require("base-x"));
 const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
 exports.bs58 = (0, base_x_1.default)(ALPHABET);
+function isBase58(s) {
+    if (s === '' || s.trim() === '') {
+        return false;
+    }
+    try {
+        return exports.bs58.encode(exports.bs58.decode(s)) === s;
+    }
+    catch (err) {
+        return false;
+    }
+}
+exports.isBase58 = isBase58;
 exports.default = exports.bs58;

package/dist/src/utils/utils.d.ts

@@ -8,6 +8,7 @@ export declare function contractIdFromAddress(address: string): Uint8Array;
 export declare function tokenIdFromAddress(address: string): Uint8Array;
 export declare function hexToBinUnsafe(hex: string): Uint8Array;
 export declare function binToHex(bin: Uint8Array): string;
+export declare function groupOfPrivateKey(privateKey: string): number;
 export declare function publicKeyFromPrivateKey(privateKey: string): string;
 export declare function addressFromPublicKey(publicKey: string): string;
 export declare function addressFromContractId(contractId: string): string;

package/dist/src/utils/utils.js

@@ -20,7 +20,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertType = exports.timeout = exports.hexToString = exports.stringToHex = exports.subContractId = exports.contractIdFromTx = exports.addressFromContractId = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.binToHex = exports.hexToBinUnsafe = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.isHexString = exports.xorByte = exports.signatureDecode = exports.signatureEncode = void 0;
+exports.assertType = exports.timeout = exports.hexToString = exports.stringToHex = exports.subContractId = exports.contractIdFromTx = exports.addressFromContractId = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.groupOfPrivateKey = exports.binToHex = exports.hexToBinUnsafe = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.isHexString = exports.xorByte = exports.signatureDecode = exports.signatureEncode = void 0;
 const elliptic_1 = require("elliptic");
 const bn_js_1 = __importDefault(require("bn.js"));
 const blakejs_1 = __importDefault(require("blakejs"));
@@ -147,6 +147,10 @@ function binToHex(bin) {
     return buffer_1.Buffer.from(bin).toString('hex');
 }
 exports.binToHex = binToHex;
+function groupOfPrivateKey(privateKey) {
+    return groupOfAddress(addressFromPublicKey(publicKeyFromPrivateKey(privateKey)));
+}
+exports.groupOfPrivateKey = groupOfPrivateKey;
 function publicKeyFromPrivateKey(privateKey) {
     const key = ec.keyFromPrivate(privateKey);
     return key.getPublic(true, 'hex');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.2.0-rc.19",
+  "version": "0.2.0-rc.20",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
@@ -27,7 +27,7 @@
   },
   "author": "Alephium dev <dev@alephium.org>",
   "config": {
-    "alephium_version": "1.5.0-rc9",
+    "alephium_version": "1.5.0-rc10",
     "explorer_backend_version": "1.9.0-rc0"
   },
   "scripts": {

package/src/contract/contract.ts

@@ -40,6 +40,7 @@ import { SignDeployContractTxParams, SignExecuteScriptTxParams, SignerWithNodePr
 import * as ralph from './ralph'
 import { bs58, binToHex, contractIdFromAddress, assertType, Eq } from '../utils'
 import { getCurrentNodeProvider } from '../global'
+import { web3 } from '..'
 
 export type FieldsSig = node.FieldsSig
 export type EventSig = node.EventSig
@@ -196,7 +197,6 @@ export class Project {
 
   readonly contractsRootDir: string
   readonly artifactsRootDir: string
-  readonly nodeProvider: NodeProvider
 
   static currentProject: Project
 
@@ -250,7 +250,6 @@ export class Project {
   }
 
   private constructor(
-    provider: NodeProvider,
     contractsRootDir: string,
     artifactsRootDir: string,
     sourceFiles: SourceFile[],
@@ -259,7 +258,6 @@ export class Project {
     errorOnWarnings: boolean,
     projectArtifact: ProjectArtifact
   ) {
-    this.nodeProvider = provider
     this.contractsRootDir = contractsRootDir
     this.artifactsRootDir = artifactsRootDir
     this.sourceFiles = sourceFiles
@@ -368,7 +366,6 @@ export class Project {
     })
     const projectArtifact = Project.buildProjectArtifact(files, contracts, scripts, compilerOptions)
     const project = new Project(
-      provider,
       contractsRootDir,
       artifactsRootDir,
       files,
@@ -410,7 +407,6 @@ export class Project {
       }
 
       return new Project(
-        provider,
         contractsRootDir,
         artifactsRootDir,
         files,
@@ -608,7 +604,7 @@ export class Contract extends Artifact {
   }
 
   async fetchState(address: string, group: number): Promise<ContractState> {
-    const state = await Project.currentProject.nodeProvider.contracts.getContractsAddressState(address, {
+    const state = await web3.getCurrentNodeProvider().contracts.getContractsAddressState(address, {
       group: group
     })
     return this.fromApiContractState(state)
@@ -662,7 +658,7 @@ export class Contract extends Artifact {
     printDebugMessages: boolean
   ): Promise<TestContractResult> {
     const apiParams: node.TestContract = this.toTestContract(funcName, params)
-    const apiResult = await Project.currentProject.nodeProvider.contracts.postContractsTestContract(apiParams)
+    const apiResult = await web3.getCurrentNodeProvider().contracts.postContractsTestContract(apiParams)
 
     const methodIndex =
       typeof params.testMethodIndex !== 'undefined' ? params.testMethodIndex : this.getMethodIndex(funcName)
@@ -791,7 +787,6 @@ export class Contract extends Artifact {
     addressToCodeHash.set(result.address, result.codeHash)
     result.contracts.forEach((contract) => addressToCodeHash.set(contract.address, contract.codeHash))
     return {
-      address: result.address,
       contractId: binToHex(contractIdFromAddress(result.address)),
       contractAddress: result.address,
       returns: fromApiArray(result.returns, this.functions[`${methodIndex}`].returnTypes),
@@ -1047,7 +1042,6 @@ export interface ContractEventByTxId {
 export type DebugMessage = node.DebugMessage
 
 export interface TestContractResult {
-  address: string
   contractId: string
   contractAddress: string
   returns: Val[]

package/src/index.ts

@@ -16,6 +16,10 @@ You should have received a copy of the GNU Lesser General Public License
 along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 
+BigInt.prototype['toJSON'] = function () {
+  return this.toString()
+}
+
 export * from './api'
 export * from './contract'
 export * from './signer'

package/src/utils/bs58.ts

@@ -23,4 +23,15 @@ const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
 
 export const bs58 = basex(ALPHABET)
 
+export function isBase58(s: string): boolean {
+  if (s === '' || s.trim() === '') {
+    return false
+  }
+  try {
+    return bs58.encode(bs58.decode(s)) === s
+  } catch (err) {
+    return false
+  }
+}
+
 export default bs58

package/src/utils/utils.ts

@@ -151,6 +151,10 @@ export function binToHex(bin: Uint8Array): string {
   return Buffer.from(bin).toString('hex')
 }
 
+export function groupOfPrivateKey(privateKey: string): number {
+  return groupOfAddress(addressFromPublicKey(publicKeyFromPrivateKey(privateKey)))
+}
+
 export function publicKeyFromPrivateKey(privateKey: string): string {
   const key = ec.keyFromPrivate(privateKey)
   return key.getPublic(true, 'hex')